← Back to branch summary

~ubuntu-branches/ubuntu/precise/gtk+2.0/precise-updates

« back to all changes in this revision

Viewing changes to gdk/quartz/gdkwindow-quartz.c

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2011-09-08 20:30:15 UTC
  • mfrom: (1.14.10 upstream)
  • Revision ID: package-import@ubuntu.com-20110908203015-hmdoq5jt1bl50nq3
Tags: 2.24.6-0ubuntu1
* debian/watch: Look for bz2 tarballs, and restrict to GTK 2 versions.
* New upstream bug fix release.
* Drop 094_git_fileselector_error.patch, include_m4_dir.patch: Included
  upstream.
* 003_gdk.pc_privates.patch, 009_gtk-export-filechooser.patch: Unfuzz.
* debian/libgail-doc.install, debian/libgtk2.0-doc.install.in: Install
  documentation from the source tree, as it's not being installed any more.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gdk/quartz/gdkwindow-quartz.c
2622
2622
 
2623
2623
  old_mask = [impl->toplevel styleMask];
2624
2624
 
2625
 
  /* Note, there doesn't seem to be a way to change this without
2626
 
   * recreating the toplevel. There might be bad side-effects of doing
2627
 
   * that, but it seems alright.
2628
 
   */
2629
2625
  if (old_mask != new_mask)
2630
2626
    {
2631
2627
      NSRect rect;
2649
2645
          rect = [NSWindow contentRectForFrameRect:rect styleMask:old_mask];
2650
2646
        }
2651
2647
 
2652
 
      impl->toplevel = [impl->toplevel initWithContentRect:rect
2653
 
                                                 styleMask:new_mask
2654
 
                                                   backing:NSBackingStoreBuffered
2655
 
                                                     defer:NO];
2656
 
 
2657
 
      [impl->toplevel setHasShadow: window_type_hint_to_shadow (impl->type_hint)];
2658
 
      [impl->toplevel setLevel: window_type_hint_to_level (impl->type_hint)];
2659
 
 
2660
 
      [impl->toplevel setContentView:old_view];
 
2648
      /* Note, before OS 10.6 there doesn't seem to be a way to change this without
 
2649
       * recreating the toplevel. There might be bad side-effects of doing
 
2650
       * that, but it seems alright.
 
2651
       */
 
2652
      if ([impl->toplevel respondsToSelector:@selector(setStyleMask:)])
 
2653
        {
 
2654
          [impl->toplevel setStyleMask:new_mask];
 
2655
        }
 
2656
      else
 
2657
        {
 
2658
          [impl->toplevel release];
 
2659
          impl->toplevel = [[GdkQuartzWindow alloc] initWithContentRect:rect
 
2660
                                                                styleMask:new_mask
 
2661
                                                                  backing:NSBackingStoreBuffered
 
2662
                                                                    defer:NO];
 
2663
          [impl->toplevel setHasShadow: window_type_hint_to_shadow (impl->type_hint)];
 
2664
          [impl->toplevel setLevel: window_type_hint_to_level (impl->type_hint)];
 
2665
          [impl->toplevel setContentView:old_view];
 
2666
        }
 
2667
 
2661
2668
      [impl->toplevel setFrame:rect display:YES];
2662
2669
 
2663
2670
      /* Invalidate the window shadow for non-opaque views that have shadow