diff options
author | marha <marha@users.sourceforge.net> | 2009-11-17 15:53:57 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-11-17 15:53:57 +0000 |
commit | 3fce787ffe938bb3e959ff0b3ec231e54d086c76 (patch) | |
tree | 198f537b43a34301bf781c67193c572f6743f925 /xorg-server/hw/xquartz/X11Controller.h | |
parent | 236c69d6034b152598ce35abaf3559b0eaa89c12 (diff) | |
parent | 578938f1cdd5a06dd6fa28167d575ec980322a5d (diff) | |
download | vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.tar.gz vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.tar.bz2 vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.zip |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/xquartz/X11Controller.h')
-rw-r--r-- | xorg-server/hw/xquartz/X11Controller.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/xorg-server/hw/xquartz/X11Controller.h b/xorg-server/hw/xquartz/X11Controller.h index a86b20f17..9e16f75ce 100644 --- a/xorg-server/hw/xquartz/X11Controller.h +++ b/xorg-server/hw/xquartz/X11Controller.h @@ -55,7 +55,11 @@ typedef unsigned int NSUInteger; #endif #endif +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 +@interface X11Controller : NSObject <NSTableViewDataSource> +#else @interface X11Controller : NSObject +#endif { IBOutlet NSPanel *prefs_panel; @@ -120,6 +124,7 @@ typedef unsigned int NSUInteger; #endif - (void) set_can_quit:(OSX_BOOL)state; - (void) server_ready; +- (OSX_BOOL) application:(NSApplication *)app openFile:(NSString *)filename; - (IBAction) apps_table_show:(id)sender; - (IBAction) apps_table_done:(id)sender; |