vcl/aqua/source/a11y/aqua11ywrapper.mm | 8 ++++----
vcl/aqua/source/app/saldata.cxx | 2 +-
vcl/aqua/source/app/salinst.cxx | 8 ++++----
vcl/aqua/source/app/vclnsapp.mm | 2 +-
vcl/aqua/source/window/salframeview.mm | 4 ++--
vcl/aqua/source/window/salmenu.cxx | 2 +-
vcl/inc/aqua/aqua11ywrapper.h | 2 +-
vcl/inc/aqua/saldata.hxx | 8 ++++++--
vcl/inc/aqua/salframeview.h | 2 +-
9 files changed, 21 insertions(+), 17 deletions(-)
New commits:
commit a7d6569fdecc36bd5ca093442a9b7aec093637d5
Author: Herbert Dürr <h...@apache.org>
Date: Thu Feb 6 15:02:34 2014 +0000
#i123795# amend r1565258's commit with its missing part
diff --git a/vcl/aqua/source/window/salframeview.mm
b/vcl/aqua/source/window/salframeview.mm
index 4d46c1b..d2e0ec7 100644
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -1717,7 +1717,7 @@ private:
}
-(NSWindow*)windowForParent
- {
+{
return mpFrame->getNSWindow();
}
diff --git a/vcl/inc/aqua/salframeview.h b/vcl/inc/aqua/salframeview.h
index 123d510..b9145b0 100644
--- a/vcl/inc/aqua/salframeview.h
+++ b/vcl/inc/aqua/salframeview.h
@@ -178,7 +178,7 @@
-(void)resetCursorRects;
-(::com::sun::star::accessibility::XAccessibleContext *)accessibleContext;
-(id)parentAttribute;
--(NSView *)viewElementForParent;
+-(NSWindow*)windowForParent;
/*
Event hook for D&D service.
commit c9ea709614473bf50303d357c87a66940db93d9e
Author: Herbert Dürr <h...@apache.org>
Date: Thu Feb 6 14:14:27 2014 +0000
#i114728# set AOO's Mac baseline to OSX 10.7
diff --git a/vcl/aqua/source/app/saldata.cxx b/vcl/aqua/source/app/saldata.cxx
index b2d658e..49a8b4f 100644
--- a/vcl/aqua/source/app/saldata.cxx
+++ b/vcl/aqua/source/app/saldata.cxx
@@ -53,7 +53,7 @@ SalData::SalData()
mxP50Pattern( NULL ),
maCursors( POINTER_COUNT, INVALID_CURSOR_PTR ),
mbIsScrollbarDoubleMax( false ),
- mnSystemVersion( VER_TIGER ),
+ mnSystemVersion( OSX_VER_LION ),
mpMainController( NULL ),
mpDockIconClickHandler( nil ),
mnDPIX( 0 ),
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index fe94102..26cccd4 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -178,13 +178,13 @@ static void initNSApp()
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 )
+ SInt32 systemVersion = OSX_VER_LION; // initialize with the minimal
requirement
+ const OSErr err = Gestalt( gestaltSystemVersion, &systemVersion);
+ if( err == noErr )
{
GetSalData()->mnSystemVersion = systemVersion;
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "System Version %x\n", (unsigned int)systemVersion);
+ fprintf( stderr, "OSX System Version 0x%04x\n", (unsigned
int)systemVersion);
#endif
}
else
diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm
index 23785aa..af63414 100644
--- a/vcl/aqua/source/app/vclnsapp.mm
+++ b/vcl/aqua/source/app/vclnsapp.mm
@@ -182,7 +182,7 @@
}
}
}
- else if( eType == NSScrollWheel && ( GetSalData()->mnSystemVersion <
VER_LEOPARD /* fixed in Leopard and above */ ) )
+ else if( eType == NSScrollWheel && ( GetSalData()->mnSystemVersion <
OSX_VER_LEOPARD /* fixed in Leopard and above */ ) )
{
NSWindow* pWin = [pEvent window];
diff --git a/vcl/aqua/source/window/salmenu.cxx
b/vcl/aqua/source/window/salmenu.cxx
index 551c74f..4d92987 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/aqua/source/window/salmenu.cxx
@@ -868,7 +868,7 @@ void AquaSalMenu::RemoveMenuBarButton( sal_uInt16 i_nId )
Rectangle AquaSalMenu::GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId,
SalFrame* i_pReferenceFrame )
{
- if( GetSalData()->mnSystemVersion < VER_LEOPARD )
+ if( GetSalData()->mnSystemVersion < OSX_VER_LEOPARD )
return Rectangle( Point( -1, -1 ), Size( 1, 1 ) );
if( ! i_pReferenceFrame || ! AquaSalFrame::isAlive(
static_cast<AquaSalFrame*>(i_pReferenceFrame) ) )
diff --git a/vcl/inc/aqua/saldata.hxx b/vcl/inc/aqua/saldata.hxx
index 134db76..2d0b07b 100644
--- a/vcl/inc/aqua/saldata.hxx
+++ b/vcl/inc/aqua/saldata.hxx
@@ -58,8 +58,12 @@ class SystemFontList;
#define SAL_CLIPRECT_COUNT 16
-#define VER_TIGER 0x1040
-#define VER_LEOPARD 0x1050
+#define OSX_VER_TIGER 0x1040
+#define OSX_VER_LEOPARD 0x1050
+#define OSX_VER_SNOW_LEO 0x1060
+#define OSX_VER_LION 0x1070
+#define OSX_VER_MOUNTLION 0x1080
+#define OSX_VER_MAVERICKS 0x1070
// -----------
// - SalData -
commit 96cd47d49a3aa5b1e3b96b649f40e516ca568d4b
Author: Herbert Dürr <h...@apache.org>
Date: Thu Feb 6 14:07:50 2014 +0000
#i123795# add a windowForParent() method for AquaA11yWrapper
for getting the parent window of an A11y enabled NSView. The method
viewElementForParent() was abused for that purpose, but it was mis-named
and mis-typed. The new method cleans this up and the now unused
viewElementForParent() method can be retired.
diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm
b/vcl/aqua/source/a11y/aqua11ywrapper.mm
index 4aa96ca..a0e7559 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm
@@ -380,8 +380,8 @@ static BOOL isPopupMenuOpen = NO;
[ aWrapper autorelease ];
}
// get associated NSWindow
- NSView * theView = [ aWrapper viewElementForParent ];
- return theView;
+ NSWindow* theWindow = [ aWrapper windowForParent ];
+ return theWindow;
}
-(id)topLevelUIElementAttribute {
@@ -1101,8 +1101,8 @@ Reference < XAccessibleContext > hitTestRunner (
com::sun::star::awt::Point poin
return mpReferenceWrapper -> rAccessibleMultiLineText.get();
}
--(NSView *)viewElementForParent {
- return self;
+-(NSWindow*)windowForParent {
+ return [self window];
}
// These four are for AXTextAreas only. They are needed, because bold and
italic
diff --git a/vcl/aqua/source/window/salframeview.mm
b/vcl/aqua/source/window/salframeview.mm
index 418ac64..4d46c1b 100644
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -1716,9 +1716,9 @@ private:
return [ super accessibleContext ];
}
--(NSView*)viewElementForParent
-{
- return mpFrame->getNSView();
+-(NSWindow*)windowForParent
+ {
+ return mpFrame->getNSWindow();
}
-(void)registerMouseEventListener: (id)theListener
diff --git a/vcl/inc/aqua/aqua11ywrapper.h b/vcl/inc/aqua/aqua11ywrapper.h
index 961fef2..812bb7a 100644
--- a/vcl/inc/aqua/aqua11ywrapper.h
+++ b/vcl/inc/aqua/aqua11ywrapper.h
@@ -90,7 +90,7 @@ struct ReferenceWrapper
// Wrapper-specific
-(void)setActsAsRadioGroup:(BOOL)actsAsRadioGroup;
-(BOOL)actsAsRadioGroup;
--(NSView *)viewElementForParent;
+-(NSWindow*)windowForParent;
-(id)initWithAccessibleContext: (::com::sun::star::uno::Reference <
::com::sun::star::accessibility::XAccessibleContext >) anAccessibleContext;
-(void) setDefaults: (::com::sun::star::uno::Reference <
::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext;
-(void) dealloc;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
