applied patch from ticket #165 + improved compatibility with MacOSX 10.5

git-svn-id: https://code.ros.org/svn/opencv/trunk@2815 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/src/highgui/window_cocoa.mm b/opencv/src/highgui/window_cocoa.mm
index f3bf44c831eb32864b42abe3efdf798134e704dd..de7df73847bb313a23349358c7e4fd22a0fe132b 100644 (file)
--- a/opencv/src/highgui/window_cocoa.mm
+++ b/opencv/src/highgui/window_cocoa.mm
@@ -106,8 +106,9 @@ CV_IMPL int cvInitSystem( int argc, char** argv)
        pool = [[NSAutoreleasePool alloc] init];
        application = [NSApplication sharedApplication];
        windows = [[NSMutableDictionary alloc] init];
-    
-    [application setActivationPolicy:NSApplicationActivationPolicyRegular];
+
+    if( floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5 )
+        [application setActivationPolicy:0/*NSApplicationActivationPolicyRegular*/];
     [application finishLaunching];
     atexit(icvCocoaCleanup);
        
@@ -400,7 +401,7 @@ CV_IMPL int cvWaitKey (int maxWait)
     CVWindow *window = (CVWindow *)[[self contentView] window];
     for(NSString *key in [window sliders]) {
         NSSlider *slider = [[window sliders] valueForKey:key];
-        viewHeight = std::min(viewHeight, [slider frame].origin.y);
+        viewHeight = std::min(viewHeight, (double)([slider frame].origin.y));
     }
     viewHeight -= TOP_BORDER;
     mp.y = viewHeight - mp.y;