From 538ca14f790c64bb793dd5cc29c013410c0a555e Mon Sep 17 00:00:00 2001 From: svntcreutz Date: Tue, 28 Aug 2007 21:43:02 +0000 Subject: some bugs fixed, some new get git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/menuorg/trunk@6103 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f --- src/menuitemsetup.cpp | 2 -- src/menusetup.cpp | 2 +- src/osdxmlitem.h | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/menuitemsetup.cpp b/src/menuitemsetup.cpp index 5e4ade7..a1ad726 100644 --- a/src/menuitemsetup.cpp +++ b/src/menuitemsetup.cpp @@ -32,8 +32,6 @@ cMenuItemSetup::cMenuItemSetup(cOsdXmlItem* osdXmlItem) itemTypeText[2] = "Submenu"; itemTypeText[3] = "Command"; - _xmlElement = xmlElement; - Add(new cMenuEditStraItem(tr("Item Type"),&_itemType, 4, itemTypeText)); switch(_itemType) diff --git a/src/menusetup.cpp b/src/menusetup.cpp index d53626b..13a1502 100644 --- a/src/menusetup.cpp +++ b/src/menusetup.cpp @@ -101,7 +101,7 @@ eOSState cMenuOrgSetup::ProcessKey(eKeys Key) break; case kGreen: - cOsdXmlItem *item=Get(Current()); + cOsdItem *item=Get(Current()); state = AddSubMenu(new cMenuItemSetup(item)); break; diff --git a/src/osdxmlitem.h b/src/osdxmlitem.h index 6f00709..041a6c7 100644 --- a/src/osdxmlitem.h +++ b/src/osdxmlitem.h @@ -30,7 +30,7 @@ using namespace std; namespace xmlpp { class Element; } -class cOsdXmlItem: cOsdItem +class cOsdXmlItem: public cOsdItem { public: const xmlpp::Element* _xmlElement; -- cgit v1.2.3