From 8856768e6eb5ee28b3cab2f63baa2a9713d5b69b Mon Sep 17 00:00:00 2001 From: Benjamin Williams Date: Wed, 1 Nov 2006 20:02:40 +0000 Subject: [PATCH] fixed bad rename git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/aui/tabmdi.h | 22 ++++++++++----------- src/aui/tabmdi.cpp | 44 ++++++++++++++++++++--------------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h index ea9b29eb39..5f7d548bd1 100644 --- a/include/wx/aui/tabmdi.h +++ b/include/wx/aui/tabmdi.h @@ -28,7 +28,7 @@ //----------------------------------------------------------------------------- class WXDLLIMPEXP_AUI wxAuiMDIParentFrame; -class WXDLLIMPEXP_AUI wxAuiTabMDIClientWindow; +class WXDLLIMPEXP_AUI wxAuiMDIClientWindow; class WXDLLIMPEXP_AUI wxAuiMDIChildFrame; //----------------------------------------------------------------------------- @@ -71,8 +71,8 @@ public: wxAuiMDIChildFrame *GetActiveChild() const; inline void SetActiveChild(wxAuiMDIChildFrame* pChildFrame); - wxAuiTabMDIClientWindow *GetClientWindow() const; - virtual wxAuiTabMDIClientWindow *OnCreateClient(); + wxAuiMDIClientWindow *GetClientWindow() const; + virtual wxAuiMDIClientWindow *OnCreateClient(); virtual void Cascade() { /* Has no effect */ } virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL) { } @@ -81,7 +81,7 @@ public: virtual void ActivatePrevious(); protected: - wxAuiTabMDIClientWindow *m_pClientWindow; + wxAuiMDIClientWindow *m_pClientWindow; wxAuiMDIChildFrame *m_pActiveChild; #if wxUSE_MENUS @@ -221,19 +221,19 @@ private: DECLARE_DYNAMIC_CLASS(wxAuiMDIChildFrame) DECLARE_EVENT_TABLE() - friend class wxAuiTabMDIClientWindow; + friend class wxAuiMDIClientWindow; }; //----------------------------------------------------------------------------- -// wxAuiTabMDIClientWindow +// wxAuiMDIClientWindow //----------------------------------------------------------------------------- -class WXDLLIMPEXP_AUI wxAuiTabMDIClientWindow : public wxAuiNotebook +class WXDLLIMPEXP_AUI wxAuiMDIClientWindow : public wxAuiNotebook { public: - wxAuiTabMDIClientWindow(); - wxAuiTabMDIClientWindow(wxAuiMDIParentFrame *parent, long style = 0); - ~wxAuiTabMDIClientWindow(); + wxAuiMDIClientWindow(); + wxAuiMDIClientWindow(wxAuiMDIParentFrame *parent, long style = 0); + ~wxAuiMDIClientWindow(); virtual bool CreateClient(wxAuiMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL); @@ -247,7 +247,7 @@ protected: void OnSize(wxSizeEvent& evt); private: - DECLARE_DYNAMIC_CLASS(wxAuiTabMDIClientWindow) + DECLARE_DYNAMIC_CLASS(wxAuiMDIClientWindow) DECLARE_EVENT_TABLE() }; #endif // wxUSE_AUI diff --git a/src/aui/tabmdi.cpp b/src/aui/tabmdi.cpp index 54cd7b7850..10c129d730 100644 --- a/src/aui/tabmdi.cpp +++ b/src/aui/tabmdi.cpp @@ -218,14 +218,14 @@ void wxAuiMDIParentFrame::SetActiveChild(wxAuiMDIChildFrame* pChildFrame) m_pActiveChild = pChildFrame; } -wxAuiTabMDIClientWindow *wxAuiMDIParentFrame::GetClientWindow() const +wxAuiMDIClientWindow *wxAuiMDIParentFrame::GetClientWindow() const { return m_pClientWindow; } -wxAuiTabMDIClientWindow *wxAuiMDIParentFrame::OnCreateClient() +wxAuiMDIClientWindow *wxAuiMDIParentFrame::OnCreateClient() { - m_pClientWindow = new wxAuiTabMDIClientWindow( this ); + m_pClientWindow = new wxAuiMDIClientWindow( this ); return m_pClientWindow; } @@ -374,7 +374,7 @@ bool wxAuiMDIChildFrame::Create(wxAuiMDIParentFrame* parent, long style, const wxString& name) { - wxAuiTabMDIClientWindow* pClientWindow = parent->GetClientWindow(); + wxAuiMDIClientWindow* pClientWindow = parent->GetClientWindow(); wxASSERT_MSG((pClientWindow != (wxWindow*) NULL), wxT("Missing MDI client window.")); wxPanel::Create(pClientWindow, id, wxDefaultPosition, size, style|wxNO_BORDER, name); @@ -397,7 +397,7 @@ bool wxAuiMDIChildFrame::Destroy() wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame(); wxASSERT_MSG(pParentFrame, wxT("Missing MDI Parent Frame")); - wxAuiTabMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow(); + wxAuiMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow(); wxASSERT_MSG(pClientWindow, wxT("Missing MDI Client Window")); if (pParentFrame->GetActiveChild() == this) @@ -451,7 +451,7 @@ void wxAuiMDIChildFrame::SetTitle(const wxString& title) wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame(); wxASSERT_MSG(pParentFrame, wxT("Missing MDI Parent Frame")); - wxAuiTabMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow(); + wxAuiMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow(); if (pClientWindow != NULL) { size_t pos; @@ -476,7 +476,7 @@ void wxAuiMDIChildFrame::Activate() wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame(); wxASSERT_MSG(pParentFrame, wxT("Missing MDI Parent Frame")); - wxAuiTabMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow(); + wxAuiMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow(); if (pClientWindow != NULL) { @@ -572,31 +572,31 @@ void wxAuiMDIChildFrame::ApplyMDIChildFrameRect() //----------------------------------------------------------------------------- -// wxAuiTabMDIClientWindow +// wxAuiMDIClientWindow //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxAuiTabMDIClientWindow, wxAuiNotebook) +IMPLEMENT_DYNAMIC_CLASS(wxAuiMDIClientWindow, wxAuiNotebook) -BEGIN_EVENT_TABLE(wxAuiTabMDIClientWindow, wxAuiNotebook) - EVT_AUINOTEBOOK_PAGE_CHANGED(wxID_ANY, wxAuiTabMDIClientWindow::OnPageChanged) - EVT_SIZE(wxAuiTabMDIClientWindow::OnSize) +BEGIN_EVENT_TABLE(wxAuiMDIClientWindow, wxAuiNotebook) + EVT_AUINOTEBOOK_PAGE_CHANGED(wxID_ANY, wxAuiMDIClientWindow::OnPageChanged) + EVT_SIZE(wxAuiMDIClientWindow::OnSize) END_EVENT_TABLE() -wxAuiTabMDIClientWindow::wxAuiTabMDIClientWindow() +wxAuiMDIClientWindow::wxAuiMDIClientWindow() { } -wxAuiTabMDIClientWindow::wxAuiTabMDIClientWindow(wxAuiMDIParentFrame* parent, long style) +wxAuiMDIClientWindow::wxAuiMDIClientWindow(wxAuiMDIParentFrame* parent, long style) { CreateClient(parent, style); } -wxAuiTabMDIClientWindow::~wxAuiTabMDIClientWindow() +wxAuiMDIClientWindow::~wxAuiMDIClientWindow() { DestroyChildren(); } -bool wxAuiTabMDIClientWindow::CreateClient(wxAuiMDIParentFrame* parent, long style) +bool wxAuiMDIClientWindow::CreateClient(wxAuiMDIParentFrame* parent, long style) { SetWindowStyleFlag(style); @@ -617,12 +617,12 @@ bool wxAuiTabMDIClientWindow::CreateClient(wxAuiMDIParentFrame* parent, long sty return true; } -int wxAuiTabMDIClientWindow::SetSelection(size_t nPage) +int wxAuiMDIClientWindow::SetSelection(size_t nPage) { return wxAuiNotebook::SetSelection(nPage); } -void wxAuiTabMDIClientWindow::PageChanged(int old_selection, int new_selection) +void wxAuiMDIClientWindow::PageChanged(int old_selection, int new_selection) { // don't do anything if the page doesn't actually change if (old_selection == new_selection) @@ -640,7 +640,7 @@ void wxAuiTabMDIClientWindow::PageChanged(int old_selection, int new_selection) if (old_selection != -1) { wxAuiMDIChildFrame* old_child = (wxAuiMDIChildFrame*)GetPage(old_selection); - wxASSERT_MSG(old_child, wxT("wxAuiTabMDIClientWindow::PageChanged - null page pointer")); + wxASSERT_MSG(old_child, wxT("wxAuiMDIClientWindow::PageChanged - null page pointer")); wxActivateEvent event(wxEVT_ACTIVATE, false, old_child->GetId()); event.SetEventObject(old_child); @@ -651,7 +651,7 @@ void wxAuiTabMDIClientWindow::PageChanged(int old_selection, int new_selection) if (new_selection != -1) { wxAuiMDIChildFrame* active_child = (wxAuiMDIChildFrame*)GetPage(new_selection); - wxASSERT_MSG(active_child, wxT("wxAuiTabMDIClientWindow::PageChanged - null page pointer")); + wxASSERT_MSG(active_child, wxT("wxAuiMDIClientWindow::PageChanged - null page pointer")); wxActivateEvent event(wxEVT_ACTIVATE, true, active_child->GetId()); event.SetEventObject(active_child); @@ -665,13 +665,13 @@ void wxAuiTabMDIClientWindow::PageChanged(int old_selection, int new_selection) } } -void wxAuiTabMDIClientWindow::OnPageChanged(wxAuiNotebookEvent& evt) +void wxAuiMDIClientWindow::OnPageChanged(wxAuiNotebookEvent& evt) { PageChanged(evt.GetOldSelection(), evt.GetSelection()); evt.Skip(); } -void wxAuiTabMDIClientWindow::OnSize(wxSizeEvent& evt) +void wxAuiMDIClientWindow::OnSize(wxSizeEvent& evt) { wxAuiNotebook::OnSize(evt); -- 2.45.2