X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57c4d796c56bd48ce370240107f3e4c07e142985..2b004197c8cea40b41632e86cf27857463f985b8:/include/wx/os2/radiobut.h diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h index 996f74487c..ee96b5008b 100644 --- a/include/wx/os2/radiobut.h +++ b/include/wx/os2/radiobut.h @@ -27,11 +27,7 @@ class WXDLLEXPORT wxRadioButton: 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 = wxRadioButtonNameStr) { @@ -43,11 +39,7 @@ class WXDLLEXPORT wxRadioButton: 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 = wxRadioButtonNameStr); @@ -59,55 +51,5 @@ class WXDLLEXPORT wxRadioButton: public wxControl void Command(wxCommandEvent& event); }; -// Not implemented -class WXDLLEXPORT wxBitmap ; - -WXDLLEXPORT_DATA(extern const char*) wxBitmapRadioButtonNameStr; - -class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton -{ - DECLARE_DYNAMIC_CLASS(wxBitmapRadioButton) - protected: - wxBitmap *theButtonBitmap; - public: - inline wxBitmapRadioButton() { theButtonBitmap = NULL; } - inline wxBitmapRadioButton(wxWindow *parent, wxWindowID id, - const wxBitmap *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 = wxBitmapRadioButtonNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxBitmap *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 = wxBitmapRadioButtonNameStr); - - virtual void SetLabel(const wxBitmap *label); - virtual void SetValue(bool val) ; - virtual bool GetValue() const ; -private: - // virtual function hiding suppression, do not use - virtual void SetLabel(const wxString& label) - { wxRadioButton::SetLabel(label); }; -}; - #endif // _WX_RADIOBUT_H_