From 696f4ea57845f48d6d979ecd9d66bb22bd9f738d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 8 Jul 2012 20:51:14 +0000 Subject: TopToolbar usage fixed everywhere git-svn-id: http://svn.miranda-ng.org/main/trunk@861 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Updater/updater.cpp | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) (limited to 'plugins/Updater') diff --git a/plugins/Updater/updater.cpp b/plugins/Updater/updater.cpp index 2d5ac9cc55..db4968c373 100644 --- a/plugins/Updater/updater.cpp +++ b/plugins/Updater/updater.cpp @@ -2,7 +2,7 @@ #include "updater.h" #include -#include "m_toolbar.h" +#include "m_toptoolbar.h" HINSTANCE hInst; @@ -179,33 +179,27 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) { static int ToolbarModulesLoaded(WPARAM, LPARAM) { - TBButton tbb = {0}; - tbb.cbSize = sizeof(TBButton); - tbb.tbbFlags = TBBF_SHOWTOOLTIP; + TTBButton tbb = {0}; + tbb.cbSize = sizeof(TTBButton); + tbb.dwFlags = TTBBF_SHOWTOOLTIP | TTBBF_ICONBYHANDLE; - tbb.pszButtonID = "updater_checkforupdates"; - tbb.pszButtonName = LPGEN("Check for Updates"); - tbb.pszServiceName = MS_UPDATE_CHECKFORUPDATES; + tbb.name = LPGEN("Check for Updates"); + tbb.pszService = MS_UPDATE_CHECKFORUPDATES; tbb.pszTooltipUp = LPGEN("Check for Updates of Plugins"); - tbb.hPrimaryIconHandle = GetIconHandle(I_CHKUPD); - tbb.defPos = 1000; - CallService(MS_TB_ADDBUTTON, 0, (LPARAM)&tbb); + tbb.hIconHandleUp = GetIconHandle(I_CHKUPD); + TopToolbar_AddButton(&tbb); - tbb.pszButtonID = "updater_restart"; - tbb.pszButtonName = LPGEN("Restart"); - tbb.pszServiceName = MS_UPDATE_MENURESTART; + tbb.name = LPGEN("Restart"); + tbb.pszService = MS_UPDATE_MENURESTART; tbb.pszTooltipUp = LPGEN("Restart Miranda IM"); - tbb.hPrimaryIconHandle = GetIconHandle(I_RSTRT); - tbb.defPos = 1001; - CallService(MS_TB_ADDBUTTON, 0, (LPARAM)&tbb); + tbb.hIconHandleUp = GetIconHandle(I_RSTRT); + TopToolbar_AddButton(&tbb); - tbb.pszButtonID = "updater_updateandexit"; - tbb.pszButtonName = LPGEN("Update and Exit"); - tbb.pszServiceName = MS_UPDATE_MENUUPDATEANDEXIT; + tbb.name = LPGEN("Update and Exit"); + tbb.pszService = MS_UPDATE_MENUUPDATEANDEXIT; tbb.pszTooltipUp = LPGEN("Update and Exit Miranda IM"); - tbb.hPrimaryIconHandle = GetIconHandle(I_CHKUPDEXT); - tbb.defPos = 1002; - CallService(MS_TB_ADDBUTTON,0, (LPARAM)&tbb); + tbb.hIconHandleUp = GetIconHandle(I_CHKUPDEXT); + TopToolbar_AddButton(&tbb); return 0; } @@ -229,7 +223,7 @@ extern "C" int __declspec(dllexport) Load(void) hEventOptInit = HookEvent(ME_OPT_INITIALISE, OptInit); hEventModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded); - hToolBarLoaded = HookEvent(ME_TB_MODULELOADED, ToolbarModulesLoaded); + hToolBarLoaded = HookEvent(ME_TTB_MODULELOADED, ToolbarModulesLoaded); InitServices(); InitIcons(); -- cgit v1.2.3