From f883c7783e144fb25e8442babc4b1467ed54b819 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/branches/WX_3_0_BRANCH@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 d47b973de5..717cf75dfb 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -3663,7 +3663,8 @@ bool wxWindowGTK::SetCursor( const wxCursor &cursor ) if (!wxWindowBase::SetCursor(cursor)) return false; - GTKUpdateCursor(); + if (m_cursor.IsOk()) + GTKUpdateCursor(); return true; }