[#1472076] Fixes after stock gdi changes within core library.

[wxWidgets.git] / contrib / include / wx / fl / toolwnd.h

diff --git a/contrib/include/wx/fl/toolwnd.h b/contrib/include/wx/fl/toolwnd.h
index 046bb66e3c4577b1a4582678d231153c3cd4a0fa..486085ea788bb972b4ff5591f50f8b6baaf018c1 100644 (file)
--- a/contrib/include/wx/fl/toolwnd.h
+++ b/contrib/include/wx/fl/toolwnd.h
@@ -13,10 +13,6 @@
 #ifndef __TOOLWND_G__
 #define __TOOLWND_G__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "toolwnd.h"
-#endif
-
 #include "wx/frame.h"
 #include "wx/dynarray.h"
 #include "wx/fl/fldefs.h"
@@ -25,13 +21,13 @@
 
 #define BTN_BOX_HEIGHT       12
 #define BTN_BOX_WIDTH        12
-#define BTN_X_WIEGHT         2
+#define BTN_X_WEIGHT         2
 
 class WXDLLIMPEXP_FL cbMiniButton;
 
 typedef cbMiniButton* cbMinitButtonPtrT;
 
-WXFL_DEFINE_ARRAY_NO_PTR( cbMinitButtonPtrT, cbMiniButtonArrayT );
+WXFL_DEFINE_ARRAY_PTR( cbMinitButtonPtrT, cbMiniButtonArrayT );
 
 /*
 A tool window is a special kind of frame that paints its own title, and
@@ -144,10 +140,10 @@ public:
 
         // Called when a mini button is clicked.
         // By default, does nothing.
-    virtual void OnMiniButtonClicked( int btnIdx ) {}
+    virtual void OnMiniButtonClicked( int WXUNUSED(btnIdx) ) {}
 
         // Handles clicking on the title. By default, does nothing.
-    virtual bool HandleTitleClick( wxMouseEvent& event ) { return FALSE; }
+    virtual bool HandleTitleClick( wxMouseEvent& WXUNUSED(event) ) { return false; }
 
     DECLARE_EVENT_TABLE()
 };
@@ -186,7 +182,7 @@ public:
         // Set the position of the button.
     void SetPos( const wxPoint& pos );
 
-        // Returns TRUE if the given position was over the button.
+        // Returns true if the given position was over the button.
     bool HitTest( const wxPoint& pos );
 
         // Responds to a left down event.
@@ -205,7 +201,7 @@ public:
         // the desired appearance.
     virtual void Draw( wxDC& dc );
 
-        // Returns TRUE if the button was clicked.
+        // Returns true if the button was clicked.
     bool WasClicked();
 
         // Reset the button.
@@ -214,7 +210,7 @@ public:
         // Enable or disable the button.
     void Enable( bool enable ) { mEnabled = enable; }
 
-        // Returns TRUE if this button is pressed.
+        // Returns true if this button is pressed.
     bool IsPressed() { return mPressed; }
 };