Ticket #49391: gdk_quartz_gdkcursor-quartz-10_6-compat.diff

gdk/quartz/gdkcursor-quartz.c

@@ -310 +310 @@
                 } \
                 return obj; \
         }
-CUSTOM_CURSOR_CTOR(gdkHelpCursor, 40)
-CUSTOM_CURSOR_CTOR(gdkProgressCursor, 4)
+
+
+// CUSTOM_CURSOR_CTOR(gdkHelpCursor, 40)
++ (id)gdkHelpCursor 
+{ 
+        gdkCoreCursor *obj; 
+        obj = [self new]; 
+        if (obj) { 
+                obj->override = YES; 
+                obj->type = 40; 
+        } 
+        return obj; 
+}
+
+
+// CUSTOM_CURSOR_CTOR(gdkProgressCursor, 4)
++ (id)gdkProgressCursor 
+{ 
+        gdkCoreCursor *obj; 
+        obj = [self new]; 
+        if (obj) { 
+                obj->override = YES; 
+                obj->type = 4; 
+        } 
+        return obj; 
+}
+
 /* TODO OS X doesn't seem to have a way to get this. There is an undocumented
  * method +[NSCursor _waitCursor], but it doesn't actually return this cursor,
  * but rather some odd low-quality non-animating version of this cursor. Use
  * the progress cursor instead for now.
  */
-CUSTOM_CURSOR_CTOR(gdkWaitCursor, 4)
-CUSTOM_CURSOR_CTOR(gdkAliasCursor, 2)
-CUSTOM_CURSOR_CTOR(gdkMoveCursor, 39)
+// CUSTOM_CURSOR_CTOR(gdkWaitCursor, 4)
++ (id)gdkWaitCursor 
+{ 
+        gdkCoreCursor *obj; 
+        obj = [self new]; 
+        if (obj) { 
+                obj->override = YES; 
+                obj->type = 4; 
+        } 
+        return obj; 
+}
+
+
+// CUSTOM_CURSOR_CTOR(gdkAliasCursor, 2)
+ + (id)gdkAliasCursor 
+{ 
+        gdkCoreCursor *obj; 
+        obj = [self new]; 
+        if (obj) { 
+                obj->override = YES; 
+                obj->type = 2; 
+        } 
+        return obj; 
+}
+
+
+
+// CUSTOM_CURSOR_CTOR(gdkMoveCursor, 39)
+ + (id)gdkMoveCursor 
+{ 
+        gdkCoreCursor *obj; 
+        obj = [self new]; 
+        if (obj) { 
+                obj->override = YES; 
+                obj->type = 39; 
+        } 
+        return obj; 
+}
+
 /* TODO OS X doesn't seem to provide one; copy the move cursor for now
  *  since it looks similar to what we want. */
-CUSTOM_CURSOR_CTOR(gdkAllScrollCursor, 39)
-CUSTOM_CURSOR_CTOR(gdkNEResizeCursor, 29)
-CUSTOM_CURSOR_CTOR(gdkNWResizeCursor, 33)
-CUSTOM_CURSOR_CTOR(gdkSEResizeCursor, 35)
-CUSTOM_CURSOR_CTOR(gdkSWResizeCursor, 37)
-CUSTOM_CURSOR_CTOR(gdkEWResizeCursor, 28)
-CUSTOM_CURSOR_CTOR(gdkNSResizeCursor, 32)
-CUSTOM_CURSOR_CTOR(gdkNESWResizeCursor, 30)
-CUSTOM_CURSOR_CTOR(gdkNWSEResizeCursor, 34)
-CUSTOM_CURSOR_CTOR(gdkZoomInCursor, 42)
-CUSTOM_CURSOR_CTOR(gdkZoomOutCursor, 43)
+// CUSTOM_CURSOR_CTOR(gdkAllScrollCursor, 39)
+ + (id)gdkAllScrollCursor 
+{ 
+        gdkCoreCursor *obj; 
+        obj = [self new]; 
+        if (obj) { 
+                obj->override = YES; 
+                obj->type = 39; 
+        } 
+        return obj; 
+}
+
+// CUSTOM_CURSOR_CTOR(gdkNEResizeCursor, 29)
+ + (id)gdkNEResizeCursor 
+{ 
+        gdkCoreCursor *obj; 
+        obj = [self new]; 
+        if (obj) { 
+                obj->override = YES; 
+                obj->type = 29; 
+        } 
+        return obj; 
+}
+
+// CUSTOM_CURSOR_CTOR(gdkNWResizeCursor, 33)
+ + (id)gdkNWResizeCursor 
+{ 
+        gdkCoreCursor *obj; 
+        obj = [self new]; 
+        if (obj) { 
+                obj->override = YES; 
+                obj->type = 33; 
+        } 
+        return obj; 
+}
+
+// CUSTOM_CURSOR_CTOR(gdkSEResizeCursor, 35)
+ + (id)gdkSEResizeCursor 
+{ 
+        gdkCoreCursor *obj; 
+        obj = [self new]; 
+        if (obj) { 
+                obj->override = YES; 
+                obj->type = 35; 
+        } 
+        return obj; 
+}
+
+// CUSTOM_CURSOR_CTOR(gdkSWResizeCursor, 37)
+ + (id)gdkSWResizeCursor 
+{ 
+        gdkCoreCursor *obj; 
+        obj = [self new]; 
+        if (obj) { 
+                obj->override = YES; 
+                obj->type = 37; 
+        } 
+        return obj; 
+}
+
+// CUSTOM_CURSOR_CTOR(gdkEWResizeCursor, 28)
+ + (id)gdkEWResizeCursor 
+{ 
+        gdkCoreCursor *obj; 
+        obj = [self new]; 
+        if (obj) { 
+                obj->override = YES; 
+                obj->type = 28; 
+        } 
+        return obj; 
+}
+
+// CUSTOM_CURSOR_CTOR(gdkNSResizeCursor, 32)
+ + (id)gdkNSResizeCursor 
+{ 
+        gdkCoreCursor *obj; 
+        obj = [self new]; 
+        if (obj) { 
+                obj->override = YES; 
+                obj->type = 32; 
+        } 
+        return obj; 
+}
+
+// CUSTOM_CURSOR_CTOR(gdkNESWResizeCursor, 30)
+ + (id)gdkNESWResizeCursor 
+{ 
+        gdkCoreCursor *obj; 
+        obj = [self new]; 
+        if (obj) { 
+                obj->override = YES; 
+                obj->type = 30; 
+        } 
+        return obj; 
+}
+
+// CUSTOM_CURSOR_CTOR(gdkNWSEResizeCursor, 34)
+ + (id)gdkNWSEResizeCursor 
+{ 
+        gdkCoreCursor *obj; 
+        obj = [self new]; 
+        if (obj) { 
+                obj->override = YES; 
+                obj->type = 34; 
+        } 
+        return obj; 
+}
+
+// CUSTOM_CURSOR_CTOR(gdkZoomInCursor, 42)
+ + (id)gdkZoomInCursor 
+{ 
+        gdkCoreCursor *obj; 
+        obj = [self new]; 
+        if (obj) { 
+                obj->override = YES; 
+                obj->type = 42; 
+        } 
+        return obj; 
+}
+
+// CUSTOM_CURSOR_CTOR(gdkZoomOutCursor, 43)
+ + (id)gdkZoomOutCursor 
+{ 
+        gdkCoreCursor *obj; 
+        obj = [self new]; 
+        if (obj) { 
+                obj->override = YES; 
+                obj->type = 43; 
+        } 
+        return obj; 
+}
+
 
 @end
 
@@ -402 +584 @@
         selector = NSSelectorFromString(test->selector);
         break;
       }
+
+  if (! [[gdkCoreCursor class] respondsToSelector:selector])
+  {
+          selector = @selector(arrowCursor);
+  }
+
   nscursor = [[gdkCoreCursor class] performSelector:selector];
 
   [nscursor retain];