moved some api headers

git-svn-id: http://svn.miranda-ng.org/main/trunk@139 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 48 insertions, 21 deletions

diff --git a/plugins/ExternalAPI/m_cln_skinedit.h b/plugins/ExternalAPI/m_cln_skinedit.h
index 5ee66829c5..a1e69bb6e1 100644
--- a/plugins/ExternalAPI/m_cln_skinedit.h
+++ b/plugins/ExternalAPI/m_cln_skinedit.h
@@ -10,18 +10,32 @@
  * data structs

  */

 

-struct TWindowData;

-class CImageItem;

-

-struct ButtonItem {

-    TCHAR   szName[40];

+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];

     HWND    hWnd;

     LONG    xOff, yOff;

     LONG    width, height;

-    CImageItem *imgNormal, *imgPressed, *imgHover;

-    LONG_PTR normalGlyphMetrics[4];

-    LONG_PTR hoverGlyphMetrics[4];

-    LONG_PTR pressedGlyphMetrics[4];

+    ImageItem *imgNormal, *imgPressed, *imgHover;

+    LONG    normalGlyphMetrics[4];

+    LONG    hoverGlyphMetrics[4];

+    LONG    pressedGlyphMetrics[4];

     DWORD   dwFlags, dwStockFlags;

     DWORD   uId;

     TCHAR   szTip[256];

@@ -29,21 +43,19 @@ struct ButtonItem {
     char    szModule[256], szSetting[256];

     BYTE    bValuePush[256], bValueRelease[256];

     DWORD   type;

-    void    (*pfnAction)(ButtonItem *item, HWND hwndDlg, TWindowData *dat, HWND hwndItem);

-    void    (*pfnCallback)(ButtonItem *item, HWND hwndDlg, TWindowData *dat, HWND hwndItem);

+    void    (*pfnAction)(struct _tagButtonItem *item, HWND hwndDlg, struct MessageWindowData *dat, HWND hwndItem);

+    void    (*pfnCallback)(struct _tagButtonItem *item, HWND hwndDlg, struct MessageWindowData *dat, HWND hwndItem);

     TCHAR   tszLabel[40];

-    ButtonItem* nextItem;

-	HANDLE  hContact;

-	TWindowData *dat;

-};

+    struct  _tagButtonItem *nextItem;

+} ButtonItem;

 

 typedef struct _tagButtonSet {

     ButtonItem  *items;

     LONG        left, top, right, bottom;               // client area offsets, calculated from button layout

 } ButtonSet;

 

-struct CSkinItem {

-    TCHAR szName[40];

+typedef struct {

+    char szName[40];

     char szDBname[40];

     int statusID;

 

@@ -65,12 +77,28 @@ struct CSkinItem {
     int MARGIN_BOTTOM;

     BYTE IGNORED;

     DWORD BORDERSTYLE;

-    CImageItem *imageItem;

-};

+    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;

 

 typedef struct _tagSkinDescription {

     DWORD           cbSize;

-    CSkinItem   *StatusItems;

+    StatusItems_t   *StatusItems;

     int             lastItem;

     int             firstItem;

     char            szModule[100];

@@ -96,7 +124,6 @@ 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