X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/210a651b4f4ef5ff4e220a100a10bb4f29e08cfd..32f8e36335fbd7116593bf57917a9be294cae363:/include/wx/os2/radiobut.h?ds=sidebyside diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h index ee96b5008b..1d3557cd10 100644 --- a/include/wx/os2/radiobut.h +++ b/include/wx/os2/radiobut.h @@ -14,42 +14,68 @@ #include "wx/control.h" -WXDLLEXPORT_DATA(extern const char*) wxRadioButtonNameStr; - class WXDLLEXPORT wxRadioButton: public wxControl { - DECLARE_DYNAMIC_CLASS(wxRadioButton) - protected: - public: - inline wxRadioButton() {} - inline wxRadioButton(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, +public: + inline wxRadioButton() { Init(); } + inline wxRadioButton( wxWindow* pParent + ,wxWindowID vId + ,const wxString& rsLabel + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,long lStyle = 0 +#if wxUSE_VALIDATORS + ,const wxValidator& rValidator = wxDefaultValidator +#endif + ,const wxString& rsName = wxRadioButtonNameStr + ) + { + Init(); + + Create( pParent + ,vId + ,rsLabel + ,rPos + ,rSize + ,lStyle #if wxUSE_VALIDATORS - const wxValidator& validator = wxDefaultValidator, + ,rValidator #endif - const wxString& name = wxRadioButtonNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, + ,rsName + ); + } + + bool Create( wxWindow* pParent + ,wxWindowID vId + ,const wxString& rsLabel + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,long lStyle = 0 #if wxUSE_VALIDATORS - const wxValidator& validator = wxDefaultValidator, + ,const wxValidator& rValidator = wxDefaultValidator #endif - const wxString& name = wxRadioButtonNameStr); + ,const wxString& rsName = wxRadioButtonNameStr + ); + + virtual void SetLabel(const wxString& rsLabel); + virtual void SetValue(bool bVal); + virtual bool GetValue(void) const ; + + bool OS2Command( WXUINT wParam + ,WXWORD wId + ); + void Command(wxCommandEvent& rEvent); + virtual void SetFocus(void); +protected: + virtual wxSize DoGetBestSize() const; + +private: + void Init(void); - virtual void SetLabel(const wxString& label); - virtual void SetValue(bool val); - virtual bool GetValue() const ; + bool m_bFocusJustSet; - bool OS2Command(WXUINT param, WXWORD id); - void Command(wxCommandEvent& event); -}; + DECLARE_DYNAMIC_CLASS(wxRadioButton) +}; // end of wxRadioButton #endif // _WX_RADIOBUT_H_