X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..a721fd82b7ca8c97048453d4aaff559e8f741d69:/include/wx/cursor.h

diff --git a/include/wx/cursor.h b/include/wx/cursor.h
index 10bc6a0cc3..f4c584fbcf 100644
--- a/include/wx/cursor.h
+++ b/include/wx/cursor.h
@@ -1,23 +1,56 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/cursor.h
+// Purpose:     wxCursor base header
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_CURSOR_H_BASE_
 #define _WX_CURSOR_H_BASE_
 
-#if defined(__WXMSW__)
-#include "wx/msw/cursor.h"
+#include "wx/defs.h"
+
+#if defined(__WXPALMOS__)
+    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_CUR_RESOURCE
+    #include "wx/palmos/cursor.h"
+#elif defined(__WXMSW__)
+    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_CUR_RESOURCE
+    #include "wx/msw/cursor.h"
 #elif defined(__WXMOTIF__)
-#include "wx/motif/cursor.h"
+    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_XBM
+    #include "wx/motif/cursor.h"
+#elif defined(__WXGTK20__)
+    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
+    #include "wx/gtk/cursor.h"
 #elif defined(__WXGTK__)
-#include "wx/gtk/cursor.h"
-#elif defined(__WXQT__)
-#include "wx/qt/cursor.h"
+    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
+    #include "wx/gtk1/cursor.h"
+#elif defined(__WXX11__)
+    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
+    #include "wx/x11/cursor.h"
+#elif defined(__WXMGL__)
+    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_CUR_RESOURCE
+    #include "wx/mgl/cursor.h"
+#elif defined(__WXDFB__)
+    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_CUR_RESOURCE
+    #include "wx/dfb/cursor.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/cursor.h"
+    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_MACCURSOR_RESOURCE
+    #include "wx/osx/cursor.h"
+#elif defined(__WXCOCOA__)
+    #define wxCURSOR_DEFAULT_TYPE   0
+    #include "wx/cocoa/cursor.h"
 #elif defined(__WXPM__)
-#include "wx/os2/cursor.h"
-#elif defined(__WXSTUBS__)
-#include "wx/stubs/cursor.h"
+    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_CUR_RESOURCE
+    #include "wx/os2/cursor.h"
 #endif
 
 #include "wx/utils.h"
+
 /* This is a small class which can be used by all ports
    to temporarily suspend the busy cursor. Useful in modal
    dialogs.
@@ -43,7 +76,6 @@ public:
         if( wxIsBusy() )
         {
             wxSetCursor( wxBusyCursor::GetStoredCursor() );
-            wxYield();
         }
     }
     ~wxBusyCursorSuspender()
@@ -51,7 +83,6 @@ public:
         if( wxIsBusy() )
         {
             wxSetCursor( wxBusyCursor::GetBusyCursor() );
-            wxYield();
         }
     }
 };