summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mir_app/res/resource.rc1
-rw-r--r--src/mir_app/src/menu_options.cpp7
-rw-r--r--src/mir_app/src/resource.h1
3 files changed, 1 insertions, 8 deletions
diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc
index d1d829991b..f6763a5245 100644
--- a/src/mir_app/res/resource.rc
+++ b/src/mir_app/res/resource.rc
@@ -473,7 +473,6 @@ BEGIN
GROUPBOX "Protocol menus",IDC_STATIC,5,81,140,41
CONTROL "Move to the main menu",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,11,95,128,8
CONTROL "Move to the status bar",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,11,107,130,8
- PUSHBUTTON "Insert submenu",IDC_INSERTSUBMENU,39,128,97,14,WS_DISABLED
PUSHBUTTON "Insert separator",IDC_INSERTSEPARATOR,39,145,97,14,WS_DISABLED
LTEXT "Module:",IDC_STATIC,4,164,29,8
EDITTEXT IDC_GENMENU_MODULE,36,162,108,12,ES_AUTOHSCROLL | ES_READONLY
diff --git a/src/mir_app/src/menu_options.cpp b/src/mir_app/src/menu_options.cpp
index 99b6e81b85..6ba6dac31e 100644
--- a/src/mir_app/src/menu_options.cpp
+++ b/src/mir_app/src/menu_options.cpp
@@ -259,7 +259,6 @@ class CGenMenuOptionsPage : public CDlgBase
m_menuItems.Enable(pmo->m_bUseUserDefinedItems);
m_btnInsSeparator.Enable(pmo->m_bUseUserDefinedItems);
- m_btnInsMenu.Enable(pmo->m_bUseUserDefinedItems);
return 1;
}
@@ -277,7 +276,7 @@ class CGenMenuOptionsPage : public CDlgBase
CCtrlTreeView m_menuItems;
CCtrlCheck m_radio1, m_radio2, m_enableIcons;
CCtrlEdit m_customName, m_service, m_module, m_id;
- CCtrlButton m_btnInsSeparator, m_btnInsMenu, m_btnReset, m_btnSet, m_btnDefault, m_btnDelete;
+ CCtrlButton m_btnInsSeparator, m_btnReset, m_btnSet, m_btnDefault, m_btnDelete;
public:
CGenMenuOptionsPage() :
@@ -289,7 +288,6 @@ public:
m_radio2(this, IDC_RADIO2),
m_enableIcons(this, IDC_DISABLEMENUICONS),
m_btnInsSeparator(this, IDC_INSERTSEPARATOR),
- m_btnInsMenu(this, IDC_INSERTSUBMENU),
m_btnReset(this, IDC_RESETMENU),
m_btnSet(this, IDC_GENMENU_SET),
m_btnDelete(this, IDC_GENMENU_DELETE),
@@ -302,7 +300,6 @@ public:
m_btnSet.OnClick = Callback(this, &CGenMenuOptionsPage::btnSet_Clicked);
m_btnReset.OnClick = Callback(this, &CGenMenuOptionsPage::btnReset_Clicked);
m_btnInsSeparator.OnClick = Callback(this, &CGenMenuOptionsPage::btnInsSep_Clicked);
- m_btnInsMenu.OnClick = Callback(this, &CGenMenuOptionsPage::btnInsMenu_Clicked);
m_btnDefault.OnClick = Callback(this, &CGenMenuOptionsPage::btnDefault_Clicked);
m_btnDelete.OnClick = Callback(this, &CGenMenuOptionsPage::btnDelete_Clicked);
@@ -535,7 +532,6 @@ public:
m_module.SetTextA("");
m_id.SetTextA("");
- m_btnInsMenu.Disable();
m_btnDefault.Disable();
m_btnSet.Disable();
m_btnDelete.Disable();
@@ -572,7 +568,6 @@ public:
auto *pPlugin = iod->pimi->mi.pPlugin;
m_module.SetTextA(pPlugin ? pPlugin->getInfo().shortName : "");
- m_btnInsMenu.Enable(iod->pimi->mi.root == nullptr);
m_btnDefault.Enable(mir_wstrcmp(iod->name, iod->defname) != 0);
m_btnDelete.Enable(iod->pimi->mi.flags & CMIF_CUSTOM);
m_btnSet.Enable(true);
diff --git a/src/mir_app/src/resource.h b/src/mir_app/src/resource.h
index 0a7cd65a53..5f963eba57 100644
--- a/src/mir_app/src/resource.h
+++ b/src/mir_app/src/resource.h
@@ -378,7 +378,6 @@
#define IDC_DOBMONTH 1227
#define IDC_WEBPAGE 1228
#define IDC_DOBYEAR 1229
-#define IDC_INSERTSUBMENU 1230
#define IDC_UPDATING 1231
#define IDC_NAMEORDER 1234
#define IDC_RECONNECTREQD 1239