From 101ca36412b3e7b8851b6b48a4f6cbc17d9f9eff Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 10 Jun 2012 14:46:58 +0000 Subject: bitmap operations were removed from TopToolBar and replaced with IcoLib git-svn-id: http://svn.miranda-ng.org/main/trunk@379 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Console/Console.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'plugins/Console/Console.c') diff --git a/plugins/Console/Console.c b/plugins/Console/Console.c index 7d08659a8b..eea28e711f 100644 --- a/plugins/Console/Console.c +++ b/plugins/Console/Console.c @@ -122,8 +122,6 @@ static int Openfile(TCHAR *outputFile, int selection); //////////////////////////////////////////////////////////////////////////////// #ifdef TTB -static HBITMAP BmpUp = NULL; -static HBITMAP BmpDn = NULL; static HANDLE hTTBButt = 0; static INT_PTR HideConsoleButt(WPARAM wParam,LPARAM lParam) @@ -149,12 +147,9 @@ static int OnTTBLoaded(WPARAM wParam,LPARAM lParam) CreateServiceFunction("Console/Hide", HideConsoleButt); CreateServiceFunction("Console/Show", ShowConsoleButt); - BmpUp = LoadBitmap(hInst,MAKEINTRESOURCE(IDB_CONSOLE_UP)); - BmpDn = LoadBitmap(hInst,MAKEINTRESOURCE(IDB_CONSOLE_DOWN)); - ttbb.cbSize = sizeof(ttbb); - ttbb.hbBitmapUp = BmpUp; - ttbb.hbBitmapDown = BmpDn; + ttbb.hIconUp = LoadIcon(hInst, MAKEINTRESOURCE(IDI_CONSOLE_UP)); + ttbb.hIconDn = LoadIcon(hInst, MAKEINTRESOURCE(IDI_CONSOLE_DOWN)); ttbb.dwFlags=(state?TTBBF_PUSHED:0)|TTBBF_VISIBLE|TTBBF_SHOWTOOLTIP; ttbb.pszServiceDown = "Console/Show"; ttbb.pszServiceUp = "Console/Hide"; @@ -1485,11 +1480,6 @@ void ShutdownConsole(void) for(i = 0; i < SIZEOF(hIcons); i++) { if (hIcons[i]) DestroyIcon(hIcons[i]); } - -#ifdef TBB - if (BmpUp) DeleteObject(BmpUp); - if (BmpDn) DeleteObject(BmpDn); -#endif } //////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3