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 1e97dea5841885d168536ff9618b9be20850c319..522ff374770d508bba1dc0fa0c4ed0b32a322868 100644 (file)
--- a/contrib/include/wx/fl/controlbar.h
+++ b/contrib/include/wx/fl/controlbar.h
@@ -13,12 +13,9 @@
 #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/pen.h"
 #include "wx/window.h"
 #include "wx/dynarray.h"
 #include "wx/fl/fldefs.h"
@@ -888,7 +885,7 @@ class cbBarInfo : public wxObject
 {
     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
@@ -904,10 +901,10 @@ public:
     bool          mHasLeftHandle;
     bool          mHasRightHandle;
 
-    // determines if this bar can float. The layout's setting as priority. For 
+    // 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 
+    // 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)
 
@@ -1002,7 +999,7 @@ which are usually the same for all panes in
 a frame layout.
 */
 
-class cbCommonPaneProperties : public wxObject
+class WXDLLIMPEXP_FL cbCommonPaneProperties : public wxObject
 {
     DECLARE_DYNAMIC_CLASS( cbCommonPaneProperties )
 
@@ -1036,11 +1033,11 @@ class cbCommonPaneProperties : public wxObject
     cbCommonPaneProperties(void);
 
         // Copy constructor
-    
+
     cbCommonPaneProperties(const cbCommonPaneProperties&);
 
         // Assignment operator
-    
+
     cbCommonPaneProperties& operator=(const cbCommonPaneProperties&);
 };
 
@@ -1461,7 +1458,7 @@ areas of frame layout that actually need to be updated. This should be extended
 to implement a custom updating strategy.
 */
 
-class cbUpdatesManagerBase : public wxObject
+class WXDLLIMPEXP_FL cbUpdatesManagerBase : public wxObject
 {
     DECLARE_ABSTRACT_CLASS( cbUpdatesManagerBase )