From 00c1c94cda3a685d46bc5232fb04d7f444beff54 Mon Sep 17 00:00:00 2001 From: Benjamin Williams Date: Wed, 1 Nov 2006 19:13:58 +0000 Subject: [PATCH] while we're at it, rename wxAuiFloatingPane to the more correct wxAuiFloatingFrame git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/aui/floatpane.h | 12 +++++----- include/wx/aui/framemanager.h | 6 ++--- src/aui/floatpane.cpp | 42 +++++++++++++++++------------------ src/aui/framemanager.cpp | 6 ++--- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/include/wx/aui/floatpane.h b/include/wx/aui/floatpane.h index 9344b52d4c..567aaca597 100644 --- 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" -#define wxAuiFloatingPaneBaseClass wxMiniFrame +#define wxAuiFloatingFrameBaseClass wxMiniFrame #else -#define wxAuiFloatingPaneBaseClass wxFrame +#define wxAuiFloatingFrameBaseClass wxFrame #endif -class WXDLLIMPEXP_AUI wxAuiFloatingPane : public wxAuiFloatingPaneBaseClass +class WXDLLIMPEXP_AUI wxAuiFloatingFrame : public wxAuiFloatingFrameBaseClass { public: - wxAuiFloatingPane(wxWindow* parent, + wxAuiFloatingFrame(wxWindow* parent, wxAuiManager* owner_mgr, const wxAuiPaneInfo& pane, wxWindowID id = wxID_ANY, @@ -40,7 +40,7 @@ public: wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | wxCLIP_CHILDREN ); - virtual ~wxAuiFloatingPane(); + virtual ~wxAuiFloatingFrame(); void SetPaneWindow(const wxAuiPaneInfo& pane); protected: @@ -70,7 +70,7 @@ private: #ifndef SWIG DECLARE_EVENT_TABLE() - DECLARE_CLASS(wxAuiFloatingPaneBaseClass) + DECLARE_CLASS(wxAuiFloatingFrameBaseClass) #endif // SWIG }; diff --git a/include/wx/aui/framemanager.h b/include/wx/aui/framemanager.h index a5f2e55356..9ae5e5e736 100644 --- a/include/wx/aui/framemanager.h +++ b/include/wx/aui/framemanager.h @@ -410,11 +410,11 @@ public: -class WXDLLIMPEXP_AUI wxAuiFloatingPane; +class WXDLLIMPEXP_AUI wxAuiFloatingFrame; class WXDLLIMPEXP_AUI wxAuiManager : public wxEvtHandler { -friend class wxAuiFloatingPane; +friend class wxAuiFloatingFrame; public: @@ -473,7 +473,7 @@ public: public: - virtual wxAuiFloatingPane* CreateFloatingFrame(wxWindow* parent, const wxAuiPaneInfo& p); + virtual wxAuiFloatingFrame* CreateFloatingFrame(wxWindow* parent, const wxAuiPaneInfo& p); void DrawHintRect(wxWindow* pane_window, const wxPoint& pt, diff --git a/src/aui/floatpane.cpp b/src/aui/floatpane.cpp index 825d85dc12..e6cc086950 100644 --- a/src/aui/floatpane.cpp +++ b/src/aui/floatpane.cpp @@ -36,9 +36,9 @@ #include "wx/msw/private.h" #endif -IMPLEMENT_CLASS( wxAuiFloatingPane, wxAuiFloatingPaneBaseClass ) +IMPLEMENT_CLASS( wxAuiFloatingFrame, wxAuiFloatingFrameBaseClass ) -wxAuiFloatingPane::wxAuiFloatingPane(wxWindow* parent, +wxAuiFloatingFrame::wxAuiFloatingFrame(wxWindow* parent, wxAuiManager* owner_mgr, const wxAuiPaneInfo& pane, wxWindowID id /*= wxID_ANY*/, @@ -46,7 +46,7 @@ wxAuiFloatingPane::wxAuiFloatingPane(wxWindow* parent, wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | wxCLIP_CHILDREN */) - : wxAuiFloatingPaneBaseClass(parent, id, wxEmptyString, + : wxAuiFloatingFrameBaseClass(parent, id, wxEmptyString, pane.floating_pos, pane.floating_size, style | (pane.HasCloseButton()?wxCLOSE_BOX:0) | @@ -70,7 +70,7 @@ wxAuiFloatingPane::wxAuiFloatingPane(wxWindow* parent, SetExtraStyle(wxWS_EX_PROCESS_IDLE); } -wxAuiFloatingPane::~wxAuiFloatingPane() +wxAuiFloatingFrame::~wxAuiFloatingFrame() { // if we do not do this, then we can crash... if(m_owner_mgr && m_owner_mgr->m_action_window == this) { @@ -79,7 +79,7 @@ wxAuiFloatingPane::~wxAuiFloatingPane() m_mgr.UnInit(); } -void wxAuiFloatingPane::SetPaneWindow(const wxAuiPaneInfo& pane) +void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane) { m_pane_window = pane.window; m_pane_window->Reparent(this); @@ -131,19 +131,19 @@ void wxAuiFloatingPane::SetPaneWindow(const wxAuiPaneInfo& pane) } } -void wxAuiFloatingPane::OnSize(wxSizeEvent& event) +void wxAuiFloatingFrame::OnSize(wxSizeEvent& event) { m_owner_mgr->OnFloatingPaneResized(m_pane_window, event.GetSize()); } -void wxAuiFloatingPane::OnClose(wxCloseEvent& evt) +void wxAuiFloatingFrame::OnClose(wxCloseEvent& evt) { m_owner_mgr->OnFloatingPaneClosed(m_pane_window, evt); if (!evt.GetVeto()) Destroy(); } -void wxAuiFloatingPane::OnMoveEvent(wxMoveEvent& event) +void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event) { if (!m_solid_drag) { @@ -230,7 +230,7 @@ void wxAuiFloatingPane::OnMoveEvent(wxMoveEvent& event) OnMoving(event.GetRect(), dir); } -void wxAuiFloatingPane::OnIdle(wxIdleEvent& event) +void wxAuiFloatingFrame::OnIdle(wxIdleEvent& event) { if (m_moving) { @@ -246,26 +246,26 @@ void wxAuiFloatingPane::OnIdle(wxIdleEvent& event) } } -void wxAuiFloatingPane::OnMoveStart() +void wxAuiFloatingFrame::OnMoveStart() { // notify the owner manager that the pane has started to move m_owner_mgr->OnFloatingPaneMoveStart(m_pane_window); } -void wxAuiFloatingPane::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; } -void wxAuiFloatingPane::OnMoveFinished() +void wxAuiFloatingFrame::OnMoveFinished() { // notify the owner manager that the pane has finished moving m_owner_mgr->OnFloatingPaneMoved(m_pane_window, m_lastDirection); } -void wxAuiFloatingPane::OnActivate(wxActivateEvent& event) +void wxAuiFloatingFrame::OnActivate(wxActivateEvent& event) { if (event.GetActive()) { @@ -277,19 +277,19 @@ void wxAuiFloatingPane::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) -bool wxAuiFloatingPane::isMouseDown() +bool wxAuiFloatingFrame::isMouseDown() { return wxGetMouseState().LeftDown(); } -BEGIN_EVENT_TABLE(wxAuiFloatingPane, wxAuiFloatingPaneBaseClass) - EVT_SIZE(wxAuiFloatingPane::OnSize) - EVT_MOVE(wxAuiFloatingPane::OnMoveEvent) - EVT_MOVING(wxAuiFloatingPane::OnMoveEvent) - EVT_CLOSE(wxAuiFloatingPane::OnClose) - EVT_IDLE(wxAuiFloatingPane::OnIdle) - EVT_ACTIVATE(wxAuiFloatingPane::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() diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp index 8b35314383..7f9d92afa4 100644 --- a/src/aui/framemanager.cpp +++ b/src/aui/framemanager.cpp @@ -503,9 +503,9 @@ wxAuiManager::~wxAuiManager() } // Creates a floating frame for the windows -wxAuiFloatingPane * wxAuiManager::CreateFloatingFrame(wxWindow* parent, const wxAuiPaneInfo& p) +wxAuiFloatingFrame * wxAuiManager::CreateFloatingFrame(wxWindow* parent, const wxAuiPaneInfo& p) { - return new wxAuiFloatingPane(parent, this, p); + return new wxAuiFloatingFrame(parent, this, p); } // GetPane() looks up a wxAuiPaneInfo structure based @@ -2206,7 +2206,7 @@ void wxAuiManager::Update() { // we need to create a frame for this // pane, which has recently been floated - wxAuiFloatingPane* frame = CreateFloatingFrame(m_frame, p); + wxAuiFloatingFrame* frame = CreateFloatingFrame(m_frame, p); #if wxCHECK_VERSION(2,7,0) // on MSW and Mac, if the owner desires transparent dragging, and -- 2.45.2