X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/677dc0ed1a3ff68af15f6246d6d0708d5264b07a..3ecb4c01f276f9050d1e976a0791ea496cca5c18:/include/wx/gtk/radiobox.h diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h index 1e6bfefd0f..2fe3566396 100644 --- a/include/wx/gtk/radiobox.h +++ b/include/wx/gtk/radiobox.h @@ -36,8 +36,8 @@ 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) { @@ -52,8 +52,8 @@ 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) { @@ -70,7 +70,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 +80,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,17 +128,12 @@ public: // implementation // -------------- - void SetFocus(); void GtkDisableEvents(); void GtkEnableEvents(); #if wxUSE_TOOLTIPS - void ApplyToolTip( GtkTooltips *tips, const gchar *tip ); + virtual void GTKApplyToolTip(const char* tip); #endif // wxUSE_TOOLTIPS - virtual void OnInternalIdle(); - - bool m_hasFocus, - m_lostFocus; wxRadioBoxButtonsInfoList m_buttonsInfo; protected: @@ -151,12 +146,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) };