wxPalette unified. Source cleaning.

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

diff --git a/contrib/include/wx/fl/controlbar.h b/contrib/include/wx/fl/controlbar.h
index db829bc6183ab7cd3d9d505e348aa32e288ef691..522ff374770d508bba1dc0fa0c4ed0b32a322868 100644 (file)
--- a/contrib/include/wx/fl/controlbar.h
+++ b/contrib/include/wx/fl/controlbar.h
@@ -7,18 +7,15 @@
 // Created:     06/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas
 // Created:     06/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __CONTROLBAR_G__
 #define __CONTROLBAR_G__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __CONTROLBAR_G__
 #define __CONTROLBAR_G__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "controlbar.h"
-#endif
-

 #include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/defs.h"
 #include "wx/string.h"

+#include "wx/pen.h"

 #include "wx/window.h"
 #include "wx/dynarray.h"
 #include "wx/fl/fldefs.h"
 #include "wx/window.h"
 #include "wx/dynarray.h"
 #include "wx/fl/fldefs.h"


@@ -27,25 +24,25 @@
 
 // forward declarations
 
 
 // forward declarations
 

-class  WXFL_DECLSPEC wxFrameLayout;
+class  WXDLLIMPEXP_FL wxFrameLayout;

 
 

-class  WXFL_DECLSPEC cbDockPane;
-class  WXFL_DECLSPEC cbUpdatesManagerBase;
-class  WXFL_DECLSPEC cbBarDimHandlerBase;
-class  WXFL_DECLSPEC cbPluginBase;
-class  WXFL_DECLSPEC cbPluginEvent;
-class  WXFL_DECLSPEC cbPaneDrawPlugin;
+class  WXDLLIMPEXP_FL cbDockPane;
+class  WXDLLIMPEXP_FL cbUpdatesManagerBase;
+class  WXDLLIMPEXP_FL cbBarDimHandlerBase;
+class  WXDLLIMPEXP_FL cbPluginBase;
+class  WXDLLIMPEXP_FL cbPluginEvent;
+class  WXDLLIMPEXP_FL cbPaneDrawPlugin;

 
 

-class WXFL_DECLSPEC cbBarInfo;
-class WXFL_DECLSPEC cbRowInfo;
-class WXFL_DECLSPEC cbDimInfo;
-class WXFL_DECLSPEC cbCommonPaneProperties;
+class WXDLLIMPEXP_FL cbBarInfo;
+class WXDLLIMPEXP_FL cbRowInfo;
+class WXDLLIMPEXP_FL cbDimInfo;
+class WXDLLIMPEXP_FL cbCommonPaneProperties;

 
 typedef cbBarInfo* BarInfoPtrT;
 typedef cbRowInfo* RowInfoPtrT;
 
 
 typedef cbBarInfo* BarInfoPtrT;
 typedef cbRowInfo* RowInfoPtrT;
 

-WXFL_DEFINE_ARRAY( BarInfoPtrT, BarArrayT );
-WXFL_DEFINE_ARRAY( RowInfoPtrT, RowArrayT );
+WXFL_DEFINE_ARRAY_PTR( BarInfoPtrT, BarArrayT );
+WXFL_DEFINE_ARRAY_PTR( RowInfoPtrT, RowArrayT );

 
 // control bar states
 
 
 // control bar states
 


@@ -98,7 +95,7 @@ Helper class, used for spying for unhandled mouse events on control bars
 and forwarding them to the frame layout.
 */
 
 and forwarding them to the frame layout.
 */
 

-class WXFL_DECLSPEC cbBarSpy : public wxEvtHandler
+class WXDLLIMPEXP_FL cbBarSpy : public wxEvtHandler

 {
 public:
     DECLARE_DYNAMIC_CLASS( cbBarSpy )
 {
 public:
     DECLARE_DYNAMIC_CLASS( cbBarSpy )


@@ -130,7 +127,7 @@ which can be docked along the top, bottom, right, or left side of the
 parent frame.
 */
 
 parent frame.
 */
 

-class WXFL_DECLSPEC wxFrameLayout : public wxEvtHandler
+class WXDLLIMPEXP_FL wxFrameLayout : public wxEvtHandler

 {
 public:
         // Default constructor, used only for serialization.
 {
 public:
         // Default constructor, used only for serialization.


@@ -142,7 +139,7 @@ public:
 
     wxFrameLayout( wxWindow* pParentFrame,
                    wxWindow* pFrameClient = NULL,
 
     wxFrameLayout( wxWindow* pParentFrame,
                    wxWindow* pFrameClient = NULL,

-                   bool      activateNow  = TRUE );
+                   bool      activateNow  = true );

 
         // Destructor. It does not destroy the bar windows.
 
 
         // Destructor. It does not destroy the bar windows.
 


@@ -150,7 +147,7 @@ public:
 
         // Enables floating behaviour. By default floating of control bars is on.
 
 
         // Enables floating behaviour. By default floating of control bars is on.
 

-    virtual void EnableFloating( bool enable = TRUE );
+    virtual void EnableFloating( bool enable = true );

 
         // Activate can be called after some other layout has been deactivated,
         // and this one must take over the current contents of the frame window.
 
         // Activate can be called after some other layout has been deactivated,
         // and this one must take over the current contents of the frame window.


@@ -223,10 +220,10 @@ public:
 
         // name is a name by which the bar can be referred in layout customization dialogs.
 
 
         // name is a name by which the bar can be referred in layout customization dialogs.
 

-        // If spyEvents is TRUE, input events for the bar should be "spyed" in order
+        // If spyEvents is true, input events for the bar should be "spyed" in order

         // to forward unhandled mouse clicks to the frame layout, for example to enable
         // easy draggablity of toolbars just by clicking on their interior regions.
         // to forward unhandled mouse clicks to the frame layout, for example to enable
         // easy draggablity of toolbars just by clicking on their interior regions.

-        // For widgets like text/tree control this value should be FALSE,
+        // For widgets like text/tree control this value should be false,

         // since there's no certain way to detect  whether the event was actually handled.
 
         // state is the initial state, such as wxCBAR_DOCKED_HORIZONTALLY,
         // since there's no certain way to detect  whether the event was actually handled.
 
         // state is the initial state, such as wxCBAR_DOCKED_HORIZONTALLY,


@@ -239,8 +236,8 @@ public:
                          int alignment    = FL_ALIGN_TOP,
                          int rowNo        = 0,
                          int columnPos    = 0,
                          int alignment    = FL_ALIGN_TOP,
                          int rowNo        = 0,
                          int columnPos    = 0,

-                         const wxString& name="bar",
-                         bool spyEvents    = FALSE,
+                         const wxString& name = wxT("bar"),
+                         bool spyEvents    = false,

                          int state        = wxCBAR_DOCKED_HORIZONTALLY
                        );
 
                          int state        = wxCBAR_DOCKED_HORIZONTALLY
                        );
 


@@ -250,7 +247,7 @@ public:
         // To dock a bar which is floating, use the wxFrameLayout::DockBar method.
 
     virtual bool RedockBar( cbBarInfo* pBar, const wxRect& shapeInParent,
         // To dock a bar which is floating, use the wxFrameLayout::DockBar method.
 
     virtual bool RedockBar( cbBarInfo* pBar, const wxRect& shapeInParent,

-                            cbDockPane* pToPane = NULL, bool updateNow = TRUE );
+                            cbDockPane* pToPane = NULL, bool updateNow = true );

 
         // Finds the bar in the framelayout, by name.
 
 
         // Finds the bar in the framelayout, by name.
 


@@ -284,7 +281,7 @@ public:
 
         // Recalculates the layout of panes, and all bars/rows in each pane.
 
 
         // Recalculates the layout of panes, and all bars/rows in each pane.
 

-    virtual void RecalcLayout( bool repositionBarsNow = FALSE );
+    virtual void RecalcLayout( bool repositionBarsNow = false );

 
         // Returns the client height.
 
 
         // Returns the client height.
 


@@ -331,7 +328,7 @@ public:
 
         // Recalculates layout and performs on-screen update of all panes.
 
 
         // Recalculates layout and performs on-screen update of all panes.
 

-    void RefreshNow( bool recalcLayout = TRUE );
+    void RefreshNow( bool recalcLayout = true );

 
         // Event handler for a size event.
 
 
         // Event handler for a size event.
 


@@ -565,7 +562,7 @@ public: /* protected really (accessed only by plugins) */
                     cbDockPane** ppPane );
 
 
                     cbDockPane** ppPane );
 
 

-        // Returns TRUE if the position is within the given pane.
+        // Returns true if the position is within the given pane.

 
     bool HitTestPane( cbDockPane* pPane, int x, int y );
 
 
     bool HitTestPane( cbDockPane* pPane, int x, int y );
 


@@ -600,7 +597,7 @@ public: /* protected really (accessed only by plugins) */
 
     void HookUpToFrame();
 
 
     void HookUpToFrame();
 

-        // Returns TRUE if the platform allows reparenting. This may not return TRUE
+        // Returns true if the platform allows reparenting. This may not return true

         // for all platforms. Reparenting allows control bars to be floated.
 
     bool CanReparent();
         // for all platforms. Reparenting allows control bars to be floated.
 
     bool CanReparent();


@@ -648,7 +645,7 @@ used by any particular updates-manager to store
 auxiliary information to be used by its updating algorithm.
 */
 
 auxiliary information to be used by its updating algorithm.
 */
 

-class WXFL_DECLSPEC cbUpdateMgrData : public wxObject
+class WXDLLIMPEXP_FL cbUpdateMgrData : public wxObject

 {
     DECLARE_DYNAMIC_CLASS( cbUpdateMgrData )
 public:
 {
     DECLARE_DYNAMIC_CLASS( cbUpdateMgrData )
 public:


@@ -659,7 +656,7 @@ public:
 
     wxObject*  mpCustomData; // any custom data stored by specific updates mgr.
 
 
     wxObject*  mpCustomData; // any custom data stored by specific updates mgr.
 

-        // Default constructor. Is-dirty flag is set TRUE initially.
+        // Default constructor. Is-dirty flag is set true initially.

 
     cbUpdateMgrData();
 
 
     cbUpdateMgrData();
 


@@ -669,7 +666,7 @@ public:
 
         // Set the dirty flag.
 
 
         // Set the dirty flag.
 

-    void SetDirty( bool isDirty = TRUE );
+    void SetDirty( bool isDirty = true );

 
         // Set custom data.
 
 
         // Set custom data.
 


@@ -688,7 +685,7 @@ to adjust the values in cbDimInfo::mSizes accordingly.
 Specific handlers can be hooked up to specific types of bar.
 */
 
 Specific handlers can be hooked up to specific types of bar.
 */
 

-class WXFL_DECLSPEC cbBarDimHandlerBase : public wxObject
+class WXDLLIMPEXP_FL cbBarDimHandlerBase : public wxObject

 {
     DECLARE_ABSTRACT_CLASS( cbBarDimHandlerBase )
 
 {
     DECLARE_ABSTRACT_CLASS( cbBarDimHandlerBase )
 


@@ -726,7 +723,7 @@ Helper class used internally by the wxFrameLayout class.
 Holds and manages information about bar dimensions.
 */
 
 Holds and manages information about bar dimensions.
 */
 

-class WXFL_DECLSPEC cbDimInfo : public wxObject
+class WXDLLIMPEXP_FL cbDimInfo : public wxObject

 {
     DECLARE_DYNAMIC_CLASS( cbDimInfo )
 public:
 {
     DECLARE_DYNAMIC_CLASS( cbDimInfo )
 public:


@@ -751,8 +748,8 @@ public:
 
     int    mHorizGap;    // NOTE:: gaps are given in frame's coord. orientation
 
 
     int    mHorizGap;    // NOTE:: gaps are given in frame's coord. orientation
 

-    // TRUE, if vertical/horizontal dimensions cannot be mannualy adjusted
-    //       by user using resizing handles. If FALSE, the frame-layout
+    // true, if vertical/horizontal dimensions cannot be mannualy adjusted
+    //       by user using resizing handles. If false, the frame-layout

     //       *automatically* places resizing handles among not-fixed bars
 
     bool   mIsFixed;
     //       *automatically* places resizing handles among not-fixed bars
 
     bool   mIsFixed;


@@ -766,8 +763,8 @@ public:
     cbDimInfo(void);
 
         // Constructor.
     cbDimInfo(void);
 
         // Constructor.

-        // isFixed is TRUE if vertical/horizontal dimensions cannot be manually adjusted
-        // by the user using resizing handles. If FALSE, the frame-layout
+        // isFixed is true if vertical/horizontal dimensions cannot be manually adjusted
+        // by the user using resizing handles. If false, the frame-layout

         // automatically places resizing handles among bars that do are not fixed.
 
     cbDimInfo( cbBarDimHandlerBase* pDimHandler,
         // automatically places resizing handles among bars that do are not fixed.
 
     cbDimInfo( cbBarDimHandlerBase* pDimHandler,


@@ -796,7 +793,7 @@ public:
                int dv_x, int dv_y,
                int f_x,  int f_y,
 
                int dv_x, int dv_y,
                int f_x,  int f_y,
 

-               bool isFixed  = TRUE,
+               bool isFixed  = true,

                int  horizGap = 6,
                int  vertGap  = 6,
 
                int  horizGap = 6,
                int  vertGap  = 6,
 


@@ -806,7 +803,7 @@ public:
         // Constructor.
 
     cbDimInfo( int x, int y,
         // Constructor.
 
     cbDimInfo( int x, int y,

-               bool isFixed  = TRUE,
+               bool isFixed  = true,

                int  gap = 6,
                cbBarDimHandlerBase* pDimHandler = NULL
              );
                int  gap = 6,
                cbBarDimHandlerBase* pDimHandler = NULL
              );


@@ -888,7 +885,7 @@ class cbBarInfo : public wxObject
 {
     DECLARE_DYNAMIC_CLASS( cbBarInfo )
 public:
 {
     DECLARE_DYNAMIC_CLASS( cbBarInfo )
 public:

-    // textual name, by which this bar is refered in layout-customization dialogs
+    // textual name, by which this bar is referred in layout-customization dialogs

     wxString      mName;
 
     // stores bar's bounds in pane's coordinates
     wxString      mName;
 
     // stores bar's bounds in pane's coordinates


@@ -904,6 +901,13 @@ public:
     bool          mHasLeftHandle;
     bool          mHasRightHandle;
 
     bool          mHasLeftHandle;
     bool          mHasRightHandle;
 

+    // determines if this bar can float. The layout's setting as priority. For
+    // example, if the layout's mFloatingOn is false, this setting is irrelevant
+    // since nothing will float at all. If the layout's floating is on, use this
+    // setting to prevent specific bars from floating. In other words, all bars
+    // float by default and floating can be turned off on individual bars.
+    bool          mFloatingOn;    // default: ON (which is also the layout's mFloatingOn default setting)
+

     cbDimInfo     mDimInfo;       // preferred sizes for each, control bar state
 
     int           mState;         // (see definition of controlbar states)
     cbDimInfo     mDimInfo;       // preferred sizes for each, control bar state
 
     int           mState;         // (see definition of controlbar states)


@@ -936,11 +940,11 @@ public:
 
     ~cbBarInfo();
 
 
     ~cbBarInfo();
 

-        // Returns TRUE if this bar is fixed.
+        // Returns true if this bar is fixed.

 
     inline bool IsFixed() const { return mDimInfo.mIsFixed; }
 
 
     inline bool IsFixed() const { return mDimInfo.mIsFixed; }
 

-        // Returns TRUE if this bar is expanded.
+        // Returns true if this bar is expanded.

 
     inline bool IsExpanded() const { return this == mpRow->mpExpandedBar; }
 };
 
     inline bool IsExpanded() const { return this == mpRow->mpExpandedBar; }
 };


@@ -976,7 +980,7 @@ public:
 
     void Reset();
 
 
     void Reset();
 

-        // Advances the iterator and returns TRUE if a bar is available.
+        // Advances the iterator and returns true if a bar is available.

 
     bool Next();
 
 
     bool Next();
 


@@ -995,7 +999,7 @@ which are usually the same for all panes in
 a frame layout.
 */
 
 a frame layout.
 */
 

-class cbCommonPaneProperties : public wxObject
+class WXDLLIMPEXP_FL cbCommonPaneProperties : public wxObject

 {
     DECLARE_DYNAMIC_CLASS( cbCommonPaneProperties )
 
 {
     DECLARE_DYNAMIC_CLASS( cbCommonPaneProperties )
 


@@ -1029,11 +1033,11 @@ class cbCommonPaneProperties : public wxObject
     cbCommonPaneProperties(void);
 
         // Copy constructor
     cbCommonPaneProperties(void);
 
         // Copy constructor

-    
+

     cbCommonPaneProperties(const cbCommonPaneProperties&);
 
         // Assignment operator
     cbCommonPaneProperties(const cbCommonPaneProperties&);
 
         // Assignment operator

-    
+

     cbCommonPaneProperties& operator=(const cbCommonPaneProperties&);
 };
 
     cbCommonPaneProperties& operator=(const cbCommonPaneProperties&);
 };
 


@@ -1111,7 +1115,7 @@ public: /* protected really (accessed only by plugins) */
 
     void SyncRowFlags( cbRowInfo* pRow );
 
 
     void SyncRowFlags( cbRowInfo* pRow );
 

-        // Returns TRUE if the bar's dimension information indicates a fixed size.
+        // Returns true if the bar's dimension information indicates a fixed size.

         // Internal function called by plugins.
 
     bool IsFixedSize( cbBarInfo* pInfo );
         // Internal function called by plugins.
 
     bool IsFixedSize( cbBarInfo* pInfo );


@@ -1126,22 +1130,22 @@ public: /* protected really (accessed only by plugins) */
 
     int GetRowY( cbRowInfo* pRow );
 
 
     int GetRowY( cbRowInfo* pRow );
 

-        // Returns TRUE if there are any variable-sized rows above this one.
+        // Returns true if there are any variable-sized rows above this one.

         // Internal function called by plugins.
 
     bool HasNotFixedRowsAbove( cbRowInfo* pRow );
 
         // Internal function called by plugins.
 
     bool HasNotFixedRowsAbove( cbRowInfo* pRow );
 

-        // Returns TRUE if there are any variable-sized rows below this one.
+        // Returns true if there are any variable-sized rows below this one.

         // Internal function called by plugins.
 
     bool HasNotFixedRowsBelow( cbRowInfo* pRow );
 
         // Internal function called by plugins.
 
     bool HasNotFixedRowsBelow( cbRowInfo* pRow );
 

-        // Returns TRUE if there are any variable-sized rows to the left of this one.
+        // Returns true if there are any variable-sized rows to the left of this one.

         // Internal function called by plugins.
 
     bool HasNotFixedBarsLeft ( cbBarInfo* pBar );
 
         // Internal function called by plugins.
 
     bool HasNotFixedBarsLeft ( cbBarInfo* pBar );
 

-        // Returns TRUE if there are any variable-sized rows to the right of this one.
+        // Returns true if there are any variable-sized rows to the right of this one.

         // Internal function called by plugins.
 
     bool HasNotFixedBarsRight( cbBarInfo* pBar );
         // Internal function called by plugins.
 
     bool HasNotFixedBarsRight( cbBarInfo* pBar );


@@ -1196,7 +1200,7 @@ public: /* protected really (accessed only by plugins) */
 
     void PaneToFrame( wxRect* pRect );
 
 
     void PaneToFrame( wxRect* pRect );
 

-        // Returns TRUE if pos is within the given rectangle.
+        // Returns true if pos is within the given rectangle.

         // Internal function called by plugins.
 
     inline bool HasPoint( const wxPoint& pos, int x, int y, int width, int height );
         // Internal function called by plugins.
 
     inline bool HasPoint( const wxPoint& pos, int x, int y, int width, int height );


@@ -1361,7 +1365,7 @@ public: /* public members */
 
         { return mRows.GetCount() ? mRows[0] : NULL; }
 
 
         { return mRows.GetCount() ? mRows[0] : NULL; }
 

-        // Returns TRUE if the given bar is present in this pane.
+        // Returns true if the given bar is present in this pane.

 
     bool BarPresent( cbBarInfo* pBar );
 
 
     bool BarPresent( cbBarInfo* pBar );
 


@@ -1374,11 +1378,11 @@ public: /* public members */
 
     int GetAlignment();
 
 
     int GetAlignment();
 

-        // Returns TRUE if the given mask matches the pane's mask.
+        // Returns true if the given mask matches the pane's mask.

 
     bool MatchesMask( int paneMask );
 
 
     bool MatchesMask( int paneMask );
 

-        // Returns TRUE if the pane is aligned to the top or bottom.
+        // Returns true if the pane is aligned to the top or bottom.

 
     inline bool IsHorizontal()
     {
 
     inline bool IsHorizontal()
     {


@@ -1454,7 +1458,7 @@ areas of frame layout that actually need to be updated. This should be extended
 to implement a custom updating strategy.
 */
 
 to implement a custom updating strategy.
 */
 

-class cbUpdatesManagerBase : public wxObject
+class WXDLLIMPEXP_FL cbUpdatesManagerBase : public wxObject

 {
     DECLARE_ABSTRACT_CLASS( cbUpdatesManagerBase )
 
 {
     DECLARE_ABSTRACT_CLASS( cbUpdatesManagerBase )
 


@@ -1491,25 +1495,25 @@ public:
         // they would usually be invoked). Custom updates-managers may utilize
         // these notifications to implement a more fine-grained updating strategy.
 
         // they would usually be invoked). Custom updates-managers may utilize
         // these notifications to implement a more fine-grained updating strategy.
 

-    virtual void OnRowWillChange( cbRowInfo* pRow, cbDockPane* pInPane ) {}
+    virtual void OnRowWillChange( cbRowInfo* WXUNUSED(pRow), cbDockPane* WXUNUSED(pInPane) ) {}

 
         // This function receives a notification from the frame layout (in the order in which
         // they would usually be invoked). Custom updates-managers may utilize
         // these notifications to implement a more fine-grained updating strategy.
 
 
         // This function receives a notification from the frame layout (in the order in which
         // they would usually be invoked). Custom updates-managers may utilize
         // these notifications to implement a more fine-grained updating strategy.
 

-    virtual void OnBarWillChange( cbBarInfo* pBar, cbRowInfo* pInRow, cbDockPane* pInPane ) {}
+    virtual void OnBarWillChange( cbBarInfo* WXUNUSED(pBar), cbRowInfo* WXUNUSED(pInRow), cbDockPane* WXUNUSED(pInPane) ) {}

 
         // This function receives a notification from the frame layout (in the order in which
         // they would usually be invoked). Custom updates-managers may utilize
         // these notifications to implement a more fine-grained updating strategy.
 
 
         // This function receives a notification from the frame layout (in the order in which
         // they would usually be invoked). Custom updates-managers may utilize
         // these notifications to implement a more fine-grained updating strategy.
 

-    virtual void OnPaneMarginsWillChange( cbDockPane* pPane ) {}
+    virtual void OnPaneMarginsWillChange( cbDockPane* WXUNUSED(pPane) ) {}

 
         // This function receives a notification from the frame layout (in the order in which
         // they would usually be invoked). Custom updates-managers may utilize
         // these notifications to implement a more fine-grained updating strategy.
 
 
         // This function receives a notification from the frame layout (in the order in which
         // they would usually be invoked). Custom updates-managers may utilize
         // these notifications to implement a more fine-grained updating strategy.
 

-    virtual void OnPaneWillChange( cbDockPane* pPane ) {}
+    virtual void OnPaneWillChange( cbDockPane* WXUNUSED(pPane) ) {}

 
         // This function receives a notification from the frame layout (in the order in which
         // they would usually be invoked). Custom updates-managers may utilize
 
         // This function receives a notification from the frame layout (in the order in which
         // they would usually be invoked). Custom updates-managers may utilize


@@ -1548,40 +1552,40 @@ public:
 
 // event types handled by plugins
 
 
 // event types handled by plugins
 

-extern wxEventType cbEVT_PL_LEFT_DOWN;
-extern wxEventType cbEVT_PL_LEFT_UP;
-extern wxEventType cbEVT_PL_RIGHT_DOWN;
-extern wxEventType cbEVT_PL_RIGHT_UP;
-extern wxEventType cbEVT_PL_MOTION;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_LEFT_DOWN;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_LEFT_UP;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_RIGHT_DOWN;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_RIGHT_UP;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_MOTION;

 
 

-extern wxEventType cbEVT_PL_LEFT_DCLICK;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_LEFT_DCLICK;

 
 

-extern wxEventType cbEVT_PL_LAYOUT_ROW;
-extern wxEventType cbEVT_PL_RESIZE_ROW;
-extern wxEventType cbEVT_PL_LAYOUT_ROWS;
-extern wxEventType cbEVT_PL_INSERT_BAR;
-extern wxEventType cbEVT_PL_RESIZE_BAR;
-extern wxEventType cbEVT_PL_REMOVE_BAR;
-extern wxEventType cbEVT_PL_SIZE_BAR_WND;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_LAYOUT_ROW;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_RESIZE_ROW;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_LAYOUT_ROWS;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_INSERT_BAR;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_RESIZE_BAR;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_REMOVE_BAR;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_SIZE_BAR_WND;

 
 

-extern wxEventType cbEVT_PL_DRAW_BAR_DECOR;
-extern wxEventType cbEVT_PL_DRAW_ROW_DECOR;
-extern wxEventType cbEVT_PL_DRAW_PANE_DECOR;
-extern wxEventType cbEVT_PL_DRAW_BAR_HANDLES;
-extern wxEventType cbEVT_PL_DRAW_ROW_HANDLES;
-extern wxEventType cbEVT_PL_DRAW_ROW_BKGROUND;
-extern wxEventType cbEVT_PL_DRAW_PANE_BKGROUND;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_DRAW_BAR_DECOR;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_DRAW_ROW_DECOR;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_DRAW_PANE_DECOR;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_DRAW_BAR_HANDLES;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_DRAW_ROW_HANDLES;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_DRAW_ROW_BKGROUND;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_DRAW_PANE_BKGROUND;

 
 

-extern wxEventType cbEVT_PL_START_BAR_DRAGGING;
-extern wxEventType cbEVT_PL_DRAW_HINT_RECT;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_START_BAR_DRAGGING;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_DRAW_HINT_RECT;

 
 

-extern wxEventType cbEVT_PL_START_DRAW_IN_AREA;
-extern wxEventType cbEVT_PL_FINISH_DRAW_IN_AREA;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_START_DRAW_IN_AREA;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_FINISH_DRAW_IN_AREA;

 
 

-extern wxEventType cbEVT_PL_CUSTOMIZE_BAR;
-extern wxEventType cbEVT_PL_CUSTOMIZE_LAYOUT;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_CUSTOMIZE_BAR;
+extern WXDLLIMPEXP_FL wxEventType cbEVT_PL_CUSTOMIZE_LAYOUT;

 
 

-extern wxEventType wxCUSTOM_CB_PLUGIN_EVENTS_START_AT;
+extern WXDLLIMPEXP_FL wxEventType wxCUSTOM_CB_PLUGIN_EVENTS_START_AT;

 
 // Forward declarations, separated by categories.
 
 
 // Forward declarations, separated by categories.
 


@@ -1653,31 +1657,31 @@ typedef void (wxEvtHandler::*cbCustomizeLayoutHandler )(cbCustomizeLayoutEvent&)
 
 // Macros for creating event table entries for plugin-events.
 
 
 // Macros for creating event table entries for plugin-events.
 

-#define EVT_PL_LEFT_DOWN(func)             wxEventTableEntry( cbEVT_PL_LEFT_DOWN,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftDownHandler        ) & func, (wxObject *) NULL ),
-#define EVT_PL_LEFT_UP(func)             wxEventTableEntry( cbEVT_PL_LEFT_UP,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftUpHandler          ) & func, (wxObject *) NULL ),
-#define EVT_PL_RIGHT_DOWN(func)             wxEventTableEntry( cbEVT_PL_RIGHT_DOWN,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRightDownHandler       ) & func, (wxObject *) NULL ),
-#define EVT_PL_RIGHT_UP(func)             wxEventTableEntry( cbEVT_PL_RIGHT_UP,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRightUpHandler         ) & func, (wxObject *) NULL ),
-#define EVT_PL_MOTION(func)                 wxEventTableEntry( cbEVT_PL_MOTION,                 -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbMotionHandler          ) & func, (wxObject *) NULL ),
-#define EVT_PL_LEFT_DCLICK(func)         wxEventTableEntry( cbEVT_PL_LEFT_DCLICK,         -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftDClickHandler      ) & func, (wxObject *) NULL ),
-
-#define EVT_PL_LAYOUT_ROW(func)             wxEventTableEntry( cbEVT_PL_LAYOUT_ROW,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLayoutRowHandler       ) & func, (wxObject *) NULL ),
-#define EVT_PL_RESIZE_ROW(func)             wxEventTableEntry( cbEVT_PL_RESIZE_ROW,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbResizeRowHandler       ) & func, (wxObject *) NULL ),
-#define EVT_PL_LAYOUT_ROWS(func)         wxEventTableEntry( cbEVT_PL_LAYOUT_ROWS,         -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLayoutRowsHandler      ) & func, (wxObject *) NULL ),
-#define EVT_PL_INSERT_BAR(func)             wxEventTableEntry( cbEVT_PL_INSERT_BAR,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbInsertBarHandler       ) & func, (wxObject *) NULL ),
-#define EVT_PL_RESIZE_BAR(func)             wxEventTableEntry( cbEVT_PL_RESIZE_BAR,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbResizeBarHandler       ) & func, (wxObject *) NULL ),
-#define EVT_PL_REMOVE_BAR(func)             wxEventTableEntry( cbEVT_PL_REMOVE_BAR,             -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRemoveBarHandler       ) & func, (wxObject *) NULL ),
-#define EVT_PL_SIZE_BAR_WND(func)         wxEventTableEntry( cbEVT_PL_SIZE_BAR_WND,         -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbSizeBarWndHandler      ) & func, (wxObject *) NULL ),
-
-#define EVT_PL_DRAW_BAR_DECOR(func)      wxEventTableEntry( cbEVT_PL_DRAW_BAR_DECOR,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawBarDecorHandler    ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_ROW_DECOR(func)      wxEventTableEntry( cbEVT_PL_DRAW_ROW_DECOR,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowDecorHandler    ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_PANE_DECOR(func)     wxEventTableEntry( cbEVT_PL_DRAW_PANE_DECOR,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawPaneDecorHandler   ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_BAR_HANDLES(func)    wxEventTableEntry( cbEVT_PL_DRAW_BAR_HANDLES,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawBarHandlesHandler  ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_ROW_HANDLES(func)    wxEventTableEntry( cbEVT_PL_DRAW_ROW_HANDLES,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowHandlesHandler  ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_ROW_BKGROUND(func)   wxEventTableEntry( cbEVT_PL_DRAW_ROW_BKGROUND,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowBkGroundHandler ) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_PANE_BKGROUND(func)  wxEventTableEntry( cbEVT_PL_DRAW_PANE_BKGROUND,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawPaneBkGroundHandler) & func, (wxObject *) NULL ),
-
-#define EVT_PL_START_BAR_DRAGGING(func)  wxEventTableEntry( cbEVT_PL_START_BAR_DRAGGING,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbStartBarDraggingHandler) & func, (wxObject *) NULL ),
-#define EVT_PL_DRAW_HINT_RECT(func)      wxEventTableEntry( cbEVT_PL_DRAW_HINT_RECT,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawHintRectHandler    ) & func, (wxObject *) NULL ),
+#define EVT_PL_LEFT_DOWN(func)   wxEventTableEntry( cbEVT_PL_LEFT_DOWN,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftDownHandler   ) & func, (wxObject *) NULL ),
+#define EVT_PL_LEFT_UP(func)     wxEventTableEntry( cbEVT_PL_LEFT_UP,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftUpHandler     ) & func, (wxObject *) NULL ),
+#define EVT_PL_RIGHT_DOWN(func)  wxEventTableEntry( cbEVT_PL_RIGHT_DOWN,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRightDownHandler  ) & func, (wxObject *) NULL ),
+#define EVT_PL_RIGHT_UP(func)    wxEventTableEntry( cbEVT_PL_RIGHT_UP,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRightUpHandler    ) & func, (wxObject *) NULL ),
+#define EVT_PL_MOTION(func)      wxEventTableEntry( cbEVT_PL_MOTION,      -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbMotionHandler     ) & func, (wxObject *) NULL ),
+#define EVT_PL_LEFT_DCLICK(func) wxEventTableEntry( cbEVT_PL_LEFT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLeftDClickHandler ) & func, (wxObject *) NULL ),
+
+#define EVT_PL_LAYOUT_ROW(func)   wxEventTableEntry( cbEVT_PL_LAYOUT_ROW,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLayoutRowHandler  ) & func, (wxObject *) NULL ),
+#define EVT_PL_RESIZE_ROW(func)   wxEventTableEntry( cbEVT_PL_RESIZE_ROW,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbResizeRowHandler  ) & func, (wxObject *) NULL ),
+#define EVT_PL_LAYOUT_ROWS(func)  wxEventTableEntry( cbEVT_PL_LAYOUT_ROWS,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbLayoutRowsHandler ) & func, (wxObject *) NULL ),
+#define EVT_PL_INSERT_BAR(func)   wxEventTableEntry( cbEVT_PL_INSERT_BAR,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbInsertBarHandler  ) & func, (wxObject *) NULL ),
+#define EVT_PL_RESIZE_BAR(func)   wxEventTableEntry( cbEVT_PL_RESIZE_BAR,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbResizeBarHandler  ) & func, (wxObject *) NULL ),
+#define EVT_PL_REMOVE_BAR(func)   wxEventTableEntry( cbEVT_PL_REMOVE_BAR,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbRemoveBarHandler  ) & func, (wxObject *) NULL ),
+#define EVT_PL_SIZE_BAR_WND(func) wxEventTableEntry( cbEVT_PL_SIZE_BAR_WND, -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbSizeBarWndHandler ) & func, (wxObject *) NULL ),
+
+#define EVT_PL_DRAW_BAR_DECOR(func)     wxEventTableEntry( cbEVT_PL_DRAW_BAR_DECOR,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawBarDecorHandler    ) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_ROW_DECOR(func)     wxEventTableEntry( cbEVT_PL_DRAW_ROW_DECOR,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowDecorHandler    ) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_PANE_DECOR(func)    wxEventTableEntry( cbEVT_PL_DRAW_PANE_DECOR,    -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawPaneDecorHandler   ) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_BAR_HANDLES(func)   wxEventTableEntry( cbEVT_PL_DRAW_BAR_HANDLES,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawBarHandlesHandler  ) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_ROW_HANDLES(func)   wxEventTableEntry( cbEVT_PL_DRAW_ROW_HANDLES,   -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowHandlesHandler  ) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_ROW_BKGROUND(func)  wxEventTableEntry( cbEVT_PL_DRAW_ROW_BKGROUND,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawRowBkGroundHandler ) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_PANE_BKGROUND(func) wxEventTableEntry( cbEVT_PL_DRAW_PANE_BKGROUND, -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawPaneBkGroundHandler) & func, (wxObject *) NULL ),
+
+#define EVT_PL_START_BAR_DRAGGING(func) wxEventTableEntry( cbEVT_PL_START_BAR_DRAGGING, -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbStartBarDraggingHandler) & func, (wxObject *) NULL ),
+#define EVT_PL_DRAW_HINT_RECT(func)     wxEventTableEntry( cbEVT_PL_DRAW_HINT_RECT,     -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbDrawHintRectHandler    ) & func, (wxObject *) NULL ),

 
 
 #define EVT_PL_START_DRAW_IN_AREA(func)  wxEventTableEntry( cbEVT_PL_START_DRAW_IN_AREA,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbStartDrawInAreaHandler)  & func, (wxObject *) NULL ),
 
 
 #define EVT_PL_START_DRAW_IN_AREA(func)  wxEventTableEntry( cbEVT_PL_START_DRAW_IN_AREA,  -1, -1, (wxObjectEventFunction) (wxEventFunction) (cbStartDrawInAreaHandler)  & func, (wxObject *) NULL ),


@@ -1706,7 +1710,7 @@ public:
 
     int            mPaneMask;
 
 
     int            mPaneMask;
 

-        // Is TRUE when plugin is ready to handle events.
+        // Is true when plugin is ready to handle events.

 
     bool           mIsReady;
 
 
     bool           mIsReady;
 


@@ -1717,7 +1721,7 @@ public:
 
         : mpLayout  ( 0 ),
           mPaneMask( wxALL_PANES ),
 
         : mpLayout  ( 0 ),
           mPaneMask( wxALL_PANES ),

-          mIsReady ( FALSE )
+          mIsReady ( false )

     {}
 
         // Constructor taking layout panel and a mask.
     {}
 
         // Constructor taking layout panel and a mask.


@@ -1726,7 +1730,7 @@ public:
 
         : mpLayout  ( pPanel ),
           mPaneMask( paneMask ),
 
         : mpLayout  ( pPanel ),
           mPaneMask( paneMask ),

-          mIsReady ( FALSE )
+          mIsReady ( false )

     {}
 
         // Returns the pane mask.
     {}
 
         // Returns the pane mask.


@@ -1741,9 +1745,9 @@ public:
         // At this point plugin is already attached to the frame layout,
         // and pane masks are set.
 
         // At this point plugin is already attached to the frame layout,
         // and pane masks are set.
 

-    virtual void OnInitPlugin() { mIsReady = TRUE; }
+    virtual void OnInitPlugin() { mIsReady = true; }

 
 

-        // Returns TRUE if the plugin is ready to receive events.
+        // Returns true if the plugin is ready to receive events.

 
     bool IsReady() { return mIsReady; }
 
 
     bool IsReady() { return mIsReady; }