reverting drawing code

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

diff --git a/src/cocoa/NSWindow.mm b/src/cocoa/NSWindow.mm
index 57edbce7ea15636cf24a64fd584a4f9ff50e7f2e..efc89aca14f10ed820c686eef6e4487e975e4cc6 100644 (file)
--- a/src/cocoa/NSWindow.mm
+++ b/src/cocoa/NSWindow.mm
@@ -26,7 +26,7 @@
 #include "wx/cocoa/ObjcPose.h"
 #include "wx/cocoa/NSWindow.h"
 
 #include "wx/cocoa/ObjcPose.h"
 #include "wx/cocoa/NSWindow.h"
 

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

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


@@ -35,66 +35,112 @@
 // ============================================================================
 @interface wxNSWindowDelegate : NSObject
 {
 // ============================================================================
 @interface wxNSWindowDelegate : NSObject
 {

+    wxCocoaNSWindow *m_wxCocoaInterface;

 }
 
 }
 

+- (id)init;
+- (void)setWxCocoaInterface: (wxCocoaNSWindow *)wxCocoaInterface;
+- (wxCocoaNSWindow *)wxCocoaInterface;
+
+// Delegate message handlers

 - (void)windowDidBecomeKey: (NSNotification *)notification;
 - (void)windowDidResignKey: (NSNotification *)notification;
 - (void)windowDidBecomeMain: (NSNotification *)notification;
 - (void)windowDidResignMain: (NSNotification *)notification;
 - (BOOL)windowShouldClose: (id)sender;
 - (void)windowWillClose: (NSNotification *)notification;
 - (void)windowDidBecomeKey: (NSNotification *)notification;
 - (void)windowDidResignKey: (NSNotification *)notification;
 - (void)windowDidBecomeMain: (NSNotification *)notification;
 - (void)windowDidResignMain: (NSNotification *)notification;
 - (BOOL)windowShouldClose: (id)sender;
 - (void)windowWillClose: (NSNotification *)notification;

+
+// Menu item handlers
+- (void)wxMenuItemAction: (NSMenuItem *)menuItem;
+- (BOOL)validateMenuItem: (NSMenuItem *)menuItem;

 @end //interface wxNSWindowDelegate
 
 @implementation wxNSWindowDelegate : NSObject
 
 @end //interface wxNSWindowDelegate
 
 @implementation wxNSWindowDelegate : NSObject
 

+- (id)init
+{
+    m_wxCocoaInterface = NULL;
+    return [super init];
+}
+
+- (void)setWxCocoaInterface: (wxCocoaNSWindow *)wxCocoaInterface
+{
+    m_wxCocoaInterface = wxCocoaInterface;
+}
+
+- (wxCocoaNSWindow *)wxCocoaInterface
+{
+    return m_wxCocoaInterface;
+}
+
+// Delegate message handlers

 - (void)windowDidBecomeKey: (NSNotification *)notification
 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
 - (void)windowDidBecomeKey: (NSNotification *)notification
 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);

-    wxCHECK_RET(win,"notificationDidBecomeKey received but no wxWindow exists");
+    wxASSERT(win==m_wxCocoaInterface);
+    wxCHECK_RET(win,wxT("notificationDidBecomeKey received but no wxWindow exists"));

     win->CocoaDelegate_windowDidBecomeKey();
 }
 
 - (void)windowDidResignKey: (NSNotification *)notification
 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
     win->CocoaDelegate_windowDidBecomeKey();
 }
 
 - (void)windowDidResignKey: (NSNotification *)notification
 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);

-    wxCHECK_RET(win,"notificationDidResignKey received but no wxWindow exists");
+    wxASSERT(win==m_wxCocoaInterface);
+    wxCHECK_RET(win,wxT("notificationDidResignKey received but no wxWindow exists"));

     win->CocoaDelegate_windowDidResignKey();
 }
 
 - (void)windowDidBecomeMain: (NSNotification *)notification
 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
     win->CocoaDelegate_windowDidResignKey();
 }
 
 - (void)windowDidBecomeMain: (NSNotification *)notification
 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);

-    wxCHECK_RET(win,"notificationDidBecomeMain received but no wxWindow exists");
+    wxASSERT(win==m_wxCocoaInterface);
+    wxCHECK_RET(win,wxT("notificationDidBecomeMain received but no wxWindow exists"));

     win->CocoaDelegate_windowDidBecomeMain();
 }
 
 - (void)windowDidResignMain: (NSNotification *)notification
 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
     win->CocoaDelegate_windowDidBecomeMain();
 }
 
 - (void)windowDidResignMain: (NSNotification *)notification
 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);

-    wxCHECK_RET(win,"notificationDidResignMain received but no wxWindow exists");
+    wxASSERT(win==m_wxCocoaInterface);
+    wxCHECK_RET(win,wxT("notificationDidResignMain received but no wxWindow exists"));

     win->CocoaDelegate_windowDidResignMain();
 }
 
 - (BOOL)windowShouldClose: (id)sender
 {
     win->CocoaDelegate_windowDidResignMain();
 }
 
 - (BOOL)windowShouldClose: (id)sender
 {

-    wxLogDebug("windowShouldClose");
+    wxLogTrace(wxTRACE_COCOA,wxT("windowShouldClose"));

     wxCocoaNSWindow *tlw = wxCocoaNSWindow::GetFromCocoa(sender);
     wxCocoaNSWindow *tlw = wxCocoaNSWindow::GetFromCocoa(sender);

+    wxASSERT(tlw==m_wxCocoaInterface);

     if(tlw && !tlw->CocoaDelegate_windowShouldClose())
     {
     if(tlw && !tlw->CocoaDelegate_windowShouldClose())
     {

-        wxLogDebug("Window will not be closed");
+        wxLogTrace(wxTRACE_COCOA,wxT("Window will not be closed"));

         return NO;
     }
         return NO;
     }

-    wxLogDebug("Window will be closed");
+    wxLogTrace(wxTRACE_COCOA,wxT("Window will be closed"));

     return YES;
 }
 
 - (void)windowWillClose: (NSNotification *)notification
 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
     return YES;
 }
 
 - (void)windowWillClose: (NSNotification *)notification
 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);

-    wxCHECK_RET(win,"windowWillClose received but no wxWindow exists");
+    wxASSERT(win==m_wxCocoaInterface);
+    wxCHECK_RET(win,wxT("windowWillClose received but no wxWindow exists"));

     win->CocoaDelegate_windowWillClose();
 }
 
     win->CocoaDelegate_windowWillClose();
 }
 

+// Menu item handlers
+- (void)wxMenuItemAction: (NSMenuItem *)sender
+{
+    wxASSERT(m_wxCocoaInterface);
+    m_wxCocoaInterface->CocoaDelegate_wxMenuItemAction(sender);
+}
+
+- (BOOL)validateMenuItem: (NSMenuItem *)sender
+{
+    wxASSERT(m_wxCocoaInterface);
+    return m_wxCocoaInterface->CocoaDelegate_validateMenuItem(sender);
+}
+

 @end //implementation wxNSWindowDelegate
 
 // ============================================================================
 @end //implementation wxNSWindowDelegate
 
 // ============================================================================


@@ -103,7 +149,18 @@
 
 WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSWindow)
 
 
 WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSWindow)
 

-struct objc_object *wxCocoaNSWindow::sm_cocoaDelegate = [[wxNSWindowDelegate alloc] init];
+wxCocoaNSWindow::wxCocoaNSWindow(wxTopLevelWindowCocoa *tlw)
+:   m_wxTopLevelWindowCocoa(tlw)
+{
+    m_cocoaDelegate = [[wxNSWindowDelegate alloc] init];
+    [m_cocoaDelegate setWxCocoaInterface: this];
+}
+
+wxCocoaNSWindow::~wxCocoaNSWindow()
+{
+    [m_cocoaDelegate setWxCocoaInterface: NULL];
+    [m_cocoaDelegate release];
+}

 
 void wxCocoaNSWindow::AssociateNSWindow(WX_NSWindow cocoaNSWindow)
 {
 
 void wxCocoaNSWindow::AssociateNSWindow(WX_NSWindow cocoaNSWindow)
 {


@@ -111,7 +168,7 @@ void wxCocoaNSWindow::AssociateNSWindow(WX_NSWindow cocoaNSWindow)
     {
         [cocoaNSWindow setReleasedWhenClosed: NO];
         sm_cocoaHash.insert(wxCocoaNSWindowHash::value_type(cocoaNSWindow,this));
     {
         [cocoaNSWindow setReleasedWhenClosed: NO];
         sm_cocoaHash.insert(wxCocoaNSWindowHash::value_type(cocoaNSWindow,this));

-        [cocoaNSWindow setDelegate: sm_cocoaDelegate];
+        [cocoaNSWindow setDelegate: m_cocoaDelegate];

     }
 }
 
     }
 }
 


@@ -124,6 +181,11 @@ void wxCocoaNSWindow::DisassociateNSWindow(WX_NSWindow cocoaNSWindow)
     }
 }
 
     }
 }
 

+wxMenuBar* wxCocoaNSWindow::GetAppMenuBar(wxCocoaNSWindow *win)
+{
+    return NULL;
+}
+

 // ============================================================================
 // @class wxPoserNSWindow
 // ============================================================================
 // ============================================================================
 // @class wxPoserNSWindow
 // ============================================================================