vlc | branch: master | Marvin Scholz <epira...@gmail.com> | Fri Sep 9 15:58:23 2016 +0200| [354e17c871e3deffdcd01cc9b7f5cf859e734d09] | committer: Jean-Baptiste Kempf
macosx: Fix more weak NSWindow references Weak NSWindow references are not allowed on 10.7, and will lead to runtime crashes. Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=354e17c871e3deffdcd01cc9b7f5cf859e734d09 --- modules/gui/macosx/VLCConvertAndSaveWindowController.h | 4 ++-- modules/gui/macosx/VLCOpenWindowController.h | 2 +- modules/gui/macosx/simple_prefs.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/gui/macosx/VLCConvertAndSaveWindowController.h b/modules/gui/macosx/VLCConvertAndSaveWindowController.h index 1d24728..d3dbc6f 100644 --- a/modules/gui/macosx/VLCConvertAndSaveWindowController.h +++ b/modules/gui/macosx/VLCConvertAndSaveWindowController.h @@ -62,7 +62,7 @@ @property (weak) IBOutlet NSButton *streamDestinationButton; // customize panel -@property (weak) IBOutlet NSWindow *customizePanel; +@property () IBOutlet NSWindow *customizePanel; @property (weak) IBOutlet NSButton *customizeNewProfileButton; @property (weak) IBOutlet NSButton *customizeCancelButton; @property (weak) IBOutlet NSButton *customizeOkButton; @@ -107,7 +107,7 @@ @property (weak) IBOutlet NSPopUpButton *customizeSubsPopup; // stream panel -@property (weak) IBOutlet NSWindow *streamPanel; +@property () IBOutlet NSWindow *streamPanel; @property (weak) IBOutlet NSTextField *streamDestinationLabel; @property (weak) IBOutlet NSTextField *streamTypeLabel; @property (weak) IBOutlet NSTextField *streamAddressLabel; diff --git a/modules/gui/macosx/VLCOpenWindowController.h b/modules/gui/macosx/VLCOpenWindowController.h index b42c3e9..918bfd4 100644 --- a/modules/gui/macosx/VLCOpenWindowController.h +++ b/modules/gui/macosx/VLCOpenWindowController.h @@ -116,7 +116,7 @@ @property (readwrite, weak) IBOutlet NSButton *netOpenUDPButton; @property (readwrite, weak) IBOutlet NSButton *netUDPCancelButton; @property (readwrite, weak) IBOutlet NSButton *netUDPOKButton; -@property (readwrite, weak) IBOutlet NSWindow *netUDPPanel; +@property (readwrite) IBOutlet NSWindow *netUDPPanel; @property (readwrite, weak) IBOutlet NSTextField *netUDPPortTextField; @property (readwrite, weak) IBOutlet NSTextField *netUDPPortLabel; @property (readwrite, weak) IBOutlet NSStepper *netUDPPortStepper; diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h index 593cc6c..a149518 100644 --- a/modules/gui/macosx/simple_prefs.h +++ b/modules/gui/macosx/simple_prefs.h @@ -51,11 +51,11 @@ @property (readwrite, weak) IBOutlet NSButtonCell *audio_autosavevol_noButtonCell; // hotkeys pane +@property (readwrite) IBOutlet NSWindow *hotkeys_change_win; @property (readwrite, weak) IBOutlet NSButton *hotkeys_changeButton; @property (readwrite, weak) IBOutlet NSTextField *hotkeys_changeLabel; @property (readwrite, weak) IBOutlet NSTextField *hotkeys_change_keysLabel; @property (readwrite, weak) IBOutlet NSTextField *hotkeys_change_takenLabel; -@property (readwrite, weak) IBOutlet NSWindow *hotkeys_change_win; @property (readwrite, weak) IBOutlet NSButton *hotkeys_change_cancelButton; @property (readwrite, weak) IBOutlet NSButton *hotkeys_change_okButton; @property (readwrite, weak) IBOutlet NSButton *hotkeys_clearButton; @@ -201,7 +201,7 @@ @property (readwrite, weak) IBOutlet NSPopUpButton *urlhandler_sftpPopup; @property (readwrite, weak) IBOutlet NSPopUpButton *urlhandler_smbPopup; @property (readwrite, weak) IBOutlet NSPopUpButton *urlhandler_udpPopup; -@property (readwrite, weak) IBOutlet NSWindow *urlhandler_win; +@property (readwrite) IBOutlet NSWindow *urlhandler_win; /* toolbar */ - (NSToolbarItem *)toolbar:(NSToolbar *)o_toolbar _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
