X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..e60f8377beb9c1f96689383ee9642de20168cc21:/src/gtk1/radiobox.cpp diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp index 87a5816ff3..7aab3d84f8 100644 --- a/src/gtk1/radiobox.cpp +++ b/src/gtk1/radiobox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: radiobox.cpp +// Name: src/gtk1/radiobox.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -14,14 +14,16 @@ #include "wx/radiobox.h" -#include "wx/dialog.h" -#include "wx/frame.h" -#include "wx/log.h" +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/frame.h" + #include "wx/dialog.h" +#endif -#include "wx/gtk/private.h" +#include "wx/gtk1/private.h" #include -#include "wx/gtk/win_gtk.h" +#include "wx/gtk1/win_gtk.h" //----------------------------------------------------------------------------- // idle system @@ -55,7 +57,7 @@ static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBo event.SetInt( rb->GetSelection() ); event.SetString( rb->GetStringSelection() ); event.SetEventObject( rb ); - rb->GetEventHandler()->ProcessEvent(event); + rb->HandleWindowEvent(event); } } @@ -113,7 +115,7 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_ } extern "C" { -static gint gtk_radiobutton_focus_in( GtkWidget *widget, +static gint gtk_radiobutton_focus_in( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxRadioBox *win ) { @@ -131,7 +133,7 @@ static gint gtk_radiobutton_focus_in( GtkWidget *widget, // never stop the signal emission, it seems to break the kbd handling // inside the radiobox - (void)win->GetEventHandler()->ProcessEvent( event ); + (void)win->HandleWindowEvent( event ); } return FALSE; @@ -139,7 +141,7 @@ static gint gtk_radiobutton_focus_in( GtkWidget *widget, } extern "C" { -static gint gtk_radiobutton_focus_out( GtkWidget *widget, +static gint gtk_radiobutton_focus_out( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxRadioBox *win ) { @@ -198,27 +200,22 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, return false; } - m_widget = gtk_frame_new( wxGTK_CONV( title ) ); + m_widget = gtk_frame_new(NULL); + SetLabel(title); + if ( HasFlag(wxNO_BORDER) ) + { + // If we don't do this here, the wxNO_BORDER style is ignored in Show() + gtk_frame_set_shadow_type(GTK_FRAME(m_widget), GTK_SHADOW_NONE); + } // 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; - } - + unsigned int num_of_cols = GetColumnCount(); + unsigned int num_of_rows = GetRowCount(); + GtkRadioButton *m_radio = (GtkRadioButton*) NULL; GtkWidget *table = gtk_table_new( num_of_rows, num_of_cols, FALSE ); @@ -226,7 +223,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, gtk_table_set_row_spacings( GTK_TABLE(table), 1 ); gtk_widget_show( table ); gtk_container_add( GTK_CONTAINER(m_widget), table ); - + wxString label; GSList *radio_button_group = (GSList *) NULL; for (int i = 0; i < n; i++) @@ -255,8 +252,8 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, int right = (i%num_of_cols) + 1; int top = i/num_of_cols; int bottom = (i/num_of_cols)+1; - gtk_table_attach( GTK_TABLE(table), GTK_WIDGET(m_radio), left, right, top, bottom, - GTK_FILL, GTK_FILL, 1, 1 ); + gtk_table_attach( GTK_TABLE(table), GTK_WIDGET(m_radio), left, right, top, bottom, + GTK_FILL, GTK_FILL, 1, 1 ); } else { @@ -264,8 +261,8 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, int right = (i/num_of_rows) + 1; int top = i%num_of_rows; int bottom = (i%num_of_rows)+1; - gtk_table_attach( GTK_TABLE(table), GTK_WIDGET(m_radio), left, right, top, bottom, - GTK_FILL, GTK_FILL, 1, 1 ); + gtk_table_attach( GTK_TABLE(table), GTK_WIDGET(m_radio), left, right, top, bottom, + GTK_FILL, GTK_FILL, 1, 1 ); } ConnectWidget( GTK_WIDGET(m_radio) ); @@ -284,8 +281,6 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, m_parent->DoAddChild( this ); - SetLabel( title ); - PostCreation(size); return true; @@ -302,7 +297,7 @@ wxRadioBox::~wxRadioBox() } } -bool wxRadioBox::Show( bool show ) +bool wxRadioBox::Show(bool show) { wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); @@ -320,7 +315,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 +326,6 @@ bool wxRadioBox::Show( bool show ) return true; } -int wxRadioBox::FindString( const wxString &find ) 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 == str) - return count; - - count++; - - node = node->GetNext(); - } - - return wxNOT_FOUND; -} - void wxRadioBox::SetFocus() { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); @@ -410,7 +382,7 @@ int wxRadioBox::GetSelection(void) const return wxNOT_FOUND; } -wxString wxRadioBox::GetString( int n ) const +wxString wxRadioBox::GetString(unsigned int n) const { wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid radiobox") ); @@ -420,11 +392,7 @@ wxString wxRadioBox::GetString( int n ) const 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; } @@ -433,12 +401,10 @@ void wxRadioBox::SetLabel( const wxString& label ) { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); - wxControl::SetLabel( label ); - - gtk_frame_set_label( GTK_FRAME(m_widget), wxGTK_CONV( wxControl::GetLabel() ) ); + GTKSetLabelForFrame(GTK_FRAME(m_widget), label); } -void wxRadioBox::SetString( int item, const wxString& label ) +void wxRadioBox::SetString(unsigned int item, const wxString& label) { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); @@ -470,7 +436,7 @@ bool wxRadioBox::Enable( bool enable ) return true; } -bool wxRadioBox::Enable( int item, bool enable ) +bool wxRadioBox::Enable(unsigned int item, bool enable) { wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); @@ -487,7 +453,22 @@ bool wxRadioBox::Enable( int item, bool enable ) return true; } -bool wxRadioBox::Show( int item, bool show ) +bool wxRadioBox::IsItemEnabled(unsigned 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(unsigned int item, bool show) { wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); @@ -505,44 +486,20 @@ bool wxRadioBox::Show( int item, bool show ) return true; } -wxString wxRadioBox::GetStringSelection() const +bool wxRadioBox::IsItemShown(unsigned 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 +unsigned int wxRadioBox::GetCount() const { return m_boxes.GetCount(); } @@ -575,10 +532,6 @@ void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style) { gtk_widget_modify_style( m_widget, style ); -#ifdef __WXGTK20__ - gtk_widget_modify_style(GTK_FRAME(m_widget)->label_widget, style); -#endif - wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) { @@ -606,14 +559,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(); } @@ -631,7 +586,7 @@ void wxRadioBox::OnInternalIdle() wxFocusEvent event( wxEVT_KILL_FOCUS, GetId() ); event.SetEventObject( this ); - (void)GetEventHandler()->ProcessEvent( event ); + (void)HandleWindowEvent( event ); } if (g_delayedFocus == this) @@ -658,24 +613,4 @@ wxRadioBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) return attr; } -#if WXWIN_COMPATIBILITY_2_2 - -int wxRadioBox::Number() const -{ - return GetCount(); -} - -wxString wxRadioBox::GetLabel(int n) const -{ - return GetString(n); -} - -void wxRadioBox::SetLabel( int item, const wxString& label ) -{ - SetString(item, label); -} - -#endif // WXWIN_COMPATIBILITY_2_2 - #endif // wxUSE_RADIOBOX -