X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/99ee04b97b773ddbd7dbb8f2be3638c946eda208..42e53e77719543f722d82274031238754f7e09f7:/src/mgl/cursor.cpp diff --git a/src/mgl/cursor.cpp b/src/mgl/cursor.cpp index 94df70a5c2..2f7a8fdbf0 100644 --- a/src/mgl/cursor.cpp +++ b/src/mgl/cursor.cpp @@ -7,11 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "cursor.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -57,7 +52,7 @@ wxCursorRefData::~wxCursorRefData() //----------------------------------------------------------------------------- -WX_DECLARE_HASH_MAP(int, wxCursor, wxIntegerHash, wxIntegerEqual, wxCursorsHash) +WX_DECLARE_HASH_MAP(int, wxCursor, wxIntegerHash, wxIntegerEqual, wxCursorsHash); static wxCursorsHash *gs_cursorsHash = NULL; @@ -69,6 +64,9 @@ wxCursor::wxCursor() wxCursor::wxCursor(int cursorId) { + if ( !gs_cursorsHash ) + gs_cursorsHash = new wxCursorsHash; + if ( gs_cursorsHash->find(cursorId) != gs_cursorsHash->end() ) { wxLogTrace(_T("mglcursor"), _T("cursor id %i fetched from cache"), cursorId); @@ -82,6 +80,7 @@ wxCursor::wxCursor(int cursorId) switch (cursorId) { case wxCURSOR_ARROW: cursorname = "arrow.cur"; break; + case wxCURSOR_RIGHT_ARROW: cursorname = "rightarr.cur"; break; case wxCURSOR_BULLSEYE: cursorname = "bullseye.cur"; break; case wxCURSOR_CHAR: cursorname = "char.cur"; break; case wxCURSOR_CROSS: cursorname = "cross.cur"; break; @@ -286,11 +285,7 @@ bool wxIsBusy() class wxCursorModule : public wxModule { public: - virtual bool OnInit() - { - gs_cursorsHash = new wxCursorsHash; - return TRUE; - } + virtual bool OnInit() { return TRUE; } virtual void OnExit() {