diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-06-26 23:41:55 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-06-26 23:41:55 +0000 |
| commit | 25221b7d2afb70f82eb3805330fd39a6f6708049 (patch) | |
| tree | 6fdd3eb5c5642788e1f8286385b15535f9a7ec16 /plugins/TopToolBar | |
| parent | ef81e9edc10e2478f514e1fbfb0828ad1e7d8e49 (diff) | |
mk: removed all LIST_INTERFACE, MI_INTERFACE & UTF8_INTERFACE instances.
all related functions moved to mir_core.
git-svn-id: http://svn.miranda-ng.org/main/trunk@644 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TopToolBar')
| -rw-r--r-- | plugins/TopToolBar/main.cpp | 4 | ||||
| -rw-r--r-- | plugins/TopToolBar/toolbar.cpp | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/plugins/TopToolBar/main.cpp b/plugins/TopToolBar/main.cpp index d4f486bbe0..91b41be6cc 100644 --- a/plugins/TopToolBar/main.cpp +++ b/plugins/TopToolBar/main.cpp @@ -4,8 +4,6 @@ HINSTANCE hInst;
PLUGINLINK *pluginLink;
-MM_INTERFACE mmi;
-LIST_INTERFACE li;
HANDLE hHookTTBModuleLoaded;
int hLangpack;
@@ -46,8 +44,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
{
pluginLink = link;
- mir_getMMI( &mmi );
- mir_getLI( &li );
mir_getLP(&pluginInfo);
LoadToolbarModule();
diff --git a/plugins/TopToolBar/toolbar.cpp b/plugins/TopToolBar/toolbar.cpp index 17e5028df0..7161d26c9b 100644 --- a/plugins/TopToolBar/toolbar.cpp +++ b/plugins/TopToolBar/toolbar.cpp @@ -185,7 +185,9 @@ INT_PTR TTBRemoveButton(WPARAM wParam, LPARAM lParam) RemoveFromOptions(b->id);
- Buttons.remove(b);
+ int idx = Buttons.getIndex(b);
+ if (idx != -1)
+ Buttons.remove(idx);
delete b;
ArrangeButtons();
|