[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 2 commits - vcl/osx

[Douglas Mencken]

Rebased ref, commits from common ancestor:
commit a028cf645411e080127b2e87172a347ba512cf54
Author: Douglas Mencken <dougmencken at gmail.com>
Date:   Sat Oct 25 11:03:56 2014 -0400

    workarounds for `objc_msgSend' on 10.5
    
    (vcl/osx/salframe.cxx, vcl/osx/salmenu.cxx)
    
    plus, move conditional includes in salframe.cxx down a bit
    
    Change-Id: I39886b4590f227ec69042fed0f5240ba0b0fd7f2

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index ce3e371..dacf9fe 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -37,11 +37,6 @@
 #include "osx/a11yfactory.h"
 #include "quartz/utils.h"
 
-#if MACOSX_SDK_VERSION < 1060
-#include "vcl/timer.hxx"
-#include "osx/saltimer.h"
-#endif
-
 #include "salwtype.hxx"
 
 #include "premac.h"
@@ -54,6 +49,11 @@
 #include <Carbon/Carbon.h>
 #include "postmac.h"
 
+#if MACOSX_SDK_VERSION < 1060
+#include "vcl/timer.hxx"
+#include "osx/saltimer.h"
+#endif
+
 using namespace std;
 
 AquaSalFrame* AquaSalFrame::s_pCaptureFrame = NULL;
@@ -201,16 +201,16 @@ void AquaSalFrame::initWindowAndView()
         [mpNSWindow setAcceptsMouseMovedEvents: YES];
     [mpNSWindow setHasShadow: YES];
 
-#if MACOSX_SDK_VERSION < 1060
-    objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow);
-#else
+#if MACOSX_SDK_VERSION >= 1070
+    /* objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow); */
     [mpNSWindow setDelegate: static_cast<id<NSWindowDelegate> >(mpNSWindow)];
-#endif
 
     if( [mpNSWindow respondsToSelector: @selector(setRestorable:)])
     {
         objc_msgSend(mpNSWindow, @selector(setRestorable:), NO);
     }
+#endif
+
     const NSRect aRect = { NSZeroPoint, NSMakeSize( maGeometry.nWidth, maGeometry.nHeight )};
     mnTrackingRectTag = [mpNSView addTrackingRect: aRect owner: mpNSView userData: nil assumeInside: NO];
 
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 32ce46b..abbc1a0 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -246,9 +246,7 @@ AquaSalMenu::AquaSalMenu( bool bMenuBar ) :
     if( ! mbMenuBar )
     {
         mpMenu = [[SalNSMenu alloc] initWithMenu: this];
-#if MACOSX_SDK_VERSION < 1060
-        objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu);
-#else
+#if MACOSX_SDK_VERSION >= 1060
         [mpMenu setDelegate: (id<NSMenuDelegate>)mpMenu];
 #endif
     }
commit 086674b7d9ce930343e18854c1a480fe0265daa0
Author: Douglas Mencken <dougmencken at gmail.com>
Date:   Sun Oct 26 06:38:10 2014 -0400

    vcl: fix some "cannot convert 'objc_object*' to..." issues
    
    Change-Id: I4b0e32c412937da4b2ea4bf350be32ea31362b3c

diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index 4e19e1d..f821da7 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -160,7 +160,7 @@ static std::ostream &operator<<(std::ostream &s, NSPoint point) {
 // (getter with parameter)    attributeNameHereAttributeForParameter:
 // (setter)                   setAttributeNameHereAttributeForElement:to:
 -(SEL)selectorForAttribute:(NSString *)attribute asGetter:(BOOL)asGetter withGetterParameter:(BOOL)withGetterParameter {
-    SEL selector = nil;
+    SEL selector = (SEL)nil;
     NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ];
     @try {
         // step 1: create method name from attribute name
@@ -186,7 +186,7 @@ static std::ostream &operator<<(std::ostream &s, NSPoint point) {
         // step 2: create selector
         selector = NSSelectorFromString ( methodName );
     } @catch ( id exception ) {
-        selector = nil;
+        selector = (SEL)nil;
     }
     [ pool release ];
     return selector;
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 19dda57..4e90836 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -482,7 +482,7 @@ static AquaSalFrame* getMouseContainerFrame()
         mpFrame = pFrame;
         mMarkedRange = NSMakeRange(NSNotFound, 0);
         mSelectedRange = NSMakeRange(NSNotFound, 0);
-        mpReferenceWrapper = nil;
+        mpReferenceWrapper = (ReferenceWrapper*)nil;
         mpMouseEventListener = nil;
         mpLastSuperEvent = nil;
     }
@@ -1788,7 +1788,7 @@ private:
         // some frames never become visible ..
         ::vcl::Window *pWindow = mpFrame -> GetWindow();
         if ( ! pWindow )
-            return nil;
+            return (::com::sun::star::accessibility::XAccessibleContext*)nil;
 
         mpReferenceWrapper = new ReferenceWrapper;
         mpReferenceWrapper -> rAccessibleContext =  pWindow -> /*GetAccessibleChildWindow( 0 ) ->*/ GetAccessible() -> getAccessibleContext();
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index ce3ab41..69f7753 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -558,7 +558,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                         [NSNumber numberWithBool:NO], @"kCUIWindowFrameDrawTitleSeparatorKey",
                         [NSNumber numberWithBool:YES], @"is.flipped",
                         nil],
-                        nil);;
+                        (const __CFDictionary**)nil);;
             }
             else
             {