test wxExecute() in the sample

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

diff --git a/src/mac/cursor.cpp b/src/mac/cursor.cpp
index fa0bbf76b29f7000d68470e8dfcaa34a1372fcbe..23b9eb4c0cd80eceec8e03a168fb648b711f5678 100644 (file)
--- a/src/mac/cursor.cpp
+++ b/src/mac/cursor.cpp
@@ -13,8 +13,12 @@
 #pragma implementation "cursor.h"
 #endif
 
 #pragma implementation "cursor.h"
 #endif
 

+#include "wx/defs.h"
+
+#include "wx/app.h"

 #include "wx/cursor.h"
 #include "wx/icon.h"
 #include "wx/cursor.h"
 #include "wx/icon.h"

+#include "wx/mac/private.h"

 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap)
 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap)


@@ -75,7 +79,8 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
 wxCursor::wxCursor(int cursor_type)
 {
   m_refData = new wxCursorRefData;
 wxCursor::wxCursor(int cursor_type)
 {
   m_refData = new wxCursorRefData;

-
+  
+  

   switch (cursor_type)
   {
     case wxCURSOR_WAIT:
   switch (cursor_type)
   {
     case wxCURSOR_WAIT:


@@ -88,47 +93,64 @@ wxCursor::wxCursor(int cursor_type)
       M_CURSORDATA->m_hCursor = ::GetCursor(crossCursor);
       break;
     case wxCURSOR_SIZENWSE:
       M_CURSORDATA->m_hCursor = ::GetCursor(crossCursor);
       break;
     case wxCURSOR_SIZENWSE:

-      M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId);
+      {
+        wxStAppResource resload ;
+        M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId);
+      }

       break;
     case wxCURSOR_SIZENESW:
       break;
     case wxCURSOR_SIZENESW:

-      M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId);
+      {
+        wxStAppResource resload ;
+        M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId);
+      }

       break;
     case wxCURSOR_SIZEWE:
       break;
     case wxCURSOR_SIZEWE:

-      M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId);
+      {
+        wxStAppResource resload ;
+        M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId);
+      }

       break;
     case wxCURSOR_SIZENS:
       break;
     case wxCURSOR_SIZENS:

-      M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeNSId);
+      {
+        wxStAppResource resload ;
+        M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeNSId);
+      }

       break;
     case wxCURSOR_CHAR:
       break;
     case wxCURSOR_CHAR:

-    {
-      M_CURSORDATA->m_hCursor = MacArrowCursor;
-      break;
-    }
+        {
+          M_CURSORDATA->m_hCursor = MacArrowCursor;
+          break;
+        }

     case wxCURSOR_HAND:
     case wxCURSOR_HAND:

-    {
-      M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
-      break;
-    }
+        {
+          wxStAppResource resload ;
+          M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
+        }
+        break;

     case wxCURSOR_BULLSEYE:
     case wxCURSOR_BULLSEYE:

-    {
-      M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
-      break;
-    }
+        {
+          wxStAppResource resload ;
+          M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
+        }
+        break;

     case wxCURSOR_PENCIL:
     case wxCURSOR_PENCIL:

-    {
-      M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
-      break;
-    }
+        {
+          wxStAppResource resload ;
+          M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
+        }
+        break;

     case wxCURSOR_MAGNIFIER:
     case wxCURSOR_MAGNIFIER:

-    {
-      M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
-      break;
-    }
+        {
+          wxStAppResource resload ;
+          M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
+        }
+        break;

     case wxCURSOR_NO_ENTRY:
     case wxCURSOR_NO_ENTRY:

-    {
-      M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
-      break;
-    }
+        {
+          wxStAppResource resload ;
+          M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
+        }
+        break;

     case wxCURSOR_LEFT_BUTTON:
     {
       M_CURSORDATA->m_hCursor = MacArrowCursor;
     case wxCURSOR_LEFT_BUTTON:
     {
       M_CURSORDATA->m_hCursor = MacArrowCursor;


@@ -195,8 +217,8 @@ void wxCursor::MacInstall() const
 {
        if ( m_refData && M_CURSORDATA->m_hCursor )
        {
 {
        if ( m_refData && M_CURSORDATA->m_hCursor )
        {

-               ::SetCursor( *M_CURSORDATA->m_hCursor ) ;
-               gMacCurrentCursor = M_CURSORDATA->m_hCursor ;
+               ::SetCursor(  *((CursHandle)M_CURSORDATA->m_hCursor) ) ;
+               gMacCurrentCursor = (CursHandle)M_CURSORDATA->m_hCursor ;

        }
        else
        {
        }
        else
        {