- Modify #if to include wxCocoa as a platform using wxBitmapBase

[wxWidgets.git] / include / wx / cursor.h

diff --git a/include/wx/cursor.h b/include/wx/cursor.h
index f163125fa6f11f5df2f9c8a4f487a4c446103005..14e5e25deaa647483514e3bd31ec10cbc6f25c32 100644 (file)
--- a/include/wx/cursor.h
+++ b/include/wx/cursor.h
@@ -7,37 +7,52 @@
 #include "wx/motif/cursor.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/cursor.h"
 #include "wx/motif/cursor.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/cursor.h"

-#elif defined(__WXQT__)
-#include "wx/qt/cursor.h"
+#elif defined(__WXX11__)
+#include "wx/x11/cursor.h"
+#elif defined(__WXMGL__)
+#include "wx/mgl/cursor.h"

 #elif defined(__WXMAC__)
 #include "wx/mac/cursor.h"
 #elif defined(__WXPM__)
 #include "wx/os2/cursor.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/cursor.h"
 #elif defined(__WXPM__)
 #include "wx/os2/cursor.h"

-#elif defined(__WXSTUBS__)
-#include "wx/stubs/cursor.h"

 #endif
 
 #include "wx/utils.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.
 /* This is a small class which can be used by all ports
    to temporarily suspend the busy cursor. Useful in modal
    dialogs.

+
+   Actually that is not (any longer) quite true..  currently it is
+   only used in wxGTK Dialog::ShowModal() and now uses static
+   wxBusyCursor methods that are only implemented for wxGTK so far.
+   The BusyCursor handling code should probably be implemented in
+   common code somewhere instead of the separate implementations we
+   currently have.  Also the name BusyCursorSuspender is a little
+   misleading since it doesn't actually suspend the BusyCursor, just
+   masks one that is already showing.
+   If another call to wxBeginBusyCursor is made while this is active
+   the Busy Cursor will again be shown.  But at least now it doesn't
+   interfere with the state of wxIsBusy() -- RL
+

 */
 class wxBusyCursorSuspender
 {
 public:
 */
 class wxBusyCursorSuspender
 {
 public:

-   wxBusyCursorSuspender()
-      {
-         m_wasBusy = wxIsBusy();
-         if(m_wasBusy)
-            wxEndBusyCursor();
-      }
-   ~wxBusyCursorSuspender()
-      {
-         if(m_wasBusy)
-            wxBeginBusyCursor();
-      }
- private:
-   bool m_wasBusy;
+    wxBusyCursorSuspender()
+    {
+        if( wxIsBusy() )
+        {
+            wxSetCursor( wxBusyCursor::GetStoredCursor() );
+        }
+    }
+    ~wxBusyCursorSuspender()
+    {
+        if( wxIsBusy() )
+        {
+            wxSetCursor( wxBusyCursor::GetBusyCursor() );
+        }
+    }

 };
 #endif
     // _WX_CURSOR_H_BASE_
 };
 #endif
     // _WX_CURSOR_H_BASE_