Override AdjustForParentClientOrigin() in wxNonOwnedWindow to do nothing.

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

diff --git a/include/wx/aui/floatpane.h b/include/wx/aui/floatpane.h
index 6e98d624b9510aeb589e1c1370e2cd36a382aafd..7069b75477249b2646be5caeb376418f084836ea 100644 (file)
--- a/include/wx/aui/floatpane.h
+++ b/include/wx/aui/floatpane.h
@@ -17,6 +17,7 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/defs.h"
 // ----------------------------------------------------------------------------
 
 #include "wx/defs.h"

+#include "wx/weakref.h"

 
 #if wxUSE_AUI
 
 
 #if wxUSE_AUI
 


@@ -30,27 +31,24 @@
 
 class WXDLLIMPEXP_AUI wxAuiFloatingFrame : public wxAuiFloatingFrameBaseClass
 {
 
 class WXDLLIMPEXP_AUI wxAuiFloatingFrame : public wxAuiFloatingFrameBaseClass
 {

-    friend class wxAuiManager;
-

 public:
     wxAuiFloatingFrame(wxWindow* parent,
 public:
     wxAuiFloatingFrame(wxWindow* parent,

-                   wxAuiManager* owner_mgr,
+                   wxAuiManager* ownerMgr,

                    const wxAuiPaneInfo& pane,
                    wxWindowID id = wxID_ANY,
                    long style = wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION |
                    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;
                                 wxCLIP_CHILDREN
                    );
     virtual ~wxAuiFloatingFrame();
     void SetPaneWindow(const wxAuiPaneInfo& pane);
     wxAuiManager* GetOwnerManager() const;

-    
+

 protected:
 protected:

-    void SetOwnerManager(wxAuiManager* owner_mgr);

     virtual void OnMoveStart();
     virtual void OnMoveStart();

-    virtual void OnMoving(const wxRect& window_rect, wxDirection dir);
+    virtual void OnMoving(const wxRect& windowRect, wxDirection dir);

     virtual void OnMoveFinished();
     virtual void OnMoveFinished();

-    
+

 private:
     void OnSize(wxSizeEvent& event);
     void OnClose(wxCloseEvent& event);
 private:
     void OnSize(wxSizeEvent& event);
     void OnClose(wxCloseEvent& event);


@@ -58,18 +56,18 @@ private:
     void OnIdle(wxIdleEvent& event);
     void OnActivate(wxActivateEvent& event);
     static bool isMouseDown();
     void OnIdle(wxIdleEvent& event);
     void OnActivate(wxActivateEvent& event);
     static bool isMouseDown();

-    
+

 private:
 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;
     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;
 
     wxDirection m_lastDirection;
 

-    wxAuiManager* m_owner_mgr;
+    wxWeakRef<wxAuiManager> m_ownerMgr;

     wxAuiManager m_mgr;
 
 #ifndef SWIG
     wxAuiManager m_mgr;
 
 #ifndef SWIG