attempts to process non ASCII key strokes properly

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

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index e660bcc9ea1902166c52efa8193c1729cad82616..c233aecccc81ab6e2b1695273b54ad79f91e9de3 100644 (file)
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -14,8 +14,10 @@
 
 #include "wx/cursor.h"
 #include "wx/utils.h"
 
 #include "wx/cursor.h"
 #include "wx/utils.h"

+#include "wx/app.h"

 
 

-#include "gdk/gdk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -70,6 +72,7 @@ wxCursor::wxCursor( int cursorId )
         case wxCURSOR_CROSS:            gdk_cur = GDK_CROSSHAIR; break;
         case wxCURSOR_SIZEWE:           gdk_cur = GDK_SB_H_DOUBLE_ARROW; break;
         case wxCURSOR_SIZENS:           gdk_cur = GDK_SB_V_DOUBLE_ARROW; break;
         case wxCURSOR_CROSS:            gdk_cur = GDK_CROSSHAIR; break;
         case wxCURSOR_SIZEWE:           gdk_cur = GDK_SB_H_DOUBLE_ARROW; break;
         case wxCURSOR_SIZENS:           gdk_cur = GDK_SB_V_DOUBLE_ARROW; break;

+        case wxCURSOR_ARROWWAIT:

         case wxCURSOR_WAIT:
         case wxCURSOR_WATCH:            gdk_cur = GDK_WATCH; break;
         case wxCURSOR_SIZING:           gdk_cur = GDK_SIZING; break;
         case wxCURSOR_WAIT:
         case wxCURSOR_WATCH:            gdk_cur = GDK_WATCH; break;
         case wxCURSOR_SIZING:           gdk_cur = GDK_SIZING; break;


@@ -107,6 +110,36 @@ wxCursor::wxCursor( int cursorId )
     M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur );
 }
 
     M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur );
 }
 

+extern GtkWidget *wxGetRootWindow();
+
+wxCursor::wxCursor(const char bits[], int width, int  height,
+                   int hotSpotX, int hotSpotY,
+                   const char maskBits[], wxColour *fg, wxColour *bg)
+{
+    if (!maskBits)
+        maskBits = bits;
+    if (!fg)
+        fg = wxBLACK;
+    if (!bg)
+        bg = wxWHITE;
+    if (hotSpotX < 0 || hotSpotX >= width)
+        hotSpotX = 0;
+    if (hotSpotY < 0 || hotSpotY >= height)
+        hotSpotY = 0;
+
+    GdkBitmap *data = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) bits, width, height );
+    GdkBitmap *mask = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) maskBits, width, height);
+
+    m_refData = new wxCursorRefData;
+    M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap(
+                 data, mask, fg->GetColor(), bg->GetColor(),
+                 hotSpotX, hotSpotY );
+
+    gdk_bitmap_unref( data );
+    gdk_bitmap_unref( mask );
+}
+
+

 wxCursor::wxCursor( const wxCursor &cursor )
 {
     Ref( cursor );
 wxCursor::wxCursor( const wxCursor &cursor )
 {
     Ref( cursor );


@@ -155,6 +188,16 @@ extern wxCursor g_globalCursor;
 static wxCursor  gs_savedCursor;
 static int       gs_busyCount = 0;
 
 static wxCursor  gs_savedCursor;
 static int       gs_busyCount = 0;
 

+const wxCursor &wxBusyCursor::GetStoredCursor()
+{
+    return gs_savedCursor;
+}
+
+const wxCursor wxBusyCursor::GetBusyCursor()
+{
+    return wxCursor(wxCURSOR_WATCH);
+}
+

 void wxEndBusyCursor()
 {
     if (--gs_busyCount > 0)
 void wxEndBusyCursor()
 {
     if (--gs_busyCount > 0)


@@ -163,7 +206,8 @@ void wxEndBusyCursor()
     wxSetCursor( gs_savedCursor );
     gs_savedCursor = wxNullCursor;
 
     wxSetCursor( gs_savedCursor );
     gs_savedCursor = wxNullCursor;
 

-    wxYield();
+    if (wxTheApp)
+        wxTheApp->SendIdleEvents();

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


@@ -178,7 +222,10 @@ void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
 
     wxSetCursor( wxCursor(wxCURSOR_WATCH) );
 
 
     wxSetCursor( wxCursor(wxCURSOR_WATCH) );
 

-    wxYield();
+    if (wxTheApp)
+        wxTheApp->SendIdleEvents();
+        
+    gdk_flush();

 }
 
 bool wxIsBusy()
 }
 
 bool wxIsBusy()