]> git.sesse.net Git - vlc/commitdiff
gui/macosx: uses the superview object for swapping between the video view and the...
authorSebastien Zwickert <dilaroga@free.fr>
Fri, 25 Dec 2009 20:21:37 +0000 (21:21 +0100)
committerPierre d'Herbemont <pdherbemont@free.fr>
Sat, 26 Dec 2009 09:31:19 +0000 (10:31 +0100)
Signed-off-by: Pierre d'Herbemont <pdherbemont@free.fr>
modules/gui/macosx/embeddedwindow.m

index 48e54e16951c25a73ccb1126338fea233156230e..57622e3dd056cea68a57294798d07f1e838ea84a 100644 (file)
             if ([screen isMainScreen])
                 SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
  
-            [[self contentView] replaceSubview:o_view with:o_temp_view];
+            [[o_view superview] replaceSubview:o_view with:o_temp_view];
             [o_temp_view setFrame:[o_view frame]];
             [o_fullscreen_window setContentView:o_view];
 
  
         /* Make sure we don't see the o_view disappearing of the screen during this operation */
         NSDisableScreenUpdates();
-        [[self contentView] replaceSubview:o_view with:o_temp_view];
+        [[o_view superview] replaceSubview:o_view with:o_temp_view];
         [o_temp_view setFrame:[o_view frame]];
         [o_fullscreen_window setContentView:o_view];
         [o_fullscreen_window makeKeyAndOrderFront:self];
     NSDisableScreenUpdates();
     [o_view retain];
     [o_view removeFromSuperviewWithoutNeedingDisplay];
-    [[self contentView] replaceSubview:o_temp_view with:o_view];
+    [[o_temp_view superview] replaceSubview:o_temp_view with:o_view];
     [o_view release];
     [o_view setFrame:[o_temp_view frame]];
     [self makeFirstResponder: o_view];