X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/083f7497d34a1df453b92ab411aace3fc4ace927..1dbdb45df56cfa29969ae0fd5a81df53925bc147:/contrib/include/wx/fl/dyntbar.h

diff --git a/contrib/include/wx/fl/dyntbar.h b/contrib/include/wx/fl/dyntbar.h
index 3e38cb439a..4829235251 100644
--- a/contrib/include/wx/fl/dyntbar.h
+++ b/contrib/include/wx/fl/dyntbar.h
@@ -24,7 +24,7 @@
 Tool layout item.
 */
 
-class WXFL_DECLSPEC wxToolLayoutItem : public wxObject
+class WXDLLIMPEXP_FL wxToolLayoutItem : public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxToolLayoutItem)
 
@@ -33,7 +33,7 @@ public:
     bool      mIsSeparator;
 };
 
-class WXFL_DECLSPEC wxDynToolInfo;
+class WXDLLIMPEXP_FL wxDynToolInfo;
 
 typedef wxToolLayoutItem* wxToolLayoutItemPtrT;
 typedef wxDynToolInfo*    wxDynToolInfoPtrT;
@@ -45,7 +45,7 @@ WXFL_DEFINE_ARRAY( wxDynToolInfoPtrT,    wxDynToolInfoArrayT );
 This is a base class for layout algorithm implementations.
 */
 
-class WXFL_DECLSPEC LayoutManagerBase
+class WXDLLIMPEXP_FL LayoutManagerBase
 {
 public:
         // Constructor.
@@ -64,7 +64,7 @@ BagLayout lays out items in left-to-right order from
 top to bottom.
 */
 
-class WXFL_DECLSPEC BagLayout : public LayoutManagerBase
+class WXDLLIMPEXP_FL BagLayout : public LayoutManagerBase
 {
 public:
         // Constructor.
@@ -79,7 +79,7 @@ public:
 This class holds dynamic toolbar item information.
 */
 
-class WXFL_DECLSPEC wxDynToolInfo : public wxToolLayoutItem
+class WXDLLIMPEXP_FL wxDynToolInfo : public wxToolLayoutItem
 {
     DECLARE_DYNAMIC_CLASS(wxDynToolInfo)
 
@@ -99,7 +99,7 @@ public:
 wxDynamicToolBar manages containment and layout of tool windows.
 */
 
-class WXFL_DECLSPEC wxDynamicToolBar : public wxToolBarBase
+class WXDLLIMPEXP_FL wxDynamicToolBar : public wxToolBarBase
 {
 protected:
     friend class wxDynamicToolBarSerializer;
@@ -148,12 +148,12 @@ public:
     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,
-                              const wxString& labelText = "", bool alignTextRight = FALSE,
+                              const wxString& labelText = wxT(""), bool alignTextRight = FALSE,
                               bool isFlat = TRUE );
 
     // Method from wxToolBarBase (for compatibility), only
@@ -162,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,
-               const wxString& helpString1 = "", const wxString& helpString2 = "");
+               const wxString& helpString1 = wxT(""), const wxString& helpString2 = wxT(""));
 
         // Adds a separator. See the documentation for wxToolBar for details.