*** empty log message ***

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

diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp
index 7c497e454cc301f185dfb2f7073bfa0619f1ee7c..80f7c26d60cb6bb71cf12ba4d122e6fdef7865fb 100644 (file)
--- a/src/gtk1/cursor.cpp
+++ b/src/gtk1/cursor.cpp
@@ -13,8 +13,16 @@
 #endif
 
 #include "wx/cursor.h"
 #endif
 
 #include "wx/cursor.h"

+#include "wx/utils.h"

 
 

-#include "gdk/gdk.h"
+#include <gdk/gdk.h>
+
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;

 
 //-----------------------------------------------------------------------------
 // wxCursor
 
 //-----------------------------------------------------------------------------
 // wxCursor


@@ -57,6 +65,7 @@ wxCursor::wxCursor( int cursorId )
     GdkCursorType gdk_cur = GDK_LEFT_PTR;
     switch (cursorId)
     {
     GdkCursorType gdk_cur = GDK_LEFT_PTR;
     switch (cursorId)
     {

+        case wxCURSOR_DEFAULT:          gdk_cur = GDK_LEFT_PTR; break;

         case wxCURSOR_HAND:             gdk_cur = GDK_HAND1; break;
         case wxCURSOR_CROSS:            gdk_cur = GDK_CROSSHAIR; break;
         case wxCURSOR_SIZEWE:           gdk_cur = GDK_SB_H_DOUBLE_ARROW; break;
         case wxCURSOR_HAND:             gdk_cur = GDK_HAND1; break;
         case wxCURSOR_CROSS:            gdk_cur = GDK_CROSSHAIR; break;
         case wxCURSOR_SIZEWE:           gdk_cur = GDK_SB_H_DOUBLE_ARROW; break;


@@ -77,6 +86,10 @@ wxCursor::wxCursor( int cursorId )
         case wxCURSOR_LEFT_BUTTON:      gdk_cur = GDK_LEFTBUTTON; break;
         case wxCURSOR_MIDDLE_BUTTON:    gdk_cur = GDK_MIDDLEBUTTON; break;
         case wxCURSOR_RIGHT_BUTTON:     gdk_cur = GDK_RIGHTBUTTON; break;
         case wxCURSOR_LEFT_BUTTON:      gdk_cur = GDK_LEFTBUTTON; break;
         case wxCURSOR_MIDDLE_BUTTON:    gdk_cur = GDK_MIDDLEBUTTON; break;
         case wxCURSOR_RIGHT_BUTTON:     gdk_cur = GDK_RIGHTBUTTON; break;

+        case wxCURSOR_BULLSEYE:         gdk_cur = GDK_TARGET; break;
+
+        case wxCURSOR_POINT_LEFT:       gdk_cur = GDK_SB_LEFT_ARROW; break;
+        case wxCURSOR_POINT_RIGHT:      gdk_cur = GDK_SB_RIGHT_ARROW; break;

 /*
         case wxCURSOR_DOUBLE_ARROW:     gdk_cur = GDK_DOUBLE_ARROW; break;
         case wxCURSOR_CROSS_REVERSE:    gdk_cur = GDK_CROSS_REVERSE; break;
 /*
         case wxCURSOR_DOUBLE_ARROW:     gdk_cur = GDK_DOUBLE_ARROW; break;
         case wxCURSOR_CROSS_REVERSE:    gdk_cur = GDK_CROSS_REVERSE; break;


@@ -84,7 +97,7 @@ wxCursor::wxCursor( int cursorId )
         case wxCURSOR_BASED_ARROW_DOWN: gdk_cur = GDK_BASED_ARROW_DOWN; break;
 */
         default:
         case wxCURSOR_BASED_ARROW_DOWN: gdk_cur = GDK_BASED_ARROW_DOWN; break;
 */
         default:

-            wxFAIL_MSG("unsupported cursor type");
+            wxFAIL_MSG(wxT("unsupported cursor type"));

             // will use the standard one
 
         case wxCURSOR_ARROW:
             // will use the standard one
 
         case wxCURSOR_ARROW:


@@ -137,38 +150,35 @@ GdkCursor *wxCursor::GetCursor() const
 // busy cursor routines
 //-----------------------------------------------------------------------------
 
 // busy cursor routines
 //-----------------------------------------------------------------------------
 

-extern wxCursor *g_globalCursor;
+extern wxCursor g_globalCursor;

 
 

-static wxCursor *gs_savedCursor = NULL;
+static wxCursor  gs_savedCursor;

 static int       gs_busyCount = 0;
 
 void wxEndBusyCursor()
 {
 static int       gs_busyCount = 0;
 
 void wxEndBusyCursor()
 {

-    if ( --gs_busyCount > 0 )
+    if (--gs_busyCount > 0)

         return;
 
         return;
 

-    wxCHECK_RET( gs_savedCursor && gs_savedCursor->Ok(),
-                 "calling wxEndBusyCursor() without wxBeginBusyCursor()?" );
+    wxSetCursor( gs_savedCursor );
+    gs_savedCursor = wxNullCursor;

 
 

-    wxSetCursor(*gs_savedCursor);
-    delete gs_savedCursor;
-    gs_savedCursor = NULL;
+    wxYield();

 }
 
 void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
 {
 }
 
 void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
 {

-    if ( gs_busyCount++ > 0 )
+    if (gs_busyCount++ > 0)

         return;
 
         return;
 

-    wxASSERT_MSG( !gs_savedCursor,
-                  "forgot to call wxEndBusyCursor, will leak memory" );
+    wxASSERT_MSG( !gs_savedCursor.Ok(),
+                  wxT("forgot to call wxEndBusyCursor, will leak memory") );

 
 

-    gs_savedCursor = new wxCursor;
-    if ( g_globalCursor && g_globalCursor->Ok() )
-        *gs_savedCursor = *g_globalCursor;
-    else
-        *gs_savedCursor = wxCursor(wxCURSOR_ARROW);
-    wxSetCursor(wxCursor(wxCURSOR_WATCH));
+    gs_savedCursor = g_globalCursor;
+
+    wxSetCursor( wxCursor(wxCURSOR_WATCH) );
+
+    wxYield();

 }
 
 bool wxIsBusy()
 }
 
 bool wxIsBusy()


@@ -178,7 +188,8 @@ bool wxIsBusy()
 
 void wxSetCursor( const wxCursor& cursor )
 {
 
 void wxSetCursor( const wxCursor& cursor )
 {

-    if (g_globalCursor) (*g_globalCursor) = cursor;
-}
-
+    if (g_isIdle)
+        wxapp_install_idle_handler();

 
 

+    g_globalCursor = cursor;
+}