Move Leopard-specific type definitions to gdkquartz.h

Update includes subsequently where it matters.  Fixes build on Mac OS
X 10.4.

(cherry picked from commit e634f3fbe0)
This commit is contained in:
Kristian Rietveld 2010-06-27 10:32:12 +02:00
parent 64f11c366a
commit 7f2e4c38a9
5 changed files with 16 additions and 13 deletions

View File

@ -23,6 +23,7 @@
#include "gdkregion-generic.h"
#include "gdkwindow-quartz.h"
#include "gdkprivate-quartz.h"
#include "gdkquartz.h"
@implementation GdkQuartzView

View File

@ -27,6 +27,7 @@
#include <gdk/gdkprivate.h>
#include <gdk/quartz/gdkpixmap-quartz.h>
#include <gdk/quartz/gdkwindow-quartz.h>
#include <gdk/quartz/gdkquartz.h>
#include <gdk/gdk.h>

View File

@ -26,6 +26,19 @@
G_BEGIN_DECLS
/* NSInteger only exists in Leopard and newer. This check has to be
* done after inclusion of the system headers. If NSInteger has not
* been defined, we know for sure that we are on 32-bit.
*/
#ifndef NSINTEGER_DEFINED
typedef int NSInteger;
typedef unsigned int NSUInteger;
#endif
#ifndef CGFLOAT_DEFINED
typedef float CGFloat;
#endif
NSWindow *gdk_quartz_window_get_nswindow (GdkWindow *window);
NSView *gdk_quartz_window_get_nsview (GdkWindow *window);
NSImage *gdk_quartz_pixbuf_to_ns_image_libgtk_only (GdkPixbuf *pixbuf);

View File

@ -25,19 +25,6 @@
#import <gdk/quartz/GdkQuartzView.h>
#import <gdk/quartz/GdkQuartzWindow.h>
/* NSInteger only exists in Leopard and newer. This check has to be
* done after inclusion of the system headers. If NSInteger has not
* been defined, we know for sure that we are on 32-bit.
*/
#ifndef NSINTEGER_DEFINED
typedef int NSInteger;
typedef unsigned int NSUInteger;
#endif
#ifndef CGFLOAT_DEFINED
typedef float CGFloat;
#endif
G_BEGIN_DECLS
/* Window implementation for Quartz

View File

@ -21,6 +21,7 @@
#include "config.h"
#include "gtkquartz.h"
#include <gdk/quartz/gdkquartz.h>
#include "gtkalias.h"
NSImage *