X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/statline.h?ds=sidebyside diff --git a/include/wx/statline.h b/include/wx/statline.h index f660c5d943..4f9e0f1561 100644 --- a/include/wx/statline.h +++ b/include/wx/statline.h @@ -3,7 +3,6 @@ // Purpose: wxStaticLine class interface // Author: Vadim Zeitlin // Created: 28.06.99 -// Version: $Id$ // Copyright: (c) 1999 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -28,13 +27,13 @@ // ---------------------------------------------------------------------------- // the default name for objects of class wxStaticLine -WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr; +extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticLineNameStr[]; // ---------------------------------------------------------------------------- // wxStaticLine - a line in a dialog // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStaticLineBase : public wxControl +class WXDLLIMPEXP_CORE wxStaticLineBase : public wxControl { public: // constructor @@ -46,22 +45,25 @@ public: // get the default size for the "lesser" dimension of the static line static int GetDefaultSize() { return 2; } - // overriden base class virtuals - virtual bool AcceptsFocus() const { return FALSE; } + // overridden base class virtuals + virtual bool AcceptsFocus() const { return false; } protected: + // choose the default border for this window + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + // set the right size for the right dimension wxSize AdjustSize(const wxSize& size) const { 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); } + + wxDECLARE_NO_COPY_CLASS(wxStaticLineBase); }; // ---------------------------------------------------------------------------- @@ -82,17 +86,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" + #include "wx/osx/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_