X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc797d8e1b4ef10be4f5c9cd73151406f459706d..8606ee50771053a38554c7d38b765a8142a1a96c:/include/wx/statbox.h?ds=sidebyside diff --git a/include/wx/statbox.h b/include/wx/statbox.h index 7eee31685e..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,11 +46,11 @@ public: *borderOther = BORDER; } -private: +protected: // choose the default border for this window virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - DECLARE_NO_COPY_CLASS(wxStaticBoxBase) + wxDECLARE_NO_COPY_CLASS(wxStaticBoxBase); }; #if defined(__WXUNIVERSAL__) @@ -64,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__)