X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/901a462fd537d432127b4f765cd2a1032639d584..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/statbox.h diff --git a/include/wx/statbox.h b/include/wx/statbox.h index 873e5d15e5..cacae66198 100644 --- a/include/wx/statbox.h +++ b/include/wx/statbox.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbox.h +// Name: wx/statbox.h // Purpose: wxStaticBox base header // Author: Julian Smart // Modified by: @@ -18,18 +18,18 @@ #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() { } - // overriden base class virtuals + // overridden base class virtuals virtual bool AcceptsFocus() const { return false; } virtual bool HasTransparentBackground() { return true; } @@ -50,7 +50,7 @@ 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 @@ protected: #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__)