X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7317857df7deea8469f4a3572308bba22fe9d7bc..9f400412e4cf9572ac5e07066e098a61fe5dbdc8:/src/gtk/radiobox.cpp diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index 7af0bde3dd..67d698b214 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,10 +47,9 @@ public: //----------------------------------------------------------------------------- #include "wx/listimpl.cpp" -WX_DEFINE_LIST( wxRadioBoxButtonsInfoList ); +WX_DEFINE_LIST( wxRadioBoxButtonsInfoList ) extern bool g_blockEventsOnDrag; -extern wxWindowGTK *g_delayedFocus; //----------------------------------------------------------------------------- // "clicked" @@ -61,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; @@ -72,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); } } @@ -83,9 +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 ) { - if (g_isIdle) - wxapp_install_idle_handler(); - if (!rb->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return FALSE; @@ -100,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) && @@ -121,8 +113,6 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_ return FALSE; } - g_signal_stop_emission_by_name (widget, "key_press_event"); - if ((gdk_event->keyval == GDK_Up) || (gdk_event->keyval == GDK_Left)) { @@ -148,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 ) { @@ -166,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; @@ -174,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 ) { @@ -197,12 +187,11 @@ static void gtk_radiobutton_size_allocate( GtkWidget *widget, GtkAllocation * alloc, wxRadioBox *win ) { - unsigned int n = 0; for ( wxRadioBoxButtonsInfoList::compatibility_iterator node = win->m_buttonsInfo.GetFirst(); node; - node = node->GetNext(), n++ ) + node = node->GetNext()) { - if( widget == GTK_WIDGET(node->GetData()->button) ) + if (widget == GTK_WIDGET(node->GetData()->button)) { const wxPoint origin = win->GetPosition(); wxRect rect = wxRect( alloc->x - origin.x, alloc->y - origin.y, @@ -223,9 +212,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl) void wxRadioBox::Init() { - m_needParent = true; - m_acceptsFocus = true; - m_hasFocus = m_lostFocus = false; } @@ -258,6 +244,12 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& 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 @@ -283,7 +275,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; @@ -562,9 +555,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(); } @@ -575,8 +567,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(); } @@ -609,7 +601,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; @@ -619,8 +611,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); } } } @@ -638,30 +629,27 @@ void wxRadioBox::DoSetItemToolTip(unsigned int n, wxToolTip *tooltip) #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); wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); while (node) { 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() { - // Check if we have to show window now - if (GtkShowFromOnIdle()) return; - + wxControl::OnInternalIdle(); + if ( m_lostFocus ) { m_hasFocus = false; @@ -670,20 +658,8 @@ void wxRadioBox::OnInternalIdle() wxFocusEvent event( wxEVT_KILL_FOCUS, GetId() ); event.SetEventObject( this ); - (void)GetEventHandler()->ProcessEvent( event ); + (void)HandleWindowEvent( event ); } - - if (g_delayedFocus == this) - { - if (GTK_WIDGET_REALIZED(m_widget)) - { - g_delayedFocus = NULL; - SetFocus(); - } - } - - if (wxUpdateUIEvent::CanUpdate(this)) - UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } // static @@ -707,7 +683,7 @@ int wxRadioBox::GetItemFromPoint(const wxPoint& point) const for ( wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); node; node = node->GetNext(), n++ ) { - if ( m_buttonsInfo[n]->rect.Inside(pt) ) + if ( m_buttonsInfo[n]->rect.Contains(pt) ) return n; }