ported rest of contrib to bakefile

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

diff --git a/contrib/include/wx/fl/dyntbar.h b/contrib/include/wx/fl/dyntbar.h
index 109d7413dd4e4aacc5956e849c80363f91d7cf17..4829235251f7f7637bbc7a8705a9cefd6146478b 100644 (file)
--- a/contrib/include/wx/fl/dyntbar.h
+++ b/contrib/include/wx/fl/dyntbar.h
@@ -12,18 +12,19 @@
 #ifndef __DYNTBAR_G__
 #define __DYNTBAR_G__
 
 #ifndef __DYNTBAR_G__
 #define __DYNTBAR_G__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "dyntbar.h"
 #endif
 
 #include "wx/tbarbase.h"
 #include "wx/dynarray.h"
     #pragma interface "dyntbar.h"
 #endif
 
 #include "wx/tbarbase.h"
 #include "wx/dynarray.h"

+#include "wx/fl/fldefs.h"

 
 /*
 Tool layout item.
 */
 
 
 /*
 Tool layout item.
 */
 

-class wxToolLayoutItem : public wxObject
+class WXDLLIMPEXP_FL wxToolLayoutItem : public wxObject

 {
     DECLARE_DYNAMIC_CLASS(wxToolLayoutItem)
 
 {
     DECLARE_DYNAMIC_CLASS(wxToolLayoutItem)
 


@@ -32,19 +33,19 @@ public:
     bool      mIsSeparator;
 };
 
     bool      mIsSeparator;
 };
 

-class wxDynToolInfo;
+class WXDLLIMPEXP_FL wxDynToolInfo;

 
 typedef wxToolLayoutItem* wxToolLayoutItemPtrT;
 typedef wxDynToolInfo*    wxDynToolInfoPtrT;
 
 
 typedef wxToolLayoutItem* wxToolLayoutItemPtrT;
 typedef wxDynToolInfo*    wxDynToolInfoPtrT;
 

-WX_DEFINE_ARRAY( wxToolLayoutItemPtrT, wxLayoutItemArrayT  );
-WX_DEFINE_ARRAY( wxDynToolInfoPtrT,    wxDynToolInfoArrayT );
+WXFL_DEFINE_ARRAY( wxToolLayoutItemPtrT, wxLayoutItemArrayT  );
+WXFL_DEFINE_ARRAY( wxDynToolInfoPtrT,    wxDynToolInfoArrayT );

 
 /*
 This is a base class for layout algorithm implementations.
 */
 
 
 /*
 This is a base class for layout algorithm implementations.
 */
 

-class LayoutManagerBase
+class WXDLLIMPEXP_FL LayoutManagerBase

 {
 public:
         // Constructor.
 {
 public:
         // Constructor.


@@ -63,7 +64,7 @@ BagLayout lays out items in left-to-right order from
 top to bottom.
 */
 
 top to bottom.
 */
 

-class BagLayout : public LayoutManagerBase
+class WXDLLIMPEXP_FL BagLayout : public LayoutManagerBase

 {
 public:
         // Constructor.
 {
 public:
         // Constructor.


@@ -78,7 +79,7 @@ public:
 This class holds dynamic toolbar item information.
 */
 
 This class holds dynamic toolbar item information.
 */
 

-class wxDynToolInfo : public wxToolLayoutItem
+class WXDLLIMPEXP_FL wxDynToolInfo : public wxToolLayoutItem

 {
     DECLARE_DYNAMIC_CLASS(wxDynToolInfo)
 
 {
     DECLARE_DYNAMIC_CLASS(wxDynToolInfo)
 


@@ -98,7 +99,7 @@ public:
 wxDynamicToolBar manages containment and layout of tool windows.
 */
 
 wxDynamicToolBar manages containment and layout of tool windows.
 */
 

-class wxDynamicToolBar : public wxToolBarBase
+class WXDLLIMPEXP_FL wxDynamicToolBar : public wxToolBarBase

 {
 protected:
     friend class wxDynamicToolBarSerializer;
 {
 protected:
     friend class wxDynamicToolBarSerializer;


@@ -147,12 +148,12 @@ public:
     virtual void AddTool( int toolIndex,
                               const wxString& imageFileName,
                               wxBitmapType imageFileType = wxBITMAP_TYPE_BMP,
     virtual void AddTool( int toolIndex,
                               const wxString& imageFileName,
                               wxBitmapType imageFileType = wxBITMAP_TYPE_BMP,

-                              const wxString& labelText = "", bool alignTextRight = FALSE,
+                              const wxString& labelText = wxT(""), bool alignTextRight = FALSE,

                               bool isFlat = TRUE );
         // Adds a tool. See the documentation for wxToolBar for details.
 
     virtual void AddTool( int toolIndex, wxBitmap labelBmp,
                               bool isFlat = TRUE );
         // Adds a tool. See the documentation for wxToolBar for details.
 
     virtual void AddTool( int toolIndex, wxBitmap labelBmp,

-                              const wxString& labelText = "", bool alignTextRight = FALSE,
+                              const wxString& labelText = wxT(""), bool alignTextRight = FALSE,

                               bool isFlat = TRUE );
 
     // Method from wxToolBarBase (for compatibility), only
                               bool isFlat = TRUE );
 
     // Method from wxToolBarBase (for compatibility), only


@@ -161,7 +162,7 @@ public:
 
     virtual wxToolBarToolBase *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
                const bool toggle = FALSE, const long xPos = -1, const long yPos = -1, wxObject *clientData = NULL,
 
     virtual wxToolBarToolBase *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
                const bool toggle = FALSE, const long xPos = -1, const long yPos = -1, wxObject *clientData = NULL,

-               const wxString& helpString1 = "", const wxString& helpString2 = "");
+               const wxString& helpString1 = wxT(""), const wxString& helpString2 = wxT(""));

 
         // Adds a separator. See the documentation for wxToolBar for details.
 
 
         // Adds a separator. See the documentation for wxToolBar for details.
 


@@ -198,7 +199,7 @@ public:
 
         // Enables or disables the given tool.
 
 
         // Enables or disables the given tool.
 

-    virtual void EnableTool(const int toolIndex, const bool enable = TRUE);
+    virtual void EnableTool(int toolIndex, bool enable = TRUE);

 
         // Responds to size events, calling Layout.
 
 
         // Responds to size events, calling Layout.