X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b4efc9b9315fc9387c44dc5e968dc422b12e7920..ad9835c97c10c0d7de345e3a7a7c0fc2776eb2cb:/src/gtk/radiobox.cpp diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index 04050c30dd..86778400df 100644 --- a/src/gtk/radiobox.cpp +++ b/src/gtk/radiobox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: radiobox.cpp +// Name: src/gtk/radiobox.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,10 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "radiobox.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -27,13 +23,6 @@ #include "wx/gtk/win_gtk.h" -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -45,6 +34,7 @@ extern wxWindowGTK *g_delayedFocus; // "clicked" //----------------------------------------------------------------------------- +extern "C" { static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBox *rb ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -60,11 +50,13 @@ static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBo event.SetEventObject( rb ); rb->GetEventHandler()->ProcessEvent(event); } +} //----------------------------------------------------------------------------- // "key_press_event" //----------------------------------------------------------------------------- +extern "C" { static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxRadioBox *rb ) { if (g_isIdle) @@ -73,6 +65,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) && @@ -87,7 +93,7 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_ 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)) @@ -111,7 +117,9 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_ return TRUE; } +} +extern "C" { static gint gtk_radiobutton_focus_in( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxRadioBox *win ) @@ -135,7 +143,9 @@ static gint gtk_radiobutton_focus_in( GtkWidget *widget, return FALSE; } +} +extern "C" { static gint gtk_radiobutton_focus_out( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxRadioBox *win ) @@ -152,6 +162,7 @@ static gint gtk_radiobutton_focus_out( GtkWidget *widget, return FALSE; } +} //----------------------------------------------------------------------------- // wxRadioBox @@ -194,20 +205,31 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, return false; } - m_widget = gtk_frame_new( wxGTK_CONV( 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 - m_majorDim = majorDim == 0 ? n : majorDim; + SetMajorDim(majorDim == 0 ? n : majorDim, style); + + + 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 ); + gtk_table_set_col_spacings( GTK_TABLE(table), 1 ); + 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++) + 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(m_radio) ); label.Empty(); for ( const wxChar *pc = choices[i]; *pc; pc++ ) @@ -217,43 +239,49 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, } m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, wxGTK_CONV( label ) ) ); + gtk_widget_show( GTK_WIDGET(m_radio) ); - gtk_signal_connect( GTK_OBJECT(m_radio), "key_press_event", - GTK_SIGNAL_FUNC(gtk_radiobox_keypress_callback), (gpointer)this ); + g_signal_connect (m_radio, "key_press_event", + G_CALLBACK (gtk_radiobox_keypress_callback), this); m_boxes.Append( (wxObject*) m_radio ); - ConnectWidget( GTK_WIDGET(m_radio) ); - - if (!i) gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_radio), TRUE ); - - gtk_signal_connect( GTK_OBJECT(m_radio), "clicked", - GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); + if (HasFlag(wxRA_SPECIFY_COLS)) + { + int left = i%num_of_cols; + 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 ); + } + else + { + int left = i/num_of_rows; + 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_signal_connect( GTK_OBJECT(m_radio), "focus_in_event", - GTK_SIGNAL_FUNC(gtk_radiobutton_focus_in), (gpointer)this ); + ConnectWidget( GTK_WIDGET(m_radio) ); - gtk_signal_connect( GTK_OBJECT(m_radio), "focus_out_event", - GTK_SIGNAL_FUNC(gtk_radiobutton_focus_out), (gpointer)this ); + if (!i) + gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_radio), TRUE ); - gtk_pizza_put( GTK_PIZZA(m_parent->m_wxwindow), - GTK_WIDGET(m_radio), - m_x+10, m_y+10+(i*24), 10, 10 ); + g_signal_connect (m_radio, "clicked", + G_CALLBACK (gtk_radiobutton_clicked_callback), this); + g_signal_connect (m_radio, "focus_in_event", + G_CALLBACK (gtk_radiobutton_focus_in), this); + g_signal_connect (m_radio, "focus_out_event", + G_CALLBACK (gtk_radiobutton_focus_out), this); } m_parent->DoAddChild( this ); - bool wasShown = IsShown(); - if ( wasShown ) - Hide(); // prevent PostCreation() from showing us - - SetLabel( title ); - PostCreation(size); - if ( wasShown ) - Show(); - return true; } @@ -268,145 +296,6 @@ wxRadioBox::~wxRadioBox() } } -void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags ) -{ - wxWindow::DoSetSize( x, y, width, height, sizeFlags ); - - LayoutItems(false); -} - -wxSize wxRadioBox::DoGetBestSize() const -{ - wxSize size = LayoutItems(true); - - GtkRequisition req; - req.width = 2; - req.height = 2; - (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req ); - if (req.width > size.x) - size.x = req.width; - - CacheBestSize(size); - return size; -} - -wxSize wxRadioBox::LayoutItems(bool justCalc) const -{ - wxSize res( 0, 0 ); - - // avoid dividing by 0 below - wxCHECK_MSG( m_majorDim, res, wxT("dimension of radiobox should not be 0!") ); - - int num_per_major = (m_boxes.GetCount() - 1) / m_majorDim +1; - - int x = 7; - int y = 15; - - 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 lineheight = GetCharHeight()+2; - - if ( HasFlag(wxRA_SPECIFY_COLS) || - (HasFlag(wxRA_SPECIFY_ROWS) && (num_of_cols > 1)) ) - { - for (int j = 0; j < num_of_cols; j++) - { - y = 3; - y += lineheight; - - int max_len = 0; - wxList::compatibility_iterator node = m_boxes.Item( j*num_of_rows ); - for (int i1 = 0; i1< num_of_rows; i1++) - { - GtkWidget *button = GTK_WIDGET( node->GetData() ); - - GtkRequisition req; - req.width = 2; - req.height = 2; - (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request ) - (button, &req ); - - if (req.width > max_len) max_len = req.width; - - if ( !justCalc ) - gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y ); - y += req.height; - - node = node->GetNext(); - if (!node) break; - } - - // we don't know the max_len before - - node = m_boxes.Item( j*num_of_rows ); - for (int i2 = 0; i2< num_of_rows; i2++) - { - GtkWidget *button = GTK_WIDGET( node->GetData() ); - - if ( !justCalc ) - gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, lineheight ); - - node = node->GetNext(); - if (!node) break; - } - - if (y > res.y) res.y = y; - - x += max_len + 2; - } - - res.x = x+4; - res.y += 4; - } - else - { - int max = 0; - - wxList::compatibility_iterator node = m_boxes.GetFirst(); - while (node) - { - GtkWidget *button = GTK_WIDGET( node->GetData() ); - - GtkRequisition req; - req.width = 2; - req.height = 2; - (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request ) - (button, &req ); - - if (req.width > max) max = req.width; - - node = node->GetNext(); - } - - node = m_boxes.GetFirst(); - while (node) - { - GtkWidget *button = GTK_WIDGET( node->GetData() ); - - if ( !justCalc ) - gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, lineheight ); - x += max; - - node = node->GetNext(); - } - res.x = x+4; - res.y = 40; - } - - return res; -} - bool wxRadioBox::Show( bool show ) { wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); @@ -425,7 +314,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(); } @@ -433,32 +325,6 @@ bool wxRadioBox::Show( bool show ) return true; } -int wxRadioBox::FindString( const wxString &find ) const -{ - wxCHECK_MSG( m_widget != NULL, -1, 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 -1; -} - void wxRadioBox::SetFocus() { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); @@ -497,7 +363,7 @@ void wxRadioBox::SetSelection( int n ) int wxRadioBox::GetSelection(void) const { - wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid radiobox") ); int count = 0; @@ -512,24 +378,20 @@ int wxRadioBox::GetSelection(void) const wxFAIL_MSG( wxT("wxRadioBox none selected") ); - return -1; + return wxNOT_FOUND; } -wxString wxRadioBox::GetString( int n ) const +wxString wxRadioBox::GetString(unsigned int n) const { - wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid radiobox") ); wxList::compatibility_iterator node = m_boxes.Item( n ); - wxCHECK_MSG( node, wxT(""), wxT("radiobox wrong index") ); + 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; } @@ -538,12 +400,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") ); @@ -551,9 +411,9 @@ void wxRadioBox::SetString( int item, const wxString& label ) 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 ) @@ -565,7 +425,7 @@ bool wxRadioBox::Enable( bool enable ) 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 ); @@ -575,28 +435,45 @@ bool wxRadioBox::Enable( bool enable ) return true; } -void wxRadioBox::Enable( int item, bool enable ) +bool wxRadioBox::Enable(unsigned int item, bool enable) { - wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); wxList::compatibility_iterator node = m_boxes.Item( item ); - wxCHECK_RET( node, wxT("radiobox wrong index") ); + 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 ); + + return true; } -void wxRadioBox::Show( int item, bool show ) +bool wxRadioBox::IsItemEnabled(unsigned int item) const { - wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); wxList::compatibility_iterator node = m_boxes.Item( item ); - wxCHECK_RET( node, wxT("radiobox wrong index") ); + 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") ); + + wxList::compatibility_iterator node = m_boxes.Item( item ); + + wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); GtkWidget *button = GTK_WIDGET( node->GetData() ); @@ -604,46 +481,24 @@ void wxRadioBox::Show( int item, bool show ) gtk_widget_show( button ); else gtk_widget_hide( button ); -} -wxString wxRadioBox::GetStringSelection() const -{ - wxCHECK_MSG( m_widget != NULL, wxT(""), 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(); - } - - wxFAIL_MSG( wxT("wxRadioBox none selected") ); - return wxT(""); + return true; } -bool wxRadioBox::SetStringSelection( const wxString &s ) +bool wxRadioBox::IsItemShown(unsigned int item) const { wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); - int res = FindString( s ); - if (res == -1) return false; - SetSelection( res ); + wxList::compatibility_iterator node = m_boxes.Item( item ); + + wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); - return true; + GtkButton *button = GTK_BUTTON( node->GetData() ); + + return GTK_WIDGET_VISIBLE(GTK_WIDGET(button)); } -int wxRadioBox::GetCount() const +unsigned int wxRadioBox::GetCount() const { return m_boxes.GetCount(); } @@ -653,8 +508,9 @@ void wxRadioBox::GtkDisableEvents() wxList::compatibility_iterator node = m_boxes.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(); } @@ -665,8 +521,8 @@ void wxRadioBox::GtkEnableEvents() wxList::compatibility_iterator node = m_boxes.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(); } @@ -674,11 +530,7 @@ 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(); while (node) @@ -686,12 +538,22 @@ void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style) 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 ) { @@ -707,14 +569,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(); } @@ -759,24 +623,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 -