don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/aui/floatpane.h b/include/wx/aui/floatpane.h
index 8c7360567624037bfb40c80ea196da28a88a4551..8d95b8cfe3f76defbaa7c49c7d6a2080ae5d834f 100644 (file)
--- a/include/wx/aui/floatpane.h
+++ b/include/wx/aui/floatpane.h
@@ -17,22 +17,20 @@
 // ----------------------------------------------------------------------------
 
 #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 wxAuiFloatingFrameBaseClass wxMiniFrame
+#if wxUSE_MINIFRAME
+    #include "wx/minifram.h"
+    #define wxAuiFloatingFrameBaseClass wxMiniFrame

 #else
 #else

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

 #endif
 
 class WXDLLIMPEXP_AUI wxAuiFloatingFrame : public wxAuiFloatingFrameBaseClass
 {
 #endif
 
 class WXDLLIMPEXP_AUI wxAuiFloatingFrame : public wxAuiFloatingFrameBaseClass
 {

-    friend class wxAuiManager;
-

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


@@ -47,7 +45,6 @@ public:
     wxAuiManager* GetOwnerManager() const;
     
 protected:
     wxAuiManager* GetOwnerManager() const;
     
 protected:

-    void SetOwnerManager(wxAuiManager* owner_mgr);

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


@@ -70,7 +67,7 @@ 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
     wxAuiManager m_mgr;
 
 #ifndef SWIG