X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16cba29d3a5a0a95b367382311a4a7a9a9833210..7e2baeb41321aedca928608f816f03c13afdeff9:/include/wx/statline.h diff --git a/include/wx/statline.h b/include/wx/statline.h index e472503747..905bb3152f 100644 --- a/include/wx/statline.h +++ b/include/wx/statline.h @@ -28,7 +28,7 @@ // ---------------------------------------------------------------------------- // the default name for objects of class wxStaticLine -extern WXDLLEXPORT_DATA(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 @@ -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__)