Commit c4ea5571 authored by David Fuhrmann's avatar David Fuhrmann Committed by Felix Paul Kühne

macosx: remove outdated and unused isFullscreen methods

(cherry picked from commit 18dee68f3ace8adfda6e5982daa41755103f9723)
Signed-off-by: default avatarFelix Paul Kühne <fkuehne@videolan.org>
parent dac588bc
...@@ -209,7 +209,6 @@ ...@@ -209,7 +209,6 @@
NSRect previousSavedFrame; NSRect previousSavedFrame;
} }
- (BOOL)isFullscreen;
- (void)customZoom:(id)sender; - (void)customZoom:(id)sender;
@end @end
...@@ -1785,7 +1785,6 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1785,7 +1785,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
rect.origin.x += [o_videoWindow frame].origin.x; rect.origin.x += [o_videoWindow frame].origin.x;
rect.origin.y += [o_videoWindow frame].origin.y; rect.origin.y += [o_videoWindow frame].origin.y;
o_fullscreen_window = [[VLCWindow alloc] initWithContentRect:rect styleMask: NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES]; o_fullscreen_window = [[VLCWindow alloc] initWithContentRect:rect styleMask: NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES];
[o_fullscreen_window setFullscreen: YES];
[o_fullscreen_window setBackgroundColor: [NSColor blackColor]]; [o_fullscreen_window setBackgroundColor: [NSColor blackColor]];
[o_fullscreen_window setCanBecomeKeyWindow: YES]; [o_fullscreen_window setCanBecomeKeyWindow: YES];
[o_fullscreen_window setCanBecomeMainWindow: YES]; [o_fullscreen_window setCanBecomeMainWindow: YES];
...@@ -2656,11 +2655,6 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -2656,11 +2655,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
[[VLCCoreInteraction sharedInstance] toggleFullscreen]; [[VLCCoreInteraction sharedInstance] toggleFullscreen];
} }
- (BOOL)isFullscreen
{
return [[VLCMainWindow sharedInstance] isFullscreen];
}
- (void)performClose:(id)sender - (void)performClose:(id)sender
{ {
if (b_dark_interface || !b_video_deco) if (b_dark_interface || !b_video_deco)
......
...@@ -149,7 +149,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -149,7 +149,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
if( key == (unichar) 0x1b ) if( key == (unichar) 0x1b )
{ {
playlist_t * p_playlist = pl_Get( VLCIntf ); playlist_t * p_playlist = pl_Get( VLCIntf );
if( var_GetBool( p_playlist, "fullscreen") ) if( var_GetBool( p_playlist, "fullscreen" ) )
[[VLCCoreInteraction sharedInstance] toggleFullscreen]; [[VLCCoreInteraction sharedInstance] toggleFullscreen];
} }
/* handle Lion's default key combo for fullscreen-toggle in addition to our own hotkeys */ /* handle Lion's default key combo for fullscreen-toggle in addition to our own hotkeys */
......
...@@ -62,7 +62,6 @@ ...@@ -62,7 +62,6 @@
BOOL b_isset_canBecomeKeyWindow; BOOL b_isset_canBecomeKeyWindow;
BOOL b_canBecomeMainWindow; BOOL b_canBecomeMainWindow;
BOOL b_isset_canBecomeMainWindow; BOOL b_isset_canBecomeMainWindow;
BOOL b_isFullscreen;
NSViewAnimation *animation; NSViewAnimation *animation;
} }
...@@ -82,9 +81,6 @@ ...@@ -82,9 +81,6 @@
/* animate mode is only supported in >=10.4 */ /* animate mode is only supported in >=10.4 */
- (void)closeAndAnimate: (BOOL)animate; - (void)closeAndAnimate: (BOOL)animate;
- (void)setFullscreen:(BOOL)b_var;
- (BOOL)isFullscreen;
@end @end
......
...@@ -180,7 +180,6 @@ static NSMutableArray *blackoutWindows = NULL; ...@@ -180,7 +180,6 @@ static NSMutableArray *blackoutWindows = NULL;
self = [super initWithContentRect:contentRect styleMask:styleMask backing:backingType defer:flag]; self = [super initWithContentRect:contentRect styleMask:styleMask backing:backingType defer:flag];
if( self ) if( self )
{ {
b_isFullscreen = NO;
b_isset_canBecomeKeyWindow = NO; b_isset_canBecomeKeyWindow = NO;
/* we don't want this window to be restored on relaunch */ /* we don't want this window to be restored on relaunch */
if (OSX_LION) if (OSX_LION)
...@@ -369,16 +368,6 @@ static NSMutableArray *blackoutWindows = NULL; ...@@ -369,16 +368,6 @@ static NSMutableArray *blackoutWindows = NULL;
} }
} }
- (void)setFullscreen:(BOOL)b_var
{
b_isFullscreen = b_var;
}
- (BOOL)isFullscreen
{
return b_isFullscreen;
}
- (IBAction)fullscreen:(id)sender - (IBAction)fullscreen:(id)sender
{ {
[[VLCCoreInteraction sharedInstance] toggleFullscreen]; [[VLCCoreInteraction sharedInstance] toggleFullscreen];
......
...@@ -48,10 +48,6 @@ ...@@ -48,10 +48,6 @@
#include <vlc_dialog.h> #include <vlc_dialog.h>
#include "opengl.h" #include "opengl.h"
@interface NSWindow (VLCCustomCode)
- (BOOL)isFullscreen;
@end
/* compilation support for 10.5 and 10.6 */ /* compilation support for 10.5 and 10.6 */
#define OSX_LION NSAppKitVersionNumber >= 1115.2 #define OSX_LION NSAppKitVersionNumber >= 1115.2
#ifndef MAC_OS_X_VERSION_10_7 #ifndef MAC_OS_X_VERSION_10_7
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment