X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/848332140be2d53aea32d0702f4c0e06c149d24b..c6a6bbbf637a5a580b7ab182483d27522f5e3189:/src/gtk/radiobut.cpp diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp index cf56a75187..f52faff09e 100644 --- a/src/gtk/radiobut.cpp +++ b/src/gtk/radiobut.cpp @@ -21,8 +21,6 @@ //----------------------------------------------------------------------------- extern bool g_blockEventsOnDrag; -extern wxCursor g_globalCursor; -extern wxWindowGTK *g_delayedFocus; //----------------------------------------------------------------------------- // "clicked" @@ -64,7 +62,6 @@ bool wxRadioButton::Create( wxWindow *parent, const wxValidator& validator, const wxString& name ) { - m_acceptsFocus = TRUE; m_needParent = TRUE; m_blockEvent = FALSE; @@ -167,38 +164,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