X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef5c70f96f5e06e1c8f8119f51b99dd019583d2b..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/gtk/radiobox.h diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h index 77bbb3a066..efbddfc2ab 100644 --- a/include/wx/gtk/radiobox.h +++ b/include/wx/gtk/radiobox.h @@ -12,7 +12,7 @@ #include "wx/bitmap.h" -class WXDLLIMPEXP_CORE wxGTKRadioButtonInfo; +class WXDLLIMPEXP_FWD_CORE wxGTKRadioButtonInfo; #include "wx/list.h" @@ -28,7 +28,7 @@ class WXDLLIMPEXP_CORE wxRadioBox : public wxControl, { public: // ctors and dtor - wxRadioBox() { Init(); } + wxRadioBox() { } wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title, @@ -36,13 +36,11 @@ public: const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = (const wxString *) NULL, - int majorDim = 1, - long style = wxRA_HORIZONTAL, + int majorDim = 0, + long style = wxRA_SPECIFY_COLS, const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr) { - Init(); - Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name ); } @@ -52,13 +50,11 @@ public: const wxPoint& pos, const wxSize& size, const wxArrayString& choices, - int majorDim = 1, - long style = wxRA_HORIZONTAL, + int majorDim = 0, + long style = wxRA_SPECIFY_COLS, const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr) { - Init(); - Create( parent, id, title, pos, size, choices, majorDim, style, val, name ); } @@ -70,7 +66,7 @@ public: int n = 0, const wxString choices[] = (const wxString *) NULL, int majorDim = 0, - long style = wxRA_HORIZONTAL, + long style = wxRA_SPECIFY_COLS, const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr); bool Create(wxWindow *parent, @@ -80,7 +76,7 @@ public: const wxSize& size, const wxArrayString& choices, int majorDim = 0, - long style = wxRA_HORIZONTAL, + long style = wxRA_SPECIFY_COLS, const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr); @@ -128,20 +124,17 @@ public: // implementation // -------------- - void SetFocus(); void GtkDisableEvents(); void GtkEnableEvents(); #if wxUSE_TOOLTIPS - void ApplyToolTip( GtkTooltips *tips, const wxChar *tip ); + virtual void GTKApplyToolTip(const char* tip); #endif // wxUSE_TOOLTIPS - virtual void OnInternalIdle(); - - bool m_hasFocus, - m_lostFocus; wxRadioBoxButtonsInfoList m_buttonsInfo; protected: + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + #if wxUSE_TOOLTIPS virtual void DoSetItemToolTip(unsigned int n, wxToolTip *tooltip); #endif @@ -149,12 +142,11 @@ protected: virtual void DoApplyWidgetStyle(GtkRcStyle *style); virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + virtual bool GTKNeedsToFilterSameWindowFocus() const { return true; } + virtual bool GTKWidgetNeedsMnemonic() const; virtual void GTKWidgetDoSetMnemonic(GtkWidget* w); - // common part of all ctors - void Init(); - private: DECLARE_DYNAMIC_CLASS(wxRadioBox) };