Renamed wx.FutureCall to wx.CallLater so it is named more like

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

diff --git a/include/wx/statline.h b/include/wx/statline.h
index c0ccedc762324ccd37c6a94869ad451d9177a39f..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
 // ----------------------------------------------------------------------------
 
 // 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


@@ -48,8 +48,6 @@ 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:
     // set the right size for the right dimension
 
 protected:
     // set the right size for the right dimension


@@ -86,8 +84,10 @@ 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__)