derive wxConfig classes from wxObject and add wxRTTI macros to them (patch 1587607)

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

diff --git a/include/wx/aui/floatpane.h b/include/wx/aui/floatpane.h
index 9344b52d4c74a9f20576ab1e6174e354b6ef5703..837a9d789e5ed5558a3c0da6b38e151a72f00f08 100644 (file)
--- a/include/wx/aui/floatpane.h
+++ b/include/wx/aui/floatpane.h
@@ -24,15 +24,15 @@
 
 #if defined( __WXMSW__ ) || defined( __WXMAC__ ) ||  defined( __WXGTK__ )
 #include "wx/minifram.h"
 
 #if defined( __WXMSW__ ) || defined( __WXMAC__ ) ||  defined( __WXGTK__ )
 #include "wx/minifram.h"

-#define wxAuiFloatingPaneBaseClass wxMiniFrame
+#define wxAuiFloatingFrameBaseClass wxMiniFrame

 #else
 #else

-#define wxAuiFloatingPaneBaseClass wxFrame
+#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,
                    wxAuiManager* owner_mgr,
                    const wxAuiPaneInfo& pane,
                    wxWindowID id = wxID_ANY,


@@ -40,8 +40,9 @@ public:
                                 wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | 
                                 wxCLIP_CHILDREN
                    );
                                 wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | 
                                 wxCLIP_CHILDREN
                    );

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

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

+    wxAuiManager* GetOwnerManager() const;

     
 protected:
     virtual void OnMoveStart();
     
 protected:
     virtual void OnMoveStart();


@@ -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


@@ -70,7 +72,7 @@ private:
 
 #ifndef SWIG
     DECLARE_EVENT_TABLE()
 
 #ifndef SWIG
     DECLARE_EVENT_TABLE()

-    DECLARE_CLASS(wxAuiFloatingPaneBaseClass)
+    DECLARE_CLASS(wxAuiFloatingFrame)

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