X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..e18c3e02072753d45643316005bfd022a9d3d7cd:/include/wx/statline.h diff --git a/include/wx/statline.h b/include/wx/statline.h index f660c5d943..e472503747 100644 --- a/include/wx/statline.h +++ b/include/wx/statline.h @@ -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 @@ -47,7 +47,9 @@ public: 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 @@ -56,12 +58,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(); } @@ -72,6 +74,8 @@ protected: { return AdjustSize(wxDefaultSize); } + + DECLARE_NO_COPY_CLASS(wxStaticLineBase) }; // ---------------------------------------------------------------------------- @@ -88,6 +92,8 @@ protected: #include "wx/os2/statline.h" #elif defined(__WXMAC__) #include "wx/mac/statline.h" +#elif defined(__WXCOCOA__) + #include "wx/cocoa/statline.h" #else // use generic implementation for all other platforms #include "wx/generic/statline.h" #endif