From 374c63b04bebaf9612cfb269cfd606b5fd780264 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 2 Feb 2014 01:16:01 +0000 Subject: [PATCH] Restore wxBusyCursor::Get{Story,Busy}Cursor() in wxGTK. Even if these methods are completely useless, we still need to keep them in wxGTK 3.0 for ABI compatibility. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/utils.h | 6 +----- src/gtk/cursor.cpp | 11 +++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/include/wx/utils.h b/include/wx/utils.h index 92701eae15..91688f5fad 100644 --- a/include/wx/utils.h +++ b/include/wx/utils.h @@ -751,11 +751,7 @@ public: ~wxBusyCursor() { wxEndBusyCursor(); } - // FIXME: These two methods are currently only implemented (and needed?) - // in wxGTK. BusyCursor handling should probably be moved to - // common code since the wxGTK and wxMSW implementations are very - // similar except for wxMSW using HCURSOR directly instead of - // wxCursor.. -- RL. + // Obsolete internal methods, do not use. static const wxCursor &GetStoredCursor(); static const wxCursor GetBusyCursor(); }; diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp index 245dc76f9d..c84da466c4 100644 --- a/src/gtk/cursor.cpp +++ b/src/gtk/cursor.cpp @@ -310,6 +310,17 @@ wxCursor::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const static int gs_busyCount = 0; +const wxCursor &wxBusyCursor::GetStoredCursor() +{ + static wxCursor s_storedCursor; + return s_storedCursor; +} + +const wxCursor wxBusyCursor::GetBusyCursor() +{ + return wxCursor(wxCURSOR_WATCH); +} + void wxBeginBusyCursor(const wxCursor* cursor) { if (gs_busyCount++ == 0)