math.h/PI integration

[wxWidgets.git] / src / cocoa / NSView.mm

diff --git a/src/cocoa/NSView.mm b/src/cocoa/NSView.mm
index ec0be69062c0ffb4b16cd6b2dd494aa96fe56e3e..364fa030594906b1508ac51100ad67b02f055c17 100644 (file)
--- a/src/cocoa/NSView.mm
+++ b/src/cocoa/NSView.mm
@@ -6,7 +6,7 @@
 // Created:     2003/02/15
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/02/15
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott

-// Licence:     wxWindows license
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -22,9 +22,10 @@
     #include "wx/window.h"
 #endif // WX_PRECOMP
 
     #include "wx/window.h"
 #endif // WX_PRECOMP
 

+#include "wx/cocoa/ObjcPose.h"

 #include "wx/cocoa/NSView.h"
 
 #include "wx/cocoa/NSView.h"
 

-#import <Appkit/NSView.h>
+#import <AppKit/NSView.h>

 #import <Foundation/NSNotification.h>
 #import <Foundation/NSString.h>
 
 #import <Foundation/NSNotification.h>
 #import <Foundation/NSString.h>
 


@@ -35,15 +36,21 @@ WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSView)
 
 void wxCocoaNSView::AssociateNSView(WX_NSView cocoaNSView)
 {
 
 void wxCocoaNSView::AssociateNSView(WX_NSView cocoaNSView)
 {

-    sm_cocoaHash.insert(wxCocoaNSViewHash::value_type(cocoaNSView,this));
-    [[NSNotificationCenter defaultCenter] addObserver:(id)sm_cocoaObserver selector:@selector(notificationFrameChanged:) name:@"NSViewFrameDidChangeNotification" object:cocoaNSView];
-    [cocoaNSView setPostsFrameChangedNotifications: YES];
+    if(cocoaNSView)
+    {
+        sm_cocoaHash.insert(wxCocoaNSViewHash::value_type(cocoaNSView,this));
+        [[NSNotificationCenter defaultCenter] addObserver:(id)sm_cocoaObserver selector:@selector(notificationFrameChanged:) name:@"NSViewFrameDidChangeNotification" object:cocoaNSView];
+        [cocoaNSView setPostsFrameChangedNotifications: YES];
+    }

 }
 
 void wxCocoaNSView::DisassociateNSView(WX_NSView cocoaNSView)
 {
 }
 
 void wxCocoaNSView::DisassociateNSView(WX_NSView cocoaNSView)
 {

-    sm_cocoaHash.erase(cocoaNSView);
-    [[NSNotificationCenter defaultCenter] removeObserver:(id)sm_cocoaObserver name:@"NSViewFrameDidChangeNotification" object:cocoaNSView];
+    if(cocoaNSView)
+    {
+        sm_cocoaHash.erase(cocoaNSView);
+        [[NSNotificationCenter defaultCenter] removeObserver:(id)sm_cocoaObserver name:@"NSViewFrameDidChangeNotification" object:cocoaNSView];
+    }

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -66,6 +73,7 @@ void wxCocoaNSView::DisassociateNSView(WX_NSView cocoaNSView)
 - (void)otherMouseDown:(NSEvent *)theEvent;
 - (void)otherMouseDragged:(NSEvent *)theEvent;
 - (void)otherMouseUp:(NSEvent *)theEvent;
 - (void)otherMouseDown:(NSEvent *)theEvent;
 - (void)otherMouseDragged:(NSEvent *)theEvent;
 - (void)otherMouseUp:(NSEvent *)theEvent;

+- (void)resetCursorRects;

 @end // wxPoserNSView
 
 WX_IMPLEMENT_POSER(wxPoserNSView);
 @end // wxPoserNSView
 
 WX_IMPLEMENT_POSER(wxPoserNSView);


@@ -162,6 +170,13 @@ WX_IMPLEMENT_POSER(wxPoserNSView);
         [super otherMouseUp:theEvent];
 }
 
         [super otherMouseUp:theEvent];
 }
 

+- (void)resetCursorRects
+{
+    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
+    if( !win || !win->Cocoa_resetCursorRects() )
+        [super resetCursorRects];
+}
+

 @end // implementation wxPoserNSView
 
 @interface wxNSViewNotificationObserver : NSObject
 @end // implementation wxPoserNSView
 
 @interface wxNSViewNotificationObserver : NSObject


@@ -182,7 +197,7 @@ void *wxCocoaNSView::sm_cocoaObserver = [[wxNSViewNotificationObserver alloc] in
 - (void)notificationFrameChanged: (NSNotification *)notification;
 {
     wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa([notification object]);
 - (void)notificationFrameChanged: (NSNotification *)notification;
 {
     wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa([notification object]);

-    wxCHECK_RET(win,"notificationFrameChanged received but no wxWindow exists");
+    wxCHECK_RET(win,wxT("notificationFrameChanged received but no wxWindow exists"));

     win->Cocoa_FrameChanged();
 }
 
     win->Cocoa_FrameChanged();
 }