From a189504e7f86d20f679a313a7d1f3764c7fb0ff5 Mon Sep 17 00:00:00 2001
From: Benjamin Williams <bwilliams@kirix.com>
Date: Tue, 11 Jul 2006 13:50:49 +0000
Subject: [PATCH] wxAUI's wxFrameManager::SetFrame() now takes a wxWindow ptr
 instead of a wxFrame ptr, in preparation for future work

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/aui/aui.h          | 3 +--
 include/wx/aui/framemanager.h | 6 +++---
 src/aui/framemanager.cpp      | 6 +++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/include/wx/aui/aui.h b/include/wx/aui/aui.h
index 1f5efcd8b5..190ce2a93b 100644
--- a/include/wx/aui/aui.h
+++ b/include/wx/aui/aui.h
@@ -16,6 +16,5 @@
 #include "wx/aui/dockart.h"
 #include "wx/aui/floatpane.h"
 
-#endif
-    // _WX_AUI_H_
+#endif // _WX_AUI_H_
 
diff --git a/include/wx/aui/framemanager.h b/include/wx/aui/framemanager.h
index f684c3e677..b102262131 100644
--- a/include/wx/aui/framemanager.h
+++ b/include/wx/aui/framemanager.h
@@ -379,8 +379,8 @@ public:
     void SetFlags(unsigned int flags);
     unsigned int GetFlags() const;
 
-    void SetFrame(wxFrame* frame);
-    wxFrame* GetFrame() const;
+    void SetFrame(wxWindow* frame);
+    wxWindow* GetFrame() const;
 
 #ifdef SWIG
     %disownarg( wxDockArt* art_provider );
@@ -493,7 +493,7 @@ protected:
 
 protected:
 
-    wxFrame* m_frame;            // the frame being managed
+    wxWindow* m_frame;           // the window being managed
     wxDockArt* m_art;            // dock art object which does all drawing
     unsigned int m_flags;        // manager flags wxAUI_MGR_*
 
diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index 129c68bf37..6fb198ed09 100644
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -501,7 +501,7 @@ unsigned int wxFrameManager::GetFlags() const
 // SetFrame() is usually called once when the frame
 // manager class is being initialized.  "frame" specifies
 // the frame which should be managed by the frame mananger
-void wxFrameManager::SetFrame(wxFrame* frame)
+void wxFrameManager::SetFrame(wxWindow* frame)
 {
     wxASSERT_MSG(frame, wxT("specified frame must be non-NULL"));
 
@@ -536,8 +536,8 @@ void wxFrameManager::UnInit()
     m_frame->RemoveEventHandler(this);
 }
 
-// GetFrame() returns the frame pointer being managed by wxFrameManager
-wxFrame* wxFrameManager::GetFrame() const
+// GetFrame() returns the window pointer being managed by wxFrameManager
+wxWindow* wxFrameManager::GetFrame() const
 {
     return m_frame;
 }
-- 
2.45.2