X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57c4d796c56bd48ce370240107f3e4c07e142985..d062e17fca1a1fc0b82b269da4a7ad271075ba2b:/include/wx/os2/checkbox.h?ds=inline diff --git a/include/wx/os2/checkbox.h b/include/wx/os2/checkbox.h index 677f3699f7..6079d5f80a 100644 --- a/include/wx/os2/checkbox.h +++ b/include/wx/os2/checkbox.h @@ -18,21 +18,15 @@ WXDLLEXPORT_DATA(extern const char*) wxCheckBoxNameStr; // Checkbox item (single checkbox) class WXDLLEXPORT wxBitmap; -class WXDLLEXPORT wxCheckBox: public wxControl +class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase { - DECLARE_DYNAMIC_CLASS(wxCheckBox) - public: inline wxCheckBox() { } inline wxCheckBox(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, #if wxUSE_VALIDATORS -# if defined(__VISAGECPP__) - const wxValidator* validator = wxDefaultValidator, -# else const wxValidator& validator = wxDefaultValidator, -# endif #endif const wxString& name = wxCheckBoxNameStr) { @@ -43,11 +37,7 @@ class WXDLLEXPORT wxCheckBox: public wxControl const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, #if wxUSE_VALIDATORS -# if defined(__VISAGECPP__) - const wxValidator* validator = wxDefaultValidator, -# else const wxValidator& validator = wxDefaultValidator, -# endif #endif const wxString& name = wxCheckBoxNameStr); @@ -61,7 +51,9 @@ class WXDLLEXPORT wxCheckBox: public wxControl WXUINT message, WXWPARAM wParam, WXLPARAM lParam); protected: - virtual wxSize DoGetBestSize(); + virtual wxSize DoGetBestSize() const; +private: + DECLARE_DYNAMIC_CLASS(wxCheckBox) }; class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox @@ -77,11 +69,7 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, #if wxUSE_VALIDATORS -# if defined(__VISAGECPP__) - const wxValidator* validator = wxDefaultValidator, -# else const wxValidator& validator = wxDefaultValidator, -# endif #endif const wxString& name = wxCheckBoxNameStr) { @@ -92,11 +80,7 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, #if wxUSE_VALIDATORS -# if defined(__VISAGECPP__) - const wxValidator* validator = wxDefaultValidator, -# else const wxValidator& validator = wxDefaultValidator, -# endif #endif const wxString& name = wxCheckBoxNameStr);