[gtk+/wip/window-scales] quartz: Fix the build for the scale_factor changes
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/window-scales] quartz: Fix the build for the scale_factor changes
- Date: Mon, 1 Jul 2013 07:56:32 +0000 (UTC)
commit 8e6eb0da22c72500e927989f2cee095234281272
Author: Alexander Larsson <alexl redhat com>
Date: Mon Jul 1 09:55:45 2013 +0200
quartz: Fix the build for the scale_factor changes
gdk/quartz/gdkscreen-quartz.c | 4 ++--
gdk/quartz/gdkwindow-quartz.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gdk/quartz/gdkscreen-quartz.c b/gdk/quartz/gdkscreen-quartz.c
index dd49e71..e83c87b 100644
--- a/gdk/quartz/gdkscreen-quartz.c
+++ b/gdk/quartz/gdkscreen-quartz.c
@@ -436,12 +436,12 @@ gint
_gdk_quartz_screen_get_monitor_scale_factor (GdkScreen *screen,
gint monitor_num)
{
- GdkScreenQuartz *quartz_screen;
+ GdkQuartzScreen *quartz_screen;
NSArray *array;
NSScreen *nsscreen;
gint scale_factor = 1;
- quartz_screen = GDK_SCREEN_QUARTZ (screen);
+ quartz_screen = GDK_QUARTZ_SCREEN (screen);
GDK_QUARTZ_ALLOC_POOL;
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 4964e95..fd01e1a 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -3014,7 +3014,7 @@ gdk_quartz_window_get_scale_factor (GdkWindow *window)
if (GDK_WINDOW_DESTROYED (window))
return 1;
- impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl);
+ impl = GDK_WINDOW_IMPL_QUARTZ (window->impl);
if (gdk_quartz_osx_version() >= GDK_OSX_LION)
return [(id <ScaleFactor>) impl->toplevel backingScaleFactor];
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]