X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..9d8fe14a97d1092989eecbe43c4e1f730fba17ad:/src/xrc/xh_mdi.cpp diff --git a/src/xrc/xh_mdi.cpp b/src/xrc/xh_mdi.cpp index 5838d7c288..d98e5409f7 100644 --- a/src/xrc/xh_mdi.cpp +++ b/src/xrc/xh_mdi.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_mdi.cpp -// Purpose: XRC resource for dialogs +// Name: src/xrc/xh_mdi.cpp +// Purpose: XRC resource for wxMDI // Author: David M. Falkinder & Vaclav Slavik // Created: 14/02/2005 // RCS-ID: $Id$ @@ -18,10 +18,13 @@ #if wxUSE_XRC && wxUSE_MDI #include "wx/xrc/xh_mdi.h" -#include "wx/mdi.h" -#include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE -#include "wx/log.h" -#include "wx/intl.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE + #include "wx/mdi.h" +#endif IMPLEMENT_DYNAMIC_CLASS(wxMdiXmlHandler, wxXmlResourceHandler) @@ -31,10 +34,14 @@ wxMdiXmlHandler::wxMdiXmlHandler() : wxXmlResourceHandler() XRC_ADD_STYLE(wxCAPTION); XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE); XRC_ADD_STYLE(wxDEFAULT_FRAME_STYLE); +#if WXWIN_COMPATIBILITY_2_6 XRC_ADD_STYLE(wxTHICK_FRAME); +#endif // WXWIN_COMPATIBILITY_2_6 XRC_ADD_STYLE(wxSYSTEM_MENU); XRC_ADD_STYLE(wxRESIZE_BORDER); +#if WXWIN_COMPATIBILITY_2_6 XRC_ADD_STYLE(wxRESIZE_BOX); +#endif // WXWIN_COMPATIBILITY_2_6 XRC_ADD_STYLE(wxCLOSE_BOX); XRC_ADD_STYLE(wxFRAME_NO_TASKBAR); @@ -45,7 +52,9 @@ wxMdiXmlHandler::wxMdiXmlHandler() : wxXmlResourceHandler() XRC_ADD_STYLE(wxMINIMIZE_BOX); XRC_ADD_STYLE(wxSTAY_ON_TOP); +#if WXWIN_COMPATIBILITY_2_6 XRC_ADD_STYLE(wxNO_3D); +#endif // WXWIN_COMPATIBILITY_2_6 XRC_ADD_STYLE(wxTAB_TRAVERSAL); XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY); XRC_ADD_STYLE(wxFRAME_EX_METAL); @@ -78,7 +87,10 @@ wxWindow *wxMdiXmlHandler::CreateFrame() wxMDIParentFrame *mdiParent = wxDynamicCast(m_parent, wxMDIParentFrame); if ( !mdiParent ) - wxLogError(wxT("Parent is not of type wxMDIParentFrame.")); + { + wxLogError(wxT("Parent of wxMDIParentFrame must be wxMDIParentFrame.")); + return NULL; + } XRC_MAKE_INSTANCE(frame, wxMDIChildFrame); @@ -124,4 +136,4 @@ bool wxMdiXmlHandler::CanHandle(wxXmlNode *node) IsOfClass(node, wxT("wxMDIChildFrame"))); } -#endif // wxUSE_XRC +#endif // wxUSE_XRC && wxUSE_MDI