last change was wrong, fix wxUSE_MDI==0 build without completely disabling this file compilation when wxUSE_MDI==1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -13,8 +13,6 @@
|
|||||||
// For compilers that support precompilation, includes "wx/wx.h".
|
// For compilers that support precompilation, includes "wx/wx.h".
|
||||||
#include "wx/wxprec.h"
|
#include "wx/wxprec.h"
|
||||||
|
|
||||||
#if !wxUSE_MDI
|
|
||||||
|
|
||||||
#ifdef __BORLANDC__
|
#ifdef __BORLANDC__
|
||||||
#pragma hdrstop
|
#pragma hdrstop
|
||||||
#endif
|
#endif
|
||||||
@@ -491,7 +489,7 @@ wxWindow *wxDynamicSashWindowImpl::FindFrame() const
|
|||||||
|
|
||||||
win = m_window->GetParent();
|
win = m_window->GetParent();
|
||||||
while (win && !win->IsTopLevel()
|
while (win && !win->IsTopLevel()
|
||||||
#ifdef __WXMSW__
|
#if defined(__WXMSW__) && wxUSE_MDI
|
||||||
&& ! wxIsKindOf(win, wxMDIChildFrame) // not top-level but still a frame
|
&& ! wxIsKindOf(win, wxMDIChildFrame) // not top-level but still a frame
|
||||||
#endif
|
#endif
|
||||||
)
|
)
|
||||||
@@ -1471,4 +1469,3 @@ wxDynamicSashReparentEvent::wxDynamicSashReparentEvent(const wxDynamicSashRepare
|
|||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxDynamicSashReparentEvent, wxEvent)
|
IMPLEMENT_DYNAMIC_CLASS(wxDynamicSashReparentEvent, wxEvent)
|
||||||
|
|
||||||
#endif // !wxUSE_MDI
|
|
Reference in New Issue
Block a user