put back Carbon UI as alternative highgui back-end (for MacOSX 10.5 users, where...

[opencv.git] / opencv / src / highgui / window_cocoa.mm

diff --git a/opencv/src/highgui/window_cocoa.mm b/opencv/src/highgui/window_cocoa.mm
index 5db642362dd256fa3526896cdf86bfbc5fb7608d..06916a14eeaf2d63d810764ba62edc9726b8eb54 100644 (file)
--- a/opencv/src/highgui/window_cocoa.mm
+++ b/opencv/src/highgui/window_cocoa.mm
@@ -95,6 +95,7 @@ static void icvCocoaCleanup(void)
     if( application )
     {
         [application terminate:nil];
+        application = 0;
         [pool release];
     }
 }
@@ -108,6 +109,10 @@ CV_IMPL int cvInitSystem( int argc, char** argv)
        windows = [[NSMutableDictionary alloc] init];
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+    
+#ifndef NSAppKitVersionNumber10_5
+#define NSAppKitVersionNumber10_5 949
+#endif
     if( floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5 )
         [application setActivationPolicy:0/*NSApplicationActivationPolicyRegular*/];
 #endif
@@ -149,18 +154,30 @@ CV_IMPL void cvDestroyAllWindows( void )
 CV_IMPL void cvShowImage( const char* name, const CvArr* arr)
 {
        CVWindow *window = cvGetWindow(name);
-       if(window) {
+    if(!window)
+    {
+        cvNamedWindow(name, CV_WINDOW_AUTOSIZE);
+        window = cvGetWindow(name);
+    }
+    
+       if(window)
+    {
         bool empty = [[window contentView] image] == nil;
+        NSRect rect = [window frame];
+        NSRect vrectOld = [[window contentView] frame];
+        
                [[window contentView] setImageData:(CvArr *)arr];
-               if([window autosize] || empty) {
-                       NSRect rect = [window frame];
-                       rect.size = [[[window contentView] image] size];
+               if([window autosize] || empty)
+        {
+                       NSRect vrectNew = vrectOld;
+            vrectNew.size = [[[window contentView] image] size];
+            rect.size.width += vrectNew.size.width - vrectOld.size.width;
+            rect.size.height += vrectNew.size.height - vrectOld.size.height;
                        [window setFrame:rect display:YES];
-               } else {
-                       [window display];
                }
+        else
+                       [window display];
        }
-       
 }
 
 CV_IMPL void cvResizeWindow( const char* name, int width, int height)
@@ -329,7 +346,14 @@ CV_IMPL int cvNamedWindow( const char* name, int flags )
     if( !wasInitialized )
         cvInitSystem(0, 0);
     
-       CVWindow *window = [[CVWindow alloc] initWithContentRect:NSMakeRect(0,0,200,200)
+       CVWindow *window = cvGetWindow(name);
+    if( window )
+    {
+        [window setAutosize:(flags == CV_WINDOW_AUTOSIZE)];
+        return 0;
+    }
+    
+    window = [[CVWindow alloc] initWithContentRect:NSMakeRect(0,0,200,200)
         styleMask:NSTitledWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask|
         (!(flags & CV_WND_PROP_AUTOSIZE) ? NSResizableWindowMask : 0)
         backing:NSBackingStoreBuffered