X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f36e602b3f4cccedfa2d8932c288f3dfed7b549e..2d55af1dfa7fd1cc2df13a6593fd51591cfcfcb1:/include/wx/checkbox.h diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h index 47ba77a0e2..60a8189f24 100644 --- a/include/wx/checkbox.h +++ b/include/wx/checkbox.h @@ -49,13 +49,13 @@ enum wxCheckBoxState }; -extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[]; // ---------------------------------------------------------------------------- // wxCheckBox: a control which shows a label and a box which may be checked // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxCheckBoxBase : public wxControl +class WXDLLIMPEXP_CORE wxCheckBoxBase : public wxControl { public: wxCheckBoxBase() { } @@ -118,6 +118,9 @@ public: } protected: + // choose the default border for this window + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; } virtual wxCheckBoxState DoGet3StateValue() const @@ -127,7 +130,7 @@ protected: } private: - DECLARE_NO_COPY_CLASS(wxCheckBoxBase) + wxDECLARE_NO_COPY_CLASS(wxCheckBoxBase); }; #if defined(__WXUNIVERSAL__) @@ -141,7 +144,7 @@ private: #elif defined(__WXGTK__) #include "wx/gtk1/checkbox.h" #elif defined(__WXMAC__) - #include "wx/mac/checkbox.h" + #include "wx/osx/checkbox.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/checkbox.h" #elif defined(__WXPM__)