Import AppKit.h instead of Quartz.h. Don't use userSpaceScaleFactor for

2007-02-18  Richard Hult  <richard@imendio.com>

	* gdk/quartz/GdkQuartzView.h:
	* gdk/quartz/GdkQuartzWindow.h:
	* gdk/quartz/gdkquartz.h: Import AppKit.h instead of Quartz.h.
	* gdk/quartz/gdkscreen-quartz.c: (get_mm_from_pixels): Don't use
	userSpaceScaleFactor for 10.3. Those changes bring us closer to working
	on panther, patch from Mathias Hasselmann.

	* gdk/quartz/gdkeventloop-quartz.c: Add includes to fix build warnings.

svn path=/trunk/; revision=17323

diff --git a/ChangeLog b/ChangeLog
index 7bb35b11e0534f21688d642305a8d4f0027d68f0..c9c85bb894fe01453887ccb754b2c8cb7f3214cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-02-18  Richard Hult  <richard@imendio.com>
+
+       * gdk/quartz/GdkQuartzView.h:
+       * gdk/quartz/GdkQuartzWindow.h:
+       * gdk/quartz/gdkquartz.h: Import AppKit.h instead of Quartz.h.
+       * gdk/quartz/gdkscreen-quartz.c: (get_mm_from_pixels): Don't use 
+       userSpaceScaleFactor for 10.3. Those changes bring us closer to working
+       on panther, patch from Mathias Hasselmann.
+       
+       * gdk/quartz/gdkeventloop-quartz.c: Add includes to fix build warnings.
+
 2007-02-16  Behdad Esfahbod  <behdad@gnome.org>
 
        * gdk/gdkpango.c (gdk_pango_layout_get_clip_region): Use PANGO_PIXELS

diff --git a/gdk/quartz/GdkQuartzView.h b/gdk/quartz/GdkQuartzView.h
index 0e25b2eccd2c9734eb720f07b6ae414078e7f8be..28f6a9377401efc40deb339a8c0cb60cce0e767d 100644 (file)
--- a/gdk/quartz/GdkQuartzView.h
+++ b/gdk/quartz/GdkQuartzView.h
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Quartz/Quartz.h>
+#import <AppKit/AppKit.h>
 #include "gdkwindow.h"
 
 @interface GdkQuartzView : NSView {

diff --git a/gdk/quartz/GdkQuartzWindow.h b/gdk/quartz/GdkQuartzWindow.h
index c73da55821d56b06916edbe7e574b9464bdc5321..5a00397095f84728851fc7b2800400e02a12d96b 100644 (file)
--- a/gdk/quartz/GdkQuartzWindow.h
+++ b/gdk/quartz/GdkQuartzWindow.h
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Quartz/Quartz.h>
+#import <AppKit/AppKit.h>
 #include "gdkwindow.h"
 
 @interface GdkQuartzWindow : NSWindow {

diff --git a/gdk/quartz/gdkeventloop-quartz.c b/gdk/quartz/gdkeventloop-quartz.c
index 012966bce4906bb08f9449950b8daf650a6860d1..5c0866b6b3921f2154eb79a9b440076eceb9dcd3 100644 (file)
--- a/gdk/quartz/gdkeventloop-quartz.c
+++ b/gdk/quartz/gdkeventloop-quartz.c
@@ -2,6 +2,9 @@
 
 #include <glib.h>
 #include <pthread.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <unistd.h>
 
 #include "gdkprivate-quartz.h"
 

diff --git a/gdk/quartz/gdkquartz.h b/gdk/quartz/gdkquartz.h
index 75afaf63687d82ab5c23ee6cdeb68d93e9ffa7e6..0db36fed4233b7f3720ee56ad6ad494efee65f67 100644 (file)
--- a/gdk/quartz/gdkquartz.h
+++ b/gdk/quartz/gdkquartz.h
@@ -1,7 +1,7 @@
 #ifndef __GDK_QUARTZ_H__
 #define __GDK_QUARTZ_H__
 
-#include <Quartz/Quartz.h>
+#include <AppKit/AppKit.h>
 #include "gdk/gdkprivate.h"
 #include "gdkprivate-quartz.h"
 #include "gdkdrawable-quartz.h"

diff --git a/gdk/quartz/gdkscreen-quartz.c b/gdk/quartz/gdkscreen-quartz.c
index c1484256fa28e6f71c4175c6c65db345f38f38f1..98165c348c7a338c16609be59708ff4183dc058d 100644 (file)
--- a/gdk/quartz/gdkscreen-quartz.c
+++ b/gdk/quartz/gdkscreen-quartz.c
@@ -139,7 +139,13 @@ get_mm_from_pixels (NSScreen *screen, int pixels)
    * 72 is the number of points per inch, 
    * and 25.4 is the number of millimeters per inch.
    */
-  return ((pixels / [screen userSpaceScaleFactor]) / 72) * 25.4;
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3
+  float dpi = [screen userSpaceScaleFactor] * 72.0;
+#else
+  float dpi = 96.0 / 72.0;
+#endif
+
+  return (pixels / dpi) * 25.4;
 }
 
 gint