added MDI support to XRC

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index b983ab864b52137a64fc813a2ca9f916d10b5853..dfe22bd3c4217c60382d5edeebd9042102070c42 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1069,6 +1069,7 @@ XRCDLL_OBJECTS =  \
        xrcdll_xh_datectrl.o \
        xrcdll_xh_dlg.o \
        xrcdll_xh_frame.o \
+       xrcdll_xh_mdi.o \
        xrcdll_xh_gauge.o \
        xrcdll_xh_gdctl.o \
        xrcdll_xh_html.o \
@@ -1117,6 +1118,7 @@ XRCLIB_OBJECTS =  \
        xrclib_xh_datectrl.o \
        xrclib_xh_dlg.o \
        xrclib_xh_frame.o \
+       xrclib_xh_mdi.o \
        xrclib_xh_gauge.o \
        xrclib_xh_gdctl.o \
        xrclib_xh_html.o \
@@ -2511,6 +2513,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
        wx/xrc/xh_datectrl.h \
        wx/xrc/xh_dlg.h \
        wx/xrc/xh_frame.h \
+       wx/xrc/xh_mdi.h \
        wx/xrc/xh_gauge.h \
        wx/xrc/xh_gdctl.h \
        wx/xrc/xh_html.h \
@@ -2782,6 +2785,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
        monodll_xh_datectrl.o \
        monodll_xh_dlg.o \
        monodll_xh_frame.o \
+       monodll_xh_mdi.o \
        monodll_xh_gauge.o \
        monodll_xh_gdctl.o \
        monodll_xh_html.o \
@@ -4238,6 +4242,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
        monolib_xh_datectrl.o \
        monolib_xh_dlg.o \
        monolib_xh_frame.o \
+       monolib_xh_mdi.o \
        monolib_xh_gauge.o \
        monolib_xh_gdctl.o \
        monolib_xh_html.o \
@@ -10651,6 +10656,9 @@ monodll_xh_dlg.o: $(srcdir)/src/xrc/xh_dlg.cpp $(MONODLL_ODEP)
 monodll_xh_frame.o: $(srcdir)/src/xrc/xh_frame.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_frame.cpp
 
+monodll_xh_mdi.o: $(srcdir)/src/xrc/xh_mdi.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_mdi.cpp
+
 monodll_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_gauge.cpp
 
@@ -14086,6 +14094,9 @@ monolib_xh_dlg.o: $(srcdir)/src/xrc/xh_dlg.cpp $(MONOLIB_ODEP)
 monolib_xh_frame.o: $(srcdir)/src/xrc/xh_frame.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_frame.cpp
 
+monolib_xh_mdi.o: $(srcdir)/src/xrc/xh_mdi.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_mdi.cpp
+
 monolib_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_gauge.cpp
 
@@ -23707,6 +23718,9 @@ xrcdll_xh_dlg.o: $(srcdir)/src/xrc/xh_dlg.cpp $(XRCDLL_ODEP)
 xrcdll_xh_frame.o: $(srcdir)/src/xrc/xh_frame.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_frame.cpp
 
+xrcdll_xh_mdi.o: $(srcdir)/src/xrc/xh_mdi.cpp $(XRCDLL_ODEP)
+       $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_mdi.cpp
+
 xrcdll_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_gauge.cpp
 
@@ -23833,6 +23847,9 @@ xrclib_xh_dlg.o: $(srcdir)/src/xrc/xh_dlg.cpp $(XRCLIB_ODEP)
 xrclib_xh_frame.o: $(srcdir)/src/xrc/xh_frame.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_frame.cpp
 
+xrclib_xh_mdi.o: $(srcdir)/src/xrc/xh_mdi.cpp $(XRCLIB_ODEP)
+       $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_mdi.cpp
+
 xrclib_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_gauge.cpp
 
@@ -24468,7 +24485,6 @@ SAMPLES_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/makefile.unx $(DISTDIR)/samples/dnd
-       cp $(SAMPDIR)/dnd/*.wxr $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/*.txt $(DISTDIR)/samples/dnd

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 98c5011d6d6df3e4d8ac83a323a86afc2a2b8313..51d44d413339c82b7343a6a04d7f49bcf243a96b 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -2562,6 +2562,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/xrc/xh_datectrl.cpp
     src/xrc/xh_dlg.cpp
     src/xrc/xh_frame.cpp
+    src/xrc/xh_mdi.cpp
     src/xrc/xh_gauge.cpp
     src/xrc/xh_gdctl.cpp
     src/xrc/xh_html.cpp
@@ -2607,6 +2608,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/xrc/xh_datectrl.h
     wx/xrc/xh_dlg.h
     wx/xrc/xh_frame.h
+    wx/xrc/xh_mdi.h
     wx/xrc/xh_gauge.h
     wx/xrc/xh_gdctl.h
     wx/xrc/xh_html.h

diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index d5e219aaeb4b5bef1b106b4c9b04b519547d6661..0d495f316363c493e0134c9951812b253fd9a159 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -870,6 +870,7 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xh_datectrl.obj \
        $(OBJS)\xrcdll_xh_dlg.obj \
        $(OBJS)\xrcdll_xh_frame.obj \
+       $(OBJS)\xrcdll_xh_mdi.obj \
        $(OBJS)\xrcdll_xh_gauge.obj \
        $(OBJS)\xrcdll_xh_gdctl.obj \
        $(OBJS)\xrcdll_xh_html.obj \
@@ -921,6 +922,7 @@ XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_xh_datectrl.obj \
        $(OBJS)\xrclib_xh_dlg.obj \
        $(OBJS)\xrclib_xh_frame.obj \
+       $(OBJS)\xrclib_xh_mdi.obj \
        $(OBJS)\xrclib_xh_gauge.obj \
        $(OBJS)\xrclib_xh_gdctl.obj \
        $(OBJS)\xrclib_xh_html.obj \
@@ -1072,6 +1074,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_xh_datectrl.obj \
        $(OBJS)\monodll_xh_dlg.obj \
        $(OBJS)\monodll_xh_frame.obj \
+       $(OBJS)\monodll_xh_mdi.obj \
        $(OBJS)\monodll_xh_gauge.obj \
        $(OBJS)\monodll_xh_gdctl.obj \
        $(OBJS)\monodll_xh_html.obj \
@@ -1582,6 +1585,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_xh_datectrl.obj \
        $(OBJS)\monolib_xh_dlg.obj \
        $(OBJS)\monolib_xh_frame.obj \
+       $(OBJS)\monolib_xh_mdi.obj \
        $(OBJS)\monolib_xh_gauge.obj \
        $(OBJS)\monolib_xh_gdctl.obj \
        $(OBJS)\monolib_xh_html.obj \
@@ -3431,9 +3435,9 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_bcc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj  $(QADLL_OBJECTS)  $(OBJS)\qadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) $(__xmldll___depname)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_bcc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj  $(QADLL_OBJECTS)  $(OBJS)\qadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
        ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(QADLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\qadll_version.res
+       c0d32.obj $(QADLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib import32.lib cw32$(__THREADSFLAG_10)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\qadll_version.res
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa $@
 !endif
@@ -4428,6 +4432,9 @@ $(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
 $(OBJS)\monodll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
+$(OBJS)\monodll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
@@ -6110,6 +6117,9 @@ $(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
 $(OBJS)\monolib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\monolib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -10477,6 +10487,9 @@ $(OBJS)\xrcdll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
 $(OBJS)\xrcdll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
        $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
 
+$(OBJS)\xrcdll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
+
 $(OBJS)\xrcdll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
        $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
 
@@ -10606,6 +10619,9 @@ $(OBJS)\xrclib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
 $(OBJS)\xrclib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
        $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
 
+$(OBJS)\xrclib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
+
 $(OBJS)\xrclib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
        $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
 

diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 2884949c9dc067227a651224b44124c3b8ead49a..f8164c03bd6b0d978f96f7a225679dffb27c97e4 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -879,6 +879,7 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xh_datectrl.o \
        $(OBJS)\xrcdll_xh_dlg.o \
        $(OBJS)\xrcdll_xh_frame.o \
+       $(OBJS)\xrcdll_xh_mdi.o \
        $(OBJS)\xrcdll_xh_gauge.o \
        $(OBJS)\xrcdll_xh_gdctl.o \
        $(OBJS)\xrcdll_xh_html.o \
@@ -930,6 +931,7 @@ XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_xh_datectrl.o \
        $(OBJS)\xrclib_xh_dlg.o \
        $(OBJS)\xrclib_xh_frame.o \
+       $(OBJS)\xrclib_xh_mdi.o \
        $(OBJS)\xrclib_xh_gauge.o \
        $(OBJS)\xrclib_xh_gdctl.o \
        $(OBJS)\xrclib_xh_html.o \
@@ -1090,6 +1092,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_xh_datectrl.o \
        $(OBJS)\monodll_xh_dlg.o \
        $(OBJS)\monodll_xh_frame.o \
+       $(OBJS)\monodll_xh_mdi.o \
        $(OBJS)\monodll_xh_gauge.o \
        $(OBJS)\monodll_xh_gdctl.o \
        $(OBJS)\monodll_xh_html.o \
@@ -1606,6 +1609,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_xh_datectrl.o \
        $(OBJS)\monolib_xh_dlg.o \
        $(OBJS)\monolib_xh_frame.o \
+       $(OBJS)\monolib_xh_mdi.o \
        $(OBJS)\monolib_xh_gauge.o \
        $(OBJS)\monolib_xh_gdctl.o \
        $(OBJS)\monolib_xh_html.o \
@@ -3524,8 +3528,8 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_QA),1)
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_gcc$(VENDORTAG).dll: $(QADLL_OBJECTS) $(OBJS)\qadll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) $(__xmldll___depname)
-       $(CXX) -shared -fPIC -o $@ $(QADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32  $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_gcc$(VENDORTAG).dll: $(QADLL_OBJECTS) $(OBJS)\qadll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
+       $(CXX) -shared -fPIC -o $@ $(QADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32  $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a
 endif
 endif
 endif
@@ -4531,6 +4535,9 @@ $(OBJS)\monodll_xh_dlg.o: ../../src/xrc/xh_dlg.cpp
 $(OBJS)\monodll_xh_frame.o: ../../src/xrc/xh_frame.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+$(OBJS)\monodll_xh_mdi.o: ../../src/xrc/xh_mdi.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_xh_gauge.o: ../../src/xrc/xh_gauge.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -6313,6 +6320,9 @@ $(OBJS)\monolib_xh_dlg.o: ../../src/xrc/xh_dlg.cpp
 $(OBJS)\monolib_xh_frame.o: ../../src/xrc/xh_frame.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+$(OBJS)\monolib_xh_mdi.o: ../../src/xrc/xh_mdi.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_xh_gauge.o: ../../src/xrc/xh_gauge.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -10980,6 +10990,9 @@ $(OBJS)\xrcdll_xh_dlg.o: ../../src/xrc/xh_dlg.cpp
 $(OBJS)\xrcdll_xh_frame.o: ../../src/xrc/xh_frame.cpp
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
+$(OBJS)\xrcdll_xh_mdi.o: ../../src/xrc/xh_mdi.cpp
+       $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+
 $(OBJS)\xrcdll_xh_gauge.o: ../../src/xrc/xh_gauge.cpp
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
@@ -11109,6 +11122,9 @@ $(OBJS)\xrclib_xh_dlg.o: ../../src/xrc/xh_dlg.cpp
 $(OBJS)\xrclib_xh_frame.o: ../../src/xrc/xh_frame.cpp
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
+$(OBJS)\xrclib_xh_mdi.o: ../../src/xrc/xh_mdi.cpp
+       $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+
 $(OBJS)\xrclib_xh_gauge.o: ../../src/xrc/xh_gauge.cpp
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index b5957b68185607accfc9d2b17129f05da28d88d7..3702d67a4510ce12309860f9622e40d93c2f2e94 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -962,6 +962,7 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xh_datectrl.obj \
        $(OBJS)\xrcdll_xh_dlg.obj \
        $(OBJS)\xrcdll_xh_frame.obj \
+       $(OBJS)\xrcdll_xh_mdi.obj \
        $(OBJS)\xrcdll_xh_gauge.obj \
        $(OBJS)\xrcdll_xh_gdctl.obj \
        $(OBJS)\xrcdll_xh_html.obj \
@@ -1016,6 +1017,7 @@ XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_xh_datectrl.obj \
        $(OBJS)\xrclib_xh_dlg.obj \
        $(OBJS)\xrclib_xh_frame.obj \
+       $(OBJS)\xrclib_xh_mdi.obj \
        $(OBJS)\xrclib_xh_gauge.obj \
        $(OBJS)\xrclib_xh_gdctl.obj \
        $(OBJS)\xrclib_xh_html.obj \
@@ -1351,6 +1353,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_xh_datectrl.obj \
        $(OBJS)\monodll_xh_dlg.obj \
        $(OBJS)\monodll_xh_frame.obj \
+       $(OBJS)\monodll_xh_mdi.obj \
        $(OBJS)\monodll_xh_gauge.obj \
        $(OBJS)\monodll_xh_gdctl.obj \
        $(OBJS)\monodll_xh_html.obj \
@@ -1885,6 +1888,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_xh_datectrl.obj \
        $(OBJS)\monolib_xh_dlg.obj \
        $(OBJS)\monolib_xh_frame.obj \
+       $(OBJS)\monolib_xh_mdi.obj \
        $(OBJS)\monolib_xh_gauge.obj \
        $(OBJS)\monolib_xh_gdctl.obj \
        $(OBJS)\monolib_xh_html.obj \
@@ -4423,9 +4427,9 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj  $(QADLL_OBJECTS) $(OBJS)\qadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) $(__xmldll___depname)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj  $(QADLL_OBJECTS) $(OBJS)\qadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_32)  /LIBPATH:$(LIBDIRNAME) @<<
-       $(QADLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
+       $(QADLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
 <<
 !endif
 
@@ -5415,6 +5419,9 @@ $(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
 $(OBJS)\monodll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
+$(OBJS)\monodll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
@@ -7097,6 +7104,9 @@ $(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
 $(OBJS)\monolib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\monolib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -11464,6 +11474,9 @@ $(OBJS)\xrcdll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
 $(OBJS)\xrcdll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
 
+$(OBJS)\xrcdll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
+
 $(OBJS)\xrcdll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
 
@@ -11593,6 +11606,9 @@ $(OBJS)\xrclib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
 $(OBJS)\xrclib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
 
+$(OBJS)\xrclib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
+
 $(OBJS)\xrclib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
 

diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 7fd0be635694a496d72030cc1aee1f1a41bd258f..c37309dc48da9ac08b433ff00d09751ee72272da 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -141,6 +141,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_xh_datectrl.obj &
        $(OBJS)\monodll_xh_dlg.obj &
        $(OBJS)\monodll_xh_frame.obj &
+       $(OBJS)\monodll_xh_mdi.obj &
        $(OBJS)\monodll_xh_gauge.obj &
        $(OBJS)\monodll_xh_gdctl.obj &
        $(OBJS)\monodll_xh_html.obj &
@@ -661,6 +662,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_xh_datectrl.obj &
        $(OBJS)\monolib_xh_dlg.obj &
        $(OBJS)\monolib_xh_frame.obj &
+       $(OBJS)\monolib_xh_mdi.obj &
        $(OBJS)\monolib_xh_gauge.obj &
        $(OBJS)\monolib_xh_gdctl.obj &
        $(OBJS)\monolib_xh_html.obj &
@@ -3217,6 +3219,7 @@ XRCDLL_OBJECTS =  &
        $(OBJS)\xrcdll_xh_datectrl.obj &
        $(OBJS)\xrcdll_xh_dlg.obj &
        $(OBJS)\xrcdll_xh_frame.obj &
+       $(OBJS)\xrcdll_xh_mdi.obj &
        $(OBJS)\xrcdll_xh_gauge.obj &
        $(OBJS)\xrcdll_xh_gdctl.obj &
        $(OBJS)\xrcdll_xh_html.obj &
@@ -3269,6 +3272,7 @@ XRCLIB_OBJECTS =  &
        $(OBJS)\xrclib_xh_datectrl.obj &
        $(OBJS)\xrclib_xh_dlg.obj &
        $(OBJS)\xrclib_xh_frame.obj &
+       $(OBJS)\xrclib_xh_mdi.obj &
        $(OBJS)\xrclib_xh_gauge.obj &
        $(OBJS)\xrclib_xh_gdctl.obj &
        $(OBJS)\xrclib_xh_html.obj &
@@ -3695,14 +3699,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 !ifeq SHARED 1
 !ifeq USE_GUI 1
 !ifeq USE_QA 1
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_wat$(VENDORTAG).dll :  $(QADLL_OBJECTS) $(OBJS)\qadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname) $(__xmldll___depname)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_wat$(VENDORTAG).dll :  $(QADLL_OBJECTS) $(OBJS)\qadll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
        @%create $(OBJS)\qadll.lbc
        @%append $(OBJS)\qadll.lbc option quiet
        @%append $(OBJS)\qadll.lbc name $^@
        @%append $(OBJS)\qadll.lbc option caseexact
        @%append $(OBJS)\qadll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
        @for %i in ($(QADLL_OBJECTS)) do @%append $(OBJS)\qadll.lbc file %i
-       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib  $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib) do @%append $(OBJS)\qadll.lbc library %i
+       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib) do @%append $(OBJS)\qadll.lbc library %i
        @%append $(OBJS)\qadll.lbc option resource=$(OBJS)\qadll_version.res
        @%append $(OBJS)\qadll.lbc system nt_dll
        wlink @$(OBJS)\qadll.lbc
@@ -4744,6 +4748,9 @@ $(OBJS)\monodll_xh_dlg.obj :  .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp
 $(OBJS)\monodll_xh_frame.obj :  .AUTODEPEND ..\..\src\xrc\xh_frame.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
+$(OBJS)\monodll_xh_mdi.obj :  .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_xh_gauge.obj :  .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -6526,6 +6533,9 @@ $(OBJS)\monolib_xh_dlg.obj :  .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp
 $(OBJS)\monolib_xh_frame.obj :  .AUTODEPEND ..\..\src\xrc\xh_frame.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
+$(OBJS)\monolib_xh_mdi.obj :  .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_xh_gauge.obj :  .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -11193,6 +11203,9 @@ $(OBJS)\xrcdll_xh_dlg.obj :  .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp
 $(OBJS)\xrcdll_xh_frame.obj :  .AUTODEPEND ..\..\src\xrc\xh_frame.cpp
        $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
+$(OBJS)\xrcdll_xh_mdi.obj :  .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+
 $(OBJS)\xrcdll_xh_gauge.obj :  .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp
        $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
@@ -11322,6 +11335,9 @@ $(OBJS)\xrclib_xh_dlg.obj :  .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp
 $(OBJS)\xrclib_xh_frame.obj :  .AUTODEPEND ..\..\src\xrc\xh_frame.cpp
        $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
+$(OBJS)\xrclib_xh_mdi.obj :  .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+
 $(OBJS)\xrclib_xh_gauge.obj :  .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp
        $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 

diff --git a/build/msw/wx_xrc.dsp b/build/msw/wx_xrc.dsp
index 593e24bfdbf9f386ce4749961378db866ef12b90..0a79a02d2741785ffa6b693bbfd607d3fa139ab0 100644 (file)
--- a/build/msw/wx_xrc.dsp
+++ b/build/msw/wx_xrc.dsp
@@ -772,6 +772,10 @@ SOURCE=..\..\include\wx\xrc\xh_listc.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\xrc\xh_mdi.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\xrc\xh_menu.h
 # End Source File
 # Begin Source File
@@ -940,6 +944,10 @@ SOURCE=..\..\src\xrc\xh_listc.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\xrc\xh_mdi.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\xrc\xh_menu.cpp
 # End Source File
 # Begin Source File

diff --git a/docs/tech/tn0014.txt b/docs/tech/tn0014.txt
index c1b5f1b045ce14fb15f6b50d5dca53335aa21c3b..8d5b9eaf6ce13df597d1774803a994d667848a96 100644 (file)
--- a/docs/tech/tn0014.txt
+++ b/docs/tech/tn0014.txt
@@ -383,6 +383,19 @@ wxMenuBar and wxStatusBar children; objects of these types are automatically
 set as frame's tool-, menu- and statusbar respectively.
 
 
+wxMDIParentFrame
+----------------
+
+Supports same attributes and children nodes as wxFrame. Additionally, children
+may be of the wxMDIChildFrame type.
+
+
+wxMDIChildFrame
+---------------
+
+Supports same attributes and children nodes as wxFrame.
+
+
 wxScrolledWindow
 ----------------
 pos                        Position                -1,-1

diff --git a/include/wx/xrc/xh_all.h b/include/wx/xrc/xh_all.h
index f5181fa33c597c33ebdc1a67e82d350ab70b1365..41baf0cbb1f2d18d7584eb85c33bb5e433d23a29 100644 (file)
--- a/include/wx/xrc/xh_all.h
+++ b/include/wx/xrc/xh_all.h
@@ -54,5 +54,6 @@
 #include "wx/xrc/xh_split.h"
 #include "wx/xrc/xh_wizrd.h"
 #include "wx/xrc/xh_statbar.h"
+#include "wx/xrc/xh_mdi.h"
 
 #endif // _WX_XH_ALL_H_

diff --git a/include/wx/xrc/xh_mdi.h b/include/wx/xrc/xh_mdi.h
new file mode 100644 (file)
index 0000000..7d5d880
--- /dev/null
+++ b/include/wx/xrc/xh_mdi.h
@@ -0,0 +1,39 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        xh_mdi.h
+// Purpose:     XML resource handler for dialogs
+// Author:      David M. Falkinder & Vaclav Slavik
+// Created:     14/02/2005
+// RCS-ID:      $Id$
+// Copyright:   (c) 2005 Vaclav Slavik
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_XH_MDI_H_
+#define _WX_XH_MDI_H_
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "xh_mdi.h"
+#endif
+
+#include "wx/xrc/xmlres.h"
+
+#if wxUSE_MDI
+
+class WXDLLIMPEXP_CORE wxFrame;
+
+class WXDLLIMPEXP_XRC wxMdiXmlHandler : public wxXmlResourceHandler
+{
+public:
+    wxMdiXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+
+private:
+    wxFrame *CreateFrame();
+
+    DECLARE_DYNAMIC_CLASS(wxMdiXmlHandler)
+};
+
+#endif // wxUSE_MDI
+
+#endif // _WX_XH_MDI_H_

diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index 3050a4741f852f78f0b7754e67b19a82543a987b..db04b752606f0d4bcfa6ad4dbeafc992c93e9348 100644 (file)
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -1711,6 +1711,10 @@ SOURCE=.\xrc\xh_listc.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\xrc\xh_mdi.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\xrc\xh_menu.cpp
 # End Source File
 # Begin Source File
@@ -3099,6 +3103,10 @@ SOURCE=..\include\wx\xrc\xh_listc.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\xrc\xh_mdi.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\xrc\xh_menu.h
 # End Source File
 # Begin Source File

diff --git a/src/xrc/xh_mdi.cpp b/src/xrc/xh_mdi.cpp
new file mode 100644 (file)
index 0000000..a290dd9
--- /dev/null
+++ b/src/xrc/xh_mdi.cpp
@@ -0,0 +1,127 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        xh_mdi.cpp
+// Purpose:     XRC resource for dialogs
+// Author:      David M. Falkinder & Vaclav Slavik
+// Created:     14/02/2005
+// RCS-ID:      $Id$
+// Copyright:   (c) 2005 Vaclav Slavik
+// 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"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#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"
+
+IMPLEMENT_DYNAMIC_CLASS(wxMdiXmlHandler, wxXmlResourceHandler)
+
+wxMdiXmlHandler::wxMdiXmlHandler() : wxXmlResourceHandler()
+{
+    XRC_ADD_STYLE(wxSTAY_ON_TOP);
+    XRC_ADD_STYLE(wxCAPTION);
+    XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
+    XRC_ADD_STYLE(wxDEFAULT_FRAME_STYLE);
+    XRC_ADD_STYLE(wxTHICK_FRAME);
+    XRC_ADD_STYLE(wxSYSTEM_MENU);
+    XRC_ADD_STYLE(wxRESIZE_BORDER);
+    XRC_ADD_STYLE(wxRESIZE_BOX);
+    XRC_ADD_STYLE(wxCLOSE_BOX);
+
+    XRC_ADD_STYLE(wxFRAME_NO_TASKBAR);
+    XRC_ADD_STYLE(wxFRAME_SHAPED);
+    XRC_ADD_STYLE(wxFRAME_TOOL_WINDOW);
+    XRC_ADD_STYLE(wxFRAME_FLOAT_ON_PARENT);
+    XRC_ADD_STYLE(wxMAXIMIZE_BOX);
+    XRC_ADD_STYLE(wxMINIMIZE_BOX);
+    XRC_ADD_STYLE(wxSTAY_ON_TOP);
+
+    XRC_ADD_STYLE(wxNO_3D);
+    XRC_ADD_STYLE(wxTAB_TRAVERSAL);
+    XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
+    XRC_ADD_STYLE(wxFRAME_EX_METAL);
+
+    XRC_ADD_STYLE(wxHSCROLL);
+    XRC_ADD_STYLE(wxVSCROLL);
+    XRC_ADD_STYLE(wxMAXIMIZE);
+    XRC_ADD_STYLE(wxFRAME_NO_WINDOW_MENU);
+
+    AddWindowStyles();
+}
+
+wxFrame *wxMdiXmlHandler::CreateFrame()
+{
+    if (m_class == wxT("wxMDIParentFrame"))
+    {
+        XRC_MAKE_INSTANCE(frame, wxMDIParentFrame);
+
+        frame->Create(m_parentAsWindow,
+                      GetID(),
+                      GetText(wxT("title")),
+                      wxDefaultPosition, wxDefaultSize,
+                      GetStyle(wxT("style"),
+                               wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL),
+                      GetName());
+        return frame;
+    }
+    else // wxMDIChildFrame
+    {
+        wxMDIParentFrame *mdiParent = wxDynamicCast(m_parent, wxMDIParentFrame);
+
+        if ( !mdiParent )
+            wxLogError(wxT("Parent is not of type wxMDIParentFrame."));
+
+        XRC_MAKE_INSTANCE(frame, wxMDIChildFrame);
+
+        frame->Create(mdiParent,
+                      GetID(),
+                      GetText(wxT("title")),
+                      wxDefaultPosition, wxDefaultSize,
+                      GetStyle(wxT("style"), wxDEFAULT_FRAME_STYLE),
+                      GetName());
+
+        return frame;
+    }
+}
+
+wxObject *wxMdiXmlHandler::DoCreateResource()
+{
+    wxFrame *frame = CreateFrame();
+
+    if (HasParam(wxT("size")))
+        frame->SetClientSize(GetSize());
+    if (HasParam(wxT("pos")))
+        frame->Move(GetPosition());
+    if (HasParam(wxT("icon")))
+        frame->SetIcon(GetIcon(wxT("icon"), wxART_FRAME_ICON));
+
+    SetupWindow(frame);
+
+    CreateChildren(frame);
+
+    if (GetBool(wxT("centered"), false))
+        frame->Centre();
+
+    return frame;
+}
+
+bool wxMdiXmlHandler::CanHandle(wxXmlNode *node)
+{
+    return (IsOfClass(node, wxT("wxMDIParentFrame")) ||
+            IsOfClass(node, wxT("wxMDIChildFrame")));
+}
+
+#endif // wxUSE_XRC

diff --git a/src/xrc/xmlrsall.cpp b/src/xrc/xmlrsall.cpp
index d1474daa7075cc2e13b494b83671a09d46d7ee25..1d1e8b8c574ae6a2b035bfdf367ff563ec8513da 100644 (file)
--- a/src/xrc/xmlrsall.cpp
+++ b/src/xrc/xmlrsall.cpp
@@ -117,6 +117,9 @@ void wxXmlResource::InitAllHandlers()
 #if wxUSE_DATEPICKCTRL
     AddHandler(new wxDateCtrlXmlHandler);
 #endif
+#if wxUSE_MDI
+    AddHandler(new wxMdiXmlHandler);
+#endif
 }
 
 #endif // wxUSE_XRC