From f274fa345dd8211cd45a667812d4f9df58fb1aab Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Wed, 19 Apr 2006 20:19:51 +0000 Subject: [PATCH] click_to_open now is always true, and cannot be disabled git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17175 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/preferences/menu/MenuBar.cpp | 6 +----- src/preferences/menu/MenuBar.h | 1 - src/preferences/menu/MenuWindow.cpp | 11 ----------- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/preferences/menu/MenuBar.cpp b/src/preferences/menu/MenuBar.cpp index 058e1350fc..4da772ece9 100644 --- a/src/preferences/menu/MenuBar.cpp +++ b/src/preferences/menu/MenuBar.cpp @@ -37,7 +37,6 @@ MenuBar::build_menu() fontSizeMenu = new FontSizeMenu(); // create the menu items - clickToOpenItem = new BMenuItem("Click To Open", new BMessage(CLICK_OPEN_MSG), 0, 0); alwaysShowTriggersItem = new BMenuItem("Always Show Triggers", new BMessage(ALLWAYS_TRIGGERS_MSG), 0, 0); separatorStyleItem = new BMenuItem("Separator Style", new BMessage(DEFAULT_MSG), 0, 0); ctlAsShortcutItem = new BitmapMenuItem("as Shortcut Key", @@ -73,7 +72,6 @@ MenuBar::build_menu() AddItem(fontMenu, 0); AddItem(fontSizeMenu, 1); AddSeparatorItem(); - AddItem(clickToOpenItem); AddItem(alwaysShowTriggersItem); AddSeparatorItem(); AddItem(colorSchemeItem); @@ -94,9 +92,7 @@ MenuBar::set_menu() get_menu_info(&info); alwaysShowTriggersItem->SetMarked(info.triggers_always_shown); - clickToOpenItem->SetMarked(info.click_to_open); - alwaysShowTriggersItem->SetEnabled(info.click_to_open); - + get_key_map(&keys, &chars); altAsShortcut = (keys->left_command_key == 0x5d) && (keys->right_command_key == 0x5f); diff --git a/src/preferences/menu/MenuBar.h b/src/preferences/menu/MenuBar.h index d4ac992f1a..7699538ad0 100644 --- a/src/preferences/menu/MenuBar.h +++ b/src/preferences/menu/MenuBar.h @@ -28,7 +28,6 @@ private: //others FontMenu *fontMenu; FontSizeMenu *fontSizeMenu; - BMenuItem *clickToOpenItem; BMenuItem *alwaysShowTriggersItem; BMenuItem *colorSchemeItem; BMenuItem *separatorStyleItem; diff --git a/src/preferences/menu/MenuWindow.cpp b/src/preferences/menu/MenuWindow.cpp index 252b4e8d38..46155c55e3 100644 --- a/src/preferences/menu/MenuWindow.cpp +++ b/src/preferences/menu/MenuWindow.cpp @@ -101,17 +101,6 @@ MenuWindow::MessageReceived(BMessage *msg) Update(); break; - case CLICK_OPEN_MSG: - revert = true; - if (info.click_to_open != true) - info.click_to_open = true; - else - info.click_to_open = false; - set_menu_info(&info); - menuBar->set_menu(); - Update(); - break; - case ALLWAYS_TRIGGERS_MSG: revert = true; if (info.triggers_always_shown != true)