AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

s/wxTopLevelWindow/wxTopLevelWindowCocoa/

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott 2004-03-03 03:44:20 +00:00
parent 7a8691eec8
commit 0092ef0d53
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@
WX_DECLARE_OBJC_HASHMAP(NSWindow); WX_DECLARE_OBJC_HASHMAP(NSWindow);
class WXDLLEXPORT wxMenuBar; class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxTopLevelWindow; class WXDLLEXPORT wxTopLevelWindowCocoa;
DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem); DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem);
DECLARE_WXCOCOA_OBJC_CLASS(wxNSWindowDelegate); DECLARE_WXCOCOA_OBJC_CLASS(wxNSWindowDelegate);
@ -41,13 +41,13 @@ public:
virtual void CocoaDelegate_wxMenuItemAction(WX_NSMenuItem menuItem) = 0; virtual void CocoaDelegate_wxMenuItemAction(WX_NSMenuItem menuItem) = 0;
virtual bool CocoaDelegate_validateMenuItem(WX_NSMenuItem menuItem) = 0; virtual bool CocoaDelegate_validateMenuItem(WX_NSMenuItem menuItem) = 0;
virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win); virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);
inline wxTopLevelWindow* GetWxTopLevelWindow() inline wxTopLevelWindowCocoa* GetWxTopLevelWindowCocoa()
{ return m_wxTopLevelWindow; } { return m_wxTopLevelWindowCocoa; }
protected: protected:
wxCocoaNSWindow(wxTopLevelWindow *tlw = NULL); wxCocoaNSWindow(wxTopLevelWindowCocoa *tlw = NULL);
virtual ~wxCocoaNSWindow(); virtual ~wxCocoaNSWindow();
WX_wxNSWindowDelegate m_cocoaDelegate; WX_wxNSWindowDelegate m_cocoaDelegate;
wxTopLevelWindow *m_wxTopLevelWindow; wxTopLevelWindowCocoa *m_wxTopLevelWindowCocoa;
}; };
#endif // _WX_COCOA_NSWINDOW_H_ #endif // _WX_COCOA_NSWINDOW_H_

4
src/cocoa/NSWindow.mm
View File

@ -149,8 +149,8 @@
WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSWindow) WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSWindow)
wxCocoaNSWindow::wxCocoaNSWindow(wxTopLevelWindow *tlw) wxCocoaNSWindow::wxCocoaNSWindow(wxTopLevelWindowCocoa *tlw)
: m_wxTopLevelWindow(tlw) : m_wxTopLevelWindowCocoa(tlw)
{ {
m_cocoaDelegate = [[wxNSWindowDelegate alloc] init]; m_cocoaDelegate = [[wxNSWindowDelegate alloc] init];
[m_cocoaDelegate setWxCocoaInterface: this]; [m_cocoaDelegate setWxCocoaInterface: this];