Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

[wxWidgets.git] / src / mgl / cursor.cpp

diff --git a/src/mgl/cursor.cpp b/src/mgl/cursor.cpp
index 1e4867ae705e74d2f025491b84e8876656924f71..54209791891f6e5f1d4b1f231e15a3ff3481fe97 100644 (file)
--- a/src/mgl/cursor.cpp
+++ b/src/mgl/cursor.cpp
@@ -3,7 +3,7 @@
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$

-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -20,11 +20,13 @@
 #endif
 
 #include "wx/cursor.h"
 #endif
 
 #include "wx/cursor.h"

+#include "wx/module.h"

 #include "wx/utils.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/utils.h"
 #include "wx/log.h"
 #include "wx/intl.h"

+#include "wx/hashmap.h"

 
 

-#include <mgraph.hpp>
+#include "wx/mgl/private.h"

 
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------


@@ -51,9 +53,13 @@ wxCursorRefData::~wxCursorRefData()
     delete m_cursor;
 }
 
     delete m_cursor;
 }
 

+#define M_CURSORDATA ((wxCursorRefData *)m_refData)
+

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-#define M_CURSORDATA ((wxCursorRefData *)m_refData)
+WX_DECLARE_HASH_MAP(int, wxCursor, wxIntegerHash, wxIntegerEqual, wxCursorsHash)
+
+static wxCursorsHash *gs_cursorsHash = NULL;

 
 IMPLEMENT_DYNAMIC_CLASS(wxCursor,wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxCursor,wxObject)
 


@@ -63,15 +69,23 @@ wxCursor::wxCursor()
 
 wxCursor::wxCursor(int cursorId)
 {
 
 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);
+        *this = (*gs_cursorsHash)[cursorId];
+        return;
+    }
+

     const char *cursorname = NULL;
     m_refData = new wxCursorRefData();
 
     switch (cursorId)
     {
     const char *cursorname = NULL;
     m_refData = new wxCursorRefData();
 
     switch (cursorId)
     {

-        // FIXME_MGL -- what about storing these default cursors in executable
-        //              as XPMs so that wxMGL binary wouldn't depend on 
-        //              tons of files in $MGL_ROOT/cursors? I don't know yet...

         case wxCURSOR_ARROW:           cursorname = "arrow.cur"; break;
         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;
         case wxCURSOR_BULLSEYE:        cursorname = "bullseye.cur"; break;
         case wxCURSOR_CHAR:            cursorname = "char.cur"; break;
         case wxCURSOR_CROSS:           cursorname = "cross.cur"; break;


@@ -98,8 +112,6 @@ wxCursor::wxCursor(int cursorId)
         case wxCURSOR_BLANK:           cursorname = "blank.cur"; break;
 
         case wxCURSOR_NONE:
         case wxCURSOR_BLANK:           cursorname = "blank.cur"; break;
 
         case wxCURSOR_NONE:

-            // FIXME_MGL - make sure wxWindow uses cursor with
-            //    GetMGLCursor() == NULL correctly, i.e. calls MS_hide()

             *this = wxNullCursor;
             return;
             break;
             *this = wxNullCursor;
             return;
             break;


@@ -123,6 +135,12 @@ wxCursor::wxCursor(int cursorId)
         wxLogError(_("Couldn't create cursor."));
         UnRef();
     }
         wxLogError(_("Couldn't create cursor."));
         UnRef();
     }

+    else
+    {
+        (*gs_cursorsHash)[cursorId] = *this;
+        wxLogTrace(_T("mglcursor"), _T("cursor id %i added to cache (%s)"), 
+                   cursorId, cursorname);
+    }

 }
 
 wxCursor::wxCursor(const char WXUNUSED(bits)[],
 }
 
 wxCursor::wxCursor(const char WXUNUSED(bits)[],


@@ -199,13 +217,21 @@ MGLCursor *wxCursor::GetMGLCursor() const
 // Global cursor setting
 // ----------------------------------------------------------------------------
 
 // Global cursor setting
 // ----------------------------------------------------------------------------
 

+static wxCursor  gs_globalCursor = wxNullCursor;

 
 void wxSetCursor(const wxCursor& cursor)
 {
     if ( cursor.Ok() )
     {
 
 void wxSetCursor(const wxCursor& cursor)
 {
     if ( cursor.Ok() )
     {

-        //MGL_setGlobalCursor(cursor.GetMGLCursor());
-        // FIXME_MGL -- needs MGL WM first
+        if ( g_winMng )
+            MGL_wmSetGlobalCursor(g_winMng, *cursor.GetMGLCursor());
+        gs_globalCursor = cursor;
+    }
+    else
+    {
+        if ( g_winMng )
+            MGL_wmSetGlobalCursor(g_winMng, NULL);
+        gs_globalCursor = wxNullCursor;        

     }
 }
 
     }
 }
 


@@ -215,10 +241,7 @@ void wxSetCursor(const wxCursor& cursor)
 // busy cursor routines
 //-----------------------------------------------------------------------------
 
 // busy cursor routines
 //-----------------------------------------------------------------------------
 

-// FIXME_MGL -- do we need this? It may be better to incorporate 
-//              support for it into MGL (a stack of global cursors?)
-static wxCursor  gs_savedCursor;
-static wxCursor  g_globalCursor;
+static wxCursor  gs_savedCursor = wxNullCursor;

 static int       gs_busyCount = 0;
 
 const wxCursor &wxBusyCursor::GetStoredCursor()
 static int       gs_busyCount = 0;
 
 const wxCursor &wxBusyCursor::GetStoredCursor()


@@ -228,7 +251,7 @@ const wxCursor &wxBusyCursor::GetStoredCursor()
 
 const wxCursor wxBusyCursor::GetBusyCursor()
 {
 
 const wxCursor wxBusyCursor::GetBusyCursor()
 {

-    return wxCursor(wxCURSOR_WAIT);
+    return gs_globalCursor;

 }
 
 void wxEndBusyCursor()
 }
 
 void wxEndBusyCursor()


@@ -237,19 +260,20 @@ void wxEndBusyCursor()
 
     wxSetCursor(gs_savedCursor);
     gs_savedCursor = wxNullCursor;
 
     wxSetCursor(gs_savedCursor);
     gs_savedCursor = wxNullCursor;

-    //wxYield(); FIXME_MGL - needed?

 }
 
 }
 

-void wxBeginBusyCursor(wxCursor *WXUNUSED(cursor))
+void wxBeginBusyCursor(wxCursor *cursor)

 {
     if ( gs_busyCount++ > 0 ) return;
 
     wxASSERT_MSG( !gs_savedCursor.Ok(),
                   wxT("forgot to call wxEndBusyCursor, will leak memory") );
 
 {
     if ( gs_busyCount++ > 0 ) return;
 
     wxASSERT_MSG( !gs_savedCursor.Ok(),
                   wxT("forgot to call wxEndBusyCursor, will leak memory") );
 

-    gs_savedCursor = g_globalCursor;
-    wxSetCursor(wxCursor(wxCURSOR_WAIT));
-    //wxYield(); FIXME_MGL - needed?
+    gs_savedCursor = gs_globalCursor;
+    if ( cursor->Ok() )
+        wxSetCursor(*cursor);
+    else
+        wxSetCursor(wxCursor(wxCURSOR_WAIT));

 }
 
 bool wxIsBusy()
 }
 
 bool wxIsBusy()


@@ -257,3 +281,24 @@ bool wxIsBusy()
     return (gs_busyCount > 0);
 }
 
     return (gs_busyCount > 0);
 }
 

+
+
+//-----------------------------------------------------------------------------
+// module - clean up code
+//-----------------------------------------------------------------------------
+
+class wxCursorModule : public wxModule
+{
+public:
+    virtual bool OnInit() { return TRUE; }
+    
+    virtual void OnExit()
+    {
+        wxDELETE(gs_cursorsHash);
+    }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxCursorModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxCursorModule, wxModule)