AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
window.cpp fixed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder 1999-06-17 17:01:53 +00:00
parent 73864f4018
commit 076d2575bc
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gtk/app.cpp
View File

@ -577,7 +577,8 @@ bool wxApp::Initialize()
wxImage::InitStandardHandlers(); wxImage::InitStandardHandlers();
g_globalCursor = wxCursor(wxCURSOR_DEFAULT); // Not needed, leave it as default. (KB)
// g_globalCursor = wxCursor(wxCURSOR_DEFAULT);
wxModule::RegisterModules(); wxModule::RegisterModules();
if (!wxModule::InitializeModules()) return FALSE; if (!wxModule::InitializeModules()) return FALSE;

2
src/gtk/window.cpp
View File

@ -2069,7 +2069,7 @@ void wxWindow::OnInternalIdle()
wxCursor cursor = m_cursor; wxCursor cursor = m_cursor;
if (g_globalCursor.Ok()) cursor = g_globalCursor; if (g_globalCursor.Ok()) cursor = g_globalCursor;
if (m_currentGdkCursor != cursor) if (cursor.Ok() && m_currentGdkCursor != cursor)
{ {
gdk_window_set_cursor( window, cursor.GetCursor() ); gdk_window_set_cursor( window, cursor.GetCursor() );
m_currentGdkCursor = cursor; m_currentGdkCursor = cursor;

3
src/gtk1/app.cpp
View File

@ -577,7 +577,8 @@ bool wxApp::Initialize()
wxImage::InitStandardHandlers(); wxImage::InitStandardHandlers();
g_globalCursor = wxCursor(wxCURSOR_DEFAULT); // Not needed, leave it as default. (KB)
// g_globalCursor = wxCursor(wxCURSOR_DEFAULT);
wxModule::RegisterModules(); wxModule::RegisterModules();
if (!wxModule::InitializeModules()) return FALSE; if (!wxModule::InitializeModules()) return FALSE;

2
src/gtk1/window.cpp
View File

@ -2069,7 +2069,7 @@ void wxWindow::OnInternalIdle()
wxCursor cursor = m_cursor; wxCursor cursor = m_cursor;
if (g_globalCursor.Ok()) cursor = g_globalCursor; if (g_globalCursor.Ok()) cursor = g_globalCursor;
if (m_currentGdkCursor != cursor) if (cursor.Ok() && m_currentGdkCursor != cursor)
{ {
gdk_window_set_cursor( window, cursor.GetCursor() ); gdk_window_set_cursor( window, cursor.GetCursor() );
m_currentGdkCursor = cursor; m_currentGdkCursor = cursor;