From 7b1f4ba70a4be3ac4db835ed7034078bf1ebd16c Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sat, 1 Feb 2014 17:08:25 +0000 Subject: [PATCH] don't override non-default cursors in native controls when no wxCursor is set, a regression introduced by r75690 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/window.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 9fd6cc66b7..e855d9fdc8 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -2067,7 +2067,8 @@ void wxWindowGTK::GTKHandleRealized() event.SetEventObject( this ); GTKProcessEvent( event ); - GTKUpdateCursor(); + if (m_cursor.IsOk()) + GTKUpdateCursor(); if (m_wxwindow && IsTopLevel()) {