From: Robert Roebling <robert@roebling.de>
Date: Sun, 30 May 2010 20:01:36 +0000 (+0000)
Subject: Patch update, probably fixes #12090: wxGTK cursor handling revamp
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9c76b9afa91300a88d8e82b4eee320c7629a5058

Patch update, probably fixes #12090: wxGTK cursor handling revamp

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 2f9a0edfe4..a23f303794 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -1845,6 +1845,8 @@ gtk_window_realized_callback(GtkWidget* widget, wxWindow* win)
     wxWindowCreateEvent event( win );
     event.SetEventObject( win );
     win->GTKProcessEvent( event );
+
+    win->GTKUpdateCursor(true, false);
 }
 
 //-----------------------------------------------------------------------------
@@ -3402,37 +3404,22 @@ void wxWindowGTK::GTKUpdateCursor(bool update_self /*=true*/, bool recurse /*=tr
         wxCursor cursor(g_globalCursor.Ok() ? g_globalCursor : GetCursor());
         if ( cursor.Ok() )
         {
-            if (m_wxwindow && (m_wxwindow != m_widget))
+            wxArrayGdkWindows windowsThis;
+            GdkWindow* window = GTKGetWindow(windowsThis);
+            if (window)
+                gdk_window_set_cursor( window, cursor.GetCursor() );
+            else
             {
-                wxArrayGdkWindows windowsThis;
-                GdkWindow* window = GTKGetDrawingWindow();
-                if (window)
-                    gdk_window_set_cursor( window, cursor.GetCursor() );
-                else
+                const size_t count = windowsThis.size();
+                for ( size_t n = 0; n < count; n++ )
                 {
-                    const size_t count = windowsThis.size();
-                    for ( size_t n = 0; n < count; n++ )
+                    GdkWindow *win = windowsThis[n];
+                    // It can be zero if the window has not been realized yet.
+                    if ( win )
                     {
-                        GdkWindow *win = windowsThis[n];
-                        if ( !win )
-                        {
-                            wxFAIL_MSG(wxT("NULL window returned by GTKGetWindow()?"));
-                            continue;
-                        }
                         gdk_window_set_cursor(win, cursor.GetCursor());
                     }
                 }
-
-                window = m_widget->window;
-                if ((window) && !(GTK_WIDGET_NO_WINDOW(m_widget)))
-                    gdk_window_set_cursor( window, cursor.GetCursor() );
-
-            }
-            else if ( m_widget )
-            {
-                GdkWindow *window = m_widget->window;
-                if ( window && !GTK_WIDGET_NO_WINDOW(m_widget) )
-                    gdk_window_set_cursor( window, cursor.GetCursor() );
             }
         }
     }