From 798a7bc2ee5f488d67831c11778f209bdadcba02 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 21 Jun 2012 18:03:23 +0000
Subject: patch for the core Mbutton class customization, to use the themes
 defined by plugins

git-svn-id: http://svn.miranda-ng.org/main/trunk@514 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Clist_nicer/INCLUDE/clc.h           | 82 +++++++++++++++--------------
 plugins/Clist_nicer/INCLUDE/commonheaders.h |  2 +
 2 files changed, 44 insertions(+), 40 deletions(-)

(limited to 'plugins/Clist_nicer/INCLUDE')

diff --git a/plugins/Clist_nicer/INCLUDE/clc.h b/plugins/Clist_nicer/INCLUDE/clc.h
index 8cd4a5b8d7..fb412f46a5 100644
--- a/plugins/Clist_nicer/INCLUDE/clc.h
+++ b/plugins/Clist_nicer/INCLUDE/clc.h
@@ -124,25 +124,25 @@ typedef struct _OrderTreeData
 	const TCHAR *	Name;
 	BYTE	Position;
 	BOOL	Visible;
-    BOOL    fReserved;
+	BOOL  fReserved;
 } *PORDERTREEDATA, ORDERTREEDATA;
 
 struct DisplayProfile {
-    DWORD   dwFlags;
-    DWORD   dwExtraImageMask;
-    int     exIconScale;
-    BOOL    bCenterStatusIcons;
-    BOOL    bDimIdle, bNoOfflineAvatars, bShowLocalTime, bShowLocalTimeSelective, bDontSeparateOffline, bCenterGroupNames;
-    BYTE    dualRowMode;
-    COLORREF avatarBorder;
-    DWORD    avatarRadius;
-    int      avatarSize;
-    DWORD    clcExStyle;
-    DWORD    clcOfflineModes;
-    BYTE     sortOrder[3], bUseDCMirroring, bGroupAlign;
-    BYTE     avatarPadding;
-    BYTE     bLeftMargin, bRightMargin, bRowSpacing, bGroupIndent, bRowHeight, bGroupRowHeight;
-    BYTE     exIconOrder[EXICON_COUNT];
+	DWORD   dwFlags;
+	DWORD   dwExtraImageMask;
+	int     exIconScale;
+	BOOL    bCenterStatusIcons;
+	BOOL    bDimIdle, bNoOfflineAvatars, bShowLocalTime, bShowLocalTimeSelective, bDontSeparateOffline, bCenterGroupNames;
+	BYTE    dualRowMode;
+	COLORREF avatarBorder;
+	DWORD    avatarRadius;
+	int      avatarSize;
+	DWORD    clcExStyle;
+	DWORD    clcOfflineModes;
+	BYTE     sortOrder[3], bUseDCMirroring, bGroupAlign;
+	BYTE     avatarPadding;
+	BYTE     bLeftMargin, bRightMargin, bRowSpacing, bGroupIndent, bRowHeight, bGroupRowHeight;
+	BYTE     exIconOrder[EXICON_COUNT];
 };
 typedef struct DisplayProfile DISPLAYPROFILE;
 
@@ -151,9 +151,9 @@ typedef struct DisplayProfile DISPLAYPROFILE;
  */
 
 struct DisplayProfileSet {
-    UINT    uID;
-    TCHAR   tszName[60];
-    DISPLAYPROFILE dp[4];
+	UINT    uID;
+	TCHAR   tszName[60];
+	DISPLAYPROFILE dp[4];
 };
 typedef struct DisplayProfileSet DISPLAYPROFILESET;
 
@@ -168,13 +168,13 @@ struct TExtraCache {
 	TCHAR *statusMsg;
 	BYTE bStatusMsgValid;
 	DWORD dwCFlags;
-    DWORD dwDFlags;     // display flags for caching only
-    DWORD dwXMask;      // local extra icon mask, calculated from CLN_xmask
+	DWORD dwDFlags;     // display flags for caching only
+	DWORD dwXMask;      // local extra icon mask, calculated from CLN_xmask
 	StatusItems_t *status_item, *proto_status_item;
 	CONTACTFLOATER *floater;
 	DWORD dwLastMsgTime;
-    DWORD msgFrequency;
-    BOOL  isChatRoom;
+	DWORD msgFrequency;
+	BOOL  isChatRoom;
 };
 
 struct ClcContact {
@@ -206,9 +206,9 @@ struct ClcContact {
 	int extraCacheEntry;
 	int avatarLeft, extraIconRightBegin;
 	int isRtl;
-    DWORD cFlags;
-    BYTE  bSecondLine;
-    //int iRowHeight;   // index into the row height table (for caching)
+	DWORD cFlags;
+	BYTE  bSecondLine;
+	//int iRowHeight;   // index into the row height table (for caching)
 };
 
 #define DRAGSTAGE_NOTMOVED  0
@@ -287,7 +287,7 @@ struct ClcData {
 	BOOL bNeedPaint, bisEmbedded, bHideSubcontacts;
 	DWORD lastRepaint;
 	BOOL forceScroll;
-    int  oldSelection;
+	int  oldSelection;
 };
 
 //#define CLUI_FRAME_SHOWTOPBUTTONS 1
@@ -425,13 +425,13 @@ struct TCluiData {
 	BYTE bWantFastGradients, bUseFastGradients;
 	BYTE sortOrder[3];
 	BYTE bGroupAlign;
-    BYTE bSkinnedScrollbar;
-    DWORD langPackCP;
-    BOOL fOnDesktop;
-    int  group_padding;
-    DWORD t_now;
-    BYTE exIconOrder[EXICON_COUNT];
-    BOOL realTimeSaving;
+	BYTE bSkinnedScrollbar;
+	DWORD langPackCP;
+	BOOL fOnDesktop;
+	int  group_padding;
+	DWORD t_now;
+	BYTE exIconOrder[EXICON_COUNT];
+	BOOL realTimeSaving;
 	TCHAR tszProfilePath[MAX_PATH];
 	FILETIME ft;
 	SYSTEMTIME st;
@@ -584,10 +584,18 @@ extern "C" void _DebugTraceA(const char *fmt, ...);
 #else
 void _DebugTraceA(const char *fmt, ...);
 #endif
+
 // Docking.c
 
 int Docking_IsDocked(WPARAM wParam, LPARAM lParam);
 
+// Buttons
+
+#define BUTTONSETIMLICON      (WM_USER+20)
+#define BUTTONSETSKINNED      (WM_USER+21)
+#define BUTTONSETASMENUACTION (WM_USER+22)
+#define BUTTONSETBTNITEM      (WM_USER+23)
+
 // Menus
 
 void IMG_DeleteItems();
@@ -611,12 +619,6 @@ int CoolSB_SetupScrollBar();
 #define SETTING_WINDOWSTYLE_THINBORDER 2
 #define SETTING_WINDOWSTYLE_NOBORDER 3
 
-#define BM_SETPRIVATEICON (WM_USER + 6)
-#define BM_SETIMLICON (WM_USER + 7)
-#define BM_SETSKINNED (WM_USER + 8)
-#define BM_SETASMENUACTION (WM_USER + 9)
-#define BM_SETBTNITEM (WM_USER+10)
-
 #define EIMG_SHOW_RES0 8
 #define EIMG_SHOW_EMAIL 1
 #define EIMG_SHOW_WEB 2
diff --git a/plugins/Clist_nicer/INCLUDE/commonheaders.h b/plugins/Clist_nicer/INCLUDE/commonheaders.h
index 235bd02203..4f46b9d1d7 100644
--- a/plugins/Clist_nicer/INCLUDE/commonheaders.h
+++ b/plugins/Clist_nicer/INCLUDE/commonheaders.h
@@ -214,6 +214,8 @@ BOOL __forceinline GetItemByStatus(int status, StatusItems_t *retitem);
 
 void DrawAlpha(HDC hdcwnd, PRECT rc, DWORD basecolor, int alpha, DWORD basecolor2, BOOL transparent, BYTE FLG_GRADIENT, BYTE FLG_CORNER, DWORD BORDERSTYLE, ImageItem *item);
 
+void CustomizeButton(HWND hWnd, bool bIsSkinned, bool bIsThemed, bool bIsFlat);
+
 void FreeAndNil( void** );
 
 #if _MSC_VER >= 1500
-- 
cgit v1.2.3