Implement GetPageText for the OSX WebKit implementation.

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

diff --git a/include/wx/aui/floatpane.h b/include/wx/aui/floatpane.h
index 9344b52d4c74a9f20576ab1e6174e354b6ef5703..2638d6e3a8f8558616d0bd733972c4395d668896 100644 (file)
--- a/include/wx/aui/floatpane.h
+++ b/include/wx/aui/floatpane.h
@@ -17,37 +17,38 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/defs.h"
 // ----------------------------------------------------------------------------
 
 #include "wx/defs.h"

+#include "wx/weakref.h"

 
 #if wxUSE_AUI
 
 
 #if wxUSE_AUI
 

-#include "wx/frame.h"
-
-#if defined( __WXMSW__ ) || defined( __WXMAC__ ) ||  defined( __WXGTK__ )
-#include "wx/minifram.h"
-#define wxAuiFloatingPaneBaseClass wxMiniFrame
+#if wxUSE_MINIFRAME
+    #include "wx/minifram.h"
+    #define wxAuiFloatingFrameBaseClass wxMiniFrame

 #else
 #else

-#define wxAuiFloatingPaneBaseClass wxFrame
+    #include "wx/frame.h"
+    #define wxAuiFloatingFrameBaseClass wxFrame

 #endif
 
 #endif
 

-class WXDLLIMPEXP_AUI wxAuiFloatingPane : public wxAuiFloatingPaneBaseClass
+class WXDLLIMPEXP_AUI wxAuiFloatingFrame : public wxAuiFloatingFrameBaseClass

 {
 public:
 {
 public:

-    wxAuiFloatingPane(wxWindow* parent,
+    wxAuiFloatingFrame(wxWindow* parent,

                    wxAuiManager* owner_mgr,
                    const wxAuiPaneInfo& pane,
                    wxWindowID id = wxID_ANY,
                    long style = wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION |
                    wxAuiManager* owner_mgr,
                    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
                    );
                                 wxCLIP_CHILDREN
                    );

-    virtual ~wxAuiFloatingPane();
+    virtual ~wxAuiFloatingFrame();

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

-    
+    wxAuiManager* GetOwnerManager() const;
+

 protected:
     virtual void OnMoveStart();
     virtual void OnMoving(const wxRect& window_rect, wxDirection dir);
     virtual void OnMoveFinished();
 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);
 private:
     void OnSize(wxSizeEvent& event);
     void OnClose(wxCloseEvent& event);


@@ -55,6 +56,7 @@ private:
     void OnIdle(wxIdleEvent& event);
     void OnActivate(wxActivateEvent& event);
     static bool isMouseDown();
     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
 private:
     wxWindow* m_pane_window;    // pane window being managed
     bool m_solid_drag;          // true if system uses solid window drag


@@ -65,12 +67,12 @@ private:
     wxSize m_last_size;
     wxDirection m_lastDirection;
 
     wxSize m_last_size;
     wxDirection m_lastDirection;
 

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

     wxAuiManager m_mgr;
 
 #ifndef SWIG
     DECLARE_EVENT_TABLE()
     wxAuiManager m_mgr;
 
 #ifndef SWIG
     DECLARE_EVENT_TABLE()

-    DECLARE_CLASS(wxAuiFloatingPaneBaseClass)
+    DECLARE_CLASS(wxAuiFloatingFrame)

 #endif // SWIG
 };
 
 #endif // SWIG
 };