X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2ff89d648e5b73172dc2f4aa84d2aadbdc063ec..141d782d567f92933f6fe868fff5bace77e8ecd2:/src/gtk/radiobox.cpp diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index abe3aed93d..938ca0d69c 100644 --- a/src/gtk/radiobox.cpp +++ b/src/gtk/radiobox.cpp @@ -14,22 +14,22 @@ #include "wx/radiobox.h" +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/frame.h" +#endif + #include "wx/dialog.h" -#include "wx/frame.h" -#include "wx/log.h" + +#if wxUSE_TOOLTIPS + #include "wx/tooltip.h" +#endif #include "wx/gtk/private.h" #include #include "wx/gtk/win_gtk.h" -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -72,6 +72,20 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_ if (!rb->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return FALSE; + if ( ((gdk_event->keyval == GDK_Tab) || + (gdk_event->keyval == GDK_ISO_Left_Tab)) && + rb->GetParent() && (rb->GetParent()->HasFlag( wxTAB_TRAVERSAL)) ) + { + wxNavigationKeyEvent new_event; + new_event.SetEventObject( rb->GetParent() ); + // GDK reports GDK_ISO_Left_Tab for SHIFT-TAB + new_event.SetDirection( (gdk_event->keyval == GDK_Tab) ); + // CTRL-TAB changes the (parent) window, i.e. switch notebook page + new_event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) ); + new_event.SetCurrentFocus( rb ); + return rb->GetParent()->GetEventHandler()->ProcessEvent( new_event ); + } + if ((gdk_event->keyval != GDK_Up) && (gdk_event->keyval != GDK_Down) && (gdk_event->keyval != GDK_Left) && @@ -80,26 +94,26 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_ return FALSE; } - wxList::compatibility_iterator node = rb->m_boxes.Find( (wxObject*) widget ); + wxList::compatibility_iterator node = rb->m_buttons.Find( (wxObject*) widget ); if (!node) { return FALSE; } - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); + g_signal_stop_emission_by_name (widget, "key_press_event"); if ((gdk_event->keyval == GDK_Up) || (gdk_event->keyval == GDK_Left)) { - if (node == rb->m_boxes.GetFirst()) - node = rb->m_boxes.GetLast(); + if (node == rb->m_buttons.GetFirst()) + node = rb->m_buttons.GetLast(); else node = node->GetPrevious(); } else { - if (node == rb->m_boxes.GetLast()) - node = rb->m_boxes.GetFirst(); + if (node == rb->m_buttons.GetLast()) + node = rb->m_buttons.GetFirst(); else node = node->GetNext(); } @@ -198,18 +212,18 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, return false; } - m_widget = gtk_frame_new(NULL); - SetLabel(title); + m_widget = GTKCreateFrame(title); + wxControl::SetLabel(title); // majorDim may be 0 if all trailing parameters were omitted, so don't // assert here but just use the correct value for it SetMajorDim(majorDim == 0 ? n : majorDim, style); - int num_of_cols = GetColumnCount(); - int num_of_rows = GetRowCount(); + unsigned int num_of_cols = GetColumnCount(); + unsigned int num_of_rows = GetRowCount(); - GtkRadioButton *m_radio = (GtkRadioButton*) NULL; + GtkRadioButton *rbtn = (GtkRadioButton*) NULL; GtkWidget *table = gtk_table_new( num_of_rows, num_of_cols, FALSE ); gtk_table_set_col_spacings( GTK_TABLE(table), 1 ); @@ -219,10 +233,10 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, wxString label; GSList *radio_button_group = (GSList *) NULL; - for (int i = 0; i < n; i++) + for (unsigned int i = 0; i < (unsigned int)n; i++) { if ( i != 0 ) - radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) ); + radio_button_group = gtk_radio_button_get_group( GTK_RADIO_BUTTON(rbtn) ); label.Empty(); for ( const wxChar *pc = choices[i]; *pc; pc++ ) @@ -231,13 +245,13 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, label += *pc; } - m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, wxGTK_CONV( label ) ) ); - gtk_widget_show( GTK_WIDGET(m_radio) ); + rbtn = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, wxGTK_CONV( label ) ) ); + gtk_widget_show( GTK_WIDGET(rbtn) ); - gtk_signal_connect( GTK_OBJECT(m_radio), "key_press_event", - GTK_SIGNAL_FUNC(gtk_radiobox_keypress_callback), (gpointer)this ); + g_signal_connect (rbtn, "key_press_event", + G_CALLBACK (gtk_radiobox_keypress_callback), this); - m_boxes.Append( (wxObject*) m_radio ); + m_buttons.Append( (wxObject*) rbtn ); if (HasFlag(wxRA_SPECIFY_COLS)) { @@ -245,7 +259,7 @@ 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_table_attach( GTK_TABLE(table), GTK_WIDGET(rbtn), left, right, top, bottom, GTK_FILL, GTK_FILL, 1, 1 ); } else @@ -254,22 +268,21 @@ 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_table_attach( GTK_TABLE(table), GTK_WIDGET(rbtn), left, right, top, bottom, GTK_FILL, GTK_FILL, 1, 1 ); } - ConnectWidget( GTK_WIDGET(m_radio) ); - - if (!i) gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_radio), TRUE ); + ConnectWidget( GTK_WIDGET(rbtn) ); - gtk_signal_connect( GTK_OBJECT(m_radio), "clicked", - GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); + if (!i) + gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(rbtn), TRUE ); - gtk_signal_connect( GTK_OBJECT(m_radio), "focus_in_event", - GTK_SIGNAL_FUNC(gtk_radiobutton_focus_in), (gpointer)this ); - - gtk_signal_connect( GTK_OBJECT(m_radio), "focus_out_event", - GTK_SIGNAL_FUNC(gtk_radiobutton_focus_out), (gpointer)this ); + g_signal_connect (rbtn, "clicked", + G_CALLBACK (gtk_radiobutton_clicked_callback), this); + g_signal_connect (rbtn, "focus_in_event", + G_CALLBACK (gtk_radiobutton_focus_in), this); + g_signal_connect (rbtn, "focus_out_event", + G_CALLBACK (gtk_radiobutton_focus_out), this); } m_parent->DoAddChild( this ); @@ -281,7 +294,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, wxRadioBox::~wxRadioBox() { - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxList::compatibility_iterator node = m_buttons.GetFirst(); while (node) { GtkWidget *button = GTK_WIDGET( node->GetData() ); @@ -303,7 +316,7 @@ bool wxRadioBox::Show( bool show ) if ( HasFlag(wxNO_BORDER) ) gtk_widget_hide( m_widget ); - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxList::compatibility_iterator node = m_buttons.GetFirst(); while (node) { GtkWidget *button = GTK_WIDGET( node->GetData() ); @@ -323,9 +336,9 @@ void wxRadioBox::SetFocus() { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); - if (m_boxes.GetCount() == 0) return; + if (m_buttons.GetCount() == 0) return; - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxList::compatibility_iterator node = m_buttons.GetFirst(); while (node) { GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() ); @@ -342,7 +355,7 @@ void wxRadioBox::SetSelection( int n ) { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); - wxList::compatibility_iterator node = m_boxes.Item( n ); + wxList::compatibility_iterator node = m_buttons.Item( n ); wxCHECK_RET( node, wxT("radiobox wrong index") ); @@ -361,7 +374,7 @@ int wxRadioBox::GetSelection(void) const int count = 0; - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxList::compatibility_iterator node = m_buttons.GetFirst(); while (node) { GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() ); @@ -375,21 +388,17 @@ 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") ); - wxList::compatibility_iterator node = m_boxes.Item( n ); + wxList::compatibility_iterator node = m_buttons.Item( n ); wxCHECK_MSG( node, wxEmptyString, wxT("radiobox wrong index") ); - GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) ); + GtkLabel *label = GTK_LABEL(GTK_BIN(node->GetData())->child); -#ifdef __WXGTK20__ wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) ); -#else - wxString str( label->label ); -#endif return str; } @@ -401,17 +410,17 @@ void wxRadioBox::SetLabel( const wxString& label ) 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") ); - wxList::compatibility_iterator node = m_boxes.Item( item ); + wxList::compatibility_iterator node = m_buttons.Item( item ); wxCHECK_RET( node, wxT("radiobox wrong index") ); - GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(node->GetData()) ); + GtkLabel *g_label = GTK_LABEL(GTK_BIN(node->GetData())->child); - gtk_label_set( g_label, wxGTK_CONV( label ) ); + gtk_label_set_text( g_label, wxGTK_CONV( label ) ); } bool wxRadioBox::Enable( bool enable ) @@ -419,11 +428,11 @@ bool wxRadioBox::Enable( bool enable ) if ( !wxControl::Enable( enable ) ) return false; - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxList::compatibility_iterator node = m_buttons.GetFirst(); while (node) { GtkButton *button = GTK_BUTTON( node->GetData() ); - GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) ); + GtkLabel *label = GTK_LABEL(GTK_BIN(button)->child); gtk_widget_set_sensitive( GTK_WIDGET(button), enable ); gtk_widget_set_sensitive( GTK_WIDGET(label), enable ); @@ -433,16 +442,16 @@ 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") ); - wxList::compatibility_iterator node = m_boxes.Item( item ); + wxList::compatibility_iterator node = m_buttons.Item( item ); wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); GtkButton *button = GTK_BUTTON( node->GetData() ); - GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) ); + GtkLabel *label = GTK_LABEL(GTK_BIN(button)->child); gtk_widget_set_sensitive( GTK_WIDGET(button), enable ); gtk_widget_set_sensitive( GTK_WIDGET(label), enable ); @@ -450,11 +459,11 @@ bool wxRadioBox::Enable( int item, bool enable ) return true; } -bool wxRadioBox::IsItemEnabled(int item) const +bool wxRadioBox::IsItemEnabled(unsigned int item) const { wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); - wxList::compatibility_iterator node = m_boxes.Item( item ); + wxList::compatibility_iterator node = m_buttons.Item( item ); wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); @@ -465,11 +474,11 @@ bool wxRadioBox::IsItemEnabled(int item) const return GTK_WIDGET_SENSITIVE(GTK_WIDGET(button)); } -bool wxRadioBox::Show( int item, bool show ) +bool wxRadioBox::Show(unsigned int item, bool show) { wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); - wxList::compatibility_iterator node = m_boxes.Item( item ); + wxList::compatibility_iterator node = m_buttons.Item( item ); wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); @@ -483,11 +492,11 @@ bool wxRadioBox::Show( int item, bool show ) return true; } -bool wxRadioBox::IsItemShown(int item) const +bool wxRadioBox::IsItemShown(unsigned int item) const { wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); - wxList::compatibility_iterator node = m_boxes.Item( item ); + wxList::compatibility_iterator node = m_buttons.Item( item ); wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); @@ -496,18 +505,19 @@ bool wxRadioBox::IsItemShown(int item) const return GTK_WIDGET_VISIBLE(GTK_WIDGET(button)); } -int wxRadioBox::GetCount() const +unsigned int wxRadioBox::GetCount() const { - return m_boxes.GetCount(); + return m_buttons.GetCount(); } void wxRadioBox::GtkDisableEvents() { - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxList::compatibility_iterator node = m_buttons.GetFirst(); while (node) { - gtk_signal_disconnect_by_func( GTK_OBJECT(node->GetData()), - GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); + g_signal_handlers_disconnect_by_func (node->GetData(), + (gpointer) gtk_radiobutton_clicked_callback, + this); node = node->GetNext(); } @@ -515,11 +525,11 @@ void wxRadioBox::GtkDisableEvents() void wxRadioBox::GtkEnableEvents() { - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxList::compatibility_iterator node = m_buttons.GetFirst(); while (node) { - gtk_signal_connect( GTK_OBJECT(node->GetData()), "clicked", - GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); + g_signal_connect (node->GetData(), "clicked", + G_CALLBACK (gtk_radiobutton_clicked_callback), this); node = node->GetNext(); } @@ -527,35 +537,58 @@ void wxRadioBox::GtkEnableEvents() 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 + GTKFrameApplyWidgetStyle(GTK_FRAME(m_widget), style); - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxList::compatibility_iterator node = m_buttons.GetFirst(); while (node) { GtkWidget *widget = GTK_WIDGET( node->GetData() ); gtk_widget_modify_style( widget, style ); - gtk_widget_modify_style( BUTTON_CHILD(node->GetData()), style ); + gtk_widget_modify_style(GTK_BIN(widget)->child, style); node = node->GetNext(); } } +bool wxRadioBox::GTKWidgetNeedsMnemonic() const +{ + return true; +} + +void wxRadioBox::GTKWidgetDoSetMnemonic(GtkWidget* w) +{ + GTKFrameSetMnemonicWidget(GTK_FRAME(m_widget), w); +} + #if wxUSE_TOOLTIPS -void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) +void wxRadioBox::ApplyToolTip(GtkTooltips * WXUNUSED(tips), const wxChar *tip) { - wxList::compatibility_iterator node = m_boxes.GetFirst(); - while (node) + // set this tooltip for all radiobuttons which don't have their own tips + unsigned n = 0; + for ( wxList::compatibility_iterator node = m_buttons.GetFirst(); + node; + node = node->GetNext(), n++ ) { - GtkWidget *widget = GTK_WIDGET( node->GetData() ); - gtk_tooltips_set_tip( tips, widget, wxConvCurrent->cWX2MB(tip), (gchar*) NULL ); - node = node->GetNext(); + if ( !GetItemToolTip(n) ) + { + wxToolTip::Apply(GTK_WIDGET(node->GetData()), + wxConvCurrent->cWX2MB(tip)); + } } } + +void wxRadioBox::DoSetItemToolTip(unsigned int n, wxToolTip *tooltip) +{ + wxCharBuffer buf; + if ( !tooltip ) + tooltip = GetToolTip(); + if ( tooltip ) + buf = wxGTK_CONV(tooltip->GetTip()); + + wxToolTip::Apply(GTK_WIDGET(m_buttons[n]), buf); +} + #endif // wxUSE_TOOLTIPS bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window ) @@ -563,7 +596,7 @@ bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window ) if (window == m_widget->window) return true; - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxList::compatibility_iterator node = m_buttons.GetFirst(); while (node) { GtkWidget *button = GTK_WIDGET( node->GetData() );