From 9b6ff3b37b44cd889fb933248a3be4fbba453fdf Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 25 Sep 2004 12:10:15 +0000 Subject: [PATCH] removed XRC library from contrib git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/samples/xrc/Makefile.in | 10 +++++++--- contrib/samples/xrc/makefile.bcc | 1 + contrib/samples/xrc/makefile.gcc | 3 ++- contrib/samples/xrc/makefile.vc | 1 + contrib/samples/xrc/makefile.wat | 12 ++++++++++-- contrib/samples/xrc/myframe.cpp | 2 ++ 6 files changed, 23 insertions(+), 6 deletions(-) diff --git a/contrib/samples/xrc/Makefile.in b/contrib/samples/xrc/Makefile.in index c5a134c31b..7d7f974cb0 100644 --- a/contrib/samples/xrc/Makefile.in +++ b/contrib/samples/xrc/Makefile.in @@ -148,7 +148,7 @@ clean: rm -rf xrcdemo.app distclean: clean - rm -f configure 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 xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc) $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) @@ -183,9 +183,13 @@ xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info data: @mkdir -p ./rc @for f in appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc; do \ - if test \( ! -s ./rc/$$f \) -o \( $(srcdir)/rc/$$f -nt ./rc/$$f \) ; then \ - cp -pRf $(srcdir)/rc/$$f ./rc ; \ + if test ! -e ./rc/$$f ; \ + then x=yep ; \ + else x=`find $(srcdir)/rc/$$f -newer ./rc/$$f -print` ; \ fi; \ + case "$$x" in ?*) \ + cp -pRf $(srcdir)/rc/$$f ./rc ;; \ + esac; \ done xrcdemo_xrcdemo.o: $(srcdir)/xrcdemo.cpp diff --git a/contrib/samples/xrc/makefile.bcc b/contrib/samples/xrc/makefile.bcc index fc4f8f8655..abc72e97e9 100644 --- a/contrib/samples/xrc/makefile.bcc +++ b/contrib/samples/xrc/makefile.bcc @@ -202,3 +202,4 @@ $(OBJS)\xrcdemo_custclas.obj: .\custclas.cpp $(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -i.\..\..\include $** + diff --git a/contrib/samples/xrc/makefile.gcc b/contrib/samples/xrc/makefile.gcc index 3da4491ea1..7a6284fc45 100644 --- a/contrib/samples/xrc/makefile.gcc +++ b/contrib/samples/xrc/makefile.gcc @@ -18,7 +18,7 @@ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) XRCDEMO_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ + $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -W -Wall -I. \ $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(__EXCEPTIONSFLAG_4) \ $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) XRCDEMO_OBJECTS = \ @@ -201,3 +201,4 @@ $(OBJS)\xrcdemo_xrcdemo_rc.o: ./xrcdemo.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --include-dir ./../../include .PHONY: all clean data + diff --git a/contrib/samples/xrc/makefile.vc b/contrib/samples/xrc/makefile.vc index b05cd8d365..080b98ddb7 100644 --- a/contrib/samples/xrc/makefile.vc +++ b/contrib/samples/xrc/makefile.vc @@ -286,3 +286,4 @@ $(OBJS)\xrcdemo_custclas.obj: .\custclas.cpp $(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /i .\..\..\include $** + diff --git a/contrib/samples/xrc/makefile.wat b/contrib/samples/xrc/makefile.wat index bd56c96efb..a1e1fba77c 100644 --- a/contrib/samples/xrc/makefile.wat +++ b/contrib/samples/xrc/makefile.wat @@ -103,6 +103,13 @@ __RUNTIME_LIBS_5 = -br !ifeq RUNTIME_LIBS static __RUNTIME_LIBS_5 = !endif +__EXCEPTIONSFLAG_6 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_6 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_6 = -xr +!endif __EXCEPTIONSFLAG_7 = !ifeq USE_EXCEPTIONS 0 __EXCEPTIONSFLAG_7 = @@ -188,8 +195,8 @@ SETUPHDIR = & XRCDEMO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & - -i=.\..\..\..\samples -i=.\..\..\include $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) & - $(CXXFLAGS) + -i=.\..\..\..\samples -i=.\..\..\include $(__EXCEPTIONSFLAG_6) & + $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) XRCDEMO_OBJECTS = & $(OBJS)\xrcdemo_xrcdemo.obj & $(OBJS)\xrcdemo_myframe.obj & @@ -241,3 +248,4 @@ $(OBJS)\xrcdemo_custclas.obj : .AUTODEPEND .\custclas.cpp $(OBJS)\xrcdemo_xrcdemo.res : .AUTODEPEND .\xrcdemo.rc wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include $< + diff --git a/contrib/samples/xrc/myframe.cpp b/contrib/samples/xrc/myframe.cpp index 577997cc1e..0359597618 100644 --- a/contrib/samples/xrc/myframe.cpp +++ b/contrib/samples/xrc/myframe.cpp @@ -168,6 +168,8 @@ void MyFrame::OnDerivedDialogToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnControlsToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) { wxDialog dlg; + wxFont font(20, wxSWISS, wxNORMAL, wxNORMAL); + dlg.wxWindowBase::SetFont(font); wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("controls_dialog")); #if wxUSE_LISTCTRL -- 2.45.2