[Libreoffice-commits] core.git: vcl/aqua vcl/inc
Tor Lillqvist
tml at iki.fi
Sun Jun 16 02:19:46 PDT 2013
vcl/aqua/source/app/saldata.cxx | 1 -
vcl/aqua/source/app/salinst.cxx | 15 +--------------
vcl/aqua/source/app/vclnsapp.mm | 12 ------------
vcl/aqua/source/window/salmenu.cxx | 3 ---
vcl/inc/aqua/saldata.hxx | 1 -
5 files changed, 1 insertion(+), 31 deletions(-)
New commits:
commit c93109f5593c19ca443013101ca132e0bdbda8e8
Author: Tor Lillqvist <tml at iki.fi>
Date: Sun Jun 16 12:17:26 2013 +0300
We only support 10.6 or later
No need to check whether running on 10.5 ("Leopard") or later.
Besides, Gestatl() is deprecated in 10.8.
Change-Id: I8d20d1e4d208eef8fbe980cbed4d70662cf4bb0d
diff --git a/vcl/aqua/source/app/saldata.cxx b/vcl/aqua/source/app/saldata.cxx
index dcbd350..185dd0b 100644
--- a/vcl/aqua/source/app/saldata.cxx
+++ b/vcl/aqua/source/app/saldata.cxx
@@ -47,7 +47,6 @@ SalData::SalData()
mxP50Pattern( NULL ),
maCursors( POINTER_COUNT, INVALID_CURSOR_PTR ),
mbIsScrollbarDoubleMax( false ),
- mnSystemVersion( VER_TIGER ),
mpMainController( NULL ),
mpDockIconClickHandler( nil ),
mnDPIX( 0 ),
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 4ccfc97..3a8e5c1 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -169,20 +169,7 @@ static void initNSApp()
name: @"AppleNoRedisplayAppearancePreferenceChanged"
object: nil ];
- // get System Version and store the value in GetSalData()->mnSystemVersion
- OSErr err = noErr;
- 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);
-#endif
- }
- else
- NSLog(@"Unable to obtain system version: %ld", (long)err);
-
- // Initialize Apple Remote
+ // Initialize Apple Remote
GetSalData()->mpMainController = [[MainController alloc] init];
[[NSDistributedNotificationCenter defaultCenter] addObserver: NSApp
diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm
index e3e2518..c4773b9 100644
--- a/vcl/aqua/source/app/vclnsapp.mm
+++ b/vcl/aqua/source/app/vclnsapp.mm
@@ -193,18 +193,6 @@
}
}
}
- else if( eType == NSScrollWheel && ( GetSalData()->mnSystemVersion < VER_LEOPARD /* fixed in Leopard and above */ ) )
- {
-
- NSWindow* pWin = [pEvent window];
- // on Tiger wheel events do not reach non key windows
- // which probably should be considered a bug
- if( [pWin isKindOfClass: [SalFrameWindow class]] && [pWin canBecomeKeyWindow] == NO )
- {
- [[pWin contentView] scrollWheel: pEvent];
- return;
- }
- }
[super sendEvent: pEvent];
}
diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx
index 0bdf9ed..350be25 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/aqua/source/window/salmenu.cxx
@@ -872,9 +872,6 @@ void AquaSalMenu::RemoveMenuBarButton( sal_uInt16 i_nId )
Rectangle AquaSalMenu::GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame* i_pReferenceFrame )
{
- if( GetSalData()->mnSystemVersion < VER_LEOPARD )
- return Rectangle( Point( -1, -1 ), Size( 1, 1 ) );
-
if( ! i_pReferenceFrame || ! AquaSalFrame::isAlive( static_cast<AquaSalFrame*>(i_pReferenceFrame) ) )
return Rectangle();
diff --git a/vcl/inc/aqua/saldata.hxx b/vcl/inc/aqua/saldata.hxx
index d26e616..b0f91d8 100644
--- a/vcl/inc/aqua/saldata.hxx
+++ b/vcl/inc/aqua/saldata.hxx
@@ -89,7 +89,6 @@ public:
static oslThreadKey s_aAutoReleaseKey;
bool mbIsScrollbarDoubleMax; // TODO: support DoubleMin and DoubleBoth too
- SInt32 mnSystemVersion; // Store System Version
MainController* mpMainController; // Apple Remote
NSObject* mpDockIconClickHandler;
More information about the Libreoffice-commits
mailing list