Include defs.h before including wxchar.h to make init.h self-contained (able to inclu...

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

diff --git a/include/wx/aui/floatpane.h b/include/wx/aui/floatpane.h
index 51c238598c58480beb9512f26c54fb72f2310eff..158c0a272ba9937d68fbf27abffb72a5ea9ceb2c 100644 (file)
--- a/include/wx/aui/floatpane.h
+++ b/include/wx/aui/floatpane.h
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        floatpane.h
+// Name:        wx/aui/floatpane.h

 // Purpose:     wxaui: wx advanced user interface - docking window manager
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-05-17
 // Purpose:     wxaui: wx advanced user interface - docking window manager
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-05-17

-// RCS-ID:      
+// RCS-ID:      $Id$

 // Copyright:   (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////


@@ -22,7 +22,7 @@
 
 #include "wx/frame.h"
 
 
 #include "wx/frame.h"
 

-#if defined( __WXMSW__ ) || defined( __WXMAC__ )
+#if defined( __WXMSW__ ) || defined( __WXMAC__ ) ||  defined( __WXGTK__ )

 #include "wx/minifram.h"
 #define wxFloatingPaneBaseClass wxMiniFrame
 #else
 #include "wx/minifram.h"
 #define wxFloatingPaneBaseClass wxMiniFrame
 #else


@@ -34,31 +34,43 @@ class WXDLLIMPEXP_AUI wxFloatingPane : public wxFloatingPaneBaseClass
 public:
     wxFloatingPane(wxWindow* parent,
                    wxFrameManager* owner_mgr,
 public:
     wxFloatingPane(wxWindow* parent,
                    wxFrameManager* owner_mgr,

-                   wxWindowID id = -1,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize);
-    ~wxFloatingPane();
+                   const wxPaneInfo& pane,
+                   wxWindowID id = wxID_ANY,
+                   long style = wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION |
+                                wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | 
+                                wxCLIP_CHILDREN
+                   );
+    virtual ~wxFloatingPane();

     void SetPaneWindow(const wxPaneInfo& pane);
     void SetPaneWindow(const wxPaneInfo& pane);

+    
+protected:
+    virtual void OnMoveStart();
+    virtual void OnMoving(const wxRect& window_rect, wxDirection dir);
+    virtual void OnMoveFinished();
+    

 private:
     void OnSize(wxSizeEvent& event);
     void OnClose(wxCloseEvent& event);
     void OnMoveEvent(wxMoveEvent& event);
     void OnIdle(wxIdleEvent& event);
 private:
     void OnSize(wxSizeEvent& event);
     void OnClose(wxCloseEvent& event);
     void OnMoveEvent(wxMoveEvent& event);
     void OnIdle(wxIdleEvent& event);

-    void OnMoveStart();
-    void OnMoving(const wxRect& window_rect);
-    void OnMoveFinished();

     void OnActivate(wxActivateEvent& event);
     static bool isMouseDown();
 private:
     wxWindow* m_pane_window;    // pane window being managed
     bool m_moving;
     wxRect m_last_rect;
     void OnActivate(wxActivateEvent& event);
     static bool isMouseDown();
 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;
     wxSize m_last_size;

+    wxDirection m_lastDirection;

 
     wxFrameManager* m_owner_mgr;
     wxFrameManager m_mgr;
 
 
     wxFrameManager* m_owner_mgr;
     wxFrameManager m_mgr;
 

+#ifndef SWIG

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+    DECLARE_CLASS(wxFloatingPaneBaseClass)
+#endif // SWIG

 };
 
 #endif // wxUSE_AUI
 };
 
 #endif // wxUSE_AUI