s/wxTopLevelWindow/wxTopLevelWindowCocoa/

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

diff --git a/include/wx/cocoa/NSWindow.h b/include/wx/cocoa/NSWindow.h
index 7a317209a9ff6b92240a81930a8f65b16f673272..65f702041b81afdf9f7611c3dc6d2cd2764f7eaa 100644 (file)
--- a/include/wx/cocoa/NSWindow.h
+++ b/include/wx/cocoa/NSWindow.h
@@ -18,7 +18,7 @@
 WX_DECLARE_OBJC_HASHMAP(NSWindow);
 
 class WXDLLEXPORT wxMenuBar;
 WX_DECLARE_OBJC_HASHMAP(NSWindow);
 
 class WXDLLEXPORT wxMenuBar;

-class WXDLLEXPORT wxTopLevelWindow;
+class WXDLLEXPORT wxTopLevelWindowCocoa;

 
 DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem);
 DECLARE_WXCOCOA_OBJC_CLASS(wxNSWindowDelegate);
 
 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);
     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:
 protected:

-    wxCocoaNSWindow(wxTopLevelWindow *tlw = NULL);
+    wxCocoaNSWindow(wxTopLevelWindowCocoa *tlw = NULL);

     virtual ~wxCocoaNSWindow();
     WX_wxNSWindowDelegate m_cocoaDelegate;
     virtual ~wxCocoaNSWindow();
     WX_wxNSWindowDelegate m_cocoaDelegate;

-    wxTopLevelWindow *m_wxTopLevelWindow;
+    wxTopLevelWindowCocoa *m_wxTopLevelWindowCocoa;

 };
 
 #endif // _WX_COCOA_NSWINDOW_H_
 };
 
 #endif // _WX_COCOA_NSWINDOW_H_

diff --git a/src/cocoa/NSWindow.mm b/src/cocoa/NSWindow.mm
index 653229e78ee18f4076c1dc3d03edee0dbb32566f..efc89aca14f10ed820c686eef6e4487e975e4cc6 100644 (file)
--- a/src/cocoa/NSWindow.mm
+++ b/src/cocoa/NSWindow.mm
@@ -149,8 +149,8 @@
 
 WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSWindow)
 
 
 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];
 {
     m_cocoaDelegate = [[wxNSWindowDelegate alloc] init];
     [m_cocoaDelegate setWxCocoaInterface: this];