From 27c78e4552aaefac9a4db0d4453eff09cdfef2ad Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 30 Nov 2005 16:39:23 +0000 Subject: [PATCH] 1. derive wxGTK wxRadioBox from wxRadioBoxBase now, as in all other ports 2. implemented wxRadioBox::IsItemShown/Enabled() for wxGTK git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/radiobox.h | 46 +++++++++------- include/wx/gtk1/radiobox.h | 46 +++++++++------- src/gtk/radiobox.cpp | 105 +++++++++++-------------------------- src/gtk1/radiobox.cpp | 105 +++++++++++-------------------------- 4 files changed, 118 insertions(+), 184 deletions(-) diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h index 1c9de3b9de..f4a0bb123c 100644 --- a/include/wx/gtk/radiobox.h +++ b/include/wx/gtk/radiobox.h @@ -7,8 +7,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKRADIOBOXH__ -#define __GTKRADIOBOXH__ +#ifndef _WX_GTK_RADIOBOX_H_ +#define _WX_GTK_RADIOBOX_H_ #include "wx/bitmap.h" @@ -16,9 +16,11 @@ // wxRadioBox //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxRadioBox: public wxControl +class WXDLLIMPEXP_CORE wxRadioBox : public wxControl, + public wxRadioBoxBase { public: + // ctors and dtor wxRadioBox() { Init(); } wxRadioBox(wxWindow *parent, wxWindowID id, @@ -36,6 +38,7 @@ public: Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name ); } + wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title, @@ -52,7 +55,6 @@ public: Create( parent, id, title, pos, size, choices, majorDim, style, val, name ); } - virtual ~wxRadioBox(); bool Create(wxWindow *parent, wxWindowID id, const wxString& title, @@ -75,27 +77,33 @@ public: const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr); - virtual int FindString(const wxString& s, bool bCase = false) const; - void SetSelection( int n ); - int GetSelection() const; + virtual ~wxRadioBox(); + - wxString GetString( int n ) const; - void SetString( int n, const wxString& label ); + // implement wxItemContainerImmutable methods + virtual int GetCount() const; - virtual bool Show( int item, bool show = true ); - virtual bool Enable( int item, bool enable = true ); + virtual wxString GetString(int n) const; + virtual void SetString(int n, const wxString& s); - virtual wxString GetStringSelection() const; - virtual bool SetStringSelection( const wxString& s ); + virtual void SetSelection(int n); + virtual int GetSelection() const; - int GetCount() const; - // we have to override those to avoid virtual function name hiding - virtual wxString GetLabel() const { return wxControl::GetLabel(); } - virtual void SetLabel( const wxString& label ); + // implement wxRadioBoxBase methods + virtual bool Show(int n, bool show = true); + virtual bool Enable(int n, bool enable = true); + + virtual bool IsItemEnabled(int n) const; + virtual bool IsItemShown(int n) const; + + + // override some base class methods to operate on radiobox itself too virtual bool Show( bool show = true ); virtual bool Enable( bool enable = true ); + virtual void SetLabel( const wxString& label ); + static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -115,7 +123,6 @@ public: bool m_hasFocus, m_lostFocus; - int m_majorDim; wxList m_boxes; protected: @@ -130,4 +137,5 @@ private: DECLARE_DYNAMIC_CLASS(wxRadioBox) }; -#endif // __GTKRADIOBOXH__ +#endif // _WX_GTK_RADIOBOX_H_ + diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h index 1c9de3b9de..f4a0bb123c 100644 --- a/include/wx/gtk1/radiobox.h +++ b/include/wx/gtk1/radiobox.h @@ -7,8 +7,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKRADIOBOXH__ -#define __GTKRADIOBOXH__ +#ifndef _WX_GTK_RADIOBOX_H_ +#define _WX_GTK_RADIOBOX_H_ #include "wx/bitmap.h" @@ -16,9 +16,11 @@ // wxRadioBox //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxRadioBox: public wxControl +class WXDLLIMPEXP_CORE wxRadioBox : public wxControl, + public wxRadioBoxBase { public: + // ctors and dtor wxRadioBox() { Init(); } wxRadioBox(wxWindow *parent, wxWindowID id, @@ -36,6 +38,7 @@ public: Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name ); } + wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title, @@ -52,7 +55,6 @@ public: Create( parent, id, title, pos, size, choices, majorDim, style, val, name ); } - virtual ~wxRadioBox(); bool Create(wxWindow *parent, wxWindowID id, const wxString& title, @@ -75,27 +77,33 @@ public: const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr); - virtual int FindString(const wxString& s, bool bCase = false) const; - void SetSelection( int n ); - int GetSelection() const; + virtual ~wxRadioBox(); + - wxString GetString( int n ) const; - void SetString( int n, const wxString& label ); + // implement wxItemContainerImmutable methods + virtual int GetCount() const; - virtual bool Show( int item, bool show = true ); - virtual bool Enable( int item, bool enable = true ); + virtual wxString GetString(int n) const; + virtual void SetString(int n, const wxString& s); - virtual wxString GetStringSelection() const; - virtual bool SetStringSelection( const wxString& s ); + virtual void SetSelection(int n); + virtual int GetSelection() const; - int GetCount() const; - // we have to override those to avoid virtual function name hiding - virtual wxString GetLabel() const { return wxControl::GetLabel(); } - virtual void SetLabel( const wxString& label ); + // implement wxRadioBoxBase methods + virtual bool Show(int n, bool show = true); + virtual bool Enable(int n, bool enable = true); + + virtual bool IsItemEnabled(int n) const; + virtual bool IsItemShown(int n) const; + + + // override some base class methods to operate on radiobox itself too virtual bool Show( bool show = true ); virtual bool Enable( bool enable = true ); + virtual void SetLabel( const wxString& label ); + static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -115,7 +123,6 @@ public: bool m_hasFocus, m_lostFocus; - int m_majorDim; wxList m_boxes; protected: @@ -130,4 +137,5 @@ private: DECLARE_DYNAMIC_CLASS(wxRadioBox) }; -#endif // __GTKRADIOBOXH__ +#endif // _WX_GTK_RADIOBOX_H_ + diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index e94ad71003..f4bc5fed50 100644 --- a/src/gtk/radiobox.cpp +++ b/src/gtk/radiobox.cpp @@ -202,22 +202,11 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, // majorDim may be 0 if all trailing parameters were omitted, so don't // assert here but just use the correct value for it - m_majorDim = majorDim == 0 ? n : majorDim; + SetMajorDim(majorDim == 0 ? n : majorDim, style); - int num_per_major = (n - 1) / m_majorDim +1; - int num_of_cols = 0; - int num_of_rows = 0; - if (HasFlag(wxRA_SPECIFY_COLS)) - { - num_of_cols = m_majorDim; - num_of_rows = num_per_major; - } - else - { - num_of_cols = num_per_major; - num_of_rows = m_majorDim; - } + int num_of_cols = GetColumnCount(); + int num_of_rows = GetRowCount(); GtkRadioButton *m_radio = (GtkRadioButton*) NULL; @@ -320,7 +309,10 @@ bool wxRadioBox::Show( bool show ) { GtkWidget *button = GTK_WIDGET( node->GetData() ); - if (show) gtk_widget_show( button ); else gtk_widget_hide( button ); + if (show) + gtk_widget_show( button ); + else + gtk_widget_hide( button ); node = node->GetNext(); } @@ -328,32 +320,6 @@ bool wxRadioBox::Show( bool show ) return true; } -int wxRadioBox::FindString( const wxString &find, bool bCase ) const -{ - wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid radiobox") ); - - int count = 0; - - wxList::compatibility_iterator node = m_boxes.GetFirst(); - while (node) - { - GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) ); -#ifdef __WXGTK20__ - wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) ); -#else - wxString str( label->label ); -#endif - if (find.IsSameAs( str, bCase )) - return count; - - count++; - - node = node->GetNext(); - } - - return wxNOT_FOUND; -} - void wxRadioBox::SetFocus() { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); @@ -487,6 +453,21 @@ bool wxRadioBox::Enable( int item, bool enable ) return true; } +bool wxRadioBox::IsItemEnabled(int item) const +{ + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); + + wxList::compatibility_iterator node = m_boxes.Item( item ); + + wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); + + GtkButton *button = GTK_BUTTON( node->GetData() ); + + // don't use GTK_WIDGET_IS_SENSITIVE() here, we want to return true even if + // the parent radiobox is disabled + return GTK_WIDGET_SENSITIVE(GTK_WIDGET(button)); +} + bool wxRadioBox::Show( int item, bool show ) { wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); @@ -505,41 +486,17 @@ bool wxRadioBox::Show( int item, bool show ) return true; } -wxString wxRadioBox::GetStringSelection() const +bool wxRadioBox::IsItemShown(int item) const { - wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid radiobox") ); - - wxList::compatibility_iterator node = m_boxes.GetFirst(); - while (node) - { - GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() ); - if (button->active) - { - GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) ); - -#ifdef __WXGTK20__ - wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) ); -#else - wxString str( label->label ); -#endif - return str; - } - node = node->GetNext(); - } + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); - wxFAIL_MSG( wxT("wxRadioBox none selected") ); - return wxEmptyString; -} + wxList::compatibility_iterator node = m_boxes.Item( item ); -bool wxRadioBox::SetStringSelection( const wxString &s ) -{ - wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); + wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); - int res = FindString( s ); - if (res == wxNOT_FOUND) return false; - SetSelection( res ); + GtkButton *button = GTK_BUTTON( node->GetData() ); - return true; + return GTK_WIDGET_VISIBLE(GTK_WIDGET(button)); } int wxRadioBox::GetCount() const @@ -606,14 +563,16 @@ void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window ) { - if (window == m_widget->window) return true; + if (window == m_widget->window) + return true; wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) { GtkWidget *button = GTK_WIDGET( node->GetData() ); - if (window == button->window) return true; + if (window == button->window) + return true; node = node->GetNext(); } diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp index e94ad71003..f4bc5fed50 100644 --- a/src/gtk1/radiobox.cpp +++ b/src/gtk1/radiobox.cpp @@ -202,22 +202,11 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, // majorDim may be 0 if all trailing parameters were omitted, so don't // assert here but just use the correct value for it - m_majorDim = majorDim == 0 ? n : majorDim; + SetMajorDim(majorDim == 0 ? n : majorDim, style); - int num_per_major = (n - 1) / m_majorDim +1; - int num_of_cols = 0; - int num_of_rows = 0; - if (HasFlag(wxRA_SPECIFY_COLS)) - { - num_of_cols = m_majorDim; - num_of_rows = num_per_major; - } - else - { - num_of_cols = num_per_major; - num_of_rows = m_majorDim; - } + int num_of_cols = GetColumnCount(); + int num_of_rows = GetRowCount(); GtkRadioButton *m_radio = (GtkRadioButton*) NULL; @@ -320,7 +309,10 @@ bool wxRadioBox::Show( bool show ) { GtkWidget *button = GTK_WIDGET( node->GetData() ); - if (show) gtk_widget_show( button ); else gtk_widget_hide( button ); + if (show) + gtk_widget_show( button ); + else + gtk_widget_hide( button ); node = node->GetNext(); } @@ -328,32 +320,6 @@ bool wxRadioBox::Show( bool show ) return true; } -int wxRadioBox::FindString( const wxString &find, bool bCase ) const -{ - wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid radiobox") ); - - int count = 0; - - wxList::compatibility_iterator node = m_boxes.GetFirst(); - while (node) - { - GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) ); -#ifdef __WXGTK20__ - wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) ); -#else - wxString str( label->label ); -#endif - if (find.IsSameAs( str, bCase )) - return count; - - count++; - - node = node->GetNext(); - } - - return wxNOT_FOUND; -} - void wxRadioBox::SetFocus() { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); @@ -487,6 +453,21 @@ bool wxRadioBox::Enable( int item, bool enable ) return true; } +bool wxRadioBox::IsItemEnabled(int item) const +{ + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); + + wxList::compatibility_iterator node = m_boxes.Item( item ); + + wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); + + GtkButton *button = GTK_BUTTON( node->GetData() ); + + // don't use GTK_WIDGET_IS_SENSITIVE() here, we want to return true even if + // the parent radiobox is disabled + return GTK_WIDGET_SENSITIVE(GTK_WIDGET(button)); +} + bool wxRadioBox::Show( int item, bool show ) { wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); @@ -505,41 +486,17 @@ bool wxRadioBox::Show( int item, bool show ) return true; } -wxString wxRadioBox::GetStringSelection() const +bool wxRadioBox::IsItemShown(int item) const { - wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid radiobox") ); - - wxList::compatibility_iterator node = m_boxes.GetFirst(); - while (node) - { - GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() ); - if (button->active) - { - GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) ); - -#ifdef __WXGTK20__ - wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) ); -#else - wxString str( label->label ); -#endif - return str; - } - node = node->GetNext(); - } + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); - wxFAIL_MSG( wxT("wxRadioBox none selected") ); - return wxEmptyString; -} + wxList::compatibility_iterator node = m_boxes.Item( item ); -bool wxRadioBox::SetStringSelection( const wxString &s ) -{ - wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); + wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); - int res = FindString( s ); - if (res == wxNOT_FOUND) return false; - SetSelection( res ); + GtkButton *button = GTK_BUTTON( node->GetData() ); - return true; + return GTK_WIDGET_VISIBLE(GTK_WIDGET(button)); } int wxRadioBox::GetCount() const @@ -606,14 +563,16 @@ void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window ) { - if (window == m_widget->window) return true; + if (window == m_widget->window) + return true; wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) { GtkWidget *button = GTK_WIDGET( node->GetData() ); - if (window == button->window) return true; + if (window == button->window) + return true; node = node->GetNext(); } -- 2.50.0