Consistent strings to avoid duplications

[vlc] / modules / gui / macosx / MainWindowTitle.h

diff --git a/modules/gui/macosx/MainWindowTitle.h b/modules/gui/macosx/MainWindowTitle.h
index fb85ff5c3bf04400207b9040342028a17b249b5f..201572f877f1eb3b38969c08c1c6b43a5de134b1 100644 (file)
--- a/modules/gui/macosx/MainWindowTitle.h
+++ b/modules/gui/macosx/MainWindowTitle.h
@@ -39,6 +39,15 @@
     NSImage * o_green_img;
     NSImage * o_green_over_img;
     NSImage * o_green_on_img;
+    // yosemite fullscreen images
+    NSImage * o_fullscreen_img;
+    NSImage * o_fullscreen_over_img;
+    NSImage * o_fullscreen_on_img;
+    // old native fullscreen images
+    NSImage * o_old_fullscreen_img;
+    NSImage * o_old_fullscreen_over_img;
+    NSImage * o_old_fullscreen_on_img;
+
     NSShadow * o_window_title_shadow;
     NSDictionary * o_window_title_attributes_dict;
 
@@ -47,35 +56,39 @@
     IBOutlet id o_green_btn;
     IBOutlet id o_fullscreen_btn;
     IBOutlet id o_title_lbl;
+
+    BOOL b_nativeFullscreenMode;
+
+    // state to determine correct image for green bubble
+    BOOL b_alt_pressed;
+    BOOL b_mouse_over;
 }
+@property (readonly) NSButton * closeButton;
+@property (readonly) NSButton * minimizeButton;
+@property (readonly) NSButton * zoomButton;
 
+- (void)informModifierPressed:(BOOL)b_is_altkey;
 - (void)loadButtonIcons;
 - (IBAction)buttonAction:(id)sender;
 - (void)setWindowTitle:(NSString *)title;
-- (void)setFullscreenButtonHidden:(BOOL)b_value;
 - (void)setWindowButtonOver:(BOOL)b_value;
 - (void)setWindowFullscreenButtonOver:(BOOL)b_value;
 
 @end
 
 @interface VLCWindowButtonCell : NSButtonCell
-{
-}
+
 @end
 
 @interface VLCResizeControl : NSImageView
-{
-}
+
 @end
 
 @interface VLCColorView : NSView
-{
-}
+
 @end
 
 @interface VLCCustomWindowButtonPrototype: NSButton
-{
-}
 - (NSArray*)extendedAccessibilityAttributeNames: (NSArray*)theAttributeNames;
 - (id)extendedAccessibilityAttributeValue: (NSString*)theAttributeName;
 - (NSNumber*)extendedAccessibilityIsAttributeSettable: (NSString*)theAttributeName;
@@ -83,23 +96,26 @@
 @end
 
 @interface VLCCustomWindowCloseButton: VLCCustomWindowButtonPrototype
-{
-}
+
 @end
 
 
 @interface VLCCustomWindowMinimizeButton: VLCCustomWindowButtonPrototype
-{
-}
+
 @end
 
 
 @interface VLCCustomWindowZoomButton: VLCCustomWindowButtonPrototype
-{
-}
+
 @end
 
 @interface VLCCustomWindowFullscreenButton : VLCCustomWindowButtonPrototype
+
+@end
+
+@interface VLCWindowTitleTextField : NSTextField
 {
+    NSMenu * contextMenu;
 }
+
 @end