X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57c4d796c56bd48ce370240107f3e4c07e142985..835165d576b66441987b78519e6ef1fe74ea795a:/include/wx/os2/radiobut.h diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h index 996f74487c..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,100 +14,68 @@ #include "wx/control.h" -WXDLLEXPORT_DATA(extern const char*) wxRadioButtonNameStr; - -class WXDLLEXPORT wxRadioButton: public wxControl +class WXDLLIMPEXP_CORE 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, -#if wxUSE_VALIDATORS -# if defined(__VISAGECPP__) - const wxValidator* validator = wxDefaultValidator, -# else - const wxValidator& validator = wxDefaultValidator, -# endif -#endif - const wxString& name = wxRadioButtonNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } +public: + inline wxRadioButton() { Init(); } + inline wxRadioButton( wxWindow* pParent + ,wxWindowID vId + ,const wxString& rsLabel + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxRadioButtonNameStr + ) + { + Init(); - bool Create(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 = wxRadioButtonNameStr); + Create( pParent + ,vId + ,rsLabel + ,rPos + ,rSize + ,lStyle + ,rValidator + ,rsName + ); + } - virtual void SetLabel(const wxString& label); - virtual void SetValue(bool val); - virtual bool GetValue() const ; + bool Create( wxWindow* pParent + ,wxWindowID vId + ,const wxString& rsLabel + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxRadioButtonNameStr + ); - bool OS2Command(WXUINT param, WXWORD id); - void Command(wxCommandEvent& event); -}; + virtual void SetLabel(const wxString& rsLabel); + virtual void SetValue(bool bVal); + virtual bool GetValue(void) const ; -// Not implemented -class WXDLLEXPORT wxBitmap ; + bool OS2Command( WXUINT wParam + ,WXWORD wId + ); + void Command(wxCommandEvent& rEvent); + virtual MRESULT OS2WindowProc( WXUINT uMsg + ,WXWPARAM wParam + ,WXLPARAM lParam + ); + virtual void SetFocus(void); -WXDLLEXPORT_DATA(extern const char*) wxBitmapRadioButtonNameStr; +protected: + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxSize DoGetBestSize() const; -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); - } +private: + void Init(void); - 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); + bool m_bFocusJustSet; - 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); }; -}; + DECLARE_DYNAMIC_CLASS(wxRadioButton) +}; // end of wxRadioButton #endif // _WX_RADIOBUT_H_