X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afa7bd1eef03eb167b7f70412f1b4ef08ad73138..09a094552238443f82cb12a105bf88f3ca5b83a3:/src/gtk/radiobut.cpp diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp index 6c8e0b91e3..400b101454 100644 --- a/src/gtk/radiobut.cpp +++ b/src/gtk/radiobut.cpp @@ -16,20 +16,11 @@ #include "wx/gtk/private.h" -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- extern bool g_blockEventsOnDrag; -extern wxCursor g_globalCursor; -extern wxWindowGTK *g_delayedFocus; //----------------------------------------------------------------------------- // "clicked" @@ -103,7 +94,7 @@ bool wxRadioButton::Create( wxWindow *parent, if (chief) { // we are part of the group started by chief - radioButtonGroup = gtk_radio_button_group( GTK_RADIO_BUTTON(chief->m_widget) ); + radioButtonGroup = gtk_radio_button_get_group( GTK_RADIO_BUTTON(chief->m_widget) ); } } @@ -174,38 +165,10 @@ void wxRadioButton::DoApplyWidgetStyle(GtkRcStyle *style) gtk_widget_modify_style(GTK_BIN(m_widget)->child, style); } -bool wxRadioButton::IsOwnGtkWindow( GdkWindow *window ) +GdkWindow * +wxRadioButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { - return window == GTK_BUTTON(m_widget)->event_window; -} - -void wxRadioButton::OnInternalIdle() -{ - wxCursor cursor = m_cursor; - if (g_globalCursor.Ok()) cursor = g_globalCursor; - - GdkWindow *win = GTK_BUTTON(m_widget)->event_window; - if ( win && cursor.Ok()) - { - /* I now set the cursor the anew in every OnInternalIdle call - as setting the cursor in a parent window also effects the - windows above so that checking for the current cursor is - not possible. */ - - gdk_window_set_cursor( win, cursor.GetCursor() ); - } - - if (g_delayedFocus == this) - { - if (GTK_WIDGET_REALIZED(m_widget)) - { - gtk_widget_grab_focus( m_widget ); - g_delayedFocus = NULL; - } - } - - if (wxUpdateUIEvent::CanUpdate(this)) - UpdateWindowUI(wxUPDATE_UI_FROMIDLE); + return GTK_BUTTON(m_widget)->event_window; } wxSize wxRadioButton::DoGetBestSize() const