diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-07-01 22:05:42 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-07-01 22:05:42 +0000 |
| commit | 7929b2d1d9058a4f5ee2447982855ad8b58f0ab9 (patch) | |
| tree | 1a258b6d79abde615bb1953a167ecd364f7f1702 /vcl/aqua/source/app/vclnsapp.mm | |
| parent | 4c3adecdef9e3ba2e5f3b5fab8f3bbec0f27b2ab (diff) | |
INTEGRATION: CWS aquavcl08 (1.5.34); FILE MERGED
2008/06/21 22:28:36 ericb 1.5.34.8: #i89655# fix a typo in the implementation
2008/06/02 16:02:29 pl 1.5.34.7: #i88582# dispatch key events to super for non handled key events
2008/06/02 09:05:16 pl 1.5.34.6: RESYNC: (1.5-1.6); FILE MERGED
2008/05/31 08:00:12 ericb 1.5.34.5: #i89600# make comment more consistent
2008/05/31 07:59:12 ericb 1.5.34.4: #i89600# use constant instead of magic
2008/05/20 08:30:52 pl 1.5.34.3: system version is not a pointer
2008/05/20 08:08:53 ericb 1.5.34.2: #i89600# use constant instead of magic
2008/05/19 18:50:27 ericb 1.5.34.1: #i89655# implement SystemVersion for aqua
Diffstat (limited to 'vcl/aqua/source/app/vclnsapp.mm')
| -rwxr-xr-x | vcl/aqua/source/app/vclnsapp.mm | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm index 57f84f784786..f935b477aff8 100755 --- a/vcl/aqua/source/app/vclnsapp.mm +++ b/vcl/aqua/source/app/vclnsapp.mm @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: vclnsapp.mm,v $ - * $Revision: 1.6 $ + * $Revision: 1.7 $ * * This file is part of OpenOffice.org. * @@ -105,11 +105,9 @@ return; } } - else if( eType == NSScrollWheel ) + else if( eType == NSScrollWheel && ( GetSalData()->mnSystemVersion < VER_LEOPARD /* fixed in Leopard and above */ ) ) { - // FIMXE: this is necessary on MacOS 10.4 only - // how do I find out the OS version ? - + NSWindow* pWin = [pEvent window]; // on Tiger wheel events do not reach non key windows // which probably should be considered a bug @@ -122,6 +120,11 @@ [super sendEvent: pEvent]; } +-(void)sendSuperEvent:(NSEvent*)pEvent +{ + [super sendEvent: pEvent]; +} + -(NSMenu*)applicationDockMenu:(NSApplication *)sender { return AquaSalInstance::GetDynamicDockMenu(); @@ -243,6 +246,26 @@ AquaSalMenu::removeFallbackMenuItem( pItem ); } +- (void)getSystemVersionMajor:(unsigned *)major + minor:(unsigned *)minor + bugFix:(unsigned *)bugFix +{ + OSErr err; + SInt32 systemVersion = VER_TIGER; // Initialize with minimal requirement + if ((err = Gestalt(gestaltSystemVersion, &systemVersion)) == noErr) + { + GetSalData()->mnSystemVersion = systemVersion; +#if OSL_DEBUG_LEVEL > 1 + fprintf( stderr, "System Version %x\n", (unsigned int)systemVersion); + fprintf( stderr, "Stored System Version %x\n", (unsigned int)GetSalData()->mnSystemVersion); +#endif + } + else + NSLog(@"Unable to obtain system version: %ld", (long)err); + + return; +} + -(void)addDockMenuItem: (NSMenuItem*)pNewItem { NSMenu* pDock = AquaSalInstance::GetDynamicDockMenu(); |