cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bad rename

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Benjamin Williams 2006-11-01 20:02:40 +00:00
parent 83941c008e
commit 8856768e6e
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/wx/aui/tabmdi.h
View File

@ -28,7 +28,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class WXDLLIMPEXP_AUI wxAuiMDIParentFrame; class WXDLLIMPEXP_AUI wxAuiMDIParentFrame;
class WXDLLIMPEXP_AUI wxAuiTabMDIClientWindow; class WXDLLIMPEXP_AUI wxAuiMDIClientWindow;
class WXDLLIMPEXP_AUI wxAuiMDIChildFrame; class WXDLLIMPEXP_AUI wxAuiMDIChildFrame;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -71,8 +71,8 @@ public:
wxAuiMDIChildFrame *GetActiveChild() const; wxAuiMDIChildFrame *GetActiveChild() const;
inline void SetActiveChild(wxAuiMDIChildFrame* pChildFrame); inline void SetActiveChild(wxAuiMDIChildFrame* pChildFrame);
wxAuiTabMDIClientWindow *GetClientWindow() const; wxAuiMDIClientWindow *GetClientWindow() const;
virtual wxAuiTabMDIClientWindow *OnCreateClient(); virtual wxAuiMDIClientWindow *OnCreateClient();
virtual void Cascade() { /* Has no effect */ } virtual void Cascade() { /* Has no effect */ }
virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL) { } virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL) { }
@ -81,7 +81,7 @@ public:
virtual void ActivatePrevious(); virtual void ActivatePrevious();
protected: protected:
wxAuiTabMDIClientWindow *m_pClientWindow; wxAuiMDIClientWindow *m_pClientWindow;
wxAuiMDIChildFrame *m_pActiveChild; wxAuiMDIChildFrame *m_pActiveChild;
#if wxUSE_MENUS #if wxUSE_MENUS
@ -221,19 +221,19 @@ private:
DECLARE_DYNAMIC_CLASS(wxAuiMDIChildFrame) DECLARE_DYNAMIC_CLASS(wxAuiMDIChildFrame)
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
friend class wxAuiTabMDIClientWindow; friend class wxAuiMDIClientWindow;
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxAuiTabMDIClientWindow // wxAuiMDIClientWindow
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class WXDLLIMPEXP_AUI wxAuiTabMDIClientWindow : public wxAuiNotebook class WXDLLIMPEXP_AUI wxAuiMDIClientWindow : public wxAuiNotebook
{ {
public: public:
wxAuiTabMDIClientWindow(); wxAuiMDIClientWindow();
wxAuiTabMDIClientWindow(wxAuiMDIParentFrame *parent, long style = 0); wxAuiMDIClientWindow(wxAuiMDIParentFrame *parent, long style = 0);
~wxAuiTabMDIClientWindow(); ~wxAuiMDIClientWindow();
virtual bool CreateClient(wxAuiMDIParentFrame *parent, virtual bool CreateClient(wxAuiMDIParentFrame *parent,
long style = wxVSCROLL | wxHSCROLL); long style = wxVSCROLL | wxHSCROLL);
@ -247,7 +247,7 @@ protected:
void OnSize(wxSizeEvent& evt); void OnSize(wxSizeEvent& evt);
private: private:
DECLARE_DYNAMIC_CLASS(wxAuiTabMDIClientWindow) DECLARE_DYNAMIC_CLASS(wxAuiMDIClientWindow)
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#endif // wxUSE_AUI #endif // wxUSE_AUI

44
src/aui/tabmdi.cpp
View File

@ -218,14 +218,14 @@ void wxAuiMDIParentFrame::SetActiveChild(wxAuiMDIChildFrame* pChildFrame)
m_pActiveChild = pChildFrame; m_pActiveChild = pChildFrame;
} }
wxAuiTabMDIClientWindow *wxAuiMDIParentFrame::GetClientWindow() const wxAuiMDIClientWindow *wxAuiMDIParentFrame::GetClientWindow() const
{ {
return m_pClientWindow; return m_pClientWindow;
} }
wxAuiTabMDIClientWindow *wxAuiMDIParentFrame::OnCreateClient() wxAuiMDIClientWindow *wxAuiMDIParentFrame::OnCreateClient()
{ {
m_pClientWindow = new wxAuiTabMDIClientWindow( this ); m_pClientWindow = new wxAuiMDIClientWindow( this );
return m_pClientWindow; return m_pClientWindow;
} }
@ -374,7 +374,7 @@ bool wxAuiMDIChildFrame::Create(wxAuiMDIParentFrame* parent,
long style, long style,
const wxString& name) const wxString& name)
{ {
wxAuiTabMDIClientWindow* pClientWindow = parent->GetClientWindow(); wxAuiMDIClientWindow* pClientWindow = parent->GetClientWindow();
wxASSERT_MSG((pClientWindow != (wxWindow*) NULL), wxT("Missing MDI client window.")); wxASSERT_MSG((pClientWindow != (wxWindow*) NULL), wxT("Missing MDI client window."));
wxPanel::Create(pClientWindow, id, wxDefaultPosition, size, style|wxNO_BORDER, name); wxPanel::Create(pClientWindow, id, wxDefaultPosition, size, style|wxNO_BORDER, name);
@ -397,7 +397,7 @@ bool wxAuiMDIChildFrame::Destroy()
wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame(); wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame();
wxASSERT_MSG(pParentFrame, wxT("Missing MDI Parent Frame")); wxASSERT_MSG(pParentFrame, wxT("Missing MDI Parent Frame"));
wxAuiTabMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow(); wxAuiMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow();
wxASSERT_MSG(pClientWindow, wxT("Missing MDI Client Window")); wxASSERT_MSG(pClientWindow, wxT("Missing MDI Client Window"));
if (pParentFrame->GetActiveChild() == this) if (pParentFrame->GetActiveChild() == this)
@ -451,7 +451,7 @@ void wxAuiMDIChildFrame::SetTitle(const wxString& title)
wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame(); wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame();
wxASSERT_MSG(pParentFrame, wxT("Missing MDI Parent Frame")); wxASSERT_MSG(pParentFrame, wxT("Missing MDI Parent Frame"));
wxAuiTabMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow(); wxAuiMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow();
if (pClientWindow != NULL) if (pClientWindow != NULL)
{ {
size_t pos; size_t pos;
@ -476,7 +476,7 @@ void wxAuiMDIChildFrame::Activate()
wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame(); wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame();
wxASSERT_MSG(pParentFrame, wxT("Missing MDI Parent Frame")); wxASSERT_MSG(pParentFrame, wxT("Missing MDI Parent Frame"));
wxAuiTabMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow(); wxAuiMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow();
if (pClientWindow != NULL) 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) BEGIN_EVENT_TABLE(wxAuiMDIClientWindow, wxAuiNotebook)
EVT_AUINOTEBOOK_PAGE_CHANGED(wxID_ANY, wxAuiTabMDIClientWindow::OnPageChanged) EVT_AUINOTEBOOK_PAGE_CHANGED(wxID_ANY, wxAuiMDIClientWindow::OnPageChanged)
EVT_SIZE(wxAuiTabMDIClientWindow::OnSize) EVT_SIZE(wxAuiMDIClientWindow::OnSize)
END_EVENT_TABLE() END_EVENT_TABLE()
wxAuiTabMDIClientWindow::wxAuiTabMDIClientWindow() wxAuiMDIClientWindow::wxAuiMDIClientWindow()
{ {
} }
wxAuiTabMDIClientWindow::wxAuiTabMDIClientWindow(wxAuiMDIParentFrame* parent, long style) wxAuiMDIClientWindow::wxAuiMDIClientWindow(wxAuiMDIParentFrame* parent, long style)
{ {
CreateClient(parent, style); CreateClient(parent, style);
} }
wxAuiTabMDIClientWindow::~wxAuiTabMDIClientWindow() wxAuiMDIClientWindow::~wxAuiMDIClientWindow()
{ {
DestroyChildren(); DestroyChildren();
} }
bool wxAuiTabMDIClientWindow::CreateClient(wxAuiMDIParentFrame* parent, long style) bool wxAuiMDIClientWindow::CreateClient(wxAuiMDIParentFrame* parent, long style)
{ {
SetWindowStyleFlag(style); SetWindowStyleFlag(style);
@ -617,12 +617,12 @@ bool wxAuiTabMDIClientWindow::CreateClient(wxAuiMDIParentFrame* parent, long sty
return true; return true;
} }
int wxAuiTabMDIClientWindow::SetSelection(size_t nPage) int wxAuiMDIClientWindow::SetSelection(size_t nPage)
{ {
return wxAuiNotebook::SetSelection(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 // don't do anything if the page doesn't actually change
if (old_selection == new_selection) if (old_selection == new_selection)
@ -640,7 +640,7 @@ void wxAuiTabMDIClientWindow::PageChanged(int old_selection, int new_selection)
if (old_selection != -1) if (old_selection != -1)
{ {
wxAuiMDIChildFrame* old_child = (wxAuiMDIChildFrame*)GetPage(old_selection); 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()); wxActivateEvent event(wxEVT_ACTIVATE, false, old_child->GetId());
event.SetEventObject(old_child); event.SetEventObject(old_child);
@ -651,7 +651,7 @@ void wxAuiTabMDIClientWindow::PageChanged(int old_selection, int new_selection)
if (new_selection != -1) if (new_selection != -1)
{ {
wxAuiMDIChildFrame* active_child = (wxAuiMDIChildFrame*)GetPage(new_selection); 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()); wxActivateEvent event(wxEVT_ACTIVATE, true, active_child->GetId());
event.SetEventObject(active_child); 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()); PageChanged(evt.GetOldSelection(), evt.GetSelection());
evt.Skip(); evt.Skip();
} }
void wxAuiTabMDIClientWindow::OnSize(wxSizeEvent& evt) void wxAuiMDIClientWindow::OnSize(wxSizeEvent& evt)
{ {
wxAuiNotebook::OnSize(evt); wxAuiNotebook::OnSize(evt);