Reverted wxAuiFloatingFrame dtor crash fix (r51324) in favor of wxWeakRef implementation, thanks Robert.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2008-01-23 07:53:03 +00:00
parent 3056dddc54
commit 704e631016
4 changed files with 7 additions and 67 deletions

View File

@@ -21,6 +21,7 @@
#if wxUSE_AUI
#include "wx/frame.h"
#include "wx/weakref.h"
#if defined( __WXMSW__ ) || defined( __WXMAC__ ) || defined( __WXGTK__ )
#include "wx/minifram.h"
@@ -31,8 +32,6 @@
class WXDLLIMPEXP_AUI wxAuiFloatingFrame : public wxAuiFloatingFrameBaseClass
{
friend class wxAuiManager;
public:
wxAuiFloatingFrame(wxWindow* parent,
wxAuiManager* owner_mgr,
@@ -47,7 +46,6 @@ public:
wxAuiManager* GetOwnerManager() const;
protected:
void SetOwnerManager(wxAuiManager* owner_mgr);
virtual void OnMoveStart();
virtual void OnMoving(const wxRect& window_rect, wxDirection dir);
virtual void OnMoveFinished();
@@ -70,7 +68,7 @@ private:
wxSize m_last_size;
wxDirection m_lastDirection;
wxAuiManager* m_owner_mgr;
wxWeakRef<wxAuiManager> m_owner_mgr;
wxAuiManager m_mgr;
#ifndef SWIG