remove checks for new dc code

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

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index fd78e1f321a341e7989e61aff077a4db3a3c2050..265b98cd3b6f8266afc66e914a18d6c7ab71eaf0 100644 (file)
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -87,7 +87,7 @@ wxCursor::wxCursor( int cursorId )
         case wxCURSOR_ARROWWAIT:
         case wxCURSOR_WAIT:
         case wxCURSOR_WATCH:            gdk_cur = GDK_WATCH; break;
-        case wxCURSOR_SIZING:           gdk_cur = GDK_FLEUR; break;
+        case wxCURSOR_SIZING:           gdk_cur = GDK_SIZING; break;
         case wxCURSOR_SPRAYCAN:         gdk_cur = GDK_SPRAYCAN; break;
         case wxCURSOR_IBEAM:            gdk_cur = GDK_XTERM; break;
         case wxCURSOR_PENCIL:           gdk_cur = GDK_PENCIL; break;
@@ -178,57 +178,52 @@ wxCursor::wxCursor( const wxImage & image )
     bool bHasMask = image.HasMask();
     int imagebitcount = (w*h)/8;
 
-#ifdef __WXGTK24__
-    if (!gtk_check_version(2,4,0))
+    if ( gdk_display_supports_cursor_color(gdk_display_get_default()) )
     {
-        if ( gdk_display_supports_cursor_color(gdk_display_get_default()) )
+        unsigned char rMask = 0,
+                      gMask = 0,
+                      bMask = 0;
+        if (bHasMask)
         {
-            unsigned char rMask = 0,
-                          gMask = 0,
-                          bMask = 0;
-            if (bHasMask)
-            {
-                rMask = image.GetMaskRed();
-                gMask = image.GetMaskGreen();
-                bMask = image.GetMaskBlue();
-            }
+            rMask = image.GetMaskRed();
+            gMask = image.GetMaskGreen();
+            bMask = image.GetMaskBlue();
+        }
 
-            GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, w, h);
-            unsigned char *alpha = image.HasAlpha() ? image.GetAlpha() : NULL;
-            unsigned char *out = gdk_pixbuf_get_pixels(pixbuf);
-            int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - 4 * w;
-            for ( int y = 0; y < h; y++, out += rowpad )
+        GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, w, h);
+        unsigned char *alpha = image.HasAlpha() ? image.GetAlpha() : NULL;
+        unsigned char *out = gdk_pixbuf_get_pixels(pixbuf);
+        int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - 4 * w;
+        for ( int y = 0; y < h; y++, out += rowpad )
+        {
+            for ( int x = 0; x < w; x++, out += 4, rgbBits += 3 )
             {
-                for ( int x = 0; x < w; x++, out += 4, rgbBits += 3 )
-                {
-                    out[0] = rgbBits[0];
-                    out[1] = rgbBits[1];
-                    out[2] = rgbBits[2];
-                    if (bHasMask &&
-                        out[0] == rMask && out[1] == gMask && out[2] == bMask)
-                        out[3] = 0;
-                    else
-                        out[3] = alpha ? *alpha : 255;
-                    if ( alpha )
-                        ++alpha;
-                }
+                out[0] = rgbBits[0];
+                out[1] = rgbBits[1];
+                out[2] = rgbBits[2];
+                if (bHasMask &&
+                    out[0] == rMask && out[1] == gMask && out[2] == bMask)
+                    out[3] = 0;
+                else
+                    out[3] = alpha ? *alpha : 255;
+                if ( alpha )
+                    ++alpha;
             }
-
-            int hotSpotX, hotSpotY;
-            GetHotSpot(image, hotSpotX, hotSpotY);
-
-            m_refData = new wxCursorRefData;
-            M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixbuf
-                                 (
-                                  gdk_display_get_default(),
-                                  pixbuf,
-                                  hotSpotX, hotSpotY
-                                 );
-            g_object_unref (pixbuf);
-            return;
         }
+
+        int hotSpotX, hotSpotY;
+        GetHotSpot(image, hotSpotX, hotSpotY);
+
+        m_refData = new wxCursorRefData;
+        M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixbuf
+                             (
+                              gdk_display_get_default(),
+                              pixbuf,
+                              hotSpotX, hotSpotY
+                             );
+        g_object_unref (pixbuf);
+        return;
     }
-#endif // GTK+ 2.4+
 
     unsigned char * bits = new unsigned char [imagebitcount];
     unsigned char * maskBits = new unsigned char [imagebitcount];
@@ -379,7 +374,9 @@ GdkCursor *wxCursor::GetCursor() const
 // busy cursor routines
 //-----------------------------------------------------------------------------
 
-extern wxCursor g_globalCursor;
+/* Current cursor, in order to hang on to
+ * cursor handle when setting the cursor globally */
+wxCursor g_globalCursor;
 
 static wxCursor  gs_savedCursor;
 static int       gs_busyCount = 0;