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

Applied patch [ 1768229 ] auibook.cpp: Fix undefined reference if wxUSE_MDI == 0

Browse Source 
Tim Kosse



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@48254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-08-21 08:14:21 +00:00
parent 44f1ac5a18
commit 2ff8932f92
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/aui/auibook.cpp
View File

@@ -2193,12 +2193,14 @@ bool wxAuiTabContainer::ButtonHitTest(int x, int y,
// as the Show() method on this class is "unplugged" // as the Show() method on this class is "unplugged"
static void ShowWnd(wxWindow* wnd, bool show) static void ShowWnd(wxWindow* wnd, bool show)
{ {
#if wxUSE_MDI
if (wnd->IsKindOf(CLASSINFO(wxAuiMDIChildFrame))) if (wnd->IsKindOf(CLASSINFO(wxAuiMDIChildFrame)))
{ {
wxAuiMDIChildFrame* cf = (wxAuiMDIChildFrame*)wnd; wxAuiMDIChildFrame* cf = (wxAuiMDIChildFrame*)wnd;
cf->DoShow(show); cf->DoShow(show);
} }
else else
#endif
{ {
wnd->Show(show); wnd->Show(show);
} }
@@ -2743,11 +2745,13 @@ public:
page.window->SetSize(m_rect.x, m_rect.y + m_tab_ctrl_height, page.window->SetSize(m_rect.x, m_rect.y + m_tab_ctrl_height,
m_rect.width, m_rect.height - m_tab_ctrl_height); m_rect.width, m_rect.height - m_tab_ctrl_height);
#if wxUSE_MDI
if (page.window->IsKindOf(CLASSINFO(wxAuiMDIChildFrame))) if (page.window->IsKindOf(CLASSINFO(wxAuiMDIChildFrame)))
{ {
wxAuiMDIChildFrame* wnd = (wxAuiMDIChildFrame*)page.window; wxAuiMDIChildFrame* wnd = (wxAuiMDIChildFrame*)page.window;
wnd->ApplyMDIChildFrameRect(); wnd->ApplyMDIChildFrameRect();
} }
#endif
} }
} }
@@ -3140,6 +3144,7 @@ bool wxAuiNotebook::DeletePage(size_t page_idx)
return false; return false;
// actually destroy the window now // actually destroy the window now
#if wxUSE_MDI
if (wnd->IsKindOf(CLASSINFO(wxAuiMDIChildFrame))) if (wnd->IsKindOf(CLASSINFO(wxAuiMDIChildFrame)))
{ {
// delete the child frame with pending delete, as is // delete the child frame with pending delete, as is
@@ -3147,7 +3152,8 @@ bool wxAuiNotebook::DeletePage(size_t page_idx)
if (!wxPendingDelete.Member(wnd)) if (!wxPendingDelete.Member(wnd))
wxPendingDelete.Append(wnd); wxPendingDelete.Append(wnd);
} }
else else
#endif
{ {
wnd->Destroy(); wnd->Destroy();
} }
@@ -4231,11 +4237,13 @@ void wxAuiNotebook::OnTabButton(wxCommandEvent& command_evt)
return; return;
#if wxUSE_MDI
if (close_wnd->IsKindOf(CLASSINFO(wxAuiMDIChildFrame))) if (close_wnd->IsKindOf(CLASSINFO(wxAuiMDIChildFrame)))
{ {
close_wnd->Close(); close_wnd->Close();
} }
else else
#endif
{ {
int main_idx = m_tabs.GetIdxFromWindow(close_wnd); int main_idx = m_tabs.GetIdxFromWindow(close_wnd);
DeletePage(main_idx); DeletePage(main_idx);