Style application fixes

[wxWidgets.git] / src / aui / floatpane.cpp

diff --git a/src/aui/floatpane.cpp b/src/aui/floatpane.cpp
index d8a8f110e4b2de2808b22e3389fdf7640a23246c..7374837fb3defc6fcc73f434622b861b9090733f 100644 (file)
--- a/src/aui/floatpane.cpp
+++ b/src/aui/floatpane.cpp
@@ -36,21 +36,21 @@
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"
 #endif
 

-IMPLEMENT_CLASS( wxFloatingPane, wxFloatingPaneBaseClass )
+IMPLEMENT_CLASS( wxAuiFloatingFrame, wxAuiFloatingFrameBaseClass )

 
 

-wxFloatingPane::wxFloatingPane(wxWindow* parent,
-                wxFrameManager* owner_mgr,
-                const wxPaneInfo& pane,
+wxAuiFloatingFrame::wxAuiFloatingFrame(wxWindow* parent,
+                wxAuiManager* owner_mgr,
+                const wxAuiPaneInfo& pane,

                 wxWindowID id /*= wxID_ANY*/,
                 long style /*=wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION |
                               wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | 
                               wxCLIP_CHILDREN
                            */)
                 wxWindowID id /*= wxID_ANY*/,
                 long style /*=wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION |
                               wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | 
                               wxCLIP_CHILDREN
                            */)

-                : wxFloatingPaneBaseClass(parent, id, wxEmptyString,
+                : wxAuiFloatingFrameBaseClass(parent, id, wxEmptyString,

                         pane.floating_pos, pane.floating_size,
                         style | 
                         (pane.HasCloseButton()?wxCLOSE_BOX:0) |
                         pane.floating_pos, pane.floating_size,
                         style | 
                         (pane.HasCloseButton()?wxCLOSE_BOX:0) |

-                        (pane.HasMaximizeButton()?wxMAXIMIZE:0) |
+                        (pane.HasMaximizeButton()?wxMAXIMIZE_BOX:0) |

                         (pane.IsFixed()?0:wxRESIZE_BORDER)
                         )
 {
                         (pane.IsFixed()?0:wxRESIZE_BORDER)
                         )
 {


@@ -70,7 +70,7 @@ wxFloatingPane::wxFloatingPane(wxWindow* parent,
     SetExtraStyle(wxWS_EX_PROCESS_IDLE);
 }
 
     SetExtraStyle(wxWS_EX_PROCESS_IDLE);
 }
 

-wxFloatingPane::~wxFloatingPane()
+wxAuiFloatingFrame::~wxAuiFloatingFrame()

 {
     // if we do not do this, then we can crash...
     if(m_owner_mgr && m_owner_mgr->m_action_window == this) {
 {
     // if we do not do this, then we can crash...
     if(m_owner_mgr && m_owner_mgr->m_action_window == this) {


@@ -79,12 +79,12 @@ wxFloatingPane::~wxFloatingPane()
     m_mgr.UnInit();
 }
 
     m_mgr.UnInit();
 }
 

-void wxFloatingPane::SetPaneWindow(const wxPaneInfo& pane)
+void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane)

 {
     m_pane_window = pane.window;
     m_pane_window->Reparent(this);
 
 {
     m_pane_window = pane.window;
     m_pane_window->Reparent(this);
 

-    wxPaneInfo contained_pane = pane;
+    wxAuiPaneInfo contained_pane = pane;

     contained_pane.Dock().Center().Show().
                     CaptionVisible(false).
                     PaneBorder(false).
     contained_pane.Dock().Center().Show().
                     CaptionVisible(false).
                     PaneBorder(false).


@@ -131,19 +131,19 @@ void wxFloatingPane::SetPaneWindow(const wxPaneInfo& pane)
     }
 }
 
     }
 }
 

-void wxFloatingPane::OnSize(wxSizeEvent& event)
+void wxAuiFloatingFrame::OnSize(wxSizeEvent& event)

 {
     m_owner_mgr->OnFloatingPaneResized(m_pane_window, event.GetSize());
 }
 
 {
     m_owner_mgr->OnFloatingPaneResized(m_pane_window, event.GetSize());
 }
 

-void wxFloatingPane::OnClose(wxCloseEvent& evt)
+void wxAuiFloatingFrame::OnClose(wxCloseEvent& evt)

 {
     m_owner_mgr->OnFloatingPaneClosed(m_pane_window, evt);
     if (!evt.GetVeto())
         Destroy();
 }
 
 {
     m_owner_mgr->OnFloatingPaneClosed(m_pane_window, evt);
     if (!evt.GetVeto())
         Destroy();
 }
 

-void wxFloatingPane::OnMoveEvent(wxMoveEvent& event)
+void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event)

 {
     if (!m_solid_drag)
     {
 {
     if (!m_solid_drag)
     {


@@ -230,7 +230,7 @@ void wxFloatingPane::OnMoveEvent(wxMoveEvent& event)
     OnMoving(event.GetRect(), dir);
 }
 
     OnMoving(event.GetRect(), dir);
 }
 

-void wxFloatingPane::OnIdle(wxIdleEvent& event)
+void wxAuiFloatingFrame::OnIdle(wxIdleEvent& event)

 {
     if (m_moving)
     {
 {
     if (m_moving)
     {


@@ -246,26 +246,26 @@ void wxFloatingPane::OnIdle(wxIdleEvent& event)
     }
 }
 
     }
 }
 

-void wxFloatingPane::OnMoveStart()
+void wxAuiFloatingFrame::OnMoveStart()

 {
     // notify the owner manager that the pane has started to move
     m_owner_mgr->OnFloatingPaneMoveStart(m_pane_window);
 }
 
 {
     // notify the owner manager that the pane has started to move
     m_owner_mgr->OnFloatingPaneMoveStart(m_pane_window);
 }
 

-void wxFloatingPane::OnMoving(const wxRect& WXUNUSED(window_rect), wxDirection dir)
+void wxAuiFloatingFrame::OnMoving(const wxRect& WXUNUSED(window_rect), wxDirection dir)

 {
     // notify the owner manager that the pane is moving
     m_owner_mgr->OnFloatingPaneMoving(m_pane_window, dir);
     m_lastDirection = dir;
 }
 
 {
     // notify the owner manager that the pane is moving
     m_owner_mgr->OnFloatingPaneMoving(m_pane_window, dir);
     m_lastDirection = dir;
 }
 

-void wxFloatingPane::OnMoveFinished()
+void wxAuiFloatingFrame::OnMoveFinished()

 {
     // notify the owner manager that the pane has finished moving
     m_owner_mgr->OnFloatingPaneMoved(m_pane_window, m_lastDirection);
 }
 
 {
     // notify the owner manager that the pane has finished moving
     m_owner_mgr->OnFloatingPaneMoved(m_pane_window, m_lastDirection);
 }
 

-void wxFloatingPane::OnActivate(wxActivateEvent& event)
+void wxAuiFloatingFrame::OnActivate(wxActivateEvent& event)

 {
     if (event.GetActive())
     {
 {
     if (event.GetActive())
     {


@@ -277,19 +277,19 @@ void wxFloatingPane::OnActivate(wxActivateEvent& event)
 // (independant of having a wxMouseEvent handy) - utimately a better
 // mechanism for this should be found (possibly by adding the
 // functionality to wxWidgets itself)
 // (independant of having a wxMouseEvent handy) - utimately a better
 // mechanism for this should be found (possibly by adding the
 // functionality to wxWidgets itself)

-bool wxFloatingPane::isMouseDown()
+bool wxAuiFloatingFrame::isMouseDown()

 {
     return wxGetMouseState().LeftDown();
 }
 
 
 {
     return wxGetMouseState().LeftDown();
 }
 
 

-BEGIN_EVENT_TABLE(wxFloatingPane, wxFloatingPaneBaseClass)
-    EVT_SIZE(wxFloatingPane::OnSize)
-    EVT_MOVE(wxFloatingPane::OnMoveEvent)
-    EVT_MOVING(wxFloatingPane::OnMoveEvent)
-    EVT_CLOSE(wxFloatingPane::OnClose)
-    EVT_IDLE(wxFloatingPane::OnIdle)
-    EVT_ACTIVATE(wxFloatingPane::OnActivate)
+BEGIN_EVENT_TABLE(wxAuiFloatingFrame, wxAuiFloatingFrameBaseClass)
+    EVT_SIZE(wxAuiFloatingFrame::OnSize)
+    EVT_MOVE(wxAuiFloatingFrame::OnMoveEvent)
+    EVT_MOVING(wxAuiFloatingFrame::OnMoveEvent)
+    EVT_CLOSE(wxAuiFloatingFrame::OnClose)
+    EVT_IDLE(wxAuiFloatingFrame::OnIdle)
+    EVT_ACTIVATE(wxAuiFloatingFrame::OnActivate)

 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()