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

added wxDatePickerCtrl XRC control

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2005-02-07 11:32:01 +00:00
parent 5a7d1ad8a3
commit 310e47b3be
12 changed files with 248 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
Makefile.in
View File

@@ -1,6 +1,6 @@
# ========================================================================= # =========================================================================
# This makefile was generated by # This makefile was generated by
# Bakefile 0.1.5 (http://bakefile.sourceforge.net) # Bakefile 0.1.6 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten! # Do not modify, all changes will be overwritten!
# ========================================================================= # =========================================================================
@@ -66,8 +66,8 @@ HOST_SUFFIX = @HOST_SUFFIX@
DESTDIR = DESTDIR =
WX_RELEASE = 2.5 WX_RELEASE = 2.5
WX_RELEASE_NODOT = 25 WX_RELEASE_NODOT = 25
WX_VERSION = $(WX_RELEASE).3 WX_VERSION = $(WX_RELEASE).4
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4
LIBDIRNAME = $(top_builddir)lib LIBDIRNAME = $(top_builddir)lib
WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ $(____SHARED) $(CPPFLAGS) $(CFLAGS) WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ $(____SHARED) $(CPPFLAGS) $(CFLAGS)
WXREGEX_OBJECTS = \ WXREGEX_OBJECTS = \
@@ -1006,6 +1006,7 @@ XRCDLL_OBJECTS = \
xrcdll_xh_chckl.o \ xrcdll_xh_chckl.o \
xrcdll_xh_choic.o \ xrcdll_xh_choic.o \
xrcdll_xh_combo.o \ xrcdll_xh_combo.o \
xrcdll_xh_datectrl.o \
xrcdll_xh_dlg.o \ xrcdll_xh_dlg.o \
xrcdll_xh_frame.o \ xrcdll_xh_frame.o \
xrcdll_xh_gauge.o \ xrcdll_xh_gauge.o \
@@ -1050,6 +1051,7 @@ XRCLIB_OBJECTS = \
xrclib_xh_chckl.o \ xrclib_xh_chckl.o \
xrclib_xh_choic.o \ xrclib_xh_choic.o \
xrclib_xh_combo.o \ xrclib_xh_combo.o \
xrclib_xh_datectrl.o \
xrclib_xh_dlg.o \ xrclib_xh_dlg.o \
xrclib_xh_frame.o \ xrclib_xh_frame.o \
xrclib_xh_gauge.o \ xrclib_xh_gauge.o \
@@ -2639,6 +2641,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \
monodll_xh_chckl.o \ monodll_xh_chckl.o \
monodll_xh_choic.o \ monodll_xh_choic.o \
monodll_xh_combo.o \ monodll_xh_combo.o \
monodll_xh_datectrl.o \
monodll_xh_dlg.o \ monodll_xh_dlg.o \
monodll_xh_frame.o \ monodll_xh_frame.o \
monodll_xh_gauge.o \ monodll_xh_gauge.o \
@@ -4080,6 +4083,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \
monolib_xh_chckl.o \ monolib_xh_chckl.o \
monolib_xh_choic.o \ monolib_xh_choic.o \
monolib_xh_combo.o \ monolib_xh_combo.o \
monolib_xh_datectrl.o \
monolib_xh_dlg.o \ monolib_xh_dlg.o \
monolib_xh_frame.o \ monolib_xh_frame.o \
monolib_xh_gauge.o \ monolib_xh_gauge.o \
@@ -8531,9 +8535,9 @@ COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \
@COND_USE_XRC_1@__wxrc___depname = wxrc @COND_USE_XRC_1@__wxrc___depname = wxrc
@COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc @COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc
@COND_USE_XRC_1@__install_wxrc___depname = install-wxrc @COND_USE_XRC_1@__install_wxrc___depname = install-wxrc
@COND_TOOLKIT_MAC@__macos_res___depname = lib/libwx_$(TOOLCHAIN_NAME).3.r @COND_TOOLKIT_MAC@__macos_res___depname = lib/libwx_$(TOOLCHAIN_NAME).4.r
@COND_TOOLKIT_MAC@__macos_res_install___depname = macos-res-install @COND_TOOLKIT_MAC@__macos_res_install___depname = macos-res-install
@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).3.r @COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).4.r
@COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install @COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install
@COND_SHARED_0@____SHARED = @COND_SHARED_0@____SHARED =
@COND_SHARED_1@____SHARED = $(PIC_FLAG) @COND_SHARED_1@____SHARED = $(PIC_FLAG)
@@ -8680,13 +8684,13 @@ COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = \ @COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
@COND_TOOLKIT_X11@ advlib_taskbarcmn.o advlib_joystick.o advlib_sound.o \ @COND_TOOLKIT_X11@ advlib_taskbarcmn.o advlib_joystick.o advlib_sound.o \
@COND_TOOLKIT_X11@ advlib_taskbarx11.o @COND_TOOLKIT_X11@ advlib_taskbarx11.o
@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).3 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).4
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .3.$(SO_SUFFIX) @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .4.$(SO_SUFFIX)
@COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX)
@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf3 \
@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).3.0.0 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).4.0.0
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .3.0.0.$(SO_SUFFIX) @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .4.0.0.$(SO_SUFFIX)
@COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
@@ -8824,8 +8828,8 @@ clean: $(__clean_wxrc___depname)
rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
rm -f $(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) rm -f $(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
(cd samples && $(MAKE) clean) (cd samples && $(MAKE) clean)
rm -f lib/libwx_$(TOOLCHAIN_NAME).3.rsrc lib/libwx_$(TOOLCHAIN_NAME).3.r rm -f lib/libwx_$(TOOLCHAIN_NAME).4.rsrc lib/libwx_$(TOOLCHAIN_NAME).4.r
rm -f lib/libwx_$(TOOLCHAIN_NAME).3.rsrc lib/libwx_$(TOOLCHAIN_NAME).3.r rm -f lib/libwx_$(TOOLCHAIN_NAME).4.rsrc lib/libwx_$(TOOLCHAIN_NAME).4.r
distclean: clean distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@@ -9240,21 +9244,21 @@ locale_install:
fi ; \ fi ; \
done done
@COND_TOOLKIT_MAC@lib/libwx_$(TOOLCHAIN_NAME).3.r: @COND_TOOLKIT_MAC@lib/libwx_$(TOOLCHAIN_NAME).4.r:
@COND_TOOLKIT_MAC@ $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/mac/carbon/apprsrc.r $(top_srcdir)/src/mac/carbon/carbrsrc.r $(top_srcdir)/src/mac/carbon/corersrc.r -o lib/libwx_$(TOOLCHAIN_NAME).3.rsrc @COND_TOOLKIT_MAC@ $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/mac/carbon/apprsrc.r $(top_srcdir)/src/mac/carbon/carbrsrc.r $(top_srcdir)/src/mac/carbon/corersrc.r -o lib/libwx_$(TOOLCHAIN_NAME).4.rsrc
@COND_TOOLKIT_MAC@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).3.rsrc Carbon.r -useDF >lib/libwx_$(TOOLCHAIN_NAME).3.r @COND_TOOLKIT_MAC@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).4.rsrc Carbon.r -useDF >lib/libwx_$(TOOLCHAIN_NAME).4.r
@COND_TOOLKIT_MAC@macos-res-install: $(__macos_res___depname) @COND_TOOLKIT_MAC@macos-res-install: $(__macos_res___depname)
@COND_TOOLKIT_MAC@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).3.r $(libdir) @COND_TOOLKIT_MAC@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).4.r $(libdir)
@COND_TOOLKIT_MAC@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).3.rsrc $(libdir) @COND_TOOLKIT_MAC@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).4.rsrc $(libdir)
@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).3.r: @COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).4.r:
@COND_TOOLKIT_COCOA@ $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).3.rsrc @COND_TOOLKIT_COCOA@ $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).4.rsrc
@COND_TOOLKIT_COCOA@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).3.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).3.r @COND_TOOLKIT_COCOA@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).4.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).4.r
@COND_TOOLKIT_COCOA@cocoa-res-install: $(__macos_res___depname) @COND_TOOLKIT_COCOA@cocoa-res-install: $(__macos_res___depname)
@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).3.r $(libdir) @COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).4.r $(libdir)
@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).3.rsrc $(libdir) @COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).4.rsrc $(libdir)
wxregex_regcomp.o: $(srcdir)/src/regex/regcomp.c wxregex_regcomp.o: $(srcdir)/src/regex/regcomp.c
$(CCC) -c -o $@ $(WXREGEX_CFLAGS) $(srcdir)/src/regex/regcomp.c $(CCC) -c -o $@ $(WXREGEX_CFLAGS) $(srcdir)/src/regex/regcomp.c
@@ -10207,6 +10211,9 @@ monodll_xh_choic.o: $(srcdir)/src/xrc/xh_choic.cpp $(MONODLL_ODEP)
monodll_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(MONODLL_ODEP) monodll_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
monodll_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
monodll_xh_dlg.o: $(srcdir)/src/xrc/xh_dlg.cpp $(MONODLL_ODEP) monodll_xh_dlg.o: $(srcdir)/src/xrc/xh_dlg.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_dlg.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_dlg.cpp
@@ -13600,6 +13607,9 @@ monolib_xh_choic.o: $(srcdir)/src/xrc/xh_choic.cpp $(MONOLIB_ODEP)
monolib_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(MONOLIB_ODEP) monolib_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
monolib_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
monolib_xh_dlg.o: $(srcdir)/src/xrc/xh_dlg.cpp $(MONOLIB_ODEP) monolib_xh_dlg.o: $(srcdir)/src/xrc/xh_dlg.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_dlg.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_dlg.cpp
@@ -23089,6 +23099,9 @@ xrcdll_xh_choic.o: $(srcdir)/src/xrc/xh_choic.cpp $(XRCDLL_ODEP)
xrcdll_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(XRCDLL_ODEP) xrcdll_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
xrcdll_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
xrcdll_xh_dlg.o: $(srcdir)/src/xrc/xh_dlg.cpp $(XRCDLL_ODEP) xrcdll_xh_dlg.o: $(srcdir)/src/xrc/xh_dlg.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_dlg.cpp $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_dlg.cpp
@@ -23206,6 +23219,9 @@ xrclib_xh_choic.o: $(srcdir)/src/xrc/xh_choic.cpp $(XRCLIB_ODEP)
xrclib_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(XRCLIB_ODEP) xrclib_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
xrclib_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
xrclib_xh_dlg.o: $(srcdir)/src/xrc/xh_dlg.cpp $(XRCLIB_ODEP) xrclib_xh_dlg.o: $(srcdir)/src/xrc/xh_dlg.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_dlg.cpp $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_dlg.cpp

1
build/bakefiles/files.bkl
View File

@@ -2501,6 +2501,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/xrc/xh_chckl.cpp src/xrc/xh_chckl.cpp
src/xrc/xh_choic.cpp src/xrc/xh_choic.cpp
src/xrc/xh_combo.cpp src/xrc/xh_combo.cpp
src/xrc/xh_datectrl.cpp
src/xrc/xh_dlg.cpp src/xrc/xh_dlg.cpp
src/xrc/xh_frame.cpp src/xrc/xh_frame.cpp
src/xrc/xh_gauge.cpp src/xrc/xh_gauge.cpp

22
build/msw/makefile.bcc
View File

@@ -1,6 +1,6 @@
# ========================================================================= # =========================================================================
# This makefile was generated by # This makefile was generated by
# Bakefile 0.1.5 (http://bakefile.sourceforge.net) # Bakefile 0.1.6 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten! # Do not modify, all changes will be overwritten!
# ========================================================================= # =========================================================================
@@ -34,7 +34,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
-DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
-DRUNTIME_LIBS="$(RUNTIME_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
WX_RELEASE_NODOT = 25 WX_RELEASE_NODOT = 25
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4
OBJS = \ OBJS = \
bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = ..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG) LIBDIRNAME = ..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
@@ -815,6 +815,7 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_xh_chckl.obj \ $(OBJS)\xrcdll_xh_chckl.obj \
$(OBJS)\xrcdll_xh_choic.obj \ $(OBJS)\xrcdll_xh_choic.obj \
$(OBJS)\xrcdll_xh_combo.obj \ $(OBJS)\xrcdll_xh_combo.obj \
$(OBJS)\xrcdll_xh_datectrl.obj \
$(OBJS)\xrcdll_xh_dlg.obj \ $(OBJS)\xrcdll_xh_dlg.obj \
$(OBJS)\xrcdll_xh_frame.obj \ $(OBJS)\xrcdll_xh_frame.obj \
$(OBJS)\xrcdll_xh_gauge.obj \ $(OBJS)\xrcdll_xh_gauge.obj \
@@ -862,6 +863,7 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_chckl.obj \ $(OBJS)\xrclib_xh_chckl.obj \
$(OBJS)\xrclib_xh_choic.obj \ $(OBJS)\xrclib_xh_choic.obj \
$(OBJS)\xrclib_xh_combo.obj \ $(OBJS)\xrclib_xh_combo.obj \
$(OBJS)\xrclib_xh_datectrl.obj \
$(OBJS)\xrclib_xh_dlg.obj \ $(OBJS)\xrclib_xh_dlg.obj \
$(OBJS)\xrclib_xh_frame.obj \ $(OBJS)\xrclib_xh_frame.obj \
$(OBJS)\xrclib_xh_gauge.obj \ $(OBJS)\xrclib_xh_gauge.obj \
@@ -1006,6 +1008,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_chckl.obj \ $(OBJS)\monodll_xh_chckl.obj \
$(OBJS)\monodll_xh_choic.obj \ $(OBJS)\monodll_xh_choic.obj \
$(OBJS)\monodll_xh_combo.obj \ $(OBJS)\monodll_xh_combo.obj \
$(OBJS)\monodll_xh_datectrl.obj \
$(OBJS)\monodll_xh_dlg.obj \ $(OBJS)\monodll_xh_dlg.obj \
$(OBJS)\monodll_xh_frame.obj \ $(OBJS)\monodll_xh_frame.obj \
$(OBJS)\monodll_xh_gauge.obj \ $(OBJS)\monodll_xh_gauge.obj \
@@ -1509,6 +1512,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_chckl.obj \ $(OBJS)\monolib_xh_chckl.obj \
$(OBJS)\monolib_xh_choic.obj \ $(OBJS)\monolib_xh_choic.obj \
$(OBJS)\monolib_xh_combo.obj \ $(OBJS)\monolib_xh_combo.obj \
$(OBJS)\monolib_xh_datectrl.obj \
$(OBJS)\monolib_xh_dlg.obj \ $(OBJS)\monolib_xh_dlg.obj \
$(OBJS)\monolib_xh_frame.obj \ $(OBJS)\monolib_xh_frame.obj \
$(OBJS)\monolib_xh_gauge.obj \ $(OBJS)\monolib_xh_gauge.obj \
@@ -3366,7 +3370,7 @@ $(SETUPHDIR)\wx\setup.h:
build_cfg_file: $(SETUPHDIR) build_cfg_file: $(SETUPHDIR)
@echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
@echo WXVER_MINOR=5 >>$(BUILD_CFG_FILE) @echo WXVER_MINOR=5 >>$(BUILD_CFG_FILE)
@echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE) @echo WXVER_RELEASE=4 >>$(BUILD_CFG_FILE)
@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
@@ -4253,6 +4257,9 @@ $(OBJS)\monodll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
$(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp $(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp $(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5915,6 +5922,9 @@ $(OBJS)\monolib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
$(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp $(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp $(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -10211,6 +10221,9 @@ $(OBJS)\xrcdll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
$(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp $(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
$(OBJS)\xrcdll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
$(OBJS)\xrcdll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp $(OBJS)\xrcdll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
@@ -10331,6 +10344,9 @@ $(OBJS)\xrclib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
$(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp $(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
$(OBJS)\xrclib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
$(OBJS)\xrclib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp $(OBJS)\xrclib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**

22
build/msw/makefile.gcc
View File

@@ -1,6 +1,6 @@
# ========================================================================= # =========================================================================
# This makefile was generated by # This makefile was generated by
# Bakefile 0.1.5 (http://bakefile.sourceforge.net) # Bakefile 0.1.6 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten! # Do not modify, all changes will be overwritten!
# ========================================================================= # =========================================================================
@@ -24,7 +24,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)"
WX_RELEASE_NODOT = 25 WX_RELEASE_NODOT = 25
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4
OBJS = \ OBJS = \
gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = ..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG) LIBDIRNAME = ..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
@@ -801,6 +801,7 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_xh_chckl.o \ $(OBJS)\xrcdll_xh_chckl.o \
$(OBJS)\xrcdll_xh_choic.o \ $(OBJS)\xrcdll_xh_choic.o \
$(OBJS)\xrcdll_xh_combo.o \ $(OBJS)\xrcdll_xh_combo.o \
$(OBJS)\xrcdll_xh_datectrl.o \
$(OBJS)\xrcdll_xh_dlg.o \ $(OBJS)\xrcdll_xh_dlg.o \
$(OBJS)\xrcdll_xh_frame.o \ $(OBJS)\xrcdll_xh_frame.o \
$(OBJS)\xrcdll_xh_gauge.o \ $(OBJS)\xrcdll_xh_gauge.o \
@@ -848,6 +849,7 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_chckl.o \ $(OBJS)\xrclib_xh_chckl.o \
$(OBJS)\xrclib_xh_choic.o \ $(OBJS)\xrclib_xh_choic.o \
$(OBJS)\xrclib_xh_combo.o \ $(OBJS)\xrclib_xh_combo.o \
$(OBJS)\xrclib_xh_datectrl.o \
$(OBJS)\xrclib_xh_dlg.o \ $(OBJS)\xrclib_xh_dlg.o \
$(OBJS)\xrclib_xh_frame.o \ $(OBJS)\xrclib_xh_frame.o \
$(OBJS)\xrclib_xh_gauge.o \ $(OBJS)\xrclib_xh_gauge.o \
@@ -999,6 +1001,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_chckl.o \ $(OBJS)\monodll_xh_chckl.o \
$(OBJS)\monodll_xh_choic.o \ $(OBJS)\monodll_xh_choic.o \
$(OBJS)\monodll_xh_combo.o \ $(OBJS)\monodll_xh_combo.o \
$(OBJS)\monodll_xh_datectrl.o \
$(OBJS)\monodll_xh_dlg.o \ $(OBJS)\monodll_xh_dlg.o \
$(OBJS)\monodll_xh_frame.o \ $(OBJS)\monodll_xh_frame.o \
$(OBJS)\monodll_xh_gauge.o \ $(OBJS)\monodll_xh_gauge.o \
@@ -1508,6 +1511,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_chckl.o \ $(OBJS)\monolib_xh_chckl.o \
$(OBJS)\monolib_xh_choic.o \ $(OBJS)\monolib_xh_choic.o \
$(OBJS)\monolib_xh_combo.o \ $(OBJS)\monolib_xh_combo.o \
$(OBJS)\monolib_xh_datectrl.o \
$(OBJS)\monolib_xh_dlg.o \ $(OBJS)\monolib_xh_dlg.o \
$(OBJS)\monolib_xh_frame.o \ $(OBJS)\monolib_xh_frame.o \
$(OBJS)\monolib_xh_gauge.o \ $(OBJS)\monolib_xh_gauge.o \
@@ -3433,7 +3437,7 @@ $(SETUPHDIR)\wx\setup.h:
build_cfg_file: $(SETUPHDIR) build_cfg_file: $(SETUPHDIR)
@echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
@echo WXVER_MINOR=5 >>$(BUILD_CFG_FILE) @echo WXVER_MINOR=5 >>$(BUILD_CFG_FILE)
@echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE) @echo WXVER_RELEASE=4 >>$(BUILD_CFG_FILE)
@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
@@ -4320,6 +4324,9 @@ $(OBJS)\monodll_xh_choic.o: ../../src/xrc/xh_choic.cpp
$(OBJS)\monodll_xh_combo.o: ../../src/xrc/xh_combo.cpp $(OBJS)\monodll_xh_combo.o: ../../src/xrc/xh_combo.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_xh_dlg.o: ../../src/xrc/xh_dlg.cpp $(OBJS)\monodll_xh_dlg.o: ../../src/xrc/xh_dlg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -6082,6 +6089,9 @@ $(OBJS)\monolib_xh_choic.o: ../../src/xrc/xh_choic.cpp
$(OBJS)\monolib_xh_combo.o: ../../src/xrc/xh_combo.cpp $(OBJS)\monolib_xh_combo.o: ../../src/xrc/xh_combo.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_xh_dlg.o: ../../src/xrc/xh_dlg.cpp $(OBJS)\monolib_xh_dlg.o: ../../src/xrc/xh_dlg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -10678,6 +10688,9 @@ $(OBJS)\xrcdll_xh_choic.o: ../../src/xrc/xh_choic.cpp
$(OBJS)\xrcdll_xh_combo.o: ../../src/xrc/xh_combo.cpp $(OBJS)\xrcdll_xh_combo.o: ../../src/xrc/xh_combo.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
$(OBJS)\xrcdll_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
$(OBJS)\xrcdll_xh_dlg.o: ../../src/xrc/xh_dlg.cpp $(OBJS)\xrcdll_xh_dlg.o: ../../src/xrc/xh_dlg.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $< $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
@@ -10798,6 +10811,9 @@ $(OBJS)\xrclib_xh_choic.o: ../../src/xrc/xh_choic.cpp
$(OBJS)\xrclib_xh_combo.o: ../../src/xrc/xh_combo.cpp $(OBJS)\xrclib_xh_combo.o: ../../src/xrc/xh_combo.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
$(OBJS)\xrclib_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
$(OBJS)\xrclib_xh_dlg.o: ../../src/xrc/xh_dlg.cpp $(OBJS)\xrclib_xh_dlg.o: ../../src/xrc/xh_dlg.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $< $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<

22
build/msw/makefile.vc
View File

@@ -1,6 +1,6 @@
# ========================================================================= # =========================================================================
# This makefile was generated by # This makefile was generated by
# Bakefile 0.1.5 (http://bakefile.sourceforge.net) # Bakefile 0.1.6 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten! # Do not modify, all changes will be overwritten!
# ========================================================================= # =========================================================================
@@ -25,7 +25,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
RUNTIME_LIBS="$(RUNTIME_LIBS)" RUNTIME_LIBS="$(RUNTIME_LIBS)"
WX_RELEASE_NODOT = 25 WX_RELEASE_NODOT = 25
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4
OBJS = \ OBJS = \
vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = ..\..\lib\vc_$(LIBTYPE_SUFFIX)$(CFG) LIBDIRNAME = ..\..\lib\vc_$(LIBTYPE_SUFFIX)$(CFG)
@@ -889,6 +889,7 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_xh_chckl.obj \ $(OBJS)\xrcdll_xh_chckl.obj \
$(OBJS)\xrcdll_xh_choic.obj \ $(OBJS)\xrcdll_xh_choic.obj \
$(OBJS)\xrcdll_xh_combo.obj \ $(OBJS)\xrcdll_xh_combo.obj \
$(OBJS)\xrcdll_xh_datectrl.obj \
$(OBJS)\xrcdll_xh_dlg.obj \ $(OBJS)\xrcdll_xh_dlg.obj \
$(OBJS)\xrcdll_xh_frame.obj \ $(OBJS)\xrcdll_xh_frame.obj \
$(OBJS)\xrcdll_xh_gauge.obj \ $(OBJS)\xrcdll_xh_gauge.obj \
@@ -939,6 +940,7 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_chckl.obj \ $(OBJS)\xrclib_xh_chckl.obj \
$(OBJS)\xrclib_xh_choic.obj \ $(OBJS)\xrclib_xh_choic.obj \
$(OBJS)\xrclib_xh_combo.obj \ $(OBJS)\xrclib_xh_combo.obj \
$(OBJS)\xrclib_xh_datectrl.obj \
$(OBJS)\xrclib_xh_dlg.obj \ $(OBJS)\xrclib_xh_dlg.obj \
$(OBJS)\xrclib_xh_frame.obj \ $(OBJS)\xrclib_xh_frame.obj \
$(OBJS)\xrclib_xh_gauge.obj \ $(OBJS)\xrclib_xh_gauge.obj \
@@ -1215,6 +1217,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_chckl.obj \ $(OBJS)\monodll_xh_chckl.obj \
$(OBJS)\monodll_xh_choic.obj \ $(OBJS)\monodll_xh_choic.obj \
$(OBJS)\monodll_xh_combo.obj \ $(OBJS)\monodll_xh_combo.obj \
$(OBJS)\monodll_xh_datectrl.obj \
$(OBJS)\monodll_xh_dlg.obj \ $(OBJS)\monodll_xh_dlg.obj \
$(OBJS)\monodll_xh_frame.obj \ $(OBJS)\monodll_xh_frame.obj \
$(OBJS)\monodll_xh_gauge.obj \ $(OBJS)\monodll_xh_gauge.obj \
@@ -1736,6 +1739,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_chckl.obj \ $(OBJS)\monolib_xh_chckl.obj \
$(OBJS)\monolib_xh_choic.obj \ $(OBJS)\monolib_xh_choic.obj \
$(OBJS)\monolib_xh_combo.obj \ $(OBJS)\monolib_xh_combo.obj \
$(OBJS)\monolib_xh_datectrl.obj \
$(OBJS)\monolib_xh_dlg.obj \ $(OBJS)\monolib_xh_dlg.obj \
$(OBJS)\monolib_xh_frame.obj \ $(OBJS)\monolib_xh_frame.obj \
$(OBJS)\monolib_xh_gauge.obj \ $(OBJS)\monolib_xh_gauge.obj \
@@ -3987,7 +3991,7 @@ $(SETUPHDIR)\wx\setup.h:
build_cfg_file: $(SETUPHDIR) build_cfg_file: $(SETUPHDIR)
@echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
@echo WXVER_MINOR=5 >>$(BUILD_CFG_FILE) @echo WXVER_MINOR=5 >>$(BUILD_CFG_FILE)
@echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE) @echo WXVER_RELEASE=4 >>$(BUILD_CFG_FILE)
@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
@@ -4874,6 +4878,9 @@ $(OBJS)\monodll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
$(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp $(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp $(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6536,6 +6543,9 @@ $(OBJS)\monolib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
$(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp $(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp $(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -10832,6 +10842,9 @@ $(OBJS)\xrcdll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
$(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp $(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
$(OBJS)\xrcdll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
$(OBJS)\xrcdll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp $(OBJS)\xrcdll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
@@ -10952,6 +10965,9 @@ $(OBJS)\xrclib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp
$(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp $(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
$(OBJS)\xrclib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
$(OBJS)\xrclib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp $(OBJS)\xrclib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**

22
build/msw/makefile.wat
View File

@@ -1,6 +1,6 @@
# ========================================================================= # =========================================================================
# This makefile was generated by # This makefile was generated by
# Bakefile 0.1.5 (http://bakefile.sourceforge.net) # Bakefile 0.1.6 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten! # Do not modify, all changes will be overwritten!
# ========================================================================= # =========================================================================
@@ -135,6 +135,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_xh_chckl.obj & $(OBJS)\monodll_xh_chckl.obj &
$(OBJS)\monodll_xh_choic.obj & $(OBJS)\monodll_xh_choic.obj &
$(OBJS)\monodll_xh_combo.obj & $(OBJS)\monodll_xh_combo.obj &
$(OBJS)\monodll_xh_datectrl.obj &
$(OBJS)\monodll_xh_dlg.obj & $(OBJS)\monodll_xh_dlg.obj &
$(OBJS)\monodll_xh_frame.obj & $(OBJS)\monodll_xh_frame.obj &
$(OBJS)\monodll_xh_gauge.obj & $(OBJS)\monodll_xh_gauge.obj &
@@ -648,6 +649,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_xh_chckl.obj & $(OBJS)\monolib_xh_chckl.obj &
$(OBJS)\monolib_xh_choic.obj & $(OBJS)\monolib_xh_choic.obj &
$(OBJS)\monolib_xh_combo.obj & $(OBJS)\monolib_xh_combo.obj &
$(OBJS)\monolib_xh_datectrl.obj &
$(OBJS)\monolib_xh_dlg.obj & $(OBJS)\monolib_xh_dlg.obj &
$(OBJS)\monolib_xh_frame.obj & $(OBJS)\monolib_xh_frame.obj &
$(OBJS)\monolib_xh_gauge.obj & $(OBJS)\monolib_xh_gauge.obj &
@@ -2304,7 +2306,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" & CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &
RUNTIME_LIBS="$(RUNTIME_LIBS)" RUNTIME_LIBS="$(RUNTIME_LIBS)"
WX_RELEASE_NODOT = 25 WX_RELEASE_NODOT = 25
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4
OBJS = & OBJS = &
wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = ..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) LIBDIRNAME = ..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
@@ -3100,6 +3102,7 @@ XRCDLL_OBJECTS = &
$(OBJS)\xrcdll_xh_chckl.obj & $(OBJS)\xrcdll_xh_chckl.obj &
$(OBJS)\xrcdll_xh_choic.obj & $(OBJS)\xrcdll_xh_choic.obj &
$(OBJS)\xrcdll_xh_combo.obj & $(OBJS)\xrcdll_xh_combo.obj &
$(OBJS)\xrcdll_xh_datectrl.obj &
$(OBJS)\xrcdll_xh_dlg.obj & $(OBJS)\xrcdll_xh_dlg.obj &
$(OBJS)\xrcdll_xh_frame.obj & $(OBJS)\xrcdll_xh_frame.obj &
$(OBJS)\xrcdll_xh_gauge.obj & $(OBJS)\xrcdll_xh_gauge.obj &
@@ -3147,6 +3150,7 @@ XRCLIB_OBJECTS = &
$(OBJS)\xrclib_xh_chckl.obj & $(OBJS)\xrclib_xh_chckl.obj &
$(OBJS)\xrclib_xh_choic.obj & $(OBJS)\xrclib_xh_choic.obj &
$(OBJS)\xrclib_xh_combo.obj & $(OBJS)\xrclib_xh_combo.obj &
$(OBJS)\xrclib_xh_datectrl.obj &
$(OBJS)\xrclib_xh_dlg.obj & $(OBJS)\xrclib_xh_dlg.obj &
$(OBJS)\xrclib_xh_frame.obj & $(OBJS)\xrclib_xh_frame.obj &
$(OBJS)\xrclib_xh_gauge.obj & $(OBJS)\xrclib_xh_gauge.obj &
@@ -3673,7 +3677,7 @@ $(SETUPHDIR)\wx\setup.h :
build_cfg_file : .SYMBOLIC $(SETUPHDIR) build_cfg_file : .SYMBOLIC $(SETUPHDIR)
@echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE) @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
@echo WXVER_MINOR=5 >>$(BUILD_CFG_FILE) @echo WXVER_MINOR=5 >>$(BUILD_CFG_FILE)
@echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE) @echo WXVER_RELEASE=4 >>$(BUILD_CFG_FILE)
@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
@@ -4560,6 +4564,9 @@ $(OBJS)\monodll_xh_choic.obj : .AUTODEPEND ..\..\src\xrc\xh_choic.cpp
$(OBJS)\monodll_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp $(OBJS)\monodll_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_xh_datectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp $(OBJS)\monodll_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -6322,6 +6329,9 @@ $(OBJS)\monolib_xh_choic.obj : .AUTODEPEND ..\..\src\xrc\xh_choic.cpp
$(OBJS)\monolib_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp $(OBJS)\monolib_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_xh_datectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp $(OBJS)\monolib_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -10918,6 +10928,9 @@ $(OBJS)\xrcdll_xh_choic.obj : .AUTODEPEND ..\..\src\xrc\xh_choic.cpp
$(OBJS)\xrcdll_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp $(OBJS)\xrcdll_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp
$(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
$(OBJS)\xrcdll_xh_datectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp
$(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
$(OBJS)\xrcdll_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp $(OBJS)\xrcdll_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp
$(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< $(CXX) -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
@@ -11038,6 +11051,9 @@ $(OBJS)\xrclib_xh_choic.obj : .AUTODEPEND ..\..\src\xrc\xh_choic.cpp
$(OBJS)\xrclib_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp $(OBJS)\xrclib_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp
$(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
$(OBJS)\xrclib_xh_datectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp
$(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
$(OBJS)\xrclib_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp $(OBJS)\xrclib_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp
$(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< $(CXX) -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<

68
build/msw/wx_xrc.dsp
View File

@@ -55,8 +55,8 @@ RSC=rc.exe
# PROP Output_Dir "..\..\lib\vc_dll" # PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\xrc" # PROP Intermediate_Dir "vc_mswunivudll\xrc"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv253u_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c # ADD BASE CPP /nologo /FD /MD /O2 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv254u_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
# ADD CPP /nologo /FD /MD /O2 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv253u_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c # ADD CPP /nologo /FD /MD /O2 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv254u_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
@@ -65,8 +65,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv25u_html.lib ..\..\lib\vc_dll\wxmswuniv25u_adv.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u_xml.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv253u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_xrc.lib" # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv25u_html.lib ..\..\lib\vc_dll\wxmswuniv25u_adv.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u_xml.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv254u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_xrc.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv25u_html.lib ..\..\lib\vc_dll\wxmswuniv25u_adv.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u_xml.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv253u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_xrc.lib" # ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv25u_html.lib ..\..\lib\vc_dll\wxmswuniv25u_adv.lib ..\..\lib\vc_dll\wxmswuniv25u_core.lib ..\..\lib\vc_dll\wxbase25u_xml.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv254u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_xrc.lib"
!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug" !ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug"
@@ -80,8 +80,8 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll" # PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\xrc" # PROP Intermediate_Dir "vc_mswunivuddll\xrc"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv253ud_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c # ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv254ud_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv253ud_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c # ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv254ud_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
@@ -90,8 +90,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv25ud_html.lib ..\..\lib\vc_dll\wxmswuniv25ud_adv.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud_xml.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv253ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_xrc.lib" /debug # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv25ud_html.lib ..\..\lib\vc_dll\wxmswuniv25ud_adv.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud_xml.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv254ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_xrc.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv25ud_html.lib ..\..\lib\vc_dll\wxmswuniv25ud_adv.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud_xml.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv253ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_xrc.lib" /debug # ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv25ud_html.lib ..\..\lib\vc_dll\wxmswuniv25ud_adv.lib ..\..\lib\vc_dll\wxmswuniv25ud_core.lib ..\..\lib\vc_dll\wxbase25ud_xml.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv254ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_xrc.lib" /debug
!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Release" !ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Release"
@@ -105,8 +105,8 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll" # PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivdll\xrc" # PROP Intermediate_Dir "vc_mswunivdll\xrc"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv253_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c # ADD BASE CPP /nologo /FD /MD /O2 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv254_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
# ADD CPP /nologo /FD /MD /O2 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv253_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c # ADD CPP /nologo /FD /MD /O2 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmswuniv254_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
@@ -115,8 +115,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv25_html.lib ..\..\lib\vc_dll\wxmswuniv25_adv.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25_xml.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv253_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_xrc.lib" # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv25_html.lib ..\..\lib\vc_dll\wxmswuniv25_adv.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25_xml.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv254_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_xrc.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv25_html.lib ..\..\lib\vc_dll\wxmswuniv25_adv.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25_xml.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv253_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_xrc.lib" # ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmswuniv25_html.lib ..\..\lib\vc_dll\wxmswuniv25_adv.lib ..\..\lib\vc_dll\wxmswuniv25_core.lib ..\..\lib\vc_dll\wxbase25_xml.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv254_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_xrc.lib"
!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug" !ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug"
@@ -130,8 +130,8 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll" # PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivddll\xrc" # PROP Intermediate_Dir "vc_mswunivddll\xrc"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv253d_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c # ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv254d_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv253d_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c # ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv254d_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
@@ -140,8 +140,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv25d_html.lib ..\..\lib\vc_dll\wxmswuniv25d_adv.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d_xml.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv253d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_xrc.lib" /debug # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv25d_html.lib ..\..\lib\vc_dll\wxmswuniv25d_adv.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d_xml.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv254d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_xrc.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv25d_html.lib ..\..\lib\vc_dll\wxmswuniv25d_adv.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d_xml.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv253d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_xrc.lib" /debug # ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmswuniv25d_html.lib ..\..\lib\vc_dll\wxmswuniv25d_adv.lib ..\..\lib\vc_dll\wxmswuniv25d_core.lib ..\..\lib\vc_dll\wxbase25d_xml.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv254d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_xrc.lib" /debug
!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Release" !ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Release"
@@ -155,8 +155,8 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll" # PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\xrc" # PROP Intermediate_Dir "vc_mswudll\xrc"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmsw253u_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c # ADD BASE CPP /nologo /FD /MD /O2 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmsw254u_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
# ADD CPP /nologo /FD /MD /O2 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmsw253u_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c # ADD CPP /nologo /FD /MD /O2 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmsw254u_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
@@ -165,8 +165,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw25u_html.lib ..\..\lib\vc_dll\wxmsw25u_adv.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u_xml.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw253u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_xrc.lib" # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw25u_html.lib ..\..\lib\vc_dll\wxmsw25u_adv.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u_xml.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw254u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_xrc.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw25u_html.lib ..\..\lib\vc_dll\wxmsw25u_adv.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u_xml.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw253u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_xrc.lib" # ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw25u_html.lib ..\..\lib\vc_dll\wxmsw25u_adv.lib ..\..\lib\vc_dll\wxmsw25u_core.lib ..\..\lib\vc_dll\wxbase25u_xml.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw254u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_xrc.lib"
!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Debug" !ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Debug"
@@ -180,8 +180,8 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll" # PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\xrc" # PROP Intermediate_Dir "vc_mswuddll\xrc"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw253ud_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c # ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw254ud_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw253ud_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c # ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw254ud_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
@@ -190,8 +190,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw25ud_html.lib ..\..\lib\vc_dll\wxmsw25ud_adv.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud_xml.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw253ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_xrc.lib" /debug # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw25ud_html.lib ..\..\lib\vc_dll\wxmsw25ud_adv.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud_xml.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw254ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_xrc.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw25ud_html.lib ..\..\lib\vc_dll\wxmsw25ud_adv.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud_xml.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw253ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_xrc.lib" /debug # ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw25ud_html.lib ..\..\lib\vc_dll\wxmsw25ud_adv.lib ..\..\lib\vc_dll\wxmsw25ud_core.lib ..\..\lib\vc_dll\wxbase25ud_xml.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw254ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_xrc.lib" /debug
!ELSEIF "$(CFG)" == "xrc - Win32 DLL Release" !ELSEIF "$(CFG)" == "xrc - Win32 DLL Release"
@@ -205,8 +205,8 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll" # PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswdll\xrc" # PROP Intermediate_Dir "vc_mswdll\xrc"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmsw253_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c # ADD BASE CPP /nologo /FD /MD /O2 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmsw254_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
# ADD CPP /nologo /FD /MD /O2 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmsw253_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c # ADD CPP /nologo /FD /MD /O2 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xrcdll.pch" /Fd..\..\lib\vc_dll\wxmsw254_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
@@ -215,8 +215,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw25_html.lib ..\..\lib\vc_dll\wxmsw25_adv.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25_xml.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw253_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_xrc.lib" # ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw25_html.lib ..\..\lib\vc_dll\wxmsw25_adv.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25_xml.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw254_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_xrc.lib"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw25_html.lib ..\..\lib\vc_dll\wxmsw25_adv.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25_xml.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw253_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_xrc.lib" # ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 ..\..\lib\vc_dll\wxmsw25_html.lib ..\..\lib\vc_dll\wxmsw25_adv.lib ..\..\lib\vc_dll\wxmsw25_core.lib ..\..\lib\vc_dll\wxbase25_xml.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw254_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_xrc.lib"
!ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug" !ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug"
@@ -230,8 +230,8 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll" # PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswddll\xrc" # PROP Intermediate_Dir "vc_mswddll\xrc"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw253d_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c # ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw254d_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw253d_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c # ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xrcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw254d_xrc_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XRC" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XRC
@@ -240,8 +240,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw25d_html.lib ..\..\lib\vc_dll\wxmsw25d_adv.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d_xml.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw253d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_xrc.lib" /debug # ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw25d_html.lib ..\..\lib\vc_dll\wxmsw25d_adv.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d_xml.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw254d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_xrc.lib" /debug
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw25d_html.lib ..\..\lib\vc_dll\wxmsw25d_adv.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d_xml.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw253d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_xrc.lib" /debug # ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 ..\..\lib\vc_dll\wxmsw25d_html.lib ..\..\lib\vc_dll\wxmsw25d_adv.lib ..\..\lib\vc_dll\wxmsw25d_core.lib ..\..\lib\vc_dll\wxbase25d_xml.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw254d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_xrc.lib" /debug
!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Release" !ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Release"
@@ -825,6 +825,10 @@ SOURCE=..\..\src\xrc\xh_combo.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\xrc\xh_datectrl.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\xrc\xh_dlg.cpp SOURCE=..\..\src\xrc\xh_dlg.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File

7
docs/tech/tn0014.txt
View File

@@ -350,6 +350,13 @@ Example:
</object> </object>
wxDatePickerCtrl
----------------
pos Position -1,-1
size Size -1,-1
style Style[wxDatePickerCtrl]
wxDialog wxDialog
-------- --------
pos Position -1,-1 pos Position -1,-1

1
include/wx/xrc/xh_all.h
View File

@@ -30,6 +30,7 @@
#include "wx/xrc/xh_combo.h" #include "wx/xrc/xh_combo.h"
#include "wx/xrc/xh_chckl.h" #include "wx/xrc/xh_chckl.h"
#include "wx/xrc/xh_choic.h" #include "wx/xrc/xh_choic.h"
#include "wx/xrc/xh_datectrl.h"
#include "wx/xrc/xh_sizer.h" #include "wx/xrc/xh_sizer.h"
#include "wx/xrc/xh_stbmp.h" #include "wx/xrc/xh_stbmp.h"
#include "wx/xrc/xh_notbk.h" #include "wx/xrc/xh_notbk.h"

29
include/wx/xrc/xh_datectrl.h Normal file
View File

@@ -0,0 +1,29 @@
/////////////////////////////////////////////////////////////////////////////
// Name: xh_datectrl.h
// Purpose: XML resource handler for wxDatePickerCtrl
// Author: Vaclav Slavik
// Created: 2005-02-07
// RCS-ID: $Id$
// Copyright: (c) 2005 Vaclav Slavik
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_XH_DATECTRL_H_
#define _WX_XH_DATECTRL_H_
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "xh_datectrl.h"
#endif
#include "wx/xrc/xmlres.h"
class WXDLLIMPEXP_XRC wxDateCtrlXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxDateCtrlXmlHandler)
public:
wxDateCtrlXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
};
#endif // _WX_XH_DATECTRL_H_

60
src/xrc/xh_datectrl.cpp Normal file
View File

@@ -0,0 +1,60 @@
/////////////////////////////////////////////////////////////////////////////
// Name: xh_datectrl.cpp
// Purpose: XML resource handler for wxDatePickerCtrl
// Author: Vaclav Slavik
// Created: 2005-02-07
// RCS-ID: $Id$
// Copyright: (c) 2005 Vaclav Slavik
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "xh_datectrl.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#if wxUSE_XRC
#include "wx/xrc/xh_datectrl.h"
#include "wx/datectrl.h"
IMPLEMENT_DYNAMIC_CLASS(wxDateCtrlXmlHandler, wxXmlResourceHandler)
wxDateCtrlXmlHandler::wxDateCtrlXmlHandler() : wxXmlResourceHandler()
{
XRC_ADD_STYLE(wxDP_DEFAULT);
XRC_ADD_STYLE(wxDP_SPIN);
XRC_ADD_STYLE(wxDP_DROPDOWN);
XRC_ADD_STYLE(wxDP_SHOWCENTURY);
AddWindowStyles();
}
wxObject *wxDateCtrlXmlHandler::DoCreateResource()
{
XRC_MAKE_INSTANCE(picker, wxDatePickerCtrl)
picker->Create(m_parentAsWindow,
GetID(),
wxDefaultDateTime,
GetPosition(), GetSize(),
GetStyle(_T("style"), wxDP_DEFAULT | wxDP_SHOWCENTURY),
wxDefaultValidator,
GetName());
SetupWindow(picker);
return picker;
}
bool wxDateCtrlXmlHandler::CanHandle(wxXmlNode *node)
{
return IsOfClass(node, wxT("wxDatePickerCtrl"));
}
#endif // wxUSE_XRC

1
src/xrc/xmlrsall.cpp
View File

@@ -107,6 +107,7 @@ void wxXmlResource::InitAllHandlers()
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
AddHandler(new wxStatusBarXmlHandler); AddHandler(new wxStatusBarXmlHandler);
#endif #endif
AddHandler(new wxDateCtrlXmlHandler);
} }
#endif // wxUSE_XRC #endif // wxUSE_XRC