Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added MDI support to XRC

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2005-04-02 22:22:55 +00:00
parent 9cce2fe26c
commit 5a0348c449
13 changed files with 290 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
build/msw/makefile.gcc
View File

@@ -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) $<