X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4cbc57f086cee690f397ac5622d3f1d7153b300e..9838b284443a889c6c629568011c8ce76cfbacd4:/contrib/include/wx/fl/toolwnd.h

diff --git a/contrib/include/wx/fl/toolwnd.h b/contrib/include/wx/fl/toolwnd.h
index efe9d125fc..8b90b2f130 100644
--- a/contrib/include/wx/fl/toolwnd.h
+++ b/contrib/include/wx/fl/toolwnd.h
@@ -13,12 +13,13 @@
 #ifndef __TOOLWND_G__
 #define __TOOLWND_G__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "toolwnd.h"
 #endif
 
 #include "wx/frame.h"
 #include "wx/dynarray.h"
+#include "wx/fl/fldefs.h"
 
 // fixed settings
 
@@ -26,18 +27,18 @@
 #define BTN_BOX_WIDTH        12
 #define BTN_X_WIEGHT         2
 
-class cbMiniButton;
+class WXDLLIMPEXP_FL cbMiniButton;
 
 typedef cbMiniButton* cbMinitButtonPtrT;
 
-WX_DEFINE_ARRAY( cbMinitButtonPtrT, cbMiniButtonArrayT );
+WXFL_DEFINE_ARRAY_PTR( cbMinitButtonPtrT, cbMiniButtonArrayT );
 
 /*
 A tool window is a special kind of frame that paints its own title, and
 can be used to implement small floating windows.
 */
 
-class wxToolWindow : public wxFrame
+class WXDLLIMPEXP_FL wxToolWindow : public wxFrame
 {
     DECLARE_DYNAMIC_CLASS( wxToolWindow )
 
@@ -143,10 +144,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()
 };
@@ -185,7 +186,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.
@@ -204,7 +205,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.
@@ -213,7 +214,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; }
 };
 
@@ -221,7 +222,7 @@ public:
 cbCloseBox is a window close button, used in a wxToolWindow titlebar.
 */
 
-class cbCloseBox : public cbMiniButton
+class WXDLLIMPEXP_FL cbCloseBox : public cbMiniButton
 {
 public:
         // Draws the close button appearance.
@@ -232,7 +233,7 @@ public:
 cbCollapseBox is a window collapse button, used in a wxToolWindow titlebar.
 */
 
-class cbCollapseBox  : public cbMiniButton
+class WXDLLIMPEXP_FL cbCollapseBox  : public cbMiniButton
 {
 public:
     bool mIsAtLeft;
@@ -245,7 +246,7 @@ public:
 cbDockBox is a window dock button, used in a wxToolWindow titlebar.
 */
 
-class cbDockBox : public cbMiniButton
+class WXDLLIMPEXP_FL cbDockBox : public cbMiniButton
 {
 public:
         // Draws the dock button appearance.
@@ -257,7 +258,7 @@ cbFloatedBarWindow is a kind of wxToolWindow,
 implementing floating toolbars.
 */
 
-class cbFloatedBarWindow : public wxToolWindow
+class WXDLLIMPEXP_FL cbFloatedBarWindow : public wxToolWindow
 {
     DECLARE_DYNAMIC_CLASS( cbFloatedBarWindow )
 protected: