diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 9 | ||||
| -rw-r--r-- | gdk/quartz/gdkwindow-quartz.c | 45 |
3 files changed, 47 insertions, 16 deletions
@@ -1,3 +1,12 @@ +2006-08-08 Michael Natterer <mitch@imendio.com> + + * gdk/quartz/gdkwindow-quartz.c + (gdk_window_maximize) + (gdk_window_unmaximize): implement. + + (gdk_window_iconify) + (gdk_window_deiconify): remove unneeded autorelease pools. + 2006-08-08 Richard Hult <richard@imendio.com> * gdk/quartz/GdkQuartzView.c: Just expose the minimal region diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c994b205c4..5253c1da07 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2006-08-08 Michael Natterer <mitch@imendio.com> + + * gdk/quartz/gdkwindow-quartz.c + (gdk_window_maximize) + (gdk_window_unmaximize): implement. + + (gdk_window_iconify) + (gdk_window_deiconify): remove unneeded autorelease pools. + 2006-08-08 Richard Hult <richard@imendio.com> * gdk/quartz/GdkQuartzView.c: Just expose the minimal region diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c index 7688d67981..110c0f9c07 100644 --- a/gdk/quartz/gdkwindow-quartz.c +++ b/gdk/quartz/gdkwindow-quartz.c @@ -640,7 +640,9 @@ gdk_window_new (GdkWindow *parent, impl->toplevel = [[GdkQuartzWindow alloc] initWithContentRect:content_rect styleMask:style_mask - backing:NSBackingStoreBuffered defer:NO]; + backing:NSBackingStoreBuffered + defer:NO]; + if (attributes_mask & GDK_WA_TITLE) title = attributes->title; else @@ -1524,12 +1526,12 @@ gdk_window_set_type_hint (GdkWindow *window, level = NSTornOffMenuWindowLevel; shadow = TRUE; break; - + case GDK_WINDOW_TYPE_HINT_SPLASHSCREEN: level = NSPopUpMenuWindowLevel; shadow = TRUE; break; - + case GDK_WINDOW_TYPE_HINT_POPUP_MENU: case GDK_WINDOW_TYPE_HINT_COMBO: level = NSPopUpMenuWindowLevel; @@ -1714,17 +1716,34 @@ gdk_window_unstick (GdkWindow *window) void gdk_window_maximize (GdkWindow *window) { + GdkWindowImplQuartz *impl; + g_return_if_fail (GDK_IS_WINDOW (window)); - /* FIXME: Implement */ + + if (GDK_WINDOW_DESTROYED (window)) + return; + + impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl); + + if (impl->toplevel && ![impl->toplevel isZoomed]) + [impl->toplevel zoom:nil]; } void gdk_window_unmaximize (GdkWindow *window) { + GdkWindowImplQuartz *impl; + g_return_if_fail (GDK_IS_WINDOW (window)); - /* FIXME: Implement */ + if (GDK_WINDOW_DESTROYED (window)) + return; + + impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl); + + if (impl->toplevel && [impl->toplevel isZoomed]) + [impl->toplevel zoom:nil]; } void @@ -1738,12 +1757,9 @@ gdk_window_iconify (GdkWindow *window) return; impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl); - if (!impl->toplevel) - return; - - GDK_QUARTZ_ALLOC_POOL; - [impl->toplevel miniaturize:nil]; - GDK_QUARTZ_RELEASE_POOL; + + if (impl->toplevel) + [impl->toplevel miniaturize:nil]; } void @@ -1757,12 +1773,9 @@ gdk_window_deiconify (GdkWindow *window) return; impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl); - if (!impl->toplevel) - return; - GDK_QUARTZ_ALLOC_POOL; - [impl->toplevel deminiaturize:nil]; - GDK_QUARTZ_RELEASE_POOL; + if (impl->toplevel) + [impl->toplevel deminiaturize:nil]; } void |