X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a7c12d28e63a7458293ea54f523c01d848236a3e..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/gtk/radiobox.cpp?ds=sidebyside diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index eb738696a5..67d698b214 100644 --- a/src/gtk/radiobox.cpp +++ b/src/gtk/radiobox.cpp @@ -14,28 +14,42 @@ #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 + +#if wxUSE_TOOLTIPS + #include "wx/tooltip.h" +#endif #include "wx/gtk/private.h" #include -#include "wx/gtk/win_gtk.h" - //----------------------------------------------------------------------------- -// idle system +// wxGTKRadioButtonInfo //----------------------------------------------------------------------------- +// structure internally used by wxRadioBox to store its child buttons + +class wxGTKRadioButtonInfo : public wxObject +{ +public: + wxGTKRadioButtonInfo( GtkRadioButton * abutton, const wxRect & arect ) + : button( abutton ), rect( arect ) {} -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; + GtkRadioButton * button; + wxRect rect; +}; //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- +#include "wx/listimpl.cpp" +WX_DEFINE_LIST( wxRadioBoxButtonsInfoList ) + extern bool g_blockEventsOnDrag; -extern wxWindowGTK *g_delayedFocus; //----------------------------------------------------------------------------- // "clicked" @@ -44,8 +58,6 @@ extern wxWindowGTK *g_delayedFocus; 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; @@ -55,7 +67,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); } } @@ -66,12 +78,23 @@ static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBo extern "C" { static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxRadioBox *rb ) { - if (g_isIdle) - wxapp_install_idle_handler(); - 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()->HandleWindowEvent(new_event); + } + if ((gdk_event->keyval != GDK_Up) && (gdk_event->keyval != GDK_Down) && (gdk_event->keyval != GDK_Left) && @@ -80,31 +103,33 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_ return FALSE; } - wxList::compatibility_iterator node = rb->m_boxes.Find( (wxObject*) widget ); + wxRadioBoxButtonsInfoList::compatibility_iterator node = rb->m_buttonsInfo.GetFirst(); + while( node && GTK_WIDGET( node->GetData()->button ) != widget ) + { + node = node->GetNext(); + } if (!node) { return FALSE; } - 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_buttonsInfo.GetFirst()) + node = rb->m_buttonsInfo.GetLast(); else node = node->GetPrevious(); } else { - if (node == rb->m_boxes.GetLast()) - node = rb->m_boxes.GetFirst(); + if (node == rb->m_buttonsInfo.GetLast()) + node = rb->m_buttonsInfo.GetFirst(); else node = node->GetNext(); } - GtkWidget *button = (GtkWidget*) node->GetData(); + GtkWidget *button = (GtkWidget*) node->GetData()->button; gtk_widget_grab_focus( button ); @@ -113,7 +138,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 +156,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 +164,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 ) { @@ -157,6 +182,28 @@ static gint gtk_radiobutton_focus_out( GtkWidget *widget, } } +extern "C" { +static void gtk_radiobutton_size_allocate( GtkWidget *widget, + GtkAllocation * alloc, + wxRadioBox *win ) +{ + for ( wxRadioBoxButtonsInfoList::compatibility_iterator node = win->m_buttonsInfo.GetFirst(); + node; + node = node->GetNext()) + { + if (widget == GTK_WIDGET(node->GetData()->button)) + { + const wxPoint origin = win->GetPosition(); + wxRect rect = wxRect( alloc->x - origin.x, alloc->y - origin.y, + alloc->width, alloc->height ); + node->GetData()->rect = rect; + break; + } + } +} +} + + //----------------------------------------------------------------------------- // wxRadioBox //----------------------------------------------------------------------------- @@ -165,9 +212,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl) void wxRadioBox::Init() { - m_needParent = true; - m_acceptsFocus = true; - m_hasFocus = m_lostFocus = false; } @@ -198,18 +242,24 @@ 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); + 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 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,25 +269,26 @@ 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++ ) + for ( wxString::const_iterator pc = choices[i].begin(); + pc != choices[i].end(); ++pc ) { if ( *pc != wxT('&') ) 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) ); - g_signal_connect (m_radio, "key_press_event", + g_signal_connect (rbtn, "key_press_event", G_CALLBACK (gtk_radiobox_keypress_callback), this); - m_boxes.Append( (wxObject*) m_radio ); + m_buttonsInfo.Append( new wxGTKRadioButtonInfo( rbtn, wxRect() ) ); if (HasFlag(wxRA_SPECIFY_COLS)) { @@ -245,7 +296,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,21 +305,23 @@ 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) ); + ConnectWidget( GTK_WIDGET(rbtn) ); if (!i) - gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_radio), TRUE ); + gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(rbtn), TRUE ); - g_signal_connect (m_radio, "clicked", + g_signal_connect (rbtn, "clicked", G_CALLBACK (gtk_radiobutton_clicked_callback), this); - g_signal_connect (m_radio, "focus_in_event", + g_signal_connect (rbtn, "focus_in_event", G_CALLBACK (gtk_radiobutton_focus_in), this); - g_signal_connect (m_radio, "focus_out_event", + g_signal_connect (rbtn, "focus_out_event", G_CALLBACK (gtk_radiobutton_focus_out), this); + g_signal_connect (rbtn, "size_allocate", + G_CALLBACK (gtk_radiobutton_size_allocate), this); } m_parent->DoAddChild( this ); @@ -280,13 +333,14 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, wxRadioBox::~wxRadioBox() { - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); while (node) { - GtkWidget *button = GTK_WIDGET( node->GetData() ); + GtkWidget *button = GTK_WIDGET( node->GetData()->button ); gtk_widget_destroy( button ); node = node->GetNext(); } + WX_CLEAR_LIST( wxRadioBoxButtonsInfoList, m_buttonsInfo ); } bool wxRadioBox::Show( bool show ) @@ -302,10 +356,10 @@ bool wxRadioBox::Show( bool show ) if ( HasFlag(wxNO_BORDER) ) gtk_widget_hide( m_widget ); - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); while (node) { - GtkWidget *button = GTK_WIDGET( node->GetData() ); + GtkWidget *button = GTK_WIDGET( node->GetData()->button ); if (show) gtk_widget_show( button ); @@ -322,12 +376,12 @@ void wxRadioBox::SetFocus() { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); - if (m_boxes.GetCount() == 0) return; + if (m_buttonsInfo.GetCount() == 0) return; - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); while (node) { - GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() ); + GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData()->button ); if (button->active) { gtk_widget_grab_focus( GTK_WIDGET(button) ); @@ -341,11 +395,11 @@ void wxRadioBox::SetSelection( int n ) { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); - wxList::compatibility_iterator node = m_boxes.Item( n ); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( n ); wxCHECK_RET( node, wxT("radiobox wrong index") ); - GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() ); + GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData()->button ); GtkDisableEvents(); @@ -360,10 +414,10 @@ int wxRadioBox::GetSelection(void) const int count = 0; - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); while (node) { - GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData() ); + GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData()->button ); if (button->active) return count; count++; node = node->GetNext(); @@ -374,15 +428,15 @@ 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 ); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( n ); wxCHECK_MSG( node, wxEmptyString, wxT("radiobox wrong index") ); - GtkLabel *label = GTK_LABEL(GTK_BIN(node->GetData())->child); + GtkLabel *label = GTK_LABEL(GTK_BIN(node->GetData()->button)->child); wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) ); @@ -396,15 +450,15 @@ 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 ); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( item ); wxCHECK_RET( node, wxT("radiobox wrong index") ); - GtkLabel *g_label = GTK_LABEL(GTK_BIN(node->GetData())->child); + GtkLabel *g_label = GTK_LABEL(GTK_BIN(node->GetData()->button)->child); gtk_label_set_text( g_label, wxGTK_CONV( label ) ); } @@ -414,10 +468,10 @@ bool wxRadioBox::Enable( bool enable ) if ( !wxControl::Enable( enable ) ) return false; - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); while (node) { - GtkButton *button = GTK_BUTTON( node->GetData() ); + GtkButton *button = GTK_BUTTON( node->GetData()->button ); GtkLabel *label = GTK_LABEL(GTK_BIN(button)->child); gtk_widget_set_sensitive( GTK_WIDGET(button), enable ); @@ -428,15 +482,15 @@ 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 ); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( item ); wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); - GtkButton *button = GTK_BUTTON( node->GetData() ); + GtkButton *button = GTK_BUTTON( node->GetData()->button ); GtkLabel *label = GTK_LABEL(GTK_BIN(button)->child); gtk_widget_set_sensitive( GTK_WIDGET(button), enable ); @@ -445,30 +499,30 @@ 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 ); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( item ); wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); - GtkButton *button = GTK_BUTTON( node->GetData() ); + GtkButton *button = GTK_BUTTON( node->GetData()->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)); } -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 ); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( item ); wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); - GtkWidget *button = GTK_WIDGET( node->GetData() ); + GtkWidget *button = GTK_WIDGET( node->GetData()->button ); if (show) gtk_widget_show( button ); @@ -478,32 +532,31 @@ 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 ); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.Item( item ); wxCHECK_MSG( node, false, wxT("radiobox wrong index") ); - GtkButton *button = GTK_BUTTON( node->GetData() ); + GtkButton *button = GTK_BUTTON( node->GetData()->button ); return GTK_WIDGET_VISIBLE(GTK_WIDGET(button)); } -int wxRadioBox::GetCount() const +unsigned int wxRadioBox::GetCount() const { - return m_boxes.GetCount(); + return m_buttonsInfo.GetCount(); } void wxRadioBox::GtkDisableEvents() { - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); while (node) { - g_signal_handlers_disconnect_by_func (node->GetData(), - (gpointer) gtk_radiobutton_clicked_callback, - this); + g_signal_handlers_block_by_func(node->GetData()->button, + (gpointer)gtk_radiobutton_clicked_callback, this); node = node->GetNext(); } @@ -511,11 +564,11 @@ void wxRadioBox::GtkDisableEvents() void wxRadioBox::GtkEnableEvents() { - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); while (node) { - g_signal_connect (node->GetData(), "clicked", - G_CALLBACK (gtk_radiobutton_clicked_callback), this); + g_signal_handlers_unblock_by_func(node->GetData()->button, + (gpointer)gtk_radiobutton_clicked_callback, this); node = node->GetNext(); } @@ -523,13 +576,12 @@ void wxRadioBox::GtkEnableEvents() void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style) { - gtk_widget_modify_style( m_widget, style ); - gtk_widget_modify_style(GTK_FRAME(m_widget)->label_widget, style); + GTKFrameApplyWidgetStyle(GTK_FRAME(m_widget), style); - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); while (node) { - GtkWidget *widget = GTK_WIDGET( node->GetData() ); + GtkWidget *widget = GTK_WIDGET( node->GetData()->button ); gtk_widget_modify_style( widget, style ); gtk_widget_modify_style(GTK_BIN(widget)->child, style); @@ -538,40 +590,66 @@ void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style) } } +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 gchar *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 ( wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.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()->button), 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_buttonsInfo[n]->button), buf); +} + #endif // wxUSE_TOOLTIPS -bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window ) +GdkWindow *wxRadioBox::GTKGetWindow(wxArrayGdkWindows& windows) const { - if (window == m_widget->window) - return true; + windows.push_back(m_widget->window); - wxList::compatibility_iterator node = m_boxes.GetFirst(); + wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); while (node) { - GtkWidget *button = GTK_WIDGET( node->GetData() ); + GtkWidget *button = GTK_WIDGET( node->GetData()->button ); - if (window == button->window) - return true; + windows.push_back(button->window); node = node->GetNext(); } - return false; + return NULL; } void wxRadioBox::OnInternalIdle() { + wxControl::OnInternalIdle(); + if ( m_lostFocus ) { m_hasFocus = false; @@ -580,16 +658,7 @@ void wxRadioBox::OnInternalIdle() 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(); - } + (void)HandleWindowEvent( event ); } } @@ -607,4 +676,18 @@ wxRadioBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) return attr; } +int wxRadioBox::GetItemFromPoint(const wxPoint& point) const +{ + const wxPoint pt = ScreenToClient(point); + unsigned n = 0; + for ( wxRadioBoxButtonsInfoList::compatibility_iterator + node = m_buttonsInfo.GetFirst(); node; node = node->GetNext(), n++ ) + { + if ( m_buttonsInfo[n]->rect.Contains(pt) ) + return n; + } + + return wxNOT_FOUND; +} + #endif // wxUSE_RADIOBOX