X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/964c139b0738b6e4999cc7a651cfd8923dc981b1..9ef3e400e02320aecf2ac883f0b58ad3a01932b3:/src/gtk/radiobox.cpp?ds=sidebyside diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index 938fe515ca..33f01ccb61 100644 --- a/src/gtk/radiobox.cpp +++ b/src/gtk/radiobox.cpp @@ -27,8 +27,6 @@ #include "wx/gtk/private.h" #include -#include "wx/gtk/win_gtk.h" - //----------------------------------------------------------------------------- // wxGTKRadioButtonInfo //----------------------------------------------------------------------------- @@ -49,7 +47,7 @@ public: //----------------------------------------------------------------------------- #include "wx/listimpl.cpp" -WX_DEFINE_LIST( wxRadioBoxButtonsInfoList ); +WX_DEFINE_LIST( wxRadioBoxButtonsInfoList ) extern bool g_blockEventsOnDrag; @@ -60,8 +58,6 @@ extern bool g_blockEventsOnDrag; 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; @@ -71,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); } } @@ -82,8 +78,6 @@ static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBo extern "C" { static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxRadioBox *rb ) { - // don't need to install idle handler, its done from "event" signal - if (!rb->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return FALSE; @@ -98,7 +92,7 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_ // 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 ); + return rb->GetParent()->HandleWindowEvent(new_event); } if ((gdk_event->keyval != GDK_Up) && @@ -144,46 +138,33 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_ } extern "C" { -static gint gtk_radiobutton_focus_in( GtkWidget *widget, - GdkEvent *WXUNUSED(event), - wxRadioBox *win ) +static gint gtk_radiobutton_focus_out( GtkWidget * WXUNUSED(widget), + GdkEventFocus *WXUNUSED(event), + wxRadioBox *win ) { - if ( win->m_lostFocus ) - { - // no, we didn't really lose it - win->m_lostFocus = FALSE; - } - else if ( !win->m_hasFocus ) - { - win->m_hasFocus = true; - - wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() ); - event.SetEventObject( win ); - - // never stop the signal emission, it seems to break the kbd handling - // inside the radiobox - (void)win->GetEventHandler()->ProcessEvent( event ); - } + // NB: This control is composed of several GtkRadioButton widgets and + // when focus changes from one of them to another in the same + // wxRadioBox, we get a focus-out event followed by focus-in for + // another GtkRadioButton owned by the same control. We don't want + // to generate two spurious wxEVT_SET_FOCUS events in this case, + // so we defer sending wx events until idle time. + win->GTKHandleFocusOut(); + // never stop the signal emission, it seems to break the kbd handling + // inside the radiobox return FALSE; } } extern "C" { -static gint gtk_radiobutton_focus_out( GtkWidget *widget, - GdkEvent *WXUNUSED(event), - wxRadioBox *win ) +static gint gtk_radiobutton_focus_in( GtkWidget * WXUNUSED(widget), + GdkEventFocus *WXUNUSED(event), + wxRadioBox *win ) { - // wxASSERT_MSG( win->m_hasFocus, _T("got focus out without any focus in?") ); - // Replace with a warning, else we dump core a lot! - // if (!win->m_hasFocus) - // wxLogWarning(_T("Radiobox got focus out without any focus in.") ); - - // 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; + win->GTKHandleFocusIn(); + // never stop the signal emission, it seems to break the kbd handling + // inside the radiobox return FALSE; } } @@ -216,15 +197,6 @@ static void gtk_radiobutton_size_allocate( GtkWidget *widget, IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl) -void wxRadioBox::Init() -{ - m_needParent = true; - m_acceptsFocus = true; - - m_hasFocus = - m_lostFocus = false; -} - bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint &pos, const wxSize &size, @@ -252,7 +224,14 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, } m_widget = GTKCreateFrame(title); + g_object_ref(m_widget); 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 @@ -278,7 +257,8 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, 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; @@ -374,25 +354,6 @@ bool wxRadioBox::Show( bool show ) return true; } -void wxRadioBox::SetFocus() -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); - - if (m_buttonsInfo.GetCount() == 0) return; - - wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); - while (node) - { - GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->GetData()->button ); - if (button->active) - { - gtk_widget_grab_focus( GTK_WIDGET(button) ); - return; - } - node = node->GetNext(); - } -} - void wxRadioBox::SetSelection( int n ) { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); @@ -557,9 +518,8 @@ void wxRadioBox::GtkDisableEvents() wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); while (node) { - g_signal_handlers_disconnect_by_func (node->GetData()->button, - (gpointer) gtk_radiobutton_clicked_callback, - this); + g_signal_handlers_block_by_func(node->GetData()->button, + (gpointer)gtk_radiobutton_clicked_callback, this); node = node->GetNext(); } @@ -570,8 +530,8 @@ void wxRadioBox::GtkEnableEvents() wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); while (node) { - g_signal_connect (node->GetData()->button, "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(); } @@ -604,7 +564,7 @@ void wxRadioBox::GTKWidgetDoSetMnemonic(GtkWidget* w) } #if wxUSE_TOOLTIPS -void wxRadioBox::ApplyToolTip(GtkTooltips * WXUNUSED(tips), const wxChar *tip) +void wxRadioBox::ApplyToolTip(GtkTooltips * WXUNUSED(tips), const gchar *tip) { // set this tooltip for all radiobuttons which don't have their own tips unsigned n = 0; @@ -614,8 +574,7 @@ void wxRadioBox::ApplyToolTip(GtkTooltips * WXUNUSED(tips), const wxChar *tip) { if ( !GetItemToolTip(n) ) { - wxToolTip::Apply(GTK_WIDGET(node->GetData()->button), - wxConvCurrent->cWX2MB(tip)); + wxToolTip::Apply(GTK_WIDGET(node->GetData()->button), tip); } } } @@ -650,22 +609,6 @@ GdkWindow *wxRadioBox::GTKGetWindow(wxArrayGdkWindows& windows) const return NULL; } -void wxRadioBox::OnInternalIdle() -{ - wxControl::OnInternalIdle(); - - if ( m_lostFocus ) - { - m_hasFocus = false; - m_lostFocus = false; - - wxFocusEvent event( wxEVT_KILL_FOCUS, GetId() ); - event.SetEventObject( this ); - - (void)GetEventHandler()->ProcessEvent( event ); - } -} - // static wxVisualAttributes wxRadioBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))