X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..bc07ab17bf5370f452e899128bf89cc7ca7b98f0:/include/wx/statline.h

diff --git a/include/wx/statline.h b/include/wx/statline.h
index b91b7c3ea8..905bb3152f 100644
--- a/include/wx/statline.h
+++ b/include/wx/statline.h
@@ -5,7 +5,7 @@
 // Created:     28.06.99
 // Version:     $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATLINE_H_BASE_
@@ -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,8 +48,6 @@ public:
 
     // overriden base class virtuals
     virtual bool AcceptsFocus() const { return false; }
-    virtual void ApplyParentThemeBackground(const wxColour& bg)
-        { SetBackgroundColour(bg); }
 
 protected:
     // set the right size for the right dimension
@@ -58,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();
         }
 
@@ -86,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__)