X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f03fc89fff2d6e823e7d4d14fbe14822ad6777b1..4c151c737e514a8b8ccdc6eebc9a6d421e8d59ec:/src/gtk/radiobox.cpp diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index 3637dffb06..dcd089fa7e 100644 --- a/src/gtk/radiobox.cpp +++ b/src/gtk/radiobox.cpp @@ -12,6 +12,9 @@ #endif #include "wx/radiobox.h" + +#if wxUSE_RADIOBOX + #include "wx/dialog.h" #include "wx/frame.h" @@ -40,7 +43,7 @@ static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRad { if (g_isIdle) wxapp_install_idle_handler(); - if (!rb->HasVMT()) return; + if (!rb->m_hasVMT) return; if (g_blockEventsOnDrag) return; if (rb->m_alreadySent) @@ -82,9 +85,12 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, m_needParent = TRUE; m_acceptsFocus = TRUE; - PreCreation( parent, id, pos, size, style, name ); - - SetValidator( validator ); + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, validator, name )) + { + wxFAIL_MSG( _T("wxRadioBox creation failed") ); + return FALSE; + } m_widget = gtk_frame_new( title.mbc_str() ); @@ -92,12 +98,21 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, GtkRadioButton *m_radio = (GtkRadioButton*) NULL; + wxString label; GSList *radio_button_group = (GSList *) NULL; for (int i = 0; i < n; i++) { - if (i) radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) ); + if ( i != 0 ) + radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) ); - m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, choices[i].mbc_str() ) ); + label.Empty(); + for ( const wxChar *pc = choices[i]; *pc; pc++ ) + { + if ( *pc != _T('&') ) + label += *pc; + } + + m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, label.mbc_str() ) ); m_boxes.Append( (wxObject*) m_radio ); @@ -108,8 +123,8 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, gtk_signal_connect( GTK_OBJECT(m_radio), "clicked", GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); - gtk_myfixed_put( GTK_MYFIXED(m_parent->GetWxWindow()), - GTK_WIDGET(m_radio), + gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow), + GTK_WIDGET(m_radio), m_x+10, m_y+10+(i*24), 10, 10 ); } @@ -158,20 +173,41 @@ wxSize wxRadioBox::LayoutItems() int x = 7; int y = 15; + if ( m_majorDim == 0 ) + { + // avoid dividing by 0 below + wxFAIL_MSG( _T("dimension of radiobox should not be 0!") ); + + m_majorDim = 1; + } + int num_per_major = (m_boxes.GetCount() - 1) / m_majorDim +1; wxSize res( 0, 0 ); - if (m_windowStyle & wxRA_HORIZONTAL) + int num_of_cols = 0; + int num_of_rows = 0; + if (HasFlag(wxRA_SPECIFY_COLS)) { - - for (int j = 0; j < m_majorDim; j++) + num_of_cols = m_majorDim; + num_of_rows = num_per_major; + } + else + { + num_of_cols = num_per_major; + num_of_rows = m_majorDim; + } + + if ( HasFlag(wxRA_SPECIFY_COLS) || + (HasFlag(wxRA_SPECIFY_ROWS) && (num_of_cols > 1)) ) + { + for (int j = 0; j < num_of_cols; j++) { y = 15; int max_len = 0; - wxNode *node = m_boxes.Nth( j*num_per_major ); - for (int i1 = 0; i1< num_per_major; i1++) + wxNode *node = m_boxes.Nth( j*num_of_rows ); + for (int i1 = 0; i1< num_of_rows; i1++) { GtkWidget *button = GTK_WIDGET( node->Data() ); GtkLabel *label = GTK_LABEL( GTK_BUTTON(button)->child ); @@ -179,8 +215,8 @@ wxSize wxRadioBox::LayoutItems() int len = 22+gdk_string_measure( font, label->label ); if (len > max_len) max_len = len; - gtk_myfixed_move( GTK_MYFIXED(m_parent->GetWxWindow()), button, m_x+x, m_y+y ); - y += 20; + gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y ); + y += 22; node = node->Next(); if (!node) break; @@ -188,12 +224,12 @@ wxSize wxRadioBox::LayoutItems() // we don't know the max_len before - node = m_boxes.Nth( j*num_per_major ); - for (int i2 = 0; i2< num_per_major; i2++) + node = m_boxes.Nth( j*num_of_rows ); + for (int i2 = 0; i2< num_of_rows; i2++) { GtkWidget *button = GTK_WIDGET( node->Data() ); - gtk_myfixed_resize( GTK_MYFIXED(m_parent->GetWxWindow()), button, max_len, 20 ); + gtk_myfixed_resize( GTK_MYFIXED(m_parent->m_wxwindow), button, max_len, 20 ); node = node->Next(); if (!node) break; @@ -229,13 +265,13 @@ wxSize wxRadioBox::LayoutItems() { GtkWidget *button = GTK_WIDGET( node->Data() ); - gtk_myfixed_set_size( GTK_MYFIXED(m_parent->GetWxWindow()), button, m_x+x, m_y+y, max, 20 ); + gtk_myfixed_set_size( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, 20 ); x += max; node = node->Next(); } res.x = x+4; - res.y = 42; + res.y = 40; } return res; @@ -249,7 +285,7 @@ bool wxRadioBox::Show( bool show ) if ((m_windowStyle & wxNO_BORDER) != 0) gtk_widget_hide( m_widget ); - + wxNode *node = m_boxes.First(); while (node) { @@ -315,7 +351,11 @@ void wxRadioBox::SetSelection( int n ) GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() ); + DisableEvents(); + gtk_toggle_button_set_state( button, 1 ); + + EnableEvents(); } int wxRadioBox::GetSelection(void) const @@ -481,6 +521,30 @@ void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) ) wxFAIL_MSG(_T("wxRadioBox::SetNumberOfRowsOrCols not implemented.")); } +void wxRadioBox::DisableEvents() +{ + wxNode *node = m_boxes.First(); + while (node) + { + gtk_signal_disconnect_by_func( GTK_OBJECT(node->Data()), + GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); + + node = node->Next(); + } +} + +void wxRadioBox::EnableEvents() +{ + wxNode *node = m_boxes.First(); + while (node) + { + gtk_signal_connect( GTK_OBJECT(node->Data()), "clicked", + GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); + + node = node->Next(); + } +} + void wxRadioBox::ApplyWidgetStyle() { SetWidgetStyle(); @@ -516,3 +580,5 @@ bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window ) return FALSE; } + +#endif