kernel extraicons, part II

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

4 files changed, 2 insertions, 10 deletions

diff --git a/plugins/Clist_modern/src/hdr/modern_clc.h b/plugins/Clist_modern/src/hdr/modern_clc.h
index 62d9473a60..10be28480c 100644
--- a/plugins/Clist_modern/src/hdr/modern_clc.h
+++ b/plugins/Clist_modern/src/hdr/modern_clc.h
@@ -74,8 +74,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define INTM_AVATARCHANGED	(WM_USER+28)

 #define INTM_TIMEZONECHANGED	(WM_USER+29)

 

-#define CLM_SETEXTRACOLUMNSSPACE   (CLM_FIRST+73)   //wParam=extra space between icons

-

 #define CLBF_TILEVTOROWHEIGHT        0x0100

 

 #define TIMERID_RENAME				10

@@ -391,7 +389,7 @@ struct SHORTDATA
 };

 

 

-typedef struct tagOVERLAYICONINFO 

+typedef struct tagOVERLAYICONINFO

 {

 	char *name;

 	char *description;

diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
index d2ce7442a8..a7ae21e716 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
@@ -112,6 +112,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_file.h>

 #include <m_timezones.h>

 #include <m_toptoolbar.h>

+#include <m_extraicons.h>

 

 #include "modern_clc.h"

 #include "modern_clist.h"

diff --git a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
index 120457fcab..2b63e85ecc 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
@@ -53,7 +53,6 @@ extern SKINOBJECTSLIST g_SkinObjectList;
 extern CURRWNDIMAGEDATA * g_pCachedWindow;

 extern char * g_szConnectingProto;

 extern BOOL g_mutex_bLockUpdating;

-extern BOOL g_mutex_bSetAllExtraIconsCycle;

 extern int  g_mutex_nCalcRowHeightLock;

 extern int  g_mutex_bOnTrayRightClick;

 extern BOOL g_flag_bPostWasCanceled;

@@ -127,9 +126,6 @@ HBITMAP GDIPlus_LoadGlyphImage(char *szFileName);
 /* EventArea */

 void    EventArea_ConfigureEventArea();

 

-/* ExtraImage */

-void    ExtraImage_SetAllExtraIcons(HWND hwndList,HANDLE hContact);

-

 /* ModernSkinButton */

 int     ModernSkinButton_AddButton(HWND parent,char * ID,char * CommandService,char * StateDefService,char * HandeService,             int Left, int Top, int Right, int Bottom, DWORD AlignedTo,TCHAR * Hint,char * DBkey,char * TypeDef,int MinWidth, int MinHeight);

 int     ModernSkinButtonLoadModule();

diff --git a/plugins/Clist_modern/src/hdr/modern_static_clui.h b/plugins/Clist_modern/src/hdr/modern_static_clui.h
index 497474e1ee..198706d21a 100644
--- a/plugins/Clist_modern/src/hdr/modern_static_clui.h
+++ b/plugins/Clist_modern/src/hdr/modern_static_clui.h
@@ -77,9 +77,6 @@ void Docking_GetMonitorRectFromWindow(HWND hWnd,RECT *rc);
 int EventArea_Create(HWND hCluiWnd);
 
 int ExtraImage_ExtraIDToColumnNum(int extra);
-void ExtraImage_LoadModule();
-void ExtraImage_ReloadExtraIcons();
-void ExtraImage_SetAllExtraIcons(HWND hwndList,HANDLE hContact);
 
 void GroupMenus_Init();