diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 2b96d69033..df4d2f0eb1 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -577,7 +577,8 @@ bool wxApp::Initialize() wxImage::InitStandardHandlers(); - g_globalCursor = wxCursor(wxCURSOR_DEFAULT); + // Not needed, leave it as default. (KB) + // g_globalCursor = wxCursor(wxCURSOR_DEFAULT); wxModule::RegisterModules(); if (!wxModule::InitializeModules()) return FALSE; diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 6ac1773a14..fc09ed7eb5 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -2069,7 +2069,7 @@ void wxWindow::OnInternalIdle() wxCursor cursor = m_cursor; if (g_globalCursor.Ok()) cursor = g_globalCursor; - if (m_currentGdkCursor != cursor) + if (cursor.Ok() && m_currentGdkCursor != cursor) { gdk_window_set_cursor( window, cursor.GetCursor() ); m_currentGdkCursor = cursor; diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 2b96d69033..df4d2f0eb1 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -577,7 +577,8 @@ bool wxApp::Initialize() wxImage::InitStandardHandlers(); - g_globalCursor = wxCursor(wxCURSOR_DEFAULT); + // Not needed, leave it as default. (KB) + // g_globalCursor = wxCursor(wxCURSOR_DEFAULT); wxModule::RegisterModules(); if (!wxModule::InitializeModules()) return FALSE; diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 6ac1773a14..fc09ed7eb5 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -2069,7 +2069,7 @@ void wxWindow::OnInternalIdle() wxCursor cursor = m_cursor; if (g_globalCursor.Ok()) cursor = g_globalCursor; - if (m_currentGdkCursor != cursor) + if (cursor.Ok() && m_currentGdkCursor != cursor) { gdk_window_set_cursor( window, cursor.GetCursor() ); m_currentGdkCursor = cursor;