X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c299c3ab663257429983c24e6fb71450f3cf9f1..7ed24cb652413094e211940d7177d89e9fc805f5:/include/wx/os2/radiobut.h?ds=sidebyside diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h index 8d23a64bcb..168967fa14 100644 --- a/include/wx/os2/radiobut.h +++ b/include/wx/os2/radiobut.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: radiobut.h +// Name: wx/os2/radiobut.h // Purpose: wxRadioButton class // Author: David Webster // Modified by: @@ -14,33 +14,29 @@ #include "wx/control.h" -WXDLLEXPORT_DATA(extern const char*) wxRadioButtonNameStr; - -class WXDLLEXPORT wxRadioButton: public wxControl +class WXDLLIMPEXP_CORE wxRadioButton: public wxControl { public: - inline wxRadioButton() {} + 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 ,rValidator -#endif ,rsName ); } @@ -51,20 +47,33 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,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); + bool OS2Command( WXUINT wParam + ,WXWORD wId + ); + void Command(wxCommandEvent& rEvent); + virtual MRESULT OS2WindowProc( WXUINT uMsg + ,WXWPARAM wParam + ,WXLPARAM lParam + ); + virtual void SetFocus(void); + +protected: + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxSize DoGetBestSize() const; + private: + void Init(void); + + bool m_bFocusJustSet; + DECLARE_DYNAMIC_CLASS(wxRadioButton) }; // end of wxRadioButton