X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..2091f5e71a1d04cf9277565121725f764d466a06:/src/gtk/radiobox.cpp diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index 64881d7cfc..abe3aed93d 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,11 +7,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "radiobox.h" -#endif - -#include "wx/defs.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #if wxUSE_RADIOBOX @@ -21,8 +18,7 @@ #include "wx/frame.h" #include "wx/log.h" -#include -#include +#include "wx/gtk/private.h" #include #include "wx/gtk/win_gtk.h" @@ -38,26 +34,22 @@ extern bool g_isIdle; // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnDrag; +extern wxWindowGTK *g_delayedFocus; //----------------------------------------------------------------------------- // "clicked" //----------------------------------------------------------------------------- -static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioBox *rb ) +extern "C" { +static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBox *rb ) { if (g_isIdle) wxapp_install_idle_handler(); if (!rb->m_hasVMT) return; if (g_blockEventsOnDrag) return; - if (rb->m_alreadySent) - { - rb->m_alreadySent = FALSE; - return; - } - - rb->m_alreadySent = TRUE; + if (!button->active) return; wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, rb->GetId() ); event.SetInt( rb->GetSelection() ); @@ -65,11 +57,13 @@ static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRad 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) @@ -85,38 +79,40 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_ { return FALSE; } - - wxNode *node = rb->m_boxes.Find( (wxObject*) widget ); + + wxList::compatibility_iterator node = rb->m_boxes.Find( (wxObject*) widget ); if (!node) { return FALSE; } - + gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); - + if ((gdk_event->keyval == GDK_Up) || (gdk_event->keyval == GDK_Left)) { - if (node == rb->m_boxes.First()) - node = rb->m_boxes.Last(); - else - node = node->Previous(); + if (node == rb->m_boxes.GetFirst()) + node = rb->m_boxes.GetLast(); + else + node = node->GetPrevious(); } else { - if (node == rb->m_boxes.Last()) - node = rb->m_boxes.First(); - else - node = node->Next(); + if (node == rb->m_boxes.GetLast()) + node = rb->m_boxes.GetFirst(); + else + node = node->GetNext(); } - - GtkWidget *button = (GtkWidget*) node->Data(); - + + GtkWidget *button = (GtkWidget*) node->GetData(); + gtk_widget_grab_focus( button ); - + return TRUE; } +} +extern "C" { static gint gtk_radiobutton_focus_in( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxRadioBox *win ) @@ -128,7 +124,7 @@ static gint gtk_radiobutton_focus_in( GtkWidget *widget, } else if ( !win->m_hasFocus ) { - win->m_hasFocus = TRUE; + win->m_hasFocus = true; wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() ); event.SetEventObject( win ); @@ -140,7 +136,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,11 +150,12 @@ static gint gtk_radiobutton_focus_out( GtkWidget *widget, // we might have lost the focus, but may be not - it may have just gone to // another button in the same radiobox, so we'll check for it in the next - // idle iteration (leave m_hasFocus == TRUE for now) - win->m_lostFocus = TRUE; + // idle iteration (leave m_hasFocus == true for now) + win->m_lostFocus = true; return FALSE; } +} //----------------------------------------------------------------------------- // wxRadioBox @@ -166,12 +165,24 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl) void wxRadioBox::Init() { - m_alreadySent = FALSE; - m_needParent = TRUE; - m_acceptsFocus = TRUE; + m_needParent = true; + m_acceptsFocus = true; m_hasFocus = - m_lostFocus = FALSE; + m_lostFocus = false; +} + +bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, + const wxString& title, + const wxPoint &pos, const wxSize &size, + const wxArrayString& choices, int majorDim, + long style, const wxValidator& validator, + const wxString &name ) +{ + wxCArrayString chs(choices); + + return Create( parent, id, title, pos, size, chs.GetCount(), + chs.GetStrings(), majorDim, style, validator, name ); } bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, @@ -184,17 +195,28 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, !CreateBase( parent, id, pos, size, style, validator, name )) { wxFAIL_MSG( wxT("wxRadioBox creation failed") ); - return FALSE; + return false; } - m_widget = gtk_frame_new( title.mbc_str() ); + m_widget = gtk_frame_new(NULL); + 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); + + + int num_of_cols = GetColumnCount(); + 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++) @@ -209,13 +231,33 @@ 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, label.mbc_str() ) ); + 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 ); - + m_boxes.Append( (wxObject*) m_radio ); + 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 ); + } + ConnectWidget( GTK_WIDGET(m_radio) ); if (!i) gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_radio), TRUE ); @@ -228,222 +270,53 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, gtk_signal_connect( GTK_OBJECT(m_radio), "focus_out_event", GTK_SIGNAL_FUNC(gtk_radiobutton_focus_out), (gpointer)this ); - - gtk_pizza_put( GTK_PIZZA(m_parent->m_wxwindow), - GTK_WIDGET(m_radio), - m_x+10, m_y+10+(i*24), 10, 10 ); } m_parent->DoAddChild( this ); - PostCreation(); - - ApplyWidgetStyle(); - - SetLabel( title ); - - SetFont( parent->GetFont() ); - - wxSize ls = LayoutItems(); + PostCreation(size); - 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 > ls.x) ls.x = req.width; - - wxSize newSize = size; - if (newSize.x == -1) newSize.x = ls.x; - if (newSize.y == -1) newSize.y = ls.y; - SetSize( newSize.x, newSize.y ); - - SetBackgroundColour( parent->GetBackgroundColour() ); - SetForegroundColour( parent->GetForegroundColour() ); - - Show( TRUE ); - - return TRUE; + return true; } wxRadioBox::~wxRadioBox() { - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) { - GtkWidget *button = GTK_WIDGET( node->Data() ); + GtkWidget *button = GTK_WIDGET( node->GetData() ); gtk_widget_destroy( button ); - node = node->Next(); + node = node->GetNext(); } } -void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags ) -{ - wxWindow::DoSetSize( x, y, width, height, sizeFlags ); - - LayoutItems(); -} - -wxSize wxRadioBox::LayoutItems() -{ - int x = 7; - int y = 15; - - if ( m_majorDim == 0 ) - { - // avoid dividing by 0 below - wxFAIL_MSG( wxT("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 ); - - 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; - } - - 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_of_rows ); - for (int i1 = 0; i1< num_of_rows; i1++) - { - GtkWidget *button = GTK_WIDGET( node->Data() ); - - 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; - - gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y ); - y += req.height; - - node = node->Next(); - if (!node) break; - } - - // we don't know the max_len before - - node = m_boxes.Nth( j*num_of_rows ); - for (int i2 = 0; i2< num_of_rows; i2++) - { - GtkWidget *button = GTK_WIDGET( node->Data() ); - - gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, 20 ); - - node = node->Next(); - 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; - - wxNode *node = m_boxes.First(); - while (node) - { - GtkWidget *button = GTK_WIDGET( node->Data() ); - - 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->Next(); - } - - node = m_boxes.First(); - while (node) - { - GtkWidget *button = GTK_WIDGET( node->Data() ); - - gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, 20 ); - x += max; - - node = node->Next(); - } - res.x = x+4; - res.y = 40; - } - - return res; -} - bool wxRadioBox::Show( bool show ) { - wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); if (!wxControl::Show(show)) { // nothing to do - return FALSE; + return false; } - if ((m_windowStyle & wxNO_BORDER) != 0) + if ( HasFlag(wxNO_BORDER) ) gtk_widget_hide( m_widget ); - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) { - GtkWidget *button = GTK_WIDGET( node->Data() ); + 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->Next(); + node = node->GetNext(); } - return TRUE; -} - -int wxRadioBox::FindString( const wxString &s ) const -{ - wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") ); - - int count = 0; - - wxNode *node = m_boxes.First(); - while (node) - { - GtkButton *button = GTK_BUTTON( node->Data() ); - - GtkLabel *label = GTK_LABEL( button->child ); - if (s == label->label) return count; - count++; - - node = node->Next(); - } - - return -1; + return true; } void wxRadioBox::SetFocus() @@ -452,286 +325,293 @@ void wxRadioBox::SetFocus() if (m_boxes.GetCount() == 0) return; - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) { - GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() ); + GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() ); if (button->active) { gtk_widget_grab_focus( GTK_WIDGET(button) ); return; } - node = node->Next(); + node = node->GetNext(); } - } void wxRadioBox::SetSelection( int n ) { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); - wxNode *node = m_boxes.Nth( n ); + wxList::compatibility_iterator node = m_boxes.Item( n ); wxCHECK_RET( node, wxT("radiobox wrong index") ); - GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() ); + GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() ); GtkDisableEvents(); - - gtk_toggle_button_set_state( button, 1 ); - + + gtk_toggle_button_set_active( button, 1 ); + GtkEnableEvents(); } 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; - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) { - GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() ); + GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() ); if (button->active) return count; count++; - node = node->Next(); + node = node->GetNext(); } wxFAIL_MSG( wxT("wxRadioBox none selected") ); - return -1; + return wxNOT_FOUND; } wxString wxRadioBox::GetString( int n ) const { - wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") ); - - wxNode *node = m_boxes.Nth( n ); + wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid radiobox") ); - wxCHECK_MSG( node, wxT(""), wxT("radiobox wrong index") ); + wxList::compatibility_iterator node = m_boxes.Item( n ); - GtkButton *button = GTK_BUTTON( node->Data() ); - GtkLabel *label = GTK_LABEL( button->child ); + wxCHECK_MSG( node, wxEmptyString, wxT("radiobox wrong index") ); - return wxString( label->label ); -} + GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) ); -wxString wxRadioBox::GetLabel( int item ) const -{ - wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") ); +#ifdef __WXGTK20__ + wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) ); +#else + wxString str( label->label ); +#endif - return GetString( item ); + return str; } 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), wxControl::GetLabel().mbc_str() ); + GTKSetLabelForFrame(GTK_FRAME(m_widget), label); } -void wxRadioBox::SetLabel( int item, const wxString& label ) +void wxRadioBox::SetString( int item, const wxString& label ) { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); - wxNode *node = m_boxes.Nth( item ); + wxList::compatibility_iterator node = m_boxes.Item( item ); wxCHECK_RET( node, wxT("radiobox wrong index") ); - GtkButton *button = GTK_BUTTON( node->Data() ); - GtkLabel *g_label = GTK_LABEL( button->child ); + GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(node->GetData()) ); - gtk_label_set( g_label, label.mbc_str() ); -} - -void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) ) -{ - wxFAIL_MSG(wxT("wxRadioBox::SetLabel not implemented.")); + gtk_label_set( g_label, wxGTK_CONV( label ) ); } bool wxRadioBox::Enable( bool enable ) { if ( !wxControl::Enable( enable ) ) - return FALSE; + return false; - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) { - GtkButton *button = GTK_BUTTON( node->Data() ); - GtkWidget *label = button->child; + GtkButton *button = GTK_BUTTON( node->GetData() ); + GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) ); + gtk_widget_set_sensitive( GTK_WIDGET(button), enable ); - gtk_widget_set_sensitive( label, enable ); - node = node->Next(); + gtk_widget_set_sensitive( GTK_WIDGET(label), enable ); + node = node->GetNext(); } - return TRUE; + return true; } -void wxRadioBox::Enable( int item, bool enable ) +bool wxRadioBox::Enable( int item, bool enable ) { - wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); - wxNode *node = m_boxes.Nth( item ); + 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) ); - GtkButton *button = GTK_BUTTON( node->Data() ); - GtkWidget *label = button->child; gtk_widget_set_sensitive( GTK_WIDGET(button), enable ); - gtk_widget_set_sensitive( label, enable ); + gtk_widget_set_sensitive( GTK_WIDGET(label), enable ); + + return true; } -void wxRadioBox::Show( int item, bool show ) +bool wxRadioBox::IsItemEnabled(int item) const { - wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); - wxNode *node = m_boxes.Nth( item ); + wxList::compatibility_iterator node = m_boxes.Item( item ); - wxCHECK_RET( node, wxT("radiobox wrong index") ); + wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); - GtkWidget *button = GTK_WIDGET( node->Data() ); + GtkButton *button = GTK_BUTTON( node->GetData() ); - if (show) - gtk_widget_show( button ); - else - gtk_widget_hide( button ); + // 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)); } -wxString wxRadioBox::GetStringSelection() const +bool wxRadioBox::Show( int item, bool show ) { - wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); - wxNode *node = m_boxes.First(); - while (node) - { - GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() ); - if (button->active) - { - GtkLabel *label = GTK_LABEL( GTK_BUTTON(button)->child ); - return label->label; - } - node = node->Next(); - } + wxList::compatibility_iterator node = m_boxes.Item( item ); - wxFAIL_MSG( wxT("wxRadioBox none selected") ); - return wxT(""); -} + wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); -bool wxRadioBox::SetStringSelection( const wxString &s ) -{ - wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobox") ); + GtkWidget *button = GTK_WIDGET( node->GetData() ); - int res = FindString( s ); - if (res == -1) return FALSE; - SetSelection( res ); + if (show) + gtk_widget_show( button ); + else + gtk_widget_hide( button ); - return TRUE; + return true; } -int wxRadioBox::Number() const +bool wxRadioBox::IsItemShown(int item) const { - return m_boxes.Number(); -} + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); -int wxRadioBox::GetNumberOfRowsOrCols() const -{ - return 1; + wxList::compatibility_iterator node = m_boxes.Item( item ); + + wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); + + GtkButton *button = GTK_BUTTON( node->GetData() ); + + return GTK_WIDGET_VISIBLE(GTK_WIDGET(button)); } -void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) ) +int wxRadioBox::GetCount() const { - wxFAIL_MSG(wxT("wxRadioBox::SetNumberOfRowsOrCols not implemented.")); + return m_boxes.GetCount(); } void wxRadioBox::GtkDisableEvents() { - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) { - gtk_signal_disconnect_by_func( GTK_OBJECT(node->Data()), + gtk_signal_disconnect_by_func( GTK_OBJECT(node->GetData()), GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); - node = node->Next(); + node = node->GetNext(); } } void wxRadioBox::GtkEnableEvents() { - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) { - gtk_signal_connect( GTK_OBJECT(node->Data()), "clicked", + gtk_signal_connect( GTK_OBJECT(node->GetData()), "clicked", GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); - node = node->Next(); + node = node->GetNext(); } } -void wxRadioBox::ApplyWidgetStyle() +void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style) { - SetWidgetStyle(); + gtk_widget_modify_style( m_widget, style ); - gtk_widget_set_style( m_widget, m_widgetStyle ); +#ifdef __WXGTK20__ + gtk_widget_modify_style(GTK_FRAME(m_widget)->label_widget, style); +#endif - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) { - GtkWidget *widget = GTK_WIDGET( node->Data() ); - gtk_widget_set_style( widget, m_widgetStyle ); + GtkWidget *widget = GTK_WIDGET( node->GetData() ); - GtkButton *button = GTK_BUTTON( node->Data() ); - gtk_widget_set_style( button->child, m_widgetStyle ); + gtk_widget_modify_style( widget, style ); + gtk_widget_modify_style( BUTTON_CHILD(node->GetData()), style ); - node = node->Next(); + node = node->GetNext(); } } #if wxUSE_TOOLTIPS void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) { - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) { - GtkWidget *widget = GTK_WIDGET( node->Data() ); + GtkWidget *widget = GTK_WIDGET( node->GetData() ); gtk_tooltips_set_tip( tips, widget, wxConvCurrent->cWX2MB(tip), (gchar*) NULL ); - node = node->Next(); + node = node->GetNext(); } } #endif // wxUSE_TOOLTIPS bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window ) { - if (window == m_widget->window) return TRUE; + if (window == m_widget->window) + return true; - wxNode *node = m_boxes.First(); + wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) { - GtkWidget *button = GTK_WIDGET( node->Data() ); + GtkWidget *button = GTK_WIDGET( node->GetData() ); - if (window == button->window) return TRUE; + if (window == button->window) + return true; - node = node->Next(); + node = node->GetNext(); } - return FALSE; + return false; } void wxRadioBox::OnInternalIdle() { if ( m_lostFocus ) { - m_hasFocus = FALSE; - m_lostFocus = FALSE; + m_hasFocus = false; + m_lostFocus = false; wxFocusEvent event( wxEVT_KILL_FOCUS, GetId() ); event.SetEventObject( this ); (void)GetEventHandler()->ProcessEvent( event ); } + + if (g_delayedFocus == this) + { + if (GTK_WIDGET_REALIZED(m_widget)) + { + g_delayedFocus = NULL; + SetFocus(); + } + } } -#endif // wxUSE_RADIOBOX +// static +wxVisualAttributes +wxRadioBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + wxVisualAttributes attr; + // NB: we need toplevel window so that GTK+ can find the right style + GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL); + GtkWidget* widget = gtk_radio_button_new_with_label(NULL, ""); + gtk_container_add(GTK_CONTAINER(wnd), widget); + attr = GetDefaultAttributesFromGTKWidget(widget); + gtk_widget_destroy(wnd); + return attr; +} +#endif // wxUSE_RADIOBOX