Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxAUI's wxFrameManager::SetFrame() now takes a wxWindow ptr instead of a wxFrame ptr, in preparation for future work

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Benjamin Williams
2006-07-11 13:50:49 +00:00
parent 315a592c4e
commit a189504e7f
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/aui/aui.h
View File

@@ -16,6 +16,5 @@
#include "wx/aui/dockart.h" #include "wx/aui/dockart.h"
#include "wx/aui/floatpane.h" #include "wx/aui/floatpane.h"
#endif #endif // _WX_AUI_H_
// _WX_AUI_H_

6
include/wx/aui/framemanager.h
View File

@@ -379,8 +379,8 @@ public:
void SetFlags(unsigned int flags); void SetFlags(unsigned int flags);
unsigned int GetFlags() const; unsigned int GetFlags() const;
void SetFrame(wxFrame* frame); void SetFrame(wxWindow* frame);
wxFrame* GetFrame() const; wxWindow* GetFrame() const;
#ifdef SWIG #ifdef SWIG
%disownarg( wxDockArt* art_provider ); %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 wxDockArt* m_art; // dock art object which does all drawing
unsigned int m_flags; // manager flags wxAUI_MGR_* unsigned int m_flags; // manager flags wxAUI_MGR_*

6
src/aui/framemanager.cpp
View File

@@ -501,7 +501,7 @@ unsigned int wxFrameManager::GetFlags() const
// SetFrame() is usually called once when the frame // SetFrame() is usually called once when the frame
// manager class is being initialized. "frame" specifies // manager class is being initialized. "frame" specifies
// the frame which should be managed by the frame mananger // 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 // GetFrame() returns the window pointer being managed by wxFrameManager
wxFrame* wxFrameManager::GetFrame() const wxWindow* wxFrameManager::GetFrame() const
{ {
return m_frame; return m_frame;
} }