wxAUI's wxFrameManager::SetFrame() now takes a wxWindow ptr instead of a wxFrame...

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

diff --git a/include/wx/aui/aui.h b/include/wx/aui/aui.h
index 1f5efcd8b59af93d1485eb24e4246a76c911bb1d..190ce2a93b6cdad9378122f941ec9e1ec26fec8f 100644 (file)
--- 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"
 
 #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 f684c3e677c1ed12f8b55bc7110c08527a10275e..b10226213168d73ef1f0bf05eb2af6b2a476f9ec 100644 (file)
--- 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 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 );
 
 #ifdef SWIG
     %disownarg( wxDockArt* art_provider );


@@ -493,7 +493,7 @@ protected:
 
 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_*
 
     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 129c68bf37276667b2ea95607643851a93216f33..6fb198ed09f99c3623a9d5791c61a554c2a88204 100644 (file)
--- 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
 // 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"));
 
 {
     wxASSERT_MSG(frame, wxT("specified frame must be non-NULL"));
 


@@ -536,8 +536,8 @@ void wxFrameManager::UnInit()
     m_frame->RemoveEventHandler(this);
 }
 
     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;
 }
 {
     return m_frame;
 }