Constructor now takes a wxTopLevelWindow * = NULL so that the new

GetWxTopLevelWindow() method can be used.

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

diff --git a/include/wx/cocoa/NSWindow.h b/include/wx/cocoa/NSWindow.h
index 761b28ee0852823b14681190eaaf6b77a44f5406..7a317209a9ff6b92240a81930a8f65b16f673272 100644 (file)
--- a/include/wx/cocoa/NSWindow.h
+++ b/include/wx/cocoa/NSWindow.h
@@ -18,6 +18,7 @@
 WX_DECLARE_OBJC_HASHMAP(NSWindow);
 
 class WXDLLEXPORT wxMenuBar;
+class WXDLLEXPORT wxTopLevelWindow;
 
 DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem);
 DECLARE_WXCOCOA_OBJC_CLASS(wxNSWindowDelegate);
@@ -40,10 +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; }
 protected:
-    wxCocoaNSWindow();
+    wxCocoaNSWindow(wxTopLevelWindow *tlw = NULL);
     virtual ~wxCocoaNSWindow();
     WX_wxNSWindowDelegate m_cocoaDelegate;
+    wxTopLevelWindow *m_wxTopLevelWindow;
 };
 
 #endif // _WX_COCOA_NSWINDOW_H_

diff --git a/src/cocoa/NSWindow.mm b/src/cocoa/NSWindow.mm
index 1f8663740c8c3e02be3a7e4c40efbea02b0c2b7c..653229e78ee18f4076c1dc3d03edee0dbb32566f 100644 (file)
--- a/src/cocoa/NSWindow.mm
+++ b/src/cocoa/NSWindow.mm
@@ -149,7 +149,8 @@
 
 WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSWindow)
 
-wxCocoaNSWindow::wxCocoaNSWindow()
+wxCocoaNSWindow::wxCocoaNSWindow(wxTopLevelWindow *tlw)
+:   m_wxTopLevelWindow(tlw)
 {
     m_cocoaDelegate = [[wxNSWindowDelegate alloc] init];
     [m_cocoaDelegate setWxCocoaInterface: this];