missing commit

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

diff --git a/src/cocoa/NSView.mm b/src/cocoa/NSView.mm
index 0238c5c50a0583312f8ac369e219f0bf59802246..9e9dcd9ca5f662fcd4cabe3176ea8382fa317daa 100644 (file)
--- a/src/cocoa/NSView.mm
+++ b/src/cocoa/NSView.mm
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/NSView.mm
+// Name:        src/cocoa/NSView.mm

 // Purpose:     wxCocoaNSView
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
 // Purpose:     wxCocoaNSView
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

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

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


@@ -22,11 +22,13 @@
     #include "wx/window.h"
 #endif // WX_PRECOMP
 
     #include "wx/window.h"
 #endif // WX_PRECOMP
 

+#include "wx/cocoa/objc/objc_uniquifying.h"

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

-#import <Appkit/NSView.h>

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

+#include "wx/cocoa/objc/NSView.h"
+#include "wx/cocoa/ObjcRef.h"

 
 // ----------------------------------------------------------------------------
 // globals
 
 // ----------------------------------------------------------------------------
 // globals


@@ -35,52 +37,186 @@ 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];
+    }

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

-// @class wxPoserNSView
+// @class WXNSView

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

-@interface wxPoserNSView : NSView
+
+@implementation WXNSView : NSView
+
+- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent

 {
 {

+    bool acceptsFirstMouse = false;
+    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
+    if(!win || !win->Cocoa_acceptsFirstMouse(acceptsFirstMouse, theEvent))
+        acceptsFirstMouse = [super acceptsFirstMouse:theEvent];
+    return acceptsFirstMouse;

 }
 
 }
 

-@end // wxPoserNSView
+- (void)drawRect: (NSRect)rect
+{
+    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
+    if( !win || !win->Cocoa_drawRect(rect) )
+        [super drawRect:rect];
+}
+
+- (void)mouseDown:(NSEvent *)theEvent
+{
+    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
+    if( !win || !win->Cocoa_mouseDown(theEvent) )
+        [super mouseDown:theEvent];
+}

 
 

-WX_IMPLEMENT_POSER(wxPoserNSView);
-@implementation wxPoserNSView : NSView
+- (void)mouseDragged:(NSEvent *)theEvent
+{
+    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
+    if( !win || !win->Cocoa_mouseDragged(theEvent) )
+        [super mouseDragged:theEvent];
+}

 
 

-@end // implementation wxPoserNSView
+- (void)mouseUp:(NSEvent *)theEvent
+{
+    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
+    if( !win || !win->Cocoa_mouseUp(theEvent) )
+        [super mouseUp:theEvent];
+}

 
 

-@interface wxNSViewNotificationObserver : NSObject
+- (void)mouseMoved:(NSEvent *)theEvent
+{
+    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
+    if( !win || !win->Cocoa_mouseMoved(theEvent) )
+        [super mouseMoved:theEvent];
+}
+
+- (void)mouseEntered:(NSEvent *)theEvent
+{
+    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
+    if( !win || !win->Cocoa_mouseEntered(theEvent) )
+        [super mouseEntered:theEvent];
+}
+
+- (void)mouseExited:(NSEvent *)theEvent
+{
+    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
+    if( !win || !win->Cocoa_mouseExited(theEvent) )
+        [super mouseExited:theEvent];
+}
+
+- (void)rightMouseDown:(NSEvent *)theEvent

 {
 {

+    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
+    if( !win || !win->Cocoa_rightMouseDown(theEvent) )
+        [super rightMouseDown:theEvent];

 }
 
 }
 

-// FIXME: Initializing like this is a really bad idea.  If for some reason
-// we ever require posing as an NSObject we won't be able to since an instance
-// will have already been created here.  Of course, catching messages for
-// NSObject seems like a LOT of overkill, so I doubt we ever will anyway!
-void *wxCocoaNSView::sm_cocoaObserver = [[wxNSViewNotificationObserver alloc] init];
+- (void)rightMouseDragged:(NSEvent *)theEvent
+{
+    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
+    if( !win || !win->Cocoa_rightMouseDragged(theEvent) )
+        [super rightMouseDragged:theEvent];
+}
+
+- (void)rightMouseUp:(NSEvent *)theEvent
+{
+    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
+    if( !win || !win->Cocoa_rightMouseUp(theEvent) )
+        [super rightMouseUp:theEvent];
+}
+
+- (void)otherMouseDown:(NSEvent *)theEvent
+{
+    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
+    if( !win || !win->Cocoa_otherMouseDown(theEvent) )
+        [super otherMouseDown:theEvent];
+}
+
+- (void)otherMouseDragged:(NSEvent *)theEvent
+{
+    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
+    if( !win || !win->Cocoa_otherMouseDragged(theEvent) )
+        [super otherMouseDragged:theEvent];
+}
+
+- (void)otherMouseUp:(NSEvent *)theEvent
+{
+    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
+    if( !win || !win->Cocoa_otherMouseUp(theEvent) )
+        [super otherMouseUp:theEvent];
+}
+
+- (void)resetCursorRects
+{
+    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
+    if( !win || !win->Cocoa_resetCursorRects() )
+        [super resetCursorRects];
+}
+
+- (void)viewDidMoveToWindow
+{
+    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
+    if( !win || !win->Cocoa_viewDidMoveToWindow() )
+        [super viewDidMoveToWindow];
+}
+
+- (void)viewWillMoveToWindow:(NSWindow *)newWindow
+{
+    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
+    if( !win || !win->Cocoa_viewWillMoveToWindow(newWindow) )
+        [super viewWillMoveToWindow:newWindow];
+}
+
+@end // implementation WXNSView
+WX_IMPLEMENT_GET_OBJC_CLASS(WXNSView,NSView)
+
+// ============================================================================
+// @class wxNSViewNotificationObserver
+// ============================================================================
+
+@interface wxNSViewNotificationObserver : NSObject
+{
+}

 
 - (void)notificationFrameChanged: (NSNotification *)notification;
 
 - (void)notificationFrameChanged: (NSNotification *)notification;

+- (void)synthesizeMouseMovedForView: (NSView *)theView;

 @end // interface wxNSViewNotificationObserver
 @end // interface wxNSViewNotificationObserver

+WX_DECLARE_GET_OBJC_CLASS(wxNSViewNotificationObserver,NSObject)

 
 @implementation wxNSViewNotificationObserver : NSObject
 
 - (void)notificationFrameChanged: (NSNotification *)notification;
 {
     wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa([notification object]);
 
 @implementation wxNSViewNotificationObserver : NSObject
 
 - (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();
 }
 

+- (void)synthesizeMouseMovedForView: (NSView *)theView
+{
+    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(theView);
+    wxCHECK_RET(win,wxT("synthesizeMouseMovedForView received but no wxWindow exists"));
+    win->Cocoa_synthesizeMouseMoved();
+}
+

 @end // implementation wxNSViewNotificationObserver
 @end // implementation wxNSViewNotificationObserver

+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSViewNotificationObserver,NSObject)

 
 

+// New CF-retained observer (this should have been using wxObjcAutoRefFromAlloc to begin with)
+wxObjcAutoRefFromAlloc<wxNSViewNotificationObserver*> s_cocoaNSViewObserver([[WX_GET_OBJC_CLASS(wxNSViewNotificationObserver) alloc] init]);
+// For compatibility with old code
+id wxCocoaNSView::sm_cocoaObserver = s_cocoaNSViewObserver;