From 101ca36412b3e7b8851b6b48a4f6cbc17d9f9eff Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
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/ExternalAPI/m_toptoolbar.h | 45 ++++++++++++++------------------------
 1 file changed, 17 insertions(+), 28 deletions(-)

(limited to 'plugins/ExternalAPI')

diff --git a/plugins/ExternalAPI/m_toptoolbar.h b/plugins/ExternalAPI/m_toptoolbar.h
index 5628f68de8..f67a3f965b 100644
--- a/plugins/ExternalAPI/m_toptoolbar.h
+++ b/plugins/ExternalAPI/m_toptoolbar.h
@@ -3,20 +3,17 @@
 #define M_TOPTOOLBAR_H
 
 //button flags
-#define TTBBF_DISABLED			1
-#define TTBBF_VISIBLE			2 
-#define TTBBF_PUSHED			4
-#define TTBBF_SHOWTOOLTIP		8
-#define TTBBF_DRAWBORDER		16//draw border for bitmap,bitmap must be WxH 16x12
-#define TTBBF_ISSEPARATOR		32
-
-//for internal launch buttons
+#define TTBBF_DISABLED         1
+#define TTBBF_VISIBLE          2 
+#define TTBBF_PUSHED           4
+#define TTBBF_SHOWTOOLTIP      8
+#define TTBBF_DRAWBORDER      16
+#define TTBBF_ISSEPARATOR     32
 #define TTBBF_ISLBUTTON			64
+#define TTBBF_ICONBYHANDLE   128 
 
 typedef struct {
 	int cbSize;
-	HBITMAP hbBitmapUp;
-	HBITMAP hbBitmapDown;
 	char *pszServiceUp;
 	char *pszServiceDown;
 	DWORD dwFlags;
@@ -25,26 +22,18 @@ typedef struct {
 	LPARAM lParamDown;
 	WPARAM wParamDown;
 	char *name;
-
-} TTBButton, * lpTTBButton;
-
-typedef struct {
-	int cbSize;
-	HBITMAP hbBitmapUp;
-	HBITMAP hbBitmapDown;
-	char *pszServiceUp;
-	char *pszServiceDown;
-	DWORD dwFlags;
-	LPARAM lParamUp;
-	WPARAM wParamUp;
-	LPARAM lParamDown;
-	WPARAM wParamDown;
-	char *name;
-	HICON hIconUp,hIconDn;
+	union {
+		HICON hIconUp;
+		HANDLE hIconHandleUp;
+	};
+	union {
+		HICON hIconDn;
+		HANDLE hIconHandleDn;
+	};
 	char *tooltipUp;
 	char *tooltipDn;
-
-} TTBButtonV2, * lpTTBButtonV2;
+}
+	TTBButton, * lpTTBButton;
 
 //=== EVENTS ===
 /*
-- 
cgit v1.2.3