From 5bb5cd34521baeff7a467c206f6ef917157a9d73 Mon Sep 17 00:00:00 2001 From: svntobi Date: Mon, 24 Mar 2008 22:32:17 +0000 Subject: Fixed small bug caused by hidden menu entries git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/menuorg/trunk@7083 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f --- src/MenuItemDefinitionFactory.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/MenuItemDefinitionFactory.cpp') diff --git a/src/MenuItemDefinitionFactory.cpp b/src/MenuItemDefinitionFactory.cpp index d6c0744..85a61bf 100644 --- a/src/MenuItemDefinitionFactory.cpp +++ b/src/MenuItemDefinitionFactory.cpp @@ -34,7 +34,7 @@ using namespace std; -IMenuItemDefinition* MenuItemDefinitionFactory::CreateFromMenuNode(MenuNode* menuNode, bool isSelected) +MenuItemDefinition* MenuItemDefinitionFactory::CreateFromMenuNode(MenuNode* menuNode, bool isSelected) { MenuItemDefinitionFactory* factory = new MenuItemDefinitionFactory(isSelected); menuNode->Process(factory); @@ -48,25 +48,25 @@ MenuItemDefinitionFactory::MenuItemDefinitionFactory(bool isSelected) void MenuItemDefinitionFactory::ProcessSystemMenuNode(SystemMenuNode* node) { - _createdMenuItemDefinition = new OsdItemDefinition(new cOsdItem(node->DisplayText().c_str(), node->State().OSState()), false); + _createdMenuItemDefinition = new OsdItemDefinition(node, new cOsdItem(node->DisplayText().c_str(), node->State().OSState()), false); } void MenuItemDefinitionFactory::ProcessPluginMenuNode(PluginMenuNode* node) { - _createdMenuItemDefinition = new PluginItemDefinition(node->DisplayText(), node->PluginIndex()); + _createdMenuItemDefinition = new PluginItemDefinition(node, node->DisplayText(), node->PluginIndex()); } void MenuItemDefinitionFactory::ProcessSubMenuNode(SubMenuNode* node) { - _createdMenuItemDefinition = new OsdItemDefinition(new cOsdItem(node->Text().c_str(), osUser1), _isSelected); + _createdMenuItemDefinition = new OsdItemDefinition(node, new cOsdItem(node->Text().c_str(), osUser1), _isSelected); } void MenuItemDefinitionFactory::ProcessCommandMenuNode(CommandMenuNode* node) { - _createdMenuItemDefinition = new OsdItemDefinition(new cOsdItem(node->Text().c_str(), osUser2), _isSelected); + _createdMenuItemDefinition = new OsdItemDefinition(node, new cOsdItem(node->Text().c_str(), osUser2), _isSelected); } void MenuItemDefinitionFactory::ProcessSeparatorMenuNode(SeparatorMenuNode* node) { - _createdMenuItemDefinition = new OsdItemDefinition(new cOsdSeparatorItem(node->DisplayText().c_str()), false); + _createdMenuItemDefinition = new OsdItemDefinition(node, new cOsdSeparatorItem(node->DisplayText().c_str()), false); } -- cgit v1.2.3