X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be66f18ee1e173d26d236ff340dfe34f8ef0e9cb..ee0a94cfc2f71e8b770eedda5197a1f4bd62b5cb:/include/wx/aui/floatpane.h diff --git a/include/wx/aui/floatpane.h b/include/wx/aui/floatpane.h index 70b44ac90c..98312e70f8 100644 --- a/include/wx/aui/floatpane.h +++ b/include/wx/aui/floatpane.h @@ -22,7 +22,7 @@ #include "wx/frame.h" -#if defined( __WXMSW__ ) || defined( __WXMAC__ ) +#if defined( __WXMSW__ ) || defined( __WXMAC__ ) || defined( __WXGTK__ ) #include "wx/minifram.h" #define wxFloatingPaneBaseClass wxMiniFrame #else @@ -34,9 +34,9 @@ class WXDLLIMPEXP_AUI wxFloatingPane : public wxFloatingPaneBaseClass public: wxFloatingPane(wxWindow* parent, wxFrameManager* owner_mgr, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize); + const wxPaneInfo& pane, + wxWindowID id = wxID_ANY + ); ~wxFloatingPane(); void SetPaneWindow(const wxPaneInfo& pane); private: @@ -45,7 +45,7 @@ private: void OnMoveEvent(wxMoveEvent& event); void OnIdle(wxIdleEvent& event); void OnMoveStart(); - void OnMoving(const wxRect& window_rect); + void OnMoving(const wxRect& window_rect, wxDirection dir); void OnMoveFinished(); void OnActivate(wxActivateEvent& event); static bool isMouseDown(); @@ -53,12 +53,18 @@ private: wxWindow* m_pane_window; // pane window being managed bool m_moving; wxRect m_last_rect; + wxRect m_last2_rect; + wxRect m_last3_rect; wxSize m_last_size; + wxDirection m_lastDirection; wxFrameManager* m_owner_mgr; wxFrameManager m_mgr; +#ifndef SWIG DECLARE_EVENT_TABLE() + DECLARE_CLASS(wxFloatingPaneBaseClass) +#endif // SWIG }; #endif // wxUSE_AUI