X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/00c1c94cda3a685d46bc5232fb04d7f444beff54..6dbf7a375093d1e94aadb61f8d6759e820a9256d:/include/wx/aui/floatpane.h?ds=inline diff --git a/include/wx/aui/floatpane.h b/include/wx/aui/floatpane.h index 567aaca597..8d95b8cfe3 100644 --- a/include/wx/aui/floatpane.h +++ b/include/wx/aui/floatpane.h @@ -17,16 +17,16 @@ // ---------------------------------------------------------------------------- #include "wx/defs.h" +#include "wx/weakref.h" #if wxUSE_AUI -#include "wx/frame.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 @@ -42,6 +42,7 @@ public: ); virtual ~wxAuiFloatingFrame(); void SetPaneWindow(const wxAuiPaneInfo& pane); + wxAuiManager* GetOwnerManager() const; protected: virtual void OnMoveStart(); @@ -55,6 +56,7 @@ private: void OnIdle(wxIdleEvent& event); void OnActivate(wxActivateEvent& event); static bool isMouseDown(); + private: wxWindow* m_pane_window; // pane window being managed bool m_solid_drag; // true if system uses solid window drag @@ -65,12 +67,12 @@ private: wxSize m_last_size; wxDirection m_lastDirection; - wxAuiManager* m_owner_mgr; + wxWeakRef m_owner_mgr; wxAuiManager m_mgr; #ifndef SWIG DECLARE_EVENT_TABLE() - DECLARE_CLASS(wxAuiFloatingFrameBaseClass) + DECLARE_CLASS(wxAuiFloatingFrame) #endif // SWIG };