X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/72a7edf007f57bc9dacea77c408adb86a57d41f7..82a5f02c861e8d57ba8255a9553b941118ad4520:/include/wx/gtk/radiobox.h diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h index eded3b86e9..d7805a70ca 100644 --- a/include/wx/gtk/radiobox.h +++ b/include/wx/gtk/radiobox.h @@ -43,24 +43,37 @@ extern const char *wxRadioBoxNameStr; class wxRadioBox: public wxControl { public: - wxRadioBox(); - inline wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title, - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = (const wxString *) NULL, - int majorDim = 1, long style = wxRA_HORIZONTAL, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr ) + wxRadioBox() { Init(); } + wxRadioBox(wxWindow *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + int n = 0, + const wxString choices[] = (const wxString *) NULL, + int majorDim = 1, + long style = wxRA_HORIZONTAL, + const wxValidator& val = wxDefaultValidator, + const wxString& name = wxRadioBoxNameStr) { - Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name ); + Init(); + + Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name ); } - ~wxRadioBox(void); - bool Create( wxWindow *parent, wxWindowID id, const wxString& title, - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = (const wxString *) NULL, - int majorDim = 0, long style = wxRA_HORIZONTAL, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr ); - + + ~wxRadioBox(); + bool Create(wxWindow *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + int n = 0, + const wxString choices[] = (const wxString *) NULL, + int majorDim = 0, + long style = wxRA_HORIZONTAL, + const wxValidator& val = wxDefaultValidator, + const wxString& name = wxRadioBoxNameStr); + int FindString( const wxString& s) const; void SetSelection( int n ); int GetSelection() const; @@ -100,12 +113,20 @@ public: void ApplyToolTip( GtkTooltips *tips, const wxChar *tip ); #endif // wxUSE_TOOLTIPS wxSize LayoutItems(); - void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO ); + + virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO ); + virtual void OnInternalIdle(); bool m_alreadySent; + bool m_hasFocus, + m_lostFocus; int m_majorDim; wxList m_boxes; - + +protected: + // common part of all ctors + void Init(); + private: DECLARE_DYNAMIC_CLASS(wxRadioBox) };