pch-less compilation fix for r55285

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

diff --git a/include/wx/statline.h b/include/wx/statline.h
index b91b7c3ea8a9bac68e664ac699298538dcb65460..9cdd7ffd2e8e726efc1bc3590ff47260150944e2 100644 (file)
--- 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
 // Created:     28.06.99
 // Version:     $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATLINE_H_BASE_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATLINE_H_BASE_


@@ -28,13 +28,13 @@
 // ----------------------------------------------------------------------------
 
 // the default name for objects of class wxStaticLine
 // ----------------------------------------------------------------------------
 
 // the default name for objects of class wxStaticLine

-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr;
+extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticLineNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxStaticLine - a line in a dialog
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxStaticLine - a line in a dialog
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxStaticLineBase : public wxControl
+class WXDLLIMPEXP_CORE wxStaticLineBase : public wxControl

 {
 public:
     // constructor
 {
 public:
     // constructor


@@ -48,22 +48,23 @@ public:
 
     // overriden base class virtuals
     virtual bool AcceptsFocus() const { return false; }
 
     // overriden base class virtuals
     virtual bool AcceptsFocus() const { return false; }

-    virtual void ApplyParentThemeBackground(const wxColour& bg)
-        { SetBackgroundColour(bg); }

 
 protected:
 
 protected:

+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+

     // set the right size for the right dimension
     wxSize AdjustSize(const wxSize& size) const
     {
         wxSize sizeReal(size);
         if ( IsVertical() )
         {
     // set the right size for the right dimension
     wxSize AdjustSize(const wxSize& size) const
     {
         wxSize sizeReal(size);
         if ( IsVertical() )
         {

-            if ( size.x == -1 )
+            if ( size.x == wxDefaultCoord )

                 sizeReal.x = GetDefaultSize();
         }
         else
         {
                 sizeReal.x = GetDefaultSize();
         }
         else
         {

-            if ( size.y == -1 )
+            if ( size.y == wxDefaultCoord )

                 sizeReal.y = GetDefaultSize();
         }
 
                 sizeReal.y = GetDefaultSize();
         }
 


@@ -86,12 +87,14 @@ protected:
     #include "wx/univ/statline.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/statline.h"
     #include "wx/univ/statline.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/statline.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/statline.h"
     #include "wx/gtk/statline.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/statline.h"

 #elif defined(__WXPM__)
     #include "wx/os2/statline.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXPM__)
     #include "wx/os2/statline.h"
 #elif defined(__WXMAC__)

-    #include "wx/mac/statline.h"
+    #include "wx/osx/statline.h"

 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/statline.h"
 #else // use generic implementation for all other platforms
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/statline.h"
 #else // use generic implementation for all other platforms


@@ -100,5 +103,4 @@ protected:
 
 #endif // wxUSE_STATLINE
 
 
 #endif // wxUSE_STATLINE
 

-#endif
-    // _WX_STATLINE_H_BASE_
+#endif // _WX_STATLINE_H_BASE_