fix for wxSYS_COLOUR_LISTBOX representation

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

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index f9f6167d682e168afcb8340e325a58321a13b97e..d84d6c2aa488a6c5e6d97dfee1c4ff192a1a6241 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -37,8 +37,11 @@
     #include "wx/cursor.h"
 #endif
 
     #include "wx/cursor.h"
 #endif
 

+#include "wx/module.h"

 #include "wx/msw/private.h"
 #include "wx/msw/private.h"

+#ifndef __WXMICROWIN__

 #include "wx/msw/dib.h"
 #include "wx/msw/dib.h"

+#endif

 
 #if wxUSE_RESOURCE_LOADING_IN_MSW
     #include "wx/msw/curico.h"
 
 #if wxUSE_RESOURCE_LOADING_IN_MSW
     #include "wx/msw/curico.h"


@@ -49,9 +52,40 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARIES
-    IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxCursorBase)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxCursorBase)
+
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
+
+// Current cursor, in order to hang on to cursor handle when setting the cursor
+// globally
+static wxCursor *gs_globalCursor = NULL;
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+class wxCursorModule : public wxModule
+{
+public:
+    virtual bool OnInit()
+    {
+        gs_globalCursor = new wxCursor;
+
+        return TRUE;
+    }
+
+    virtual void OnExit()
+    {
+        delete gs_globalCursor;
+        gs_globalCursor = (wxCursor *)NULL;
+    }
+};
+
+// ============================================================================
+// implementation
+// ============================================================================

 
 // ----------------------------------------------------------------------------
 // wxCursorRefData
 
 // ----------------------------------------------------------------------------
 // wxCursorRefData


@@ -62,15 +96,17 @@ wxCursorRefData::wxCursorRefData()
   m_width = 32;
   m_height = 32;
 
   m_width = 32;
   m_height = 32;
 

-  m_destroyCursor = FALSE;
+  m_destroyCursor = TRUE;

 }
 
 void wxCursorRefData::Free()
 {
     if ( m_hCursor )
     {
 }
 
 void wxCursorRefData::Free()
 {
     if ( m_hCursor )
     {

+#ifndef __WXMICROWIN__

         if ( m_destroyCursor )
             ::DestroyCursor((HCURSOR)m_hCursor);
         if ( m_destroyCursor )
             ::DestroyCursor((HCURSOR)m_hCursor);

+#endif

 
         m_hCursor = 0;
     }
 
         m_hCursor = 0;
     }


@@ -96,11 +132,12 @@ wxCursor::wxCursor(const wxString& cursor_file,
                    long flags,
                    int hotSpotX, int hotSpotY)
 {
                    long flags,
                    int hotSpotX, int hotSpotY)
 {

+#ifdef __WXMICROWIN__
+    m_refData = NULL;
+#else

     wxCursorRefData *refData = new wxCursorRefData;
     m_refData = refData;
 
     wxCursorRefData *refData = new wxCursorRefData;
     m_refData = refData;
 

-    refData->m_destroyCursor = FALSE;
-

     if (flags == wxBITMAP_TYPE_CUR_RESOURCE)
     {
 #ifdef __WIN95__
     if (flags == wxBITMAP_TYPE_CUR_RESOURCE)
     {
 #ifdef __WIN95__


@@ -116,7 +153,6 @@ wxCursor::wxCursor(const wxString& cursor_file,
 #else
 #if wxUSE_RESOURCE_LOADING_IN_MSW
         refData->m_hCursor = (WXHCURSOR) ReadCursorFile(WXSTRINGCAST cursor_file, wxGetInstance(), &refData->m_width, &refData->m_height);
 #else
 #if wxUSE_RESOURCE_LOADING_IN_MSW
         refData->m_hCursor = (WXHCURSOR) ReadCursorFile(WXSTRINGCAST cursor_file, wxGetInstance(), &refData->m_width, &refData->m_height);

-        refData->m_destroyCursor = TRUE;

 #endif
 #endif
     }
 #endif
 #endif
     }


@@ -124,7 +160,6 @@ wxCursor::wxCursor(const wxString& cursor_file,
     {
 #if wxUSE_RESOURCE_LOADING_IN_MSW
         refData->m_hCursor = (WXHCURSOR) IconToCursor(WXSTRINGCAST cursor_file, wxGetInstance(), hotSpotX, hotSpotY, &refData->m_width, &refData->m_height);
     {
 #if wxUSE_RESOURCE_LOADING_IN_MSW
         refData->m_hCursor = (WXHCURSOR) IconToCursor(WXSTRINGCAST cursor_file, wxGetInstance(), hotSpotX, hotSpotY, &refData->m_width, &refData->m_height);

-        refData->m_destroyCursor = TRUE;

 #endif
     }
     else if (flags == wxBITMAP_TYPE_BMP)
 #endif
     }
     else if (flags == wxBITMAP_TYPE_BMP)


@@ -141,7 +176,6 @@ wxCursor::wxCursor(const wxString& cursor_file,
         pnt.x = hotSpotX;
         pnt.y = hotSpotY;
         refData->m_hCursor = (WXHCURSOR) MakeCursorFromBitmap(wxGetInstance(), hBitmap, &pnt);
         pnt.x = hotSpotX;
         pnt.y = hotSpotY;
         refData->m_hCursor = (WXHCURSOR) MakeCursorFromBitmap(wxGetInstance(), hBitmap, &pnt);

-        refData->m_destroyCursor = TRUE;

         DeleteObject(hBitmap);
 #endif
     }
         DeleteObject(hBitmap);
 #endif
     }


@@ -149,16 +183,26 @@ wxCursor::wxCursor(const wxString& cursor_file,
 #if WXWIN_COMPATIBILITY_2
     refData->SetOk();
 #endif // WXWIN_COMPATIBILITY_2
 #if WXWIN_COMPATIBILITY_2
     refData->SetOk();
 #endif // WXWIN_COMPATIBILITY_2

+
+#endif

 }
 
 // Cursors by stock number
 wxCursor::wxCursor(int cursor_type)
 {
 }
 
 // Cursors by stock number
 wxCursor::wxCursor(int cursor_type)
 {

+#ifdef __WXMICROWIN__
+    m_refData = NULL;
+#else

   wxCursorRefData *refData = new wxCursorRefData;
   m_refData = refData;
 
   switch (cursor_type)
   {
   wxCursorRefData *refData = new wxCursorRefData;
   m_refData = refData;
 
   switch (cursor_type)
   {

+    case wxCURSOR_ARROWWAIT:
+#ifndef __WIN16__
+      refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_APPSTARTING);
+      break;
+#endif

     case wxCURSOR_WAIT:
       refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_WAIT);
       break;
     case wxCURSOR_WAIT:
       refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_WAIT);
       break;


@@ -257,6 +301,7 @@ wxCursor::wxCursor(int cursor_type)
     }
     case wxCURSOR_QUESTION_ARROW:
     {
     }
     case wxCURSOR_QUESTION_ARROW:
     {

+//      refData->m_hCursor = (WXHCURSOR) LoadImage(wxGetInstance(), wxT("wxCURSOR_QARROW"), IMAGE_CURSOR, 16, 16, LR_MONOCHROME);

       refData->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), wxT("wxCURSOR_QARROW"));
       break;
     }
       refData->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), wxT("wxCURSOR_QARROW"));
       break;
     }


@@ -270,6 +315,11 @@ wxCursor::wxCursor(int cursor_type)
       refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_ARROW);
       break;
   }
       refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_ARROW);
       break;
   }

+
+  // no need to destroy the stock cursors
+  // TODO: check this
+  //m_refData->m_destroyCursor = FALSE;
+#endif

 }
 
 wxCursor::~wxCursor()
 }
 
 wxCursor::~wxCursor()


@@ -280,16 +330,21 @@ wxCursor::~wxCursor()
 // Global cursor setting
 // ----------------------------------------------------------------------------
 
 // Global cursor setting
 // ----------------------------------------------------------------------------
 

-void wxSetCursor(const wxCursor& cursor)
+const wxCursor *wxGetGlobalCursor()

 {
 {

-    extern wxCursor *g_globalCursor;
+    return gs_globalCursor;
+}

 
 

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

     {
     {

-        ::SetCursor((HCURSOR) cursor.GetHCURSOR());
+#ifndef __WXMICROWIN__
+        ::SetCursor(GetHcursorOf(cursor));
+#endif

 
 

-        if ( g_globalCursor )
-            (*g_globalCursor) = cursor;
+        if ( gs_globalCursor )
+            *gs_globalCursor = cursor;

     }
 }
 
     }
 }