Rename some of the Cocoa methods to reflect that they are implemented

by the NSWindow delegate.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cocoa/NSWindow.h b/include/wx/cocoa/NSWindow.h
index 927b80b70ea79871b9722db0dab797e4542f7506..8f73ba32678c9dd5a2a287944d306d15e5532733 100644 (file)
--- a/include/wx/cocoa/NSWindow.h
+++ b/include/wx/cocoa/NSWindow.h
@@ -25,9 +25,9 @@ public:
     void AssociateNSWindow(WX_NSWindow cocoaNSWindow);
     void DisassociateNSWindow(WX_NSWindow cocoaNSWindow);
     virtual void Cocoa_close(void) = 0;
     void AssociateNSWindow(WX_NSWindow cocoaNSWindow);
     void DisassociateNSWindow(WX_NSWindow cocoaNSWindow);
     virtual void Cocoa_close(void) = 0;

-    virtual bool Cocoa_windowShouldClose(void) = 0;
-    virtual void CocoaNotification_DidBecomeKey(void) { }
-    virtual void CocoaNotification_DidResignKey(void) { }
+    virtual bool CocoaDelegate_windowShouldClose(void) = 0;
+    virtual void CocoaDelegate_windowDidBecomeKey(void) { }
+    virtual void CocoaDelegate_windowDidResignKey(void) { }

 protected:
     static struct objc_object *sm_cocoaDelegate;
 };
 protected:
     static struct objc_object *sm_cocoaDelegate;
 };

diff --git a/include/wx/cocoa/toplevel.h b/include/wx/cocoa/toplevel.h
index eb8996a4cd8b8f7a904bf1ce72f13a94dc902e43..8fb7a4623aee1dacde4408a78719f5b67f9f781c 100644 (file)
--- a/include/wx/cocoa/toplevel.h
+++ b/include/wx/cocoa/toplevel.h
@@ -60,9 +60,9 @@ protected:
 public:
     inline WX_NSWindow GetNSWindow() { return m_cocoaNSWindow; }
     virtual void Cocoa_close(void);
 public:
     inline WX_NSWindow GetNSWindow() { return m_cocoaNSWindow; }
     virtual void Cocoa_close(void);

-    virtual bool Cocoa_windowShouldClose(void);
-    virtual void CocoaNotification_DidBecomeKey(void);
-    virtual void CocoaNotification_DidResignKey(void);
+    virtual bool CocoaDelegate_windowShouldClose(void);
+    virtual void CocoaDelegate_windowDidBecomeKey(void);
+    virtual void CocoaDelegate_windowDidResignKey(void);

 protected:
     void SetNSWindow(WX_NSWindow cocoaNSWindow);
     WX_NSWindow m_cocoaNSWindow;
 protected:
     void SetNSWindow(WX_NSWindow cocoaNSWindow);
     WX_NSWindow m_cocoaNSWindow;

diff --git a/src/cocoa/NSWindow.mm b/src/cocoa/NSWindow.mm
index 4bf6ef9a76946c799dc8dae82126a2245c30aa07..45cf2bfa0a3606b731619baaa514aaa904a4b844 100644 (file)
--- a/src/cocoa/NSWindow.mm
+++ b/src/cocoa/NSWindow.mm
@@ -48,21 +48,21 @@
 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
     wxCHECK_RET(win,"notificationDidBecomeKey received but no wxWindow exists");
 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
     wxCHECK_RET(win,"notificationDidBecomeKey received but no wxWindow exists");

-    win->CocoaNotification_DidBecomeKey();
+    win->CocoaDelegate_windowDidBecomeKey();

 }
 
 - (void)windowDidResignKey: (NSNotification *)notification
 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
     wxCHECK_RET(win,"notificationDidResignKey received but no wxWindow exists");
 }
 
 - (void)windowDidResignKey: (NSNotification *)notification
 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
     wxCHECK_RET(win,"notificationDidResignKey received but no wxWindow exists");

-    win->CocoaNotification_DidResignKey();
+    win->CocoaDelegate_windowDidResignKey();

 }
 
 - (BOOL)windowShouldClose: (id)sender
 {
     wxLogDebug("windowShouldClose");
     wxCocoaNSWindow *tlw = wxCocoaNSWindow::GetFromCocoa(sender);
 }
 
 - (BOOL)windowShouldClose: (id)sender
 {
     wxLogDebug("windowShouldClose");
     wxCocoaNSWindow *tlw = wxCocoaNSWindow::GetFromCocoa(sender);

-    if(tlw && !tlw->Cocoa_windowShouldClose())
+    if(tlw && !tlw->CocoaDelegate_windowShouldClose())

     {
         wxLogDebug("Window will not be closed");
         return NO;
     {
         wxLogDebug("Window will not be closed");
         return NO;

diff --git a/src/cocoa/toplevel.mm b/src/cocoa/toplevel.mm
index 1b5703aa12c24dc7342afc7fde610bbd5f1ff562..fa9ffc308c6a47b1a73ef399eff7a6d043052468 100644 (file)
--- a/src/cocoa/toplevel.mm
+++ b/src/cocoa/toplevel.mm
@@ -128,17 +128,17 @@ void wxTopLevelWindowCocoa::CocoaReplaceView(WX_NSView oldView, WX_NSView newVie
         [m_cocoaNSWindow setContentView:newView];
 }
 
         [m_cocoaNSWindow setContentView:newView];
 }
 

-void wxTopLevelWindowCocoa::CocoaNotification_DidBecomeKey(void)
+void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeKey(void)

 {
 {

-    wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaNotification_DidBecomeKey",this);
+    wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeKey",this);

     wxActivateEvent event(wxEVT_ACTIVATE, TRUE, GetId());
     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);
 }
 
     wxActivateEvent event(wxEVT_ACTIVATE, TRUE, GetId());
     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);
 }
 

-void wxTopLevelWindowCocoa::CocoaNotification_DidResignKey(void)
+void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey(void)

 {
 {

-    wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaNotification_DidResignKey",this);
+    wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignKey",this);

     wxActivateEvent event(wxEVT_ACTIVATE, FALSE, GetId());
     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);
     wxActivateEvent event(wxEVT_ACTIVATE, FALSE, GetId());
     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);


@@ -154,7 +154,7 @@ void wxTopLevelWindowCocoa::Cocoa_close(void)
     wxTheApp->CocoaInstallRequestedIdleHandler();
 }
 
     wxTheApp->CocoaInstallRequestedIdleHandler();
 }
 

-bool wxTopLevelWindowCocoa::Cocoa_windowShouldClose()
+bool wxTopLevelWindowCocoa::CocoaDelegate_windowShouldClose()

 {
     return wxWindowBase::Close(false);
 }
 {
     return wxWindowBase::Close(false);
 }