summaryrefslogtreecommitdiff
path: root/src/mir_app
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-01-17 23:14:12 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-01-17 23:14:32 +0300
commitdcfb8826d85930581d179164afb1522c88074b2d (patch)
treee2b57adef41bcfbed8038b3f8844e6edbbea736d /src/mir_app
parentfc14cd04c3894702603bb4db7e56258608c5c8d7 (diff)
no need to copy that stuff each time
Diffstat (limited to 'src/mir_app')
-rw-r--r--src/mir_app/src/menu_options.cpp8
-rw-r--r--src/mir_app/src/proto_order.cpp14
2 files changed, 3 insertions, 19 deletions
diff --git a/src/mir_app/src/menu_options.cpp b/src/mir_app/src/menu_options.cpp
index 750fe1fd8a..93e4422902 100644
--- a/src/mir_app/src/menu_options.cpp
+++ b/src/mir_app/src/menu_options.cpp
@@ -293,7 +293,7 @@ public:
m_menuObjects.OnSelChange = Callback(this, &CGenMenuOptionsPage::onMenuObjectChanged);
- m_menuItems.SetFlags(MTREE_CHECKBOX | MTREE_DND /*| MTREE_MULTISELECT*/);
+ m_menuItems.SetFlags(MTREE_CHECKBOX | MTREE_DND);
m_menuItems.OnSelChanged = Callback(this, &CGenMenuOptionsPage::onMenuItemChanged);
m_menuItems.OnBeginDrag = Callback(this, &CGenMenuOptionsPage::onMenuItemBeginDrag);
@@ -307,11 +307,6 @@ public:
{
iInitMenuValue = db_get_b(0, "CList", "MoveProtoMenus", TRUE);
- HIMAGELIST himlCheckBoxes = ImageList_Create(g_iIconSX, g_iIconSY, ILC_COLOR32 | ILC_MASK, 2, 2);
- ImageList_AddIcon_IconLibLoaded(himlCheckBoxes, SKINICON_OTHER_NOTICK);
- ImageList_AddIcon_IconLibLoaded(himlCheckBoxes, SKINICON_OTHER_TICK);
- m_menuItems.SetImageList(himlCheckBoxes, TVSIL_NORMAL);
-
if (iInitMenuValue)
m_radio2.SetState(true);
else
@@ -348,7 +343,6 @@ public:
virtual void OnDestroy()
{
- ImageList_Destroy(m_menuItems.GetImageList(TVSIL_NORMAL));
FreeTreeData();
}
diff --git a/src/mir_app/src/proto_order.cpp b/src/mir_app/src/proto_order.cpp
index b72b6ff049..c1b971b185 100644
--- a/src/mir_app/src/proto_order.cpp
+++ b/src/mir_app/src/proto_order.cpp
@@ -153,17 +153,12 @@ public:
m_order.OnDeleteItem = Callback(this, &CProtocolOrderOpts::onOrder_DeleteItem);
}
- virtual void OnInitDialog()
+ virtual void OnInitDialog() override
{
- HIMAGELIST himlCheckBoxes = ImageList_Create(g_iIconSX, g_iIconSY, ILC_COLOR32 | ILC_MASK, 2, 2);
- ImageList_AddIcon_IconLibLoaded(himlCheckBoxes, SKINICON_OTHER_NOTICK);
- ImageList_AddIcon_IconLibLoaded(himlCheckBoxes, SKINICON_OTHER_TICK);
- m_order.SetImageList(himlCheckBoxes, TVSIL_NORMAL);
-
FillTree();
}
- virtual void OnApply()
+ virtual void OnApply() override
{
int idx = 0;
@@ -195,11 +190,6 @@ public:
Clist_Broadcast(INTM_INVALIDATE, 0, 0);
}
- virtual void OnDestroy()
- {
- ImageList_Destroy(m_order.GetImageList(TVSIL_NORMAL));
- }
-
void onReset_Click(CCtrlButton*)
{
for (int i = 0; i < accounts.getCount(); i++)