- fixes for Unicode;

- fixes for a hangup in nicer+;
- code redesign;
- CLCButton.cpp removed from project

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

1 files changed, 17 insertions, 3 deletions

diff --git a/plugins/TopToolBar/common.h b/plugins/TopToolBar/common.h
index 5bda9975c3..6e51009e93 100644
--- a/plugins/TopToolBar/common.h
+++ b/plugins/TopToolBar/common.h
@@ -15,6 +15,7 @@
 #include "win2k.h"

 #include "newpluginapi.h"

 #include "m_system.h"

+#include "m_system_cpp.h"

 #include "m_database.h"

 #include "m_clist.h"

 #include "m_skin.h"

@@ -94,8 +95,11 @@ struct ButtonOptData
 	bool show;

 };

 

-extern bool OptionsOpened;

-extern HWND OptionshWnd;			

+extern bool OptionsOpened, UseIcoLib, StopArrange;

+extern HWND OptionshWnd;

+extern HANDLE hHookTTBModuleLoaded;

+extern HINSTANCE hInst;

+extern LIST<void> arHooks, arServices;

 

 int OptionsPageRebuild();

 void lockbut();

@@ -132,7 +136,14 @@ char *AS(char *str, const char *setting, char *addstr)
 

 int LoadInternalButtons( HWND );

 int UnLoadInternalButtons( void );

+

 int LoadButtonModule( void );

+int UnloadButtonModule( void );

+

+int LoadToolbarModule( void );

+int UnloadToolbarModule( void );

+

+int LoadAllSeparators( void );

 

 int SetAllBitmaps( void );

 int SaveAllLButs( void );

@@ -151,6 +162,10 @@ INT_PTR TTBRemoveButton(WPARAM, LPARAM);
 INT_PTR DeleteLBut(WPARAM, LPARAM);

 INT_PTR ModifyLButton(WPARAM, LPARAM);

 INT_PTR GetLButton(WPARAM, LPARAM);

+INT_PTR InsertNewFreeSeparator(WPARAM, LPARAM);

+INT_PTR DeleteSeparator(WPARAM, LPARAM);

+

+int OnModulesLoad(WPARAM, LPARAM);

 

 INT_PTR InsertLBut(int id);

 

@@ -161,7 +176,6 @@ struct LBUTOPT
 	char *name;

 };

 

-int LoadCLCButtonModule(void);

 #define BM_SETPRIVATEICON (WM_USER + 6)

 #define BM_SETIMLICON (WM_USER + 7)

 #define UseIcoLibDefaultValue 0