X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f36e602b3f4cccedfa2d8932c288f3dfed7b549e..b04237742c51e022af8ca8fe8933437734f392a3:/include/wx/statbox.h diff --git a/include/wx/statbox.h b/include/wx/statbox.h index 039df42af3..2b3683d3d7 100644 --- a/include/wx/statbox.h +++ b/include/wx/statbox.h @@ -18,13 +18,13 @@ #include "wx/control.h" -extern WXDLLEXPORT_DATA(const char) wxStaticBoxNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBoxNameStr[]; // ---------------------------------------------------------------------------- // wxStaticBox: a grouping box with a label // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStaticBoxBase : public wxControl +class WXDLLIMPEXP_CORE wxStaticBoxBase : public wxControl { public: wxStaticBoxBase() { } @@ -46,8 +46,11 @@ public: *borderOther = BORDER; } -private: - DECLARE_NO_COPY_CLASS(wxStaticBoxBase) +protected: + // choose the default border for this window + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + + wxDECLARE_NO_COPY_CLASS(wxStaticBoxBase); }; #if defined(__WXUNIVERSAL__) @@ -61,7 +64,7 @@ private: #elif defined(__WXGTK__) #include "wx/gtk1/statbox.h" #elif defined(__WXMAC__) - #include "wx/mac/statbox.h" + #include "wx/osx/statbox.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/statbox.h" #elif defined(__WXPM__)