diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-16 15:34:33 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-16 15:34:33 +0000 |
| commit | 0b8629ada4293370d220bbb7e6c195c711baee7d (patch) | |
| tree | a7774b45662db90282ae18b17eb3d8f77d8c746d /xorg-server/hw/xquartz/X11Controller.h | |
| parent | 8654ee514b4d79feec936501717a06892090d3b7 (diff) | |
| download | vcxsrv-0b8629ada4293370d220bbb7e6c195c711baee7d.tar.gz vcxsrv-0b8629ada4293370d220bbb7e6c195c711baee7d.tar.bz2 vcxsrv-0b8629ada4293370d220bbb7e6c195c711baee7d.zip | |
svn merge -r534:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz/X11Controller.h')
| -rw-r--r-- | xorg-server/hw/xquartz/X11Controller.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/hw/xquartz/X11Controller.h b/xorg-server/hw/xquartz/X11Controller.h index 9e16f75ce..65a09b8d5 100644 --- a/xorg-server/hw/xquartz/X11Controller.h +++ b/xorg-server/hw/xquartz/X11Controller.h @@ -55,10 +55,9 @@ typedef unsigned int NSUInteger; #endif #endif -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 -@interface X11Controller : NSObject <NSTableViewDataSource> -#else @interface X11Controller : NSObject +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 +<NSTableViewDataSource> #endif { IBOutlet NSPanel *prefs_panel; @@ -69,6 +68,7 @@ typedef unsigned int NSUInteger; IBOutlet NSButton *use_sysbeep; IBOutlet NSButton *enable_keyequivs; IBOutlet NSButton *sync_keymap; + IBOutlet NSButton *option_sends_alt; IBOutlet NSButton *click_through; IBOutlet NSButton *focus_follows_mouse; IBOutlet NSButton *focus_on_new_window; |