force wxUSE_THREADS/EXCEPTIONS to 0 if wxNO_THREADS/EXCEPTIONS is defined

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

diff --git a/include/wx/statline.h b/include/wx/statline.h
index 6a8b7db0d5ccbbefd03be657775c6cdfeb2a8c46..e47250374713a0dc931657eba173f928b0a012b3 100644 (file)
--- a/include/wx/statline.h
+++ b/include/wx/statline.h
@@ -28,7 +28,7 @@
 // ----------------------------------------------------------------------------
 
 // the default name for objects of class wxStaticLine
 // ----------------------------------------------------------------------------
 
 // 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
 
 // ----------------------------------------------------------------------------
 // wxStaticLine - a line in a dialog


@@ -47,7 +47,9 @@ public:
     static int GetDefaultSize() { return 2; }
 
     // overriden base class virtuals
     static int GetDefaultSize() { return 2; }
 
     // overriden base class virtuals

-    virtual bool AcceptsFocus() const { return FALSE; }
+    virtual bool AcceptsFocus() const { return false; }
+    virtual void ApplyParentThemeBackground(const wxColour& bg)
+        { SetBackgroundColour(bg); }

 
 protected:
     // set the right size for the right dimension
 
 protected:
     // set the right size for the right dimension


@@ -56,12 +58,12 @@ protected:
         wxSize sizeReal(size);
         if ( IsVertical() )
         {
         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();
         }