wxOS2 build fixes after wxColourBase introduction.

[wxWidgets.git] / include / wx / statline.h

diff --git a/include/wx/statline.h b/include/wx/statline.h
index 6beb05a2c597bc0a5b0901ab94b95999a159f5d5..905bb3152f7b5de236c1483b4885d3001936baa0 100644 (file)
--- a/include/wx/statline.h
+++ b/include/wx/statline.h
@@ -28,7 +28,7 @@
 // ----------------------------------------------------------------------------
 
 // the default name for objects of class wxStaticLine
-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxStaticTextNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxStaticLine - a line in a dialog
@@ -48,7 +48,6 @@ public:
 
     // overriden base class virtuals
     virtual bool AcceptsFocus() const { return false; }
-    virtual bool CanApplyParentThemeBackground() const { return true; }
 
 protected:
     // set the right size for the right dimension
@@ -57,12 +56,12 @@ protected:
         wxSize sizeReal(size);
         if ( IsVertical() )
         {
-            if ( size.x == -1 )
+            if ( size.x == wxDefaultCoord )
                 sizeReal.x = GetDefaultSize();
         }
         else
         {
-            if ( size.y == -1 )
+            if ( size.y == wxDefaultCoord )
                 sizeReal.y = GetDefaultSize();
         }
 
@@ -85,8 +84,10 @@ protected:
     #include "wx/univ/statline.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/statline.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/statline.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/statline.h"
 #elif defined(__WXPM__)
     #include "wx/os2/statline.h"
 #elif defined(__WXMAC__)