- unused icons removed;

- spaces replaced with tabs

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

9 files changed, 317 insertions, 320 deletions

diff --git a/plugins/Clist_modern/src/hdr/modern_callproc.h b/plugins/Clist_modern/src/hdr/modern_callproc.h
index 19cfb883b6..4e3df47257 100644
--- a/plugins/Clist_modern/src/hdr/modern_callproc.h
+++ b/plugins/Clist_modern/src/hdr/modern_callproc.h
@@ -16,95 +16,95 @@ class __baseCall { public: virtual int __DoCallStorageProc() =0;  virtual ~__bas
 template< class R > class _callParams0 : public __baseCall

 {

 public:

-    R(*_proc)();

-    _callParams0( R (*proc)()) : _proc(proc){};

-    int __DoCallStorageProc() { return (int)_proc(); }

+	R(*_proc)();

+	_callParams0( R (*proc)()) : _proc(proc){};

+	int __DoCallStorageProc() { return (int)_proc(); }

 };

 

 template<> class _callParams0<void> : public __baseCall

 {

 public:

-    void(*_proc)();

-    _callParams0( void (*proc)()) : _proc(proc){};

-    int __DoCallStorageProc() { _proc(); return 0; }

+	void(*_proc)();

+	_callParams0( void (*proc)()) : _proc(proc){};

+	int __DoCallStorageProc() { _proc(); return 0; }

 };

 

 template< class R, class A> class _callParams1 : public __baseCall

 {

 public:

-    R(*_proc)(A); A _a; 

-    _callParams1( R(*proc)(A), A a) : _proc(proc), _a(a) {};

-    int __DoCallStorageProc() { return (int)_proc(_a);  }

+	R(*_proc)(A); A _a; 

+	_callParams1( R(*proc)(A), A a) : _proc(proc), _a(a) {};

+	int __DoCallStorageProc() { return (int)_proc(_a);  }

 };

 

 template<class A> class _callParams1<void, A> : public __baseCall

 {

 public:

-    void(*_proc)(A);  A _a; 

-    _callParams1( void(*proc)(A), A a) : _proc(proc), _a(a) {};

-    int __DoCallStorageProc() { _proc(_a); return 0;  }

+	void(*_proc)(A);  A _a; 

+	_callParams1( void(*proc)(A), A a) : _proc(proc), _a(a) {};

+	int __DoCallStorageProc() { _proc(_a); return 0;  }

 };

 

 template< class R, class A, class B> class _callParams2 : public __baseCall

 {

 public:

-    R (*_proc)(A, B); A _a; B _b;

-    _callParams2( R (*proc)(A, B), A a, B b) : _proc(proc), _a(a), _b(b) {};

-    int __DoCallStorageProc() { return (int)_proc(_a, _b); }

+	R (*_proc)(A, B); A _a; B _b;

+	_callParams2( R (*proc)(A, B), A a, B b) : _proc(proc), _a(a), _b(b) {};

+	int __DoCallStorageProc() { return (int)_proc(_a, _b); }

 };

 

 template< class A, class B> class _callParams2<void, A, B> : public __baseCall

 {

 public:

-    void (*_proc)(A, B); A _a; B _b;

-    _callParams2( void (*proc)(A, B), A a, B b) : _proc(proc), _a(a), _b(b) {};

-    int __DoCallStorageProc() { _proc(_a, _b); return 0; }

+	void (*_proc)(A, B); A _a; B _b;

+	_callParams2( void (*proc)(A, B), A a, B b) : _proc(proc), _a(a), _b(b) {};

+	int __DoCallStorageProc() { _proc(_a, _b); return 0; }

 };

 

 template< class R, class A, class B, class C>   class _callParams3 : public __baseCall

 {

 public:

-    R (*_proc)(A, B, C); A _a; B _b; C _c;

-    _callParams3( R (*proc)(A, B, C), A a, B b, C c ) : _proc(proc), _a(a), _b(b), _c(c) {};

-    int __DoCallStorageProc() { return (int)_proc(_a,_b,_c); }

+	R (*_proc)(A, B, C); A _a; B _b; C _c;

+	_callParams3( R (*proc)(A, B, C), A a, B b, C c ) : _proc(proc), _a(a), _b(b), _c(c) {};

+	int __DoCallStorageProc() { return (int)_proc(_a,_b,_c); }

 };

 

 template< class A, class B, class C>   class _callParams3<void, A, B, C> : public __baseCall

 {

 public:

-    void (*_proc)(A, B, C); A _a; B _b; C _c;

-    _callParams3( void (*proc)(A, B, C), A a, B b, C c ) : _proc(proc), _a(a), _b(b), _c(c) {};

-    int __DoCallStorageProc() { _proc(_a,_b,_c); return 0;}

+	void (*_proc)(A, B, C); A _a; B _b; C _c;

+	_callParams3( void (*proc)(A, B, C), A a, B b, C c ) : _proc(proc), _a(a), _b(b), _c(c) {};

+	int __DoCallStorageProc() { _proc(_a,_b,_c); return 0;}

 };

 

 template < class R > R __DoCall( R(*__proc)(), ASYNC_T sync_mode )

 {  

-    typedef _callParams0< R > callClass;

-    callClass * storage = new callClass( __proc );

-    return (R) call::__ProcessCall( storage, sync_mode );

+	typedef _callParams0< R > callClass;

+	callClass * storage = new callClass( __proc );

+	return (R) call::__ProcessCall( storage, sync_mode );

 };

 

 template < class R, class A > R __DoCall( R(*__proc)( A ), A a, ASYNC_T sync_mode )

 {

-    typedef _callParams1< R, A > callClass;

-    callClass * storage = new callClass( __proc, a );

-    return (R)__ProcessCall( storage, sync_mode );

+	typedef _callParams1< R, A > callClass;

+	callClass * storage = new callClass( __proc, a );

+	return (R)__ProcessCall( storage, sync_mode );

 };

 

 

 template < class R, class A, class B > R __DoCall( R(*__proc)( A, B ), A a, B b, ASYNC_T sync_mode )

 {

-    typedef _callParams2< R, A, B > callClass;

-    callClass * storage = new callClass( __proc, a, b);

-    return (R)__ProcessCall( storage, sync_mode );

+	typedef _callParams2< R, A, B > callClass;

+	callClass * storage = new callClass( __proc, a, b);

+	return (R)__ProcessCall( storage, sync_mode );

 };

 

 

 template < class R, class A, class B, class C > R __DoCall( R(*__proc)( A, B, C ), A a, B b, C c, ASYNC_T sync_mode )

 {

-    typedef _callParams3< R, A, B, C > callClass;

-    callClass * storage = new callClass( __proc, a, b, c);

-    return (R)__ProcessCall( storage, sync_mode );

+	typedef _callParams3< R, A, B, C > callClass;

+	callClass * storage = new callClass( __proc, a, b, c);

+	return (R)__ProcessCall( storage, sync_mode );

 };

 

 

diff --git a/plugins/Clist_modern/src/hdr/modern_clcpaint.h b/plugins/Clist_modern/src/hdr/modern_clcpaint.h
index 73c275fe56..6e1a5ceea4 100644
--- a/plugins/Clist_modern/src/hdr/modern_clcpaint.h
+++ b/plugins/Clist_modern/src/hdr/modern_clcpaint.h
@@ -119,72 +119,72 @@ private:
 	 void _GetBlendMode( IN struct ClcData *dat, IN ClcContact * Drawing, IN BOOL selected, IN BOOL hottrack, IN BOOL bFlag, OUT COLORREF * OutColourFg, OUT int * OutMode );

 	 void _DrawContactItems( HWND hwnd, HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, RECT *row_rc, RECT *free_row_rc, int left_pos, int right_pos, int selected, int hottrack, RECT *rcPaint );

 	 void _PaintRowItems ( HWND hwnd, HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, RECT row_rc, RECT free_row_rc, int left_pos, int right_pos, int selected, int hottrack, RECT *rcPaint );

-	 

-     void _DrawContactAvatar    ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, RECT *row_rc, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem );

-     void _DrawContactIcon      ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem );

-     void _DrawContactText      ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem, UINT uTextFormat );

-     void _DrawContactSubText   ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem, UINT uTextFormat, BYTE itemType );

-     void _DrawContactTime      ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem );     

-     void _DrawContactExtraIcon ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * rc, int iImage );

-     void _DrawContactSelection ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT *rcPaint, RECT * prcItem );

-     void _DrawContactLine      ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, RECT *free_row_rc, RECT *rcPaint, RECT& text_rc );

-

-     int _rcWidth( RECT *rc ) { return rc->right-rc->left; }

-     int _rcHeight( RECT *rc ) { return rc->bottom-rc->top; }

+

+	 void _DrawContactAvatar    ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, RECT *row_rc, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem );

+	 void _DrawContactIcon      ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem );

+	 void _DrawContactText      ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem, UINT uTextFormat );

+	 void _DrawContactSubText   ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem, UINT uTextFormat, BYTE itemType );

+	 void _DrawContactTime      ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem );     

+	 void _DrawContactExtraIcon ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * rc, int iImage );

+	 void _DrawContactSelection ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT *rcPaint, RECT * prcItem );

+	 void _DrawContactLine      ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, RECT *free_row_rc, RECT *rcPaint, RECT& text_rc );

+

+	 int _rcWidth( RECT *rc ) { return rc->right-rc->left; }

+	 int _rcHeight( RECT *rc ) { return rc->bottom-rc->top; }

 

 private:

-    enum enDrawMode 

-    {   

-        DM_LAYERED          = 1,        // Draw normal skin on 32 bit with alpha layer

-        DM_NON_LAYERED      = 2,        // Draw skinnable, but does not take care about alpha       

-        DM_CLASSIC          = 4,        // Old style draw for classic

-        DM_CONTROL          = 8,        // Draw as control according to windows color scheme

-        DM_FLOAT            = 16,       // Float mode 

-        DM_GRAY             = 32,       // Grayed mode

-        DM_GREYALTERNATE    = 64,       // Gray odd lines

+	enum enDrawMode 

+	{   

+		DM_LAYERED          = 1,        // Draw normal skin on 32 bit with alpha layer

+		DM_NON_LAYERED      = 2,        // Draw skinnable, but does not take care about alpha       

+		DM_CLASSIC          = 4,        // Old style draw for classic

+		DM_CONTROL          = 8,        // Draw as control according to windows color scheme

+		DM_FLOAT            = 16,       // Float mode 

+		DM_GRAY             = 32,       // Grayed mode

+		DM_GREYALTERNATE    = 64,       // Gray odd lines

 		DM_DRAW_OFFSCREEN	= DM_FLOAT | DM_CONTROL | DM_NON_LAYERED | DM_CLASSIC, 

+	};

 

-    };

-

-    inline int _DetermineDrawMode( HWND hWnd, struct ClcData *dat );

-

-    struct _PaintContext

-    {

-        enum 

-        {   release_none    = 0,

-            release_hdcmem2 = 1, 

-            release_hdcmem  = 2

-        };

-        HDC hdcMem;

-        HDC hdcMem2;

-

-        HBITMAP hBmpOsb2;

-        HBITMAP oldbmp2;

-

-        HBITMAP hBmpOsb;

-        HBITMAP oldbmp;

-

-        HBRUSH   hBrushAlternateGrey;

-        COLORREF tmpbkcolour;

-        COLORREF tmpforecolour;

-

-        DWORD fRelease;

-        _PaintContext( HDC _hdcMem = NULL) :

-            hdcMem ( _hdcMem ), hdcMem2( NULL ),

-            hBmpOsb2( NULL ), oldbmp2( NULL ),

-            hBmpOsb( NULL ), oldbmp( NULL ),

-            hBrushAlternateGrey ( NULL ),

-            tmpbkcolour( 0 ), tmpforecolour( 0 ),

-            fRelease ( release_none ) {};

-    };

-    inline void _PreparePaintContext( HWND hWnd, struct ClcData * dat, HDC hdc, int paintMode, RECT& clRect, _PaintContext& pc );

-    inline void _DrawBackground( HWND hWnd, struct ClcData * dat, HDC hdc, int paintMode, RECT* rcPaint, RECT& clRect, _PaintContext& pc );

-    inline void _DrawLines( HWND hWnd, struct ClcData * dat, HDC hdc, int paintMode, RECT* rcPaint, RECT& clRect, _PaintContext& pc );

-    inline void _DrawInsertionMark( struct ClcData * dat, RECT& clRect, _PaintContext& pc );

-    inline void _CopyPaintToDest( HWND hWnd, struct ClcData * dat, HDC hdc, int paintMode, RECT* rcPaint,  RECT& clRect, _PaintContext& pc );

-    inline void _FreePaintContext( _PaintContext& pc );

-    

-    // void _PaintClcOld( HWND hwnd, struct ClcData *dat, HDC hdc, RECT *rcPaint );

+	inline int _DetermineDrawMode( HWND hWnd, struct ClcData *dat );

+

+	struct _PaintContext

+	{

+		enum 

+		{   release_none    = 0,

+		release_hdcmem2 = 1, 

+		release_hdcmem  = 2

+		};

+		HDC hdcMem;

+		HDC hdcMem2;

+

+		HBITMAP hBmpOsb2;

+		HBITMAP oldbmp2;

+

+		HBITMAP hBmpOsb;

+		HBITMAP oldbmp;

+

+		HBRUSH   hBrushAlternateGrey;

+		COLORREF tmpbkcolour;

+		COLORREF tmpforecolour;

+

+		DWORD fRelease;

+		_PaintContext( HDC _hdcMem = NULL) :

+		hdcMem ( _hdcMem ), hdcMem2( NULL ),

+			hBmpOsb2( NULL ), oldbmp2( NULL ),

+			hBmpOsb( NULL ), oldbmp( NULL ),

+			hBrushAlternateGrey ( NULL ),

+			tmpbkcolour( 0 ), tmpforecolour( 0 ),

+			fRelease ( release_none ) {};

+	};

+

+	inline void _PreparePaintContext( HWND hWnd, struct ClcData * dat, HDC hdc, int paintMode, RECT& clRect, _PaintContext& pc );

+	inline void _DrawBackground( HWND hWnd, struct ClcData * dat, HDC hdc, int paintMode, RECT* rcPaint, RECT& clRect, _PaintContext& pc );

+	inline void _DrawLines( HWND hWnd, struct ClcData * dat, HDC hdc, int paintMode, RECT* rcPaint, RECT& clRect, _PaintContext& pc );

+	inline void _DrawInsertionMark( struct ClcData * dat, RECT& clRect, _PaintContext& pc );

+	inline void _CopyPaintToDest( HWND hWnd, struct ClcData * dat, HDC hdc, int paintMode, RECT* rcPaint,  RECT& clRect, _PaintContext& pc );

+	inline void _FreePaintContext( _PaintContext& pc );

+

+	// void _PaintClcOld( HWND hwnd, struct ClcData *dat, HDC hdc, RECT *rcPaint );

 };

 

 

diff --git a/plugins/Clist_modern/src/hdr/modern_cluiframes.h b/plugins/Clist_modern/src/hdr/modern_cluiframes.h
index e2c1aade78..d10b828a17 100644
--- a/plugins/Clist_modern/src/hdr/modern_cluiframes.h
+++ b/plugins/Clist_modern/src/hdr/modern_cluiframes.h
@@ -57,17 +57,18 @@ typedef struct
 #define CLUIFRAMESMOVEUP			"CLUIFramesMoveUp"

 #define CLUIFRAMESMOVEDOWN			"CLUIFramesMoveDown"

 

-typedef struct tagMenuHandles

+struct FrameMenuHandles

 {

 	HANDLE MainMenuItem;

 	HANDLE MIVisible,MITitle,MITBVisible,MILock,MIColl,MIFloating,MIAlignRoot;

 	HANDLE MIAlignTop,MIAlignClient,MIAlignBottom;

 	HANDLE MIBorder;

 	HANDLE MIPosRoot;

-    HANDLE MIPosUp,MIPosDown;

-} FrameMenuHandles;

+	HANDLE MIPosUp,MIPosDown;

+};

 

-typedef struct tagFrameTitleBar{

+struct FrameTitleBar

+{

 	HWND hwnd;

 	HWND TitleBarbutt;

 	HWND hwndTip;

@@ -88,15 +89,16 @@ typedef struct tagFrameTitleBar{
 	int oldstyles;

 	POINT oldpos;

 	RECT wndSize;

-} FrameTitleBar;

+};

 

-typedef struct _DockOpt

+struct DockOpt

 {

 	HWND	hwndLeft;

 	HWND	hwndRight;

-}

-DockOpt;

-typedef struct _tagFrameWnd{

+};

+

+struct FRAMEWND

+{

 	int id;

 	HWND hWnd ;

 	RECT wndSize;

@@ -122,13 +124,12 @@ typedef struct _tagFrameWnd{
 	BOOLEAN UseBorder;

 	int order;

 	DockOpt dockOpt;

-    HWND OwnerWindow;

-    tPaintCallbackProc PaintCallbackProc;

-    sPaintRequest * PaintData;

-    BOOLEAN bQueued;

-    HRGN UpdateRgn;

-

-} FRAMEWND;

+	HWND OwnerWindow;

+	tPaintCallbackProc PaintCallbackProc;

+	sPaintRequest * PaintData;

+	BOOLEAN bQueued;

+	HRGN UpdateRgn;

+};

 

 #define OFFSET_PROTOPOS 200

 #define OFFSET_VISIBLE 400

diff --git a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
index 2b63e85ecc..6e3631e3b0 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
@@ -328,10 +328,10 @@ extern BOOL (WINAPI *g_proc_SetLayeredWindowAttributesNew)(HWND,COLORREF,BYTE,DW
 #define DWM_BB_TRANSITIONONMAXIMIZED   0x00000004

 struct DWM_BLURBEHIND

 {

-   DWORD dwFlags;

-   BOOL fEnable;

-   HRGN hRgnBlur;

-   BOOL fTransitionOnMaximized;

+	DWORD dwFlags;

+	BOOL fEnable;

+	HRGN hRgnBlur;

+	BOOL fTransitionOnMaximized;

 };

 extern HRESULT (WINAPI *g_proc_DWMEnableBlurBehindWindow)(HWND hWnd, DWM_BLURBEHIND *pBlurBehind);

 

diff --git a/plugins/Clist_modern/src/hdr/modern_row.h b/plugins/Clist_modern/src/hdr/modern_row.h
index 47b9582c29..4148a692a5 100644
--- a/plugins/Clist_modern/src/hdr/modern_row.h
+++ b/plugins/Clist_modern/src/hdr/modern_row.h
@@ -52,28 +52,29 @@
 //

 typedef struct tagRowCell

 {

-	int cont;				// Тип контейнера - контакт, сторока, столбец

-	int type;				// Тип элемента, содержащегося в контейнере, если 0 - пустой контейнер

-	int halign;				// Горизонтальное выравнивание внутри контейнера

-	int valign;				// Вертикальное выравнивание внутри контейнера

+	int cont;			// Тип контейнера - контакт, сторока, столбец

+	int type;			// Тип элемента, содержащегося в контейнере, если 0 - пустой контейнер

+	int halign;			// Горизонтальное выравнивание внутри контейнера

+	int valign;			// Вертикальное выравнивание внутри контейнера

 

-	int	w;					// Ширина элемента контакта, для текстовых полей игнорируется

-	int	h;					// Высота элемента котнакта

+	int	w;				// Ширина элемента контакта, для текстовых полей игнорируется

+	int	h;				// Высота элемента котнакта

 

-	BOOL sizing;			// Параметр, показывающий наличие текстовых полей в дочерних контейнерах

-	BOOL layer;				// Параметр, показывающий, что контейнер образует новый слой

-  

-  BOOL hasfixed;    // Параметр показывающий что есть вложенные фиксированные элементы

-  BOOL fitwidth;    // Параметр указывающий что последний элемент заполняет все оставшееся 

-                    // Пространство (расстягивает родителя.оверлей)

+	BOOL sizing;		// Параметр, показывающий наличие текстовых полей в дочерних контейнерах

+	BOOL layer;			// Параметр, показывающий, что контейнер образует новый слой

+

+	BOOL hasfixed;    // Параметр показывающий что есть вложенные фиксированные элементы

+	BOOL fitwidth;    // Параметр указывающий что последний элемент заполняет все оставшееся 

+                     // Пространство (расстягивает родителя.оверлей)

 

   int fixed_width;

   int full_width;

 

-	RECT r;					// Прямоугольник для рисования элемента

-	struct tagRowCell * next;		// Поле связи 

-	struct tagRowCell * child;		// Поле связи см. файл описания

-} ROWCELL, *pROWCELL;

+  RECT r;					// Прямоугольник для рисования элемента

+  struct tagRowCell * next;		// Поле связи 

+  struct tagRowCell * child;		// Поле связи см. файл описания

+}

+	ROWCELL, *pROWCELL;

 

 // Структура для доступа к контейнерам элемента контакта внутри дерева опивания

 #ifndef _CPPCODE

diff --git a/plugins/Clist_modern/src/hdr/modern_skinengine.h b/plugins/Clist_modern/src/hdr/modern_skinengine.h
index a2b365b2ba..f9ff072e31 100644
--- a/plugins/Clist_modern/src/hdr/modern_skinengine.h
+++ b/plugins/Clist_modern/src/hdr/modern_skinengine.h
@@ -20,70 +20,69 @@
 

 /* Structs */

 

-typedef struct tagSKINOBJECTSLIST

+struct SKINOBJECTSLIST

 {

-    DWORD               dwObjLPReserved;

-    DWORD               dwObjLPAlocated;

-    char              * szSkinPlace;

-    LISTMODERNMASK		* pMaskList;

-    SKINOBJECTDESCRIPTOR  * pObjects;

-	SortedList	*		pTextList;

-} SKINOBJECTSLIST;

-

-typedef struct tagGLYPHIMAGE

+	DWORD dwObjLPReserved;

+	DWORD dwObjLPAlocated;

+	char *szSkinPlace;

+	LISTMODERNMASK	*pMaskList;

+	SKINOBJECTDESCRIPTOR  *pObjects;

+	SortedList *pTextList;

+};

+

+struct GLYPHIMAGE

 {

-    char * szFileName;

-    DWORD dwLoadedTimes;

-    HBITMAP hGlyph;

-    BYTE isSemiTransp;

-} GLYPHIMAGE,*LPGLYPHIMAGE;

+	char * szFileName;

+	DWORD dwLoadedTimes;

+	HBITMAP hGlyph;

+	BYTE isSemiTransp;

+};

 

-typedef struct tagCURRWNDIMAGEDATA

+typedef GLYPHIMAGE *LPGLYPHIMAGE;

+

+struct CURRWNDIMAGEDATA

 {

-    HDC hImageDC;

-    HDC hBackDC;

-    HDC hScreenDC;

-    HBITMAP hImageDIB, hImageOld;

-    HBITMAP hBackDIB, hBackOld;

-    BYTE * hImageDIBByte;

-    BYTE * hBackDIBByte;

-    int Width,Height;

-

-}CURRWNDIMAGEDATA;

-

-typedef  struct tagEFFECTSSTACKITEM 

+	HDC hImageDC;

+	HDC hBackDC;

+	HDC hScreenDC;

+	HBITMAP hImageDIB, hImageOld;

+	HBITMAP hBackDIB, hBackOld;

+	BYTE * hImageDIBByte;

+	BYTE * hBackDIBByte;

+	int Width,Height;

+};

+

+struct EFFECTSSTACKITEM 

 {

-    HDC hdc;

-    BYTE EffectID;

-    DWORD FirstColor;

-    DWORD SecondColor;

-} EFFECTSSTACKITEM;

+	HDC hdc;

+	BYTE EffectID;

+	DWORD FirstColor;

+	DWORD SecondColor;

+};

 

 #pragma pack(push, 1)

 /* tga header */

-typedef struct

+struct tga_header_t

 {

-    BYTE id_lenght;          /* size of image id */

-    BYTE colormap_type;      /* 1 is has a colormap */

-    BYTE image_type;         /* compression type */

-

-    short	cm_first_entry;       /* colormap origin */

-    short	cm_length;            /* colormap length */

-    BYTE cm_size;               /* colormap size */

+	BYTE id_lenght;          /* size of image id */

+	BYTE colormap_type;      /* 1 is has a colormap */

+	BYTE image_type;         /* compression type */

 

-    short	x_origin;             /* bottom left x coord origin */

-    short	y_origin;             /* bottom left y coord origin */

+	short	cm_first_entry;       /* colormap origin */

+	short	cm_length;            /* colormap length */

+	BYTE cm_size;               /* colormap size */

 

-    short	width;                /* picture width (in pixels) */

-    short	height;               /* picture height (in pixels) */

+	short	x_origin;             /* bottom left x coord origin */

+	short	y_origin;             /* bottom left y coord origin */

 

-    BYTE pixel_depth;        /* bits per pixel: 8, 16, 24 or 32 */

-    BYTE image_descriptor;   /* 24 bits = 0x00; 32 bits = 0x80 */

+	short	width;                /* picture width (in pixels) */

+	short	height;               /* picture height (in pixels) */

 

-} tga_header_t;

+	BYTE pixel_depth;        /* bits per pixel: 8, 16, 24 or 32 */

+	BYTE image_descriptor;   /* 24 bits = 0x00; 32 bits = 0x80 */

+};

 #pragma pack(pop)

 

-

 class IniParser

 {

 public:

@@ -106,7 +105,6 @@ public:
 	static int GetSkinFolder( IN const TCHAR * szFileName, OUT TCHAR * pszFolderName );

 

 private:

-

 	// common

 	enum {	MAX_LINE_LEN = 512 };

 	int		 _eType;

diff --git a/plugins/Clist_modern/src/hdr/modern_skinselector.h b/plugins/Clist_modern/src/hdr/modern_skinselector.h
index 9509695ad3..b6918b6638 100644
--- a/plugins/Clist_modern/src/hdr/modern_skinselector.h
+++ b/plugins/Clist_modern/src/hdr/modern_skinselector.h
@@ -35,34 +35,33 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define MPF_NOT_EQUAL	( MPF_DIFF|MPF_EQUAL )

 #define MPF_HASHED		4

 

-typedef struct tagMASKPARAM

+struct MASKPARAM

 {

-    DWORD	dwId;

-    BYTE	bMaskParamFlag;

-    char*	szName;

-    DWORD	dwValueHash;

-    char*	szValue;

-} MASKPARAM;

-

-

-typedef struct tagMODERNMASK

+	DWORD	dwId;

+	BYTE	bMaskParamFlag;

+	char*	szName;

+	DWORD	dwValueHash;

+	char*	szValue;

+};

+

+struct MODERNMASK

 {

-  MASKPARAM*	    pl_Params;

-  DWORD				dwParamCnt;

-  union

-  {

-	void*			pObject;

-	char*			szObjectName;

-  };

-  DWORD				dwMaskId;

-  BOOL				bObjectFound;

-} MODERNMASK;

-

-typedef struct tagLISTMODERNMASK

+	MASKPARAM*	    pl_Params;

+	DWORD				dwParamCnt;

+	union

+	{

+		void*			pObject;

+		char*			szObjectName;

+	};

+	DWORD				dwMaskId;

+	BOOL				bObjectFound;

+};

+

+struct LISTMODERNMASK

 {

-  MODERNMASK*	pl_Masks;

-  DWORD			dwMaskCnt;

-} LISTMODERNMASK;

+	MODERNMASK*	pl_Masks;

+	DWORD			dwMaskCnt;

+};

 

 /// PROTOTYPES

 int AddModernMaskToList(MODERNMASK * mm,  LISTMODERNMASK * mmTemplateList);

diff --git a/plugins/Clist_modern/src/hdr/modern_static_clui.h b/plugins/Clist_modern/src/hdr/modern_static_clui.h
index 198706d21a..892a126680 100644
--- a/plugins/Clist_modern/src/hdr/modern_static_clui.h
+++ b/plugins/Clist_modern/src/hdr/modern_static_clui.h
@@ -198,15 +198,13 @@ static PROTOTICKS CycleStartTick[64]={0};//max 64 protocols
 
 static int nAnimatedIconStep=100;
 
-
-
-int	CheckFramesPos(RECT *wr);			//cluiframes.c
+int CheckFramesPos(RECT *wr);			//cluiframes.c
 int CLUIFrames_ApplyNewSizes(int mode); //cluiframes.c
-int	CLUIFrames_GetTotalHeight();		//cluiframes.c
+int CLUIFrames_GetTotalHeight();		//cluiframes.c
 int CLUIFrames_RepaintSubContainers();  //cluiframes.c
 int CLUIFramesGetMinHeight();			//cluiframes.c
 
-int		SizeFramesByWindowRect(RECT *r, HDWP * PosBatch, int mode);	//cluiframes.c
+int SizeFramesByWindowRect(RECT *r, HDWP * PosBatch, int mode);	//cluiframes.c
 
 int InitSkinHotKeys();
 BOOL amWakeThread();
@@ -217,27 +215,28 @@ HIMAGELIST hAvatarOverlays=NULL;
 
 OVERLAYICONINFO g_pAvatarOverlayIcons[ID_STATUS_OUTTOLUNCH - ID_STATUS_OFFLINE + 1] = 
 {
-    { "AVATAR_OVERLAY_OFFLINE",		LPGEN("Offline"),		IDI_AVATAR_OVERLAY_OFFLINE,   -1},
-    { "AVATAR_OVERLAY_ONLINE",		LPGEN("Online"),		IDI_AVATAR_OVERLAY_ONLINE,	  -1},
-    { "AVATAR_OVERLAY_AWAY",		LPGEN("Away"),			IDI_AVATAR_OVERLAY_AWAY,	  -1},
-    { "AVATAR_OVERLAY_DND",			LPGEN("DND"),			IDI_AVATAR_OVERLAY_DND,		  -1},
-    { "AVATAR_OVERLAY_NA",			LPGEN("NA"),			IDI_AVATAR_OVERLAY_NA,	 	  -1},
-    { "AVATAR_OVERLAY_OCCUPIED",	LPGEN("Occupied"),		IDI_AVATAR_OVERLAY_OCCUPIED,  -1},
-    { "AVATAR_OVERLAY_CHAT",		LPGEN("Free for chat"), IDI_AVATAR_OVERLAY_CHAT,	  -1},
-    { "AVATAR_OVERLAY_INVISIBLE",	LPGEN("Invisible"),		IDI_AVATAR_OVERLAY_INVISIBLE, -1},
-    { "AVATAR_OVERLAY_PHONE",		LPGEN("On the phone"),	IDI_AVATAR_OVERLAY_PHONE,	  -1},
-    { "AVATAR_OVERLAY_LUNCH",		LPGEN("Out to lunch"),	IDI_AVATAR_OVERLAY_LUNCH,	  -1}
+	{ "AVATAR_OVERLAY_OFFLINE",		LPGEN("Offline"),		IDI_AVATAR_OVERLAY_OFFLINE,   -1},
+	{ "AVATAR_OVERLAY_ONLINE",		LPGEN("Online"),		IDI_AVATAR_OVERLAY_ONLINE,	  -1},
+	{ "AVATAR_OVERLAY_AWAY",		LPGEN("Away"),			IDI_AVATAR_OVERLAY_AWAY,	  -1},
+	{ "AVATAR_OVERLAY_DND",			LPGEN("DND"),			IDI_AVATAR_OVERLAY_DND,		  -1},
+	{ "AVATAR_OVERLAY_NA",			LPGEN("NA"),			IDI_AVATAR_OVERLAY_NA,	 	  -1},
+	{ "AVATAR_OVERLAY_OCCUPIED",	LPGEN("Occupied"),		IDI_AVATAR_OVERLAY_OCCUPIED,  -1},
+	{ "AVATAR_OVERLAY_CHAT",		LPGEN("Free for chat"), IDI_AVATAR_OVERLAY_CHAT,	  -1},
+	{ "AVATAR_OVERLAY_INVISIBLE",	LPGEN("Invisible"),		IDI_AVATAR_OVERLAY_INVISIBLE, -1},
+	{ "AVATAR_OVERLAY_PHONE",		LPGEN("On the phone"),	IDI_AVATAR_OVERLAY_PHONE,	  -1},
+	{ "AVATAR_OVERLAY_LUNCH",		LPGEN("Out to lunch"),	IDI_AVATAR_OVERLAY_LUNCH,	  -1}
 };
+
 OVERLAYICONINFO g_pStatusOverlayIcons[ID_STATUS_OUTTOLUNCH - ID_STATUS_OFFLINE + 1] = 
 {
-    { "STATUS_OVERLAY_OFFLINE", LPGEN("Offline"), IDI_STATUS_OVERLAY_OFFLINE, -1},
-    { "STATUS_OVERLAY_ONLINE", LPGEN("Online"), IDI_STATUS_OVERLAY_ONLINE, -1},
-    { "STATUS_OVERLAY_AWAY", LPGEN("Away"), IDI_STATUS_OVERLAY_AWAY, -1},
-    { "STATUS_OVERLAY_DND", LPGEN("DND"), IDI_STATUS_OVERLAY_DND, -1},
-    { "STATUS_OVERLAY_NA", LPGEN("NA"), IDI_STATUS_OVERLAY_NA, -1},
-    { "STATUS_OVERLAY_OCCUPIED", LPGEN("Occupied"), IDI_STATUS_OVERLAY_OCCUPIED, -1},
-    { "STATUS_OVERLAY_CHAT", LPGEN("Free for chat"), IDI_STATUS_OVERLAY_CHAT, -1},
-    { "STATUS_OVERLAY_INVISIBLE", LPGEN("Invisible"), IDI_STATUS_OVERLAY_INVISIBLE, -1},
-    { "STATUS_OVERLAY_PHONE", LPGEN("On the phone"), IDI_STATUS_OVERLAY_PHONE, -1},
-    { "STATUS_OVERLAY_LUNCH", LPGEN("Out to lunch"), IDI_STATUS_OVERLAY_LUNCH, -1}
+	{ "STATUS_OVERLAY_OFFLINE", LPGEN("Offline"), IDI_STATUS_OVERLAY_OFFLINE, -1},
+	{ "STATUS_OVERLAY_ONLINE", LPGEN("Online"), IDI_STATUS_OVERLAY_ONLINE, -1},
+	{ "STATUS_OVERLAY_AWAY", LPGEN("Away"), IDI_STATUS_OVERLAY_AWAY, -1},
+	{ "STATUS_OVERLAY_DND", LPGEN("DND"), IDI_STATUS_OVERLAY_DND, -1},
+	{ "STATUS_OVERLAY_NA", LPGEN("NA"), IDI_STATUS_OVERLAY_NA, -1},
+	{ "STATUS_OVERLAY_OCCUPIED", LPGEN("Occupied"), IDI_STATUS_OVERLAY_OCCUPIED, -1},
+	{ "STATUS_OVERLAY_CHAT", LPGEN("Free for chat"), IDI_STATUS_OVERLAY_CHAT, -1},
+	{ "STATUS_OVERLAY_INVISIBLE", LPGEN("Invisible"), IDI_STATUS_OVERLAY_INVISIBLE, -1},
+	{ "STATUS_OVERLAY_PHONE", LPGEN("On the phone"), IDI_STATUS_OVERLAY_PHONE, -1},
+	{ "STATUS_OVERLAY_LUNCH", LPGEN("Out to lunch"), IDI_STATUS_OVERLAY_LUNCH, -1}
 };
diff --git a/plugins/Clist_modern/src/hdr/modern_static_cluiframes_service.h b/plugins/Clist_modern/src/hdr/modern_static_cluiframes_service.h
index 34403ad8cd..46a2dfaed9 100644
--- a/plugins/Clist_modern/src/hdr/modern_static_cluiframes_service.h
+++ b/plugins/Clist_modern/src/hdr/modern_static_cluiframes_service.h
@@ -28,71 +28,70 @@ static int _us_DoAlignFrameBottom( WPARAM wParam,LPARAM lParam );
 static int _us_DoSetFrameFloat( WPARAM wParam,LPARAM lParam );

 

 enum { 

-    CFM_FIRST_MGS= WM_USER + 0x2FF,

-

-    CFM_SETFRAMEPAINTPROC,

-    CFM_ADDFRAME,

-    CFM_REMOVEFRAME,

-    CFM_SETFRAMEOPTIONS,

-    CFM_GETFRAMEOPTIONS,

-    CFM_UPDATEFRAME,

-    CFM_SHOWHIDEFRAMETITLE,

-    CFM_SHOWTITLES,

-    CFM_HIDETITLES,

-    CFM_SHOWHIDEFRAME,

-    CFM_SHOWALL,

-    CFM_LOCKFRAME,

-    CFM_COLLAPSEFRAME,

-    CFM_SETFRAMEBORDER,

-    CFM_SETFRAMEALIGN,

-    CFM_MOVEFRAME,

-    CFM_MOVEFRAMEUP,

-    CFM_MOVEFRAMEDOWN,

-    CFM_ALIGNFRAMETOP,

-    CFM_ALIGNFRAMEBOTTOM,

-    CFM_ALIGNFRAMECLIENT,

-    CFM_SETFRAMEFLOAT,

-

-    CFM_LAST_MSG

+	CFM_FIRST_MGS= WM_USER + 0x2FF,

+

+	CFM_SETFRAMEPAINTPROC,

+	CFM_ADDFRAME,

+	CFM_REMOVEFRAME,

+	CFM_SETFRAMEOPTIONS,

+	CFM_GETFRAMEOPTIONS,

+	CFM_UPDATEFRAME,

+	CFM_SHOWHIDEFRAMETITLE,

+	CFM_SHOWTITLES,

+	CFM_HIDETITLES,

+	CFM_SHOWHIDEFRAME,

+	CFM_SHOWALL,

+	CFM_LOCKFRAME,

+	CFM_COLLAPSEFRAME,

+	CFM_SETFRAMEBORDER,

+	CFM_SETFRAMEALIGN,

+	CFM_MOVEFRAME,

+	CFM_MOVEFRAMEUP,

+	CFM_MOVEFRAMEDOWN,

+	CFM_ALIGNFRAMETOP,

+	CFM_ALIGNFRAMEBOTTOM,

+	CFM_ALIGNFRAMECLIENT,

+	CFM_SETFRAMEFLOAT,

+

+	CFM_LAST_MSG

 };

 

 #define CLM_PROCESS( msg, proc ) case msg: result = proc( wParam, lParam); break;

 

 BOOL CALLBACK ProcessCLUIFrameInternalMsg(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT& result )

 {

-    if ( msg <= CFM_FIRST_MGS || msg >= CFM_LAST_MSG ) return FALSE;

-

-    switch ( msg )

-    {

-        CLM_PROCESS( CFM_SETFRAMEPAINTPROC,  _us_DoSetFramePaintProc    );

-        CLM_PROCESS( CFM_ADDFRAME,           _us_DoAddFrame             );

-        CLM_PROCESS( CFM_REMOVEFRAME,        _us_DoRemoveFrame          );

-        CLM_PROCESS( CFM_SETFRAMEOPTIONS,    _us_DoSetFrameOptions      );

-        CLM_PROCESS( CFM_GETFRAMEOPTIONS,    _us_DoGetFrameOptions      );

-        CLM_PROCESS( CFM_UPDATEFRAME,        _us_DoUpdateFrame          );

-        CLM_PROCESS( CFM_SHOWHIDEFRAMETITLE, _us_DoShowHideFrameTitle   );

-        CLM_PROCESS( CFM_SHOWTITLES,         _us_DoShowTitles           );

-        CLM_PROCESS( CFM_HIDETITLES,         _us_DoHideTitles           );

-        CLM_PROCESS( CFM_SHOWHIDEFRAME,      _us_DoShowHideFrame        );

-        CLM_PROCESS( CFM_SHOWALL,            _us_DoShowAllFrames        );

-        CLM_PROCESS( CFM_LOCKFRAME,          _us_DoLockFrame            );

-        CLM_PROCESS( CFM_COLLAPSEFRAME,      _us_DoCollapseFrame        );

-        CLM_PROCESS( CFM_SETFRAMEBORDER,     _us_DoSetFrameBorder       );

-        CLM_PROCESS( CFM_SETFRAMEALIGN,      _us_DoSetFrameAlign        );

-        CLM_PROCESS( CFM_MOVEFRAME,          _us_DoMoveFrame            );

-        CLM_PROCESS( CFM_MOVEFRAMEUP,        _us_DoMoveFrameUp          );

-        CLM_PROCESS( CFM_MOVEFRAMEDOWN,      _us_DoMoveFrameDown        );

-        CLM_PROCESS( CFM_ALIGNFRAMETOP,      _us_DoAlignFrameTop        );

-        CLM_PROCESS( CFM_ALIGNFRAMEBOTTOM,   _us_DoAlignFrameClient     );

-        CLM_PROCESS( CFM_ALIGNFRAMECLIENT,   _us_DoAlignFrameBottom     );

-        CLM_PROCESS( CFM_SETFRAMEFLOAT,      _us_DoSetFrameFloat        );

-    default:

-        return FALSE;   // Not Handled

-    }

-    return TRUE;

+	if ( msg <= CFM_FIRST_MGS || msg >= CFM_LAST_MSG )

+		return FALSE;

+

+	switch ( msg ) {

+		CLM_PROCESS( CFM_SETFRAMEPAINTPROC,  _us_DoSetFramePaintProc    );

+		CLM_PROCESS( CFM_ADDFRAME,           _us_DoAddFrame             );

+		CLM_PROCESS( CFM_REMOVEFRAME,        _us_DoRemoveFrame          );

+		CLM_PROCESS( CFM_SETFRAMEOPTIONS,    _us_DoSetFrameOptions      );

+		CLM_PROCESS( CFM_GETFRAMEOPTIONS,    _us_DoGetFrameOptions      );

+		CLM_PROCESS( CFM_UPDATEFRAME,        _us_DoUpdateFrame          );

+		CLM_PROCESS( CFM_SHOWHIDEFRAMETITLE, _us_DoShowHideFrameTitle   );

+		CLM_PROCESS( CFM_SHOWTITLES,         _us_DoShowTitles           );

+		CLM_PROCESS( CFM_HIDETITLES,         _us_DoHideTitles           );

+		CLM_PROCESS( CFM_SHOWHIDEFRAME,      _us_DoShowHideFrame        );

+		CLM_PROCESS( CFM_SHOWALL,            _us_DoShowAllFrames        );

+		CLM_PROCESS( CFM_LOCKFRAME,          _us_DoLockFrame            );

+		CLM_PROCESS( CFM_COLLAPSEFRAME,      _us_DoCollapseFrame        );

+		CLM_PROCESS( CFM_SETFRAMEBORDER,     _us_DoSetFrameBorder       );

+		CLM_PROCESS( CFM_SETFRAMEALIGN,      _us_DoSetFrameAlign        );

+		CLM_PROCESS( CFM_MOVEFRAME,          _us_DoMoveFrame            );

+		CLM_PROCESS( CFM_MOVEFRAMEUP,        _us_DoMoveFrameUp          );

+		CLM_PROCESS( CFM_MOVEFRAMEDOWN,      _us_DoMoveFrameDown        );

+		CLM_PROCESS( CFM_ALIGNFRAMETOP,      _us_DoAlignFrameTop        );

+		CLM_PROCESS( CFM_ALIGNFRAMEBOTTOM,   _us_DoAlignFrameClient     );

+		CLM_PROCESS( CFM_ALIGNFRAMECLIENT,   _us_DoAlignFrameBottom     );

+		CLM_PROCESS( CFM_SETFRAMEFLOAT,      _us_DoSetFrameFloat        );

+	default:

+		return FALSE;   // Not Handled

+	}

+	return TRUE;

 }

 

-

 static INT_PTR CLUIFrames_SetFramePaintProc( WPARAM wParam,LPARAM lParam )

 {  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SETFRAMEPAINTPROC, wParam,lParam ) : 0; }

 

@@ -161,32 +160,32 @@ static INT_PTR CLUIFrames_SetFrameFloat( WPARAM wParam,LPARAM lParam )
 

 static void CreateCluiFramesServices()

 {

-    CreateServiceFunction( MS_SKINENG_REGISTERPAINTSUB,	    CLUIFrames_SetFramePaintProc );

-    CreateServiceFunction( MS_CLIST_FRAMES_ADDFRAME,	    CLUIFrames_AddFrame );

-    CreateServiceFunction( MS_CLIST_FRAMES_REMOVEFRAME,     CLUIFrames_RemoveFrame );

-

-    CreateServiceFunction( MS_CLIST_FRAMES_SETFRAMEOPTIONS,	CLUIFrames_SetFrameOptions );

-    CreateServiceFunction( MS_CLIST_FRAMES_GETFRAMEOPTIONS,	CLUIFrames_GetFrameOptions );

-    CreateServiceFunction( MS_CLIST_FRAMES_UPDATEFRAME,		CLUIFrames_UpdateFrame );

-

-    CreateServiceFunction( MS_CLIST_FRAMES_SHFRAMETITLEBAR,	CLUIFrames_ShowHideFrameTitle );

-    CreateServiceFunction( MS_CLIST_FRAMES_SHOWALLFRAMESTB,	CLUIFrames_ShowTitles );

-    CreateServiceFunction( MS_CLIST_FRAMES_HIDEALLFRAMESTB,	CLUIFrames_HideTitles );

-    CreateServiceFunction( MS_CLIST_FRAMES_SHFRAME,			CLUIFrames_ShowHideFrame );

-    CreateServiceFunction( MS_CLIST_FRAMES_SHOWALLFRAMES,	CLUIFrames_ShowAllFrames );

-

-    CreateServiceFunction( MS_CLIST_FRAMES_ULFRAME,			CLUIFrames_LockFrame );

-    CreateServiceFunction( MS_CLIST_FRAMES_UCOLLFRAME,		CLUIFrames_CollapseFrame );

-    CreateServiceFunction( MS_CLIST_FRAMES_SETUNBORDER,		CLUIFrames_SetFrameBorder );

-

-    CreateServiceFunction( CLUIFRAMESSETALIGN,			    CLUIFrames_SetFrameAlign );

-    CreateServiceFunction( CLUIFRAMESMOVEUPDOWN,		    CLUIFrames_MoveFrame );

-    CreateServiceFunction( CLUIFRAMESMOVEUP,			    CLUIFrames_MoveFrameUp );

-    CreateServiceFunction( CLUIFRAMESMOVEDOWN,			    CLUIFrames_MoveFrameDown );

-

-    CreateServiceFunction( CLUIFRAMESSETALIGNALTOP,		    CLUIFrames_AlignFrameTop );

-    CreateServiceFunction( CLUIFRAMESSETALIGNALCLIENT,	    CLUIFrames_AlignFrameClient );

-    CreateServiceFunction( CLUIFRAMESSETALIGNALBOTTOM,	    CLUIFrames_AlignFrameBottom );

-

-    CreateServiceFunction( CLUIFRAMESSETFLOATING,		    CLUIFrames_SetFrameFloat );

-}
\ No newline at end of file
+	CreateServiceFunction( MS_SKINENG_REGISTERPAINTSUB,	    CLUIFrames_SetFramePaintProc );

+	CreateServiceFunction( MS_CLIST_FRAMES_ADDFRAME,	    CLUIFrames_AddFrame );

+	CreateServiceFunction( MS_CLIST_FRAMES_REMOVEFRAME,     CLUIFrames_RemoveFrame );

+

+	CreateServiceFunction( MS_CLIST_FRAMES_SETFRAMEOPTIONS,	CLUIFrames_SetFrameOptions );

+	CreateServiceFunction( MS_CLIST_FRAMES_GETFRAMEOPTIONS,	CLUIFrames_GetFrameOptions );

+	CreateServiceFunction( MS_CLIST_FRAMES_UPDATEFRAME,		CLUIFrames_UpdateFrame );

+

+	CreateServiceFunction( MS_CLIST_FRAMES_SHFRAMETITLEBAR,	CLUIFrames_ShowHideFrameTitle );

+	CreateServiceFunction( MS_CLIST_FRAMES_SHOWALLFRAMESTB,	CLUIFrames_ShowTitles );

+	CreateServiceFunction( MS_CLIST_FRAMES_HIDEALLFRAMESTB,	CLUIFrames_HideTitles );

+	CreateServiceFunction( MS_CLIST_FRAMES_SHFRAME,			CLUIFrames_ShowHideFrame );

+	CreateServiceFunction( MS_CLIST_FRAMES_SHOWALLFRAMES,	CLUIFrames_ShowAllFrames );

+

+	CreateServiceFunction( MS_CLIST_FRAMES_ULFRAME,			CLUIFrames_LockFrame );

+	CreateServiceFunction( MS_CLIST_FRAMES_UCOLLFRAME,		CLUIFrames_CollapseFrame );

+	CreateServiceFunction( MS_CLIST_FRAMES_SETUNBORDER,		CLUIFrames_SetFrameBorder );

+

+	CreateServiceFunction( CLUIFRAMESSETALIGN,			    CLUIFrames_SetFrameAlign );

+	CreateServiceFunction( CLUIFRAMESMOVEUPDOWN,		    CLUIFrames_MoveFrame );

+	CreateServiceFunction( CLUIFRAMESMOVEUP,			    CLUIFrames_MoveFrameUp );

+	CreateServiceFunction( CLUIFRAMESMOVEDOWN,			    CLUIFrames_MoveFrameDown );

+

+	CreateServiceFunction( CLUIFRAMESSETALIGNALTOP,		    CLUIFrames_AlignFrameTop );

+	CreateServiceFunction( CLUIFRAMESSETALIGNALCLIENT,	    CLUIFrames_AlignFrameClient );

+	CreateServiceFunction( CLUIFRAMESSETALIGNALBOTTOM,	    CLUIFrames_AlignFrameBottom );

+

+	CreateServiceFunction( CLUIFRAMESSETFLOATING,		    CLUIFrames_SetFrameFloat );

+}