Compilation fix.

[wxWidgets.git] / include / wx / aui / floatpane.h

diff --git a/include/wx/aui/floatpane.h b/include/wx/aui/floatpane.h
index 9bbf28c47607f029b4f3b69b3a13bd128d88c76f..6e98d624b9510aeb589e1c1370e2cd36a382aafd 100644 (file)
--- a/include/wx/aui/floatpane.h
+++ b/include/wx/aui/floatpane.h
@@ -20,18 +20,18 @@
 
 #if wxUSE_AUI
 
-#include "wx/frame.h"
-#include "wx/weakref.h"
-
-#if defined( __WXMSW__ ) || defined( __WXMAC__ ) ||  defined( __WXGTK__ )
-#include "wx/minifram.h"
-#define wxAuiFloatingFrameBaseClass wxMiniFrame
+#if wxUSE_MINIFRAME
+    #include "wx/minifram.h"
+    #define wxAuiFloatingFrameBaseClass wxMiniFrame
 #else
-#define wxAuiFloatingFrameBaseClass wxFrame
+    #include "wx/frame.h"
+    #define wxAuiFloatingFrameBaseClass wxFrame
 #endif
 
 class WXDLLIMPEXP_AUI wxAuiFloatingFrame : public wxAuiFloatingFrameBaseClass
 {
+    friend class wxAuiManager;
+
 public:
     wxAuiFloatingFrame(wxWindow* parent,
                    wxAuiManager* owner_mgr,
@@ -46,6 +46,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 +69,7 @@ private:
     wxSize m_last_size;
     wxDirection m_lastDirection;
 
-    wxWeakRef<wxAuiManager> m_owner_mgr;
+    wxAuiManager* m_owner_mgr;
     wxAuiManager m_mgr;
 
 #ifndef SWIG