s/wxTopLevelWindow/wxTopLevelWindowCocoa/
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
7a8691eec8
commit
0092ef0d53
@ -18,7 +18,7 @@
|
||||
WX_DECLARE_OBJC_HASHMAP(NSWindow);
|
||||
|
||||
class WXDLLEXPORT wxMenuBar;
|
||||
class WXDLLEXPORT wxTopLevelWindow;
|
||||
class WXDLLEXPORT wxTopLevelWindowCocoa;
|
||||
|
||||
DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem);
|
||||
DECLARE_WXCOCOA_OBJC_CLASS(wxNSWindowDelegate);
|
||||
@ -41,13 +41,13 @@ public:
|
||||
virtual void CocoaDelegate_wxMenuItemAction(WX_NSMenuItem menuItem) = 0;
|
||||
virtual bool CocoaDelegate_validateMenuItem(WX_NSMenuItem menuItem) = 0;
|
||||
virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);
|
||||
inline wxTopLevelWindow* GetWxTopLevelWindow()
|
||||
{ return m_wxTopLevelWindow; }
|
||||
inline wxTopLevelWindowCocoa* GetWxTopLevelWindowCocoa()
|
||||
{ return m_wxTopLevelWindowCocoa; }
|
||||
protected:
|
||||
wxCocoaNSWindow(wxTopLevelWindow *tlw = NULL);
|
||||
wxCocoaNSWindow(wxTopLevelWindowCocoa *tlw = NULL);
|
||||
virtual ~wxCocoaNSWindow();
|
||||
WX_wxNSWindowDelegate m_cocoaDelegate;
|
||||
wxTopLevelWindow *m_wxTopLevelWindow;
|
||||
wxTopLevelWindowCocoa *m_wxTopLevelWindowCocoa;
|
||||
};
|
||||
|
||||
#endif // _WX_COCOA_NSWINDOW_H_
|
||||
|
@ -149,8 +149,8 @@
|
||||
|
||||
WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSWindow)
|
||||
|
||||
wxCocoaNSWindow::wxCocoaNSWindow(wxTopLevelWindow *tlw)
|
||||
: m_wxTopLevelWindow(tlw)
|
||||
wxCocoaNSWindow::wxCocoaNSWindow(wxTopLevelWindowCocoa *tlw)
|
||||
: m_wxTopLevelWindowCocoa(tlw)
|
||||
{
|
||||
m_cocoaDelegate = [[wxNSWindowDelegate alloc] init];
|
||||
[m_cocoaDelegate setWxCocoaInterface: this];
|
||||
|
Loading…
Reference in New Issue
Block a user