- mir_cslock - class for locking critical sections;

- unneeded helpers removed;
- code cleaning in TTB

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

1 files changed, 11 insertions, 18 deletions

diff --git a/plugins/TopToolBar/common.h b/plugins/TopToolBar/common.h
index 26620cf85f..ea577b4c74 100644
--- a/plugins/TopToolBar/common.h
+++ b/plugins/TopToolBar/common.h
@@ -92,7 +92,6 @@ TopButtonInt* CreateButton(TTBButton* but);
 int ttbOptionsChanged();

 

 int ArrangeButtons();

-int RecreateWindows();

 

 #define DEFBUTTWIDTH	20

 #define DEFBUTTHEIGHT	16

@@ -102,20 +101,17 @@ int RecreateWindows();
 

 extern LIST<TopButtonInt> Buttons;

 extern bool StopArrange;

-extern HWND OptionshWnd, hwndTopToolBar;

+extern HWND hwndTopToolBar;

 extern HANDLE hHookTTBModuleLoaded;

 extern HINSTANCE hInst;

 extern LIST<void> arHooks, arServices;

 extern HBITMAP hBmpBackground, hBmpSeparator;

 extern int BUTTWIDTH, BUTTHEIGHT, BUTTGAP;

+extern CRITICAL_SECTION csButtonsHook;

 

 void AddToOptions(TopButtonInt* b);

 void RemoveFromOptions(int id);

 

-//int OptionsPageRebuild();

-void lockbut();

-void ulockbut();

-

 //append string

 char *AS(char *str, const char *setting, char *addstr)

 {

@@ -128,21 +124,18 @@ char *AS(char *str, const char *setting, char *addstr)
 

 #define TTB_LAUNCHSERVICE "TTB/LaunchSerice"

 

-int LoadInternalButtons( HWND );

-int UnLoadInternalButtons( void );

-

-int LoadToolbarModule( void );

-int UnloadToolbarModule( void );

+INT_PTR TTBAddButton(WPARAM, LPARAM);

+INT_PTR TTBRemoveButton(WPARAM, LPARAM);

 

-int SetAllBitmaps( void );

-int SaveAllLButs( void );

-int SaveAllButtonsOptions( void );

+int  LoadInternalButtons( HWND );

+int  UnLoadInternalButtons( void );

 

-void lockbut();

-void ulockbut();

+int  LoadToolbarModule( void );

+int  UnloadToolbarModule( void );

 

-INT_PTR TTBAddButton(WPARAM, LPARAM);

-INT_PTR TTBRemoveButton(WPARAM, LPARAM);

+void SetAllBitmaps( void );

+int  SaveAllLButs( void );

+int  SaveAllButtonsOptions( void );

 

 void InsertSeparator( int i );

 void DeleteSeparator(int i);