reverted r51340: don't use wxWeakRef in the library code as long as not all supported compilers (notably all versions of Borland C++) can compile it; reapply r51340 once wxWeakRef is supported everywhere

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-02-18 23:47:50 +00:00
parent 96b35b2505
commit 8949ba7d74
4 changed files with 67 additions and 7 deletions

View File

@@ -21,7 +21,6 @@
#if wxUSE_AUI
#include "wx/frame.h"
#include "wx/weakref.h"
#if defined( __WXMSW__ ) || defined( __WXMAC__ ) || defined( __WXGTK__ )
#include "wx/minifram.h"
@@ -32,6 +31,8 @@
class WXDLLIMPEXP_AUI wxAuiFloatingFrame : public wxAuiFloatingFrameBaseClass
{
friend class wxAuiManager;
public:
wxAuiFloatingFrame(wxWindow* parent,
wxAuiManager* owner_mgr,
@@ -46,6 +47,7 @@ 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();
@@ -68,7 +70,7 @@ private:
wxSize m_last_size;
wxDirection m_lastDirection;
wxWeakRef<wxAuiManager> m_owner_mgr;
wxAuiManager* m_owner_mgr;
wxAuiManager m_mgr;
#ifndef SWIG