ASF: help stupid compiler

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

diff --git a/modules/gui/macosx/misc.h b/modules/gui/macosx/misc.h
index bd81f28668176ac8bf55675ec2afbb33503acd4b..a29b4dcf6a5b728a89858b28ce40597bc69faeec 100644 (file)
--- a/modules/gui/macosx/misc.h
+++ b/modules/gui/macosx/misc.h
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * misc.h: code not specific to vlc
  *****************************************************************************
- * Copyright (C) 2003 the VideoLAN team
+ * Copyright (C) 2003-2011 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
+ *          Felix Paul Kühne <fkuehne at videolan dot org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +24,7 @@
 
 #import <Cocoa/Cocoa.h>
 #import <ApplicationServices/ApplicationServices.h>
+#import "CompatibilityFixes.h"
 
 /*****************************************************************************
  * NSAnimation (VLCAddition)
@@ -55,7 +57,7 @@
  *  Missing extension to NSWindow
  *****************************************************************************/
 
-@interface VLCWindow : NSWindow
+@interface VLCWindow : NSWindow <NSWindowDelegate>
 {
     BOOL b_canBecomeKeyWindow;
     BOOL b_isset_canBecomeKeyWindow;
@@ -78,17 +80,6 @@
 @end
 
 
-/*****************************************************************************
- * VLCControllerWindow
- *****************************************************************************/
-
-
-@interface VLCControllerWindow : NSWindow
-{
-}
-
-@end
-
 /*****************************************************************************
  * VLCControllerView
  *****************************************************************************/
@@ -122,24 +113,48 @@
 @end
 
 /*****************************************************************************
- * ITSliderCell
+ * TimeLineSlider
+ *****************************************************************************/
+
+@interface TimeLineSlider : NSSlider
+{
+}
+
+- (void)drawRect:(NSRect)rect;
+- (void)drawKnobInRect:(NSRect)knobRect;
+
+@end
+
+/*****************************************************************************
+ * ITSlider
  *****************************************************************************/
- 
+
 @interface ITSlider : NSSlider
 {
 }
 
+- (void)drawRect:(NSRect)rect;
+- (void)drawKnobInRect:(NSRect)knobRect;
+
+@end
+
+/*****************************************************************************
+ * VLCTimeField interface
+ *****************************************************************************
+ * we need the implementation to catch our click-event in the controller window
+ *****************************************************************************/
+
+@interface VLCTimeField : NSTextField
+{
+}
+- (BOOL)timeRemaining;
 @end
 
 /*****************************************************************************
- * ITSliderCell
+ * VLCMainWindowSplitView interface
  *****************************************************************************/
- 
-@interface ITSliderCell : NSSliderCell
+@interface VLCMainWindowSplitView : NSSplitView
 {
-    NSImage *_knobOff;
-    NSImage *_knobOn;
-    BOOL b_mouse_down;
 }
 
 @end