From f3d44bc057201407373012b7f682881bda7b3d98 Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
Date: Wed, 23 May 2012 07:44:30 +0000
Subject: some includes restored, mir_full.sln updated, some renaming of
 folders and projects

git-svn-id: http://svn.miranda-ng.org/main/trunk@140 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/ExternalAPI/m_cln_skinedit.h | 69 +++++++++++-------------------------
 1 file changed, 21 insertions(+), 48 deletions(-)

(limited to 'plugins/ExternalAPI')

diff --git a/plugins/ExternalAPI/m_cln_skinedit.h b/plugins/ExternalAPI/m_cln_skinedit.h
index a1e69bb6e1..5ee66829c5 100644
--- a/plugins/ExternalAPI/m_cln_skinedit.h
+++ b/plugins/ExternalAPI/m_cln_skinedit.h
@@ -10,32 +10,18 @@
  * data structs
  */
 
-typedef struct _tagImageItem {
-    char    szName[40];
-    HBITMAP hbm;
-    BYTE    bLeft, bRight, bTop, bBottom;      // sizing margins
-    BYTE    alpha;
-    DWORD   dwFlags;
-    HDC     hdc;
-    HBITMAP hbmOld;
-    LONG    inner_height, inner_width;
-    LONG    width, height;
-    BLENDFUNCTION bf;
-    BYTE    bStretch;
-    HBRUSH  fillBrush;
-    LONG    glyphMetrics[4];
-    struct  _tagImageItem *nextItem;
-} ImageItem;
-
-typedef struct _tagButtonItem {
-    char    szName[40];
+struct TWindowData;
+class CImageItem;
+
+struct ButtonItem {
+    TCHAR   szName[40];
     HWND    hWnd;
     LONG    xOff, yOff;
     LONG    width, height;
-    ImageItem *imgNormal, *imgPressed, *imgHover;
-    LONG    normalGlyphMetrics[4];
-    LONG    hoverGlyphMetrics[4];
-    LONG    pressedGlyphMetrics[4];
+    CImageItem *imgNormal, *imgPressed, *imgHover;
+    LONG_PTR normalGlyphMetrics[4];
+    LONG_PTR hoverGlyphMetrics[4];
+    LONG_PTR pressedGlyphMetrics[4];
     DWORD   dwFlags, dwStockFlags;
     DWORD   uId;
     TCHAR   szTip[256];
@@ -43,19 +29,21 @@ typedef struct _tagButtonItem {
     char    szModule[256], szSetting[256];
     BYTE    bValuePush[256], bValueRelease[256];
     DWORD   type;
-    void    (*pfnAction)(struct _tagButtonItem *item, HWND hwndDlg, struct MessageWindowData *dat, HWND hwndItem);
-    void    (*pfnCallback)(struct _tagButtonItem *item, HWND hwndDlg, struct MessageWindowData *dat, HWND hwndItem);
+    void    (*pfnAction)(ButtonItem *item, HWND hwndDlg, TWindowData *dat, HWND hwndItem);
+    void    (*pfnCallback)(ButtonItem *item, HWND hwndDlg, TWindowData *dat, HWND hwndItem);
     TCHAR   tszLabel[40];
-    struct  _tagButtonItem *nextItem;
-} ButtonItem;
+    ButtonItem* nextItem;
+	HANDLE  hContact;
+	TWindowData *dat;
+};
 
 typedef struct _tagButtonSet {
     ButtonItem  *items;
     LONG        left, top, right, bottom;               // client area offsets, calculated from button layout
 } ButtonSet;
 
-typedef struct {
-    char szName[40];
+struct CSkinItem {
+    TCHAR szName[40];
     char szDBname[40];
     int statusID;
 
@@ -77,28 +65,12 @@ typedef struct {
     int MARGIN_BOTTOM;
     BYTE IGNORED;
     DWORD BORDERSTYLE;
-    ImageItem *imageItem;
-} StatusItems_t;
-
-typedef struct {
-    BOOL bGRADIENT;
-    BOOL bCORNER;
-    BOOL bCOLOR;
-    BOOL bCOLOR2;
-    BOOL bCOLOR2_TRANSPARENT;
-    BOOL bTEXTCOLOR;
-    BOOL bALPHA;
-    BOOL bMARGIN_LEFT;
-    BOOL bMARGIN_TOP;
-    BOOL bMARGIN_RIGHT;
-    BOOL bMARGIN_BOTTOM;
-    BOOL bIGNORED;
-    BOOL bBORDERSTYLE;
-} ChangedSItems_t;
+    CImageItem *imageItem;
+};
 
 typedef struct _tagSkinDescription {
     DWORD           cbSize;
-    StatusItems_t   *StatusItems;
+    CSkinItem   *StatusItems;
     int             lastItem;
     int             firstItem;
     char            szModule[100];
@@ -124,6 +96,7 @@ typedef struct _tagSkinDescription {
 #define CORNER_TR 4
 #define CORNER_BR 8
 #define CORNER_BL 16
+#define CORNER_ALL (CORNER_TL | CORNER_TR | CORNER_BR | CORNER_BL | CORNER_ACTIVE)
 
 #define GRADIENT_NONE 0
 #define GRADIENT_ACTIVE 1
-- 
cgit v1.2.3