X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..52170c5b4419c63d6e0083df411aad420395ec98:/include/wx/statline.h?ds=sidebyside diff --git a/include/wx/statline.h b/include/wx/statline.h index f660c5d943..6b43415c84 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) wxStaticLineNameStr[]; // ---------------------------------------------------------------------------- // wxStaticLine - a line in a dialog @@ -47,7 +47,7 @@ public: static int GetDefaultSize() { return 2; } // overriden base class virtuals - virtual bool AcceptsFocus() const { return FALSE; } + virtual bool AcceptsFocus() const { return false; } protected: // set the right size for the right dimension @@ -56,12 +56,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 +72,8 @@ protected: { return AdjustSize(wxDefaultSize); } + + DECLARE_NO_COPY_CLASS(wxStaticLineBase) }; // ---------------------------------------------------------------------------- @@ -82,17 +84,20 @@ 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__) #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 #endif // wxUSE_STATLINE -#endif - // _WX_STATLINE_H_BASE_ +#endif // _WX_STATLINE_H_BASE_