X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dc79cfb52a2548139629daaa4d1e83da28568dc..6968a3b87cee46f5c5af9b46e1ef97f17133cef7:/include/wx/aui/floatpane.h diff --git a/include/wx/aui/floatpane.h b/include/wx/aui/floatpane.h index 837a9d789e..7069b75477 100644 --- a/include/wx/aui/floatpane.h +++ b/include/wx/aui/floatpane.h @@ -17,38 +17,38 @@ // ---------------------------------------------------------------------------- #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 { public: wxAuiFloatingFrame(wxWindow* parent, - wxAuiManager* owner_mgr, + wxAuiManager* ownerMgr, const wxAuiPaneInfo& pane, wxWindowID id = wxID_ANY, long style = wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION | - wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | + wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | wxCLIP_CHILDREN ); virtual ~wxAuiFloatingFrame(); void SetPaneWindow(const wxAuiPaneInfo& pane); wxAuiManager* GetOwnerManager() const; - + protected: virtual void OnMoveStart(); - virtual void OnMoving(const wxRect& window_rect, wxDirection dir); + virtual void OnMoving(const wxRect& windowRect, wxDirection dir); virtual void OnMoveFinished(); - + private: void OnSize(wxSizeEvent& event); void OnClose(wxCloseEvent& event); @@ -56,18 +56,18 @@ 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 + wxWindow* m_paneWindow; // pane window being managed + bool m_solidDrag; // true if system uses solid window drag bool m_moving; - wxRect m_last_rect; - wxRect m_last2_rect; - wxRect m_last3_rect; - wxSize m_last_size; + wxRect m_lastRect; + wxRect m_last2Rect; + wxRect m_last3Rect; + wxSize m_lastSize; wxDirection m_lastDirection; - wxAuiManager* m_owner_mgr; + wxWeakRef m_ownerMgr; wxAuiManager m_mgr; #ifndef SWIG