X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d33704ddf2884c8b1cf1178e3cee6d2e1b4004f0..03773e400b6ff2692f2a9ba045d652c3b7b7109d:/include/wx/gtk/radiobox.h diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h index dd48a66911..901a09d845 100644 --- a/include/wx/gtk/radiobox.h +++ b/include/wx/gtk/radiobox.h @@ -12,6 +12,13 @@ #include "wx/bitmap.h" +class WXDLLIMPEXP_FWD_CORE wxGTKRadioButtonInfo; + +#include "wx/list.h" + +WX_DECLARE_EXPORTED_LIST(wxGTKRadioButtonInfo, wxRadioBoxButtonsInfoList); + + //----------------------------------------------------------------------------- // wxRadioBox //----------------------------------------------------------------------------- @@ -29,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) { @@ -45,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) { @@ -63,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, @@ -73,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); @@ -107,32 +114,43 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + virtual int GetItemFromPoint( const wxPoint& pt ) const; +#if wxUSE_HELP + // override virtual wxWindow::GetHelpTextAtPoint to use common platform independent + // wxRadioBoxBase::DoGetHelpTextAtPoint from the platform independent + // base class-interface wxRadioBoxBase. + virtual wxString GetHelpTextAtPoint(const wxPoint & pt, wxHelpEvent::Origin origin) const + { + return wxRadioBoxBase::DoGetHelpTextAtPoint( this, pt, origin ); + } +#endif // wxUSE_HELP + // implementation // -------------- - void SetFocus(); void GtkDisableEvents(); void GtkEnableEvents(); - bool IsOwnGtkWindow( GdkWindow *window ); #if wxUSE_TOOLTIPS - void ApplyToolTip( GtkTooltips *tips, const wxChar *tip ); + void GTKApplyToolTip( GtkTooltips *tips, const gchar *tip ); #endif // wxUSE_TOOLTIPS - virtual void OnInternalIdle(); - - bool m_hasFocus, - m_lostFocus; - wxList m_buttons; + wxRadioBoxButtonsInfoList m_buttonsInfo; protected: - void DoApplyWidgetStyle(GtkRcStyle *style); + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + +#if wxUSE_TOOLTIPS + virtual void DoSetItemToolTip(unsigned int n, wxToolTip *tooltip); +#endif + + 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) };