Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
by the NSWindow delegate.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-08-29 14:59:04 +00:00
parent eb3426e77a
commit aa992c594e
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/cocoa/NSWindow.h
View File

@@ -25,9 +25,9 @@ public:
void AssociateNSWindow(WX_NSWindow cocoaNSWindow); void AssociateNSWindow(WX_NSWindow cocoaNSWindow);
void DisassociateNSWindow(WX_NSWindow cocoaNSWindow); void DisassociateNSWindow(WX_NSWindow cocoaNSWindow);
virtual void Cocoa_close(void) = 0; virtual void Cocoa_close(void) = 0;
virtual bool Cocoa_windowShouldClose(void) = 0; virtual bool CocoaDelegate_windowShouldClose(void) = 0;
virtual void CocoaNotification_DidBecomeKey(void) { } virtual void CocoaDelegate_windowDidBecomeKey(void) { }
virtual void CocoaNotification_DidResignKey(void) { } virtual void CocoaDelegate_windowDidResignKey(void) { }
protected: protected:
static struct objc_object *sm_cocoaDelegate; static struct objc_object *sm_cocoaDelegate;
}; };

6
include/wx/cocoa/toplevel.h
View File

@@ -60,9 +60,9 @@ protected:
public: public:
inline WX_NSWindow GetNSWindow() { return m_cocoaNSWindow; } inline WX_NSWindow GetNSWindow() { return m_cocoaNSWindow; }
virtual void Cocoa_close(void); virtual void Cocoa_close(void);
virtual bool Cocoa_windowShouldClose(void); virtual bool CocoaDelegate_windowShouldClose(void);
virtual void CocoaNotification_DidBecomeKey(void); virtual void CocoaDelegate_windowDidBecomeKey(void);
virtual void CocoaNotification_DidResignKey(void); virtual void CocoaDelegate_windowDidResignKey(void);
protected: protected:
void SetNSWindow(WX_NSWindow cocoaNSWindow); void SetNSWindow(WX_NSWindow cocoaNSWindow);
WX_NSWindow m_cocoaNSWindow; WX_NSWindow m_cocoaNSWindow;

6
src/cocoa/NSWindow.mm
View File

@@ -48,21 +48,21 @@
{ {
wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]); wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
wxCHECK_RET(win,"notificationDidBecomeKey received but no wxWindow exists"); wxCHECK_RET(win,"notificationDidBecomeKey received but no wxWindow exists");
win->CocoaNotification_DidBecomeKey(); win->CocoaDelegate_windowDidBecomeKey();
} }
- (void)windowDidResignKey: (NSNotification *)notification - (void)windowDidResignKey: (NSNotification *)notification
{ {
wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]); wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
wxCHECK_RET(win,"notificationDidResignKey received but no wxWindow exists"); wxCHECK_RET(win,"notificationDidResignKey received but no wxWindow exists");
win->CocoaNotification_DidResignKey(); win->CocoaDelegate_windowDidResignKey();
} }
- (BOOL)windowShouldClose: (id)sender - (BOOL)windowShouldClose: (id)sender
{ {
wxLogDebug("windowShouldClose"); wxLogDebug("windowShouldClose");
wxCocoaNSWindow *tlw = wxCocoaNSWindow::GetFromCocoa(sender); wxCocoaNSWindow *tlw = wxCocoaNSWindow::GetFromCocoa(sender);
if(tlw && !tlw->Cocoa_windowShouldClose()) if(tlw && !tlw->CocoaDelegate_windowShouldClose())
{ {
wxLogDebug("Window will not be closed"); wxLogDebug("Window will not be closed");
return NO; return NO;

10
src/cocoa/toplevel.mm
View File

@@ -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()); wxActivateEvent event(wxEVT_ACTIVATE, TRUE, GetId());
event.SetEventObject(this); event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event); 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()); wxActivateEvent event(wxEVT_ACTIVATE, FALSE, GetId());
event.SetEventObject(this); event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event); 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);
} }