define wxUSE_BOOKCTRL when wxUSE_NOTE/LIST/CHOICEBOOK are 0; also define it as as...

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

diff --git a/include/wx/aui/floatpane.h b/include/wx/aui/floatpane.h
index 204652a21c6f1cf61c7e49ea9ab093ef5d079065..98f79fe07201f88de7fd0d08e05bef7a95105753 100644 (file)
--- 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
@@ -37,7 +37,7 @@ public:
                    const wxPaneInfo& pane,
                    wxWindowID id = wxID_ANY
                    );
-    ~wxFloatingPane();
+    virtual ~wxFloatingPane();
     void SetPaneWindow(const wxPaneInfo& pane);
 private:
     void OnSize(wxSizeEvent& event);
@@ -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,14 +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