projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compilation in !wxUSE_MENUS case.
[wxWidgets.git]
/
src
/
xrc
/
xh_mdi.cpp
diff --git
a/src/xrc/xh_mdi.cpp
b/src/xrc/xh_mdi.cpp
index 7a581f80779374a2f9118030aabc84047d82b3e6..50a7ed1cb79f8cccf9f59e24cf7988d8019301c6 100644
(file)
--- 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$
// Author: David M. Falkinder & Vaclav Slavik
// Created: 14/02/2005
// RCS-ID: $Id$
@@
-8,10
+8,6
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "xh_mdi.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-23,9
+19,12
@@
#include "wx/xrc/xh_mdi.h"
#include "wx/mdi.h"
#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
+#endif
IMPLEMENT_DYNAMIC_CLASS(wxMdiXmlHandler, wxXmlResourceHandler)
IMPLEMENT_DYNAMIC_CLASS(wxMdiXmlHandler, wxXmlResourceHandler)
@@
-35,10
+34,14
@@
wxMdiXmlHandler::wxMdiXmlHandler() : wxXmlResourceHandler()
XRC_ADD_STYLE(wxCAPTION);
XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
XRC_ADD_STYLE(wxDEFAULT_FRAME_STYLE);
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);
XRC_ADD_STYLE(wxTHICK_FRAME);
+#endif // WXWIN_COMPATIBILITY_2_6
XRC_ADD_STYLE(wxSYSTEM_MENU);
XRC_ADD_STYLE(wxRESIZE_BORDER);
XRC_ADD_STYLE(wxSYSTEM_MENU);
XRC_ADD_STYLE(wxRESIZE_BORDER);
+#if WXWIN_COMPATIBILITY_2_6
XRC_ADD_STYLE(wxRESIZE_BOX);
XRC_ADD_STYLE(wxRESIZE_BOX);
+#endif // WXWIN_COMPATIBILITY_2_6
XRC_ADD_STYLE(wxCLOSE_BOX);
XRC_ADD_STYLE(wxFRAME_NO_TASKBAR);
XRC_ADD_STYLE(wxCLOSE_BOX);
XRC_ADD_STYLE(wxFRAME_NO_TASKBAR);
@@
-49,7
+52,9
@@
wxMdiXmlHandler::wxMdiXmlHandler() : wxXmlResourceHandler()
XRC_ADD_STYLE(wxMINIMIZE_BOX);
XRC_ADD_STYLE(wxSTAY_ON_TOP);
XRC_ADD_STYLE(wxMINIMIZE_BOX);
XRC_ADD_STYLE(wxSTAY_ON_TOP);
+#if WXWIN_COMPATIBILITY_2_6
XRC_ADD_STYLE(wxNO_3D);
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);
XRC_ADD_STYLE(wxTAB_TRAVERSAL);
XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
XRC_ADD_STYLE(wxFRAME_EX_METAL);
@@
-82,7
+87,10
@@
wxWindow *wxMdiXmlHandler::CreateFrame()
wxMDIParentFrame *mdiParent = wxDynamicCast(m_parent, wxMDIParentFrame);
if ( !mdiParent )
wxMDIParentFrame *mdiParent = wxDynamicCast(m_parent, wxMDIParentFrame);
if ( !mdiParent )
- wxLogError(wxT("Parent is not of type wxMDIParentFrame."));
+ {
+ ReportError("parent of wxMDIChildFrame must be wxMDIParentFrame");
+ return NULL;
+ }
XRC_MAKE_INSTANCE(frame, wxMDIChildFrame);
XRC_MAKE_INSTANCE(frame, wxMDIChildFrame);
@@
-109,7
+117,7
@@
wxObject *wxMdiXmlHandler::DoCreateResource()
{
wxFrame* f = wxDynamicCast(frame, wxFrame);
if (f)
{
wxFrame* f = wxDynamicCast(frame, wxFrame);
if (f)
- f->SetIcon
(GetIcon
(wxT("icon"), wxART_FRAME_ICON));
+ f->SetIcon
s(GetIconBundle
(wxT("icon"), wxART_FRAME_ICON));
}
SetupWindow(frame);
}
SetupWindow(frame);
@@
-128,4
+136,4
@@
bool wxMdiXmlHandler::CanHandle(wxXmlNode *node)
IsOfClass(node, wxT("wxMDIChildFrame")));
}
IsOfClass(node, wxT("wxMDIChildFrame")));
}
-#endif // wxUSE_XRC
+#endif // wxUSE_XRC
&& wxUSE_MDI