X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1be7a35c5ec31b6cfcab9d969c7969586441a945..cbeda384e51acb82e13994cb67ac1714669cae10:/include/wx/statline.h?ds=sidebyside diff --git a/include/wx/statline.h b/include/wx/statline.h index 905bb3152f..3894169118 100644 --- a/include/wx/statline.h +++ b/include/wx/statline.h @@ -28,13 +28,13 @@ // ---------------------------------------------------------------------------- // the default name for objects of class wxStaticLine -extern WXDLLEXPORT_DATA(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 @@ -50,6 +50,9 @@ public: 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 { @@ -73,7 +76,7 @@ protected: return AdjustSize(wxDefaultSize); } - DECLARE_NO_COPY_CLASS(wxStaticLineBase) + wxDECLARE_NO_COPY_CLASS(wxStaticLineBase); }; // ---------------------------------------------------------------------------- @@ -91,7 +94,7 @@ protected: #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 @@ -100,5 +103,4 @@ protected: #endif // wxUSE_STATLINE -#endif - // _WX_STATLINE_H_BASE_ +#endif // _WX_STATLINE_H_BASE_