X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1e44484f7cc269ce7ed5dd0217a8b824aed5c6d..e3f9e20cb15c62bd347a8e52d2d36529adbdb3d6:/src/msw/mdi.cpp?ds=sidebyside diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index edb246d750..5f980abb3d 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -234,7 +234,9 @@ bool wxMDIParentFrame::Create(wxWindow *parent, wxMDIParentFrame::~wxMDIParentFrame() { // see comment in ~wxMDIChildFrame +#if wxUSE_TOOLBAR m_frameToolBar = NULL; +#endif m_frameStatusBar = NULL; DestroyChildren(); @@ -732,7 +734,9 @@ wxMDIChildFrame::~wxMDIChildFrame() { // will be destroyed by DestroyChildren() but reset them before calling it // to avoid using dangling pointers if a callback comes in the meanwhile +#if wxUSE_TOOLBAR m_frameToolBar = NULL; +#endif m_frameStatusBar = NULL; DestroyChildren(); @@ -1027,11 +1031,13 @@ bool wxMDIChildFrame::HandleWindowPosChanging(void *pos) lpPos->cx = rectClient.right - rectClient.left; lpPos->cy = rectClient.bottom - rectClient.top; } +#if wxUSE_TOOLBAR wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent(); if (pFrameWnd && pFrameWnd->GetToolBar() && pFrameWnd->GetToolBar()->IsShown()) { pFrameWnd->GetToolBar()->Refresh(); } +#endif } #endif // Win95