Fixed the ugly cursor. global cursor no longer initialised, broken code in

window.cpp fixed.

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 2b96d6903305581d984629f02b4dbcc10959026d..df4d2f0eb1ed34fb9caac043a85ce74f3dbcb929 100644 (file)
--- 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 6ac1773a14c92ce5d002ae3454063b4cfcec98f9..fc09ed7eb5391a5e467348e5308d3071c87bfea3 100644 (file)
--- 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 2b96d6903305581d984629f02b4dbcc10959026d..df4d2f0eb1ed34fb9caac043a85ce74f3dbcb929 100644 (file)
--- 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 6ac1773a14c92ce5d002ae3454063b4cfcec98f9..fc09ed7eb5391a5e467348e5308d3071c87bfea3 100644 (file)
--- 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;