From 2fc9385a2c0054257b8c48d22d3a523afd6252a6 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 30 Mar 2003 22:47:33 +0000 Subject: [PATCH] Removing deprecated classes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 32 +++++++------- configure.in | 66 +++++++++++++---------------- contrib/src/deprecated/makefile.b32 | 9 +++- contrib/src/deprecated/makefile.g95 | 45 +++++++++++++++++++- contrib/src/deprecated/makefile.vc | 14 +++++- distrib/msw/tmake/b32.t | 58 ++----------------------- distrib/msw/tmake/bcc.t | 15 ------- distrib/msw/tmake/dos.t | 12 ------ distrib/msw/tmake/filelist.txt | 12 ------ distrib/msw/tmake/g95.t | 42 ------------------ distrib/msw/tmake/vc6msw.t | 6 --- distrib/msw/tmake/wat.t | 10 ----- include/wx/chkconf.h | 16 ------- include/wx/mac/setup0.h | 9 ---- include/wx/msw/setup0.h | 12 ------ include/wx/os2/setup0.h | 3 -- src/cocoa/files.lst | 20 --------- src/gtk/files.lst | 22 ---------- src/gtk1/files.lst | 22 ---------- src/mac/carbon/files.lst | 14 ------ src/mac/files.lst | 14 ------ src/mgl/files.lst | 16 ------- src/motif/files.lst | 16 ------- src/msw/files.lst | 18 -------- src/msw/makebase.vc | 14 ------ src/msw/makefile.b32 | 26 ------------ src/msw/makefile.bcc | 35 --------------- src/msw/makefile.dos | 36 ---------------- src/msw/makefile.g95 | 18 -------- src/msw/makefile.mic | 1 - src/msw/makefile.sc | 8 +--- src/msw/makefile.vc | 21 --------- src/msw/makefile.wat | 24 ----------- src/x11/files.lst | 18 -------- utils/dialoged/src/dialoged.cpp | 2 + utils/dialoged/src/dialoged.h | 2 +- utils/dialoged/src/reseditr.cpp | 4 +- utils/dialoged/src/reseditr.h | 8 +++- 38 files changed, 126 insertions(+), 594 deletions(-) diff --git a/Makefile.in b/Makefile.in index f356e0f9c7..203b0a2366 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1231,12 +1231,12 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing - mkdir $(DISTDIR)/samples/resource - cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource - cp $(SAMPDIR)/resource/makefile.unx $(DISTDIR)/samples/resource - cp $(SAMPDIR)/resource/*.cpp $(DISTDIR)/samples/resource - cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource - cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource +# mkdir $(DISTDIR)/samples/resource +# cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource +# cp $(SAMPDIR)/resource/makefile.unx $(DISTDIR)/samples/resource +# cp $(SAMPDIR)/resource/*.cpp $(DISTDIR)/samples/resource +# cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource +# cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource mkdir $(DISTDIR)/samples/rotate cp $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate @@ -1253,11 +1253,11 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit cp $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit - mkdir $(DISTDIR)/samples/proplist - cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist - cp $(SAMPDIR)/proplist/makefile.unx $(DISTDIR)/samples/proplist - cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist - cp $(SAMPDIR)/proplist/*.h $(DISTDIR)/samples/proplist +# mkdir $(DISTDIR)/samples/proplist +# cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist +# cp $(SAMPDIR)/proplist/makefile.unx $(DISTDIR)/samples/proplist +# cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist +# cp $(SAMPDIR)/proplist/*.h $(DISTDIR)/samples/proplist mkdir $(DISTDIR)/samples/propsize cp $(SAMPDIR)/propsize/Makefile.in $(DISTDIR)/samples/propsize @@ -1324,11 +1324,11 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl - mkdir $(DISTDIR)/samples/treelay - cp $(SAMPDIR)/treelay/Makefile.in $(DISTDIR)/samples/treelay - cp $(SAMPDIR)/treelay/makefile.unx $(DISTDIR)/samples/treelay - cp $(SAMPDIR)/treelay/*.cpp $(DISTDIR)/samples/treelay - cp $(SAMPDIR)/treelay/*.h $(DISTDIR)/samples/treelay +# mkdir $(DISTDIR)/samples/treelay +# cp $(SAMPDIR)/treelay/Makefile.in $(DISTDIR)/samples/treelay +# cp $(SAMPDIR)/treelay/makefile.unx $(DISTDIR)/samples/treelay +# cp $(SAMPDIR)/treelay/*.cpp $(DISTDIR)/samples/treelay +# cp $(SAMPDIR)/treelay/*.h $(DISTDIR)/samples/treelay mkdir $(DISTDIR)/samples/typetest cp $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest diff --git a/configure.in b/configure.in index 898a70c917..1ea47338c1 100644 --- a/configure.in +++ b/configure.in @@ -380,7 +380,6 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=no DEFAULT_wxUSE_PRINTING_ARCHITECTURE=no - DEFAULT_wxUSE_PROLOGIO=no DEFAULT_wxUSE_RESOURCES=no DEFAULT_wxUSE_CONSTRAINTS=no DEFAULT_wxUSE_IPC=no @@ -438,7 +437,6 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_LISTBOX=no DEFAULT_wxUSE_LISTCTRL=no DEFAULT_wxUSE_NOTEBOOK=no - DEFAULT_wxUSE_PROPSHEET=no DEFAULT_wxUSE_RADIOBOX=no DEFAULT_wxUSE_RADIOBTN=no DEFAULT_wxUSE_SASH=no @@ -554,7 +552,6 @@ else DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=yes DEFAULT_wxUSE_PRINTING_ARCHITECTURE=yes - DEFAULT_wxUSE_PROLOGIO=no DEFAULT_wxUSE_RESOURCES=no DEFAULT_wxUSE_CONSTRAINTS=yes DEFAULT_wxUSE_IPC=yes @@ -612,7 +609,6 @@ else DEFAULT_wxUSE_LISTBOX=yes DEFAULT_wxUSE_LISTCTRL=yes DEFAULT_wxUSE_NOTEBOOK=yes - DEFAULT_wxUSE_PROPSHEET=yes DEFAULT_wxUSE_RADIOBOX=yes DEFAULT_wxUSE_RADIOBTN=yes DEFAULT_wxUSE_SASH=yes @@ -846,7 +842,7 @@ dnl --------------------------------------------------------------------------- dnl resources dnl --------------------------------------------------------------------------- -WX_ARG_ENABLE(prologio, [ --enable-prologio use Prolog IO library], wxUSE_PROLOGIO) +dnl WX_ARG_ENABLE(prologio, [ --enable-prologio use Prolog IO library], wxUSE_PROLOGIO) WX_ARG_ENABLE(resources, [ --enable-resources use wxWindows resources], wxUSE_RESOURCES) WX_ARG_ENABLE(xresources, [ --enable-xresources use X resources for save (default for gtk+)], wxUSE_X_RESOURCES) @@ -859,7 +855,7 @@ WX_ARG_ENABLE(clipboard, [ --enable-clipboard use wxClipboard class], wx WX_ARG_ENABLE(dnd, [ --enable-dnd use Drag'n'Drop classes], wxUSE_DRAG_AND_DROP) WX_ARG_ENABLE(metafile, [ --enable-metafile use win32 metafiles], wxUSE_METAFILE) -WX_ARG_ENABLE(treelayout, [ --enable-treelayout use wxTreeLayout class], wxUSE_TREELAYOUT) +dnl WX_ARG_ENABLE(treelayout, [ --enable-treelayout use wxTreeLayout class], wxUSE_TREELAYOUT) dnl --------------------------------------------------------------------------- dnl optional GUI controls (in alphabetical order except the first one) @@ -886,7 +882,6 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_LISTBOX=yes DEFAULT_wxUSE_LISTCTRL=yes DEFAULT_wxUSE_NOTEBOOK=yes - DEFAULT_wxUSE_PROPSHEET=yes DEFAULT_wxUSE_RADIOBOX=yes DEFAULT_wxUSE_RADIOBTN=yes DEFAULT_wxUSE_SASH=yes @@ -924,7 +919,6 @@ elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_LISTBOX=no DEFAULT_wxUSE_LISTCTRL=no DEFAULT_wxUSE_NOTEBOOK=no - DEFAULT_wxUSE_PROPSHEET=no DEFAULT_wxUSE_RADIOBOX=no DEFAULT_wxUSE_RADIOBTN=no DEFAULT_wxUSE_SASH=no @@ -973,7 +967,6 @@ if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then DEFAULT_wxUSE_GRID=no DEFAULT_wxUSE_NUMBERDLG=no DEFAULT_wxUSE_PROGRESSDLG=no - DEFAULT_wxUSE_PROPSHEET=no DEFAULT_wxUSE_SASH=no DEFAULT_wxUSE_SPLITTER=no DEFAULT_wxUSE_WIZARDDLG=no @@ -998,7 +991,6 @@ WX_ARG_ENABLE(imaglist, [ --enable-imaglist use wxImageList class], wx WX_ARG_ENABLE(listbox, [ --enable-listbox use wxListBox class], wxUSE_LISTBOX) WX_ARG_ENABLE(listctrl, [ --enable-listctrl use wxListCtrl class], wxUSE_LISTCTRL) WX_ARG_ENABLE(notebook, [ --enable-notebook use wxNotebook class], wxUSE_NOTEBOOK) -WX_ARG_ENABLE(propsheet, [ --enable-propsheet use wxPropertySheet class], wxUSE_PROPSHEET) WX_ARG_ENABLE(radiobox, [ --enable-radiobox use wxRadioBox class], wxUSE_RADIOBOX) WX_ARG_ENABLE(radiobtn, [ --enable-radiobtn use wxRadioButton class], wxUSE_RADIOBTN) WX_ARG_ENABLE(sash, [ --enable-sash use wxSashWindow class], wxUSE_SASH) @@ -2621,9 +2613,9 @@ equivalent variable and GTK+ is version 1.2.3 or above. if test "$wxUSE_PM" = 1; then TOOLKIT=PM GUIDIST=GTK_DIST - AC_MSG_WARN([OS/2 PM requires old resource format, re-enabled]) - wxUSE_PROLOGIO="yes" - wxUSE_RESOURCES="yes" +dnl AC_MSG_WARN([OS/2 PM requires old resource format, re-enabled]) +dnl wxUSE_PROLOGIO="yes" +dnl wxUSE_RESOURCES="yes" AC_MSG_WARN([OS/2 threads are not yet supported... disabled]) wxUSE_THREADS="no" fi @@ -4663,22 +4655,22 @@ if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing" fi -if test "$wxUSE_PROLOGIO" = "yes" ; then - AC_DEFINE(wxUSE_PROLOGIO) - ALL_OBJECTS="$ALL_OBJECTS parser.o" -fi +dnl if test "$wxUSE_PROLOGIO" = "yes" ; then +dnl AC_DEFINE(wxUSE_PROLOGIO) +dnl ALL_OBJECTS="$ALL_OBJECTS parser.o" +dnl fi -if test "$wxUSE_RESOURCES" = "yes" ; then - if test "$wxUSE_NANOX" = "yes"; then - AC_MSG_WARN([Cannot use resource database functions in NanoX]) - else - AC_DEFINE(wxUSE_RESOURCES) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource" - fi - if test "$wxUSE_PROLOGIO" != "yes" ; then - ALL_OBJECTS="$ALL_OBJECTS parser.o" - fi -fi +dnl if test "$wxUSE_RESOURCES" = "yes" ; then +dnl if test "$wxUSE_NANOX" = "yes"; then +dnl AC_MSG_WARN([Cannot use resource database functions in NanoX]) +dnl else +dnl AC_DEFINE(wxUSE_RESOURCES) +dnl SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource" +dnl fi +dnl if test "$wxUSE_PROLOGIO" != "yes" ; then +dnl ALL_OBJECTS="$ALL_OBJECTS parser.o" +dnl fi +dnl fi if test "$wxUSE_X_RESOURCES" = "yes"; then AC_DEFINE(wxUSE_X_RESOURCES) @@ -4888,11 +4880,11 @@ if test "$wxUSE_NOTEBOOK" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook" fi -if test "$wxUSE_PROPSHEET" = "yes"; then - AC_DEFINE(wxUSE_PROPSHEET) - USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS proplist" -fi +dnl if test "$wxUSE_PROPSHEET" = "yes"; then +dnl AC_DEFINE(wxUSE_PROPSHEET) +dnl USES_CONTROLS=1 +dnl SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS proplist" +dnl fi if test "$wxUSE_RADIOBOX" = "yes"; then AC_DEFINE(wxUSE_RADIOBOX) @@ -5068,10 +5060,10 @@ dnl --------------------------------------------------------------------------- dnl misc options dnl --------------------------------------------------------------------------- -if test "$wxUSE_TREELAYOUT" = "yes"; then - AC_DEFINE(wxUSE_TREELAYOUT) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelay" -fi +dnl if test "$wxUSE_TREELAYOUT" = "yes"; then +dnl AC_DEFINE(wxUSE_TREELAYOUT) +dnl SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelay" +dnl fi if test "$wxUSE_DRAGIMAGE" = "yes"; then AC_DEFINE(wxUSE_DRAGIMAGE) diff --git a/contrib/src/deprecated/makefile.b32 b/contrib/src/deprecated/makefile.b32 index b45c3ab60a..1e9622703e 100644 --- a/contrib/src/deprecated/makefile.b32 +++ b/contrib/src/deprecated/makefile.b32 @@ -11,7 +11,14 @@ WXDIR = $(WXWIN) LIBTARGET=$(WXDIR)\lib\wxdeprecated.lib -OBJECTS = prop.obj propform.obj proplist.obj y_tab.obj resource.obj treelay.obj +OBJECTS = prop.obj propform.obj proplist.obj dosyacc.obj resource.obj treelay.obj !include $(WXDIR)\src\makelib.b32 +#$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c +# copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c +# +#$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c +# copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c +# + diff --git a/contrib/src/deprecated/makefile.g95 b/contrib/src/deprecated/makefile.g95 index 31a23ee0bf..0ba1a4b88a 100644 --- a/contrib/src/deprecated/makefile.g95 +++ b/contrib/src/deprecated/makefile.g95 @@ -10,7 +10,50 @@ WXDIR = ../../.. LIBTARGET=$(WXDIR)/lib/libwxdeprecated.a -OBJECTS = prop.o propform.o proplist.o y_tab.o resource.o treelay.o +OBJECTS = prop.o propform.o proplist.o dosyacc.o resource.o treelay.o include $(WXDIR)/src/makelib.g95 +dosyacc.$(OBJSUFF): dosyacc.c doslex.c + $(CCLEX) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ dosyacc.c + +#$(COMMDIR)/y_tab.$(OBJSUFF): $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c +# $(CCLEX) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c +# +#$(COMMDIR)/y_tab.c: $(COMMDIR)/dosyacc.c +# $(COPY) ../common/dosyacc.c ../common/y_tab.c +# +#$(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.c +# $(COPY) ../common/doslex.c ../common/lex_yy.c + +# Replace lex with flex if you run into compilation +# problems with lex_yy.c. See also note about LEX_SCANNER +# above. +# $(COMMDIR)/lex_yy.c: $(COMMDIR)/lexer.l +# $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l +# +# Try one of these if the above line doesn't work. +# Alternative syntax (1) +# $(LEX) -t -L $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c +# Alternative syntax (2) +# $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l +# +# sed -e "s/BUFSIZ/5000/g" < lex.yy.c | \ +# sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \ +# sed -e "s/YYLMAX 200/YYLMAX 5000/g" > lex_yy.c +# rm -f lex.yy.c +# +# Replace yacc with bison if you run into compilation +# problems with y_tab.c. +# +# $(COMMDIR)/y_tab.c: $(COMMDIR)/parser.y +# $(YACC) -o $(COMMDIR)/y_tab.c $(COMMDIR)/parser.y +# +# If you use e.g. gcc on Unix, uncomment these lines +# and comment out the above. +# +# $(COMMDIR)/y_tab.c: $(COMMDIR)/parser.y +# $(YACC) $(COMMDIR)/parser.y +# mv y.tab.c $(COMMDIR)/y_tab.c + + diff --git a/contrib/src/deprecated/makefile.vc b/contrib/src/deprecated/makefile.vc index 9b18d5efa9..be47d0cc1c 100644 --- a/contrib/src/deprecated/makefile.vc +++ b/contrib/src/deprecated/makefile.vc @@ -32,7 +32,19 @@ LIBEXT=d LIBTARGET=$(WXDIR)\lib\wxdeprecated$(LIBEXT).lib EXTRATARGETS=$(D) -OBJECTS=$(D)\prop.obj $(D)\propform.obj $(D)\proplist.obj $(D)\y_tab.obj $(D)\resource.obj $(D)\treelay.obj +OBJECTS=$(D)\prop.obj $(D)\propform.obj $(D)\proplist.obj $(D)\dosyacc.obj $(D)\resource.obj $(D)\treelay.obj !include $(WXDIR)\src\makelib.vc +$D\dosyacc.obj: dosyacc.c doslex.c + cl @<< +$(CPPFLAGS2) /c dosyacc.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ +<< + +#$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c +# copy "$(COMMDIR)"\dosyacc.c "$(COMMDIR)"\y_tab.c + +#$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c +# copy "$(COMMDIR)"\doslex.c "$(COMMDIR)"\lex_yy.c + + diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t index 4201fc3f53..be9ebf6ab1 100644 --- a/distrib/msw/tmake/b32.t +++ b/distrib/msw/tmake/b32.t @@ -210,7 +210,6 @@ UNIVTHEMEOBJS = #$ ExpandList("WXUNIVTHEMEOBJS"); HTMLOBJS = #$ ExpandList("WXHTMLOBJS"); COMMONOBJS = \ - $(MSWDIR)\y_tab.obj \ #$ ExpandList("WXCOMMONOBJS"); !if "$(WXUSINGUNIV)" == "1" @@ -270,18 +269,6 @@ dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\includ version.res: brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc -$(MSWDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c - -# cl @<< -# $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ -# << - -$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c - copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c - -$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c - copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c - # $(OBJECTS): $(WXDIR)\include\wx\setup.h !if "$(WXUSINGUNIV)" == "1" @@ -514,8 +501,6 @@ clean: $(PERIPH_CLEAN_TARGET) -erase *.pch -erase *.csm -erase "wx32.#??" - -erase ..\common\y_tab.c - -erase ..\common\lex_yy.c cleanall: clean @@ -525,20 +510,15 @@ docs: allhlp allhtml allpdfrtf alldocs: docs hlp: wxhlp portinghlp wxhlp: $(DOCDIR)/winhelp/wx.hlp -prophlp: $(DOCDIR)/winhelp/prop.hlp refhlp: $(DOCDIR)/winhelp/techref.hlp rtf: $(DOCDIR)/winhelp/wx.rtf -proprtf: $(DOCDIR)/winhelp/prop.rtf pdfrtf: $(DOCDIR)/pdf/wx.rtf -proppdfrtf: $(DOCDIR)/pdf/prop.rtf refpdfrtf: $(DOCDIR)/pdf/techref.rtf html: wxhtml portinghtml wxhtml: $(DOCDIR)\html\wx\wx.htm htmlhelp: $(DOCDIR)\html\wx\wx.chm -prophtml: $(DOCDIR)\html\proplist\prop.htm ps: wxps referencps wxps: $(WXDIR)\docs\ps\wx.ps -propps: $(WXDIR)\docs\ps\prop.ps referencps: $(WXDIR)\docs\ps\referenc.ps portinghtml: $(DOCDIR)\html\porting\port.htm @@ -547,7 +527,7 @@ portinghlp: $(DOCDIR)/winhelp/porting.hlp portingpdfrtf: $(DOCDIR)/pdf/porting.rtf portingps: $(WXDIR)\docs\ps\porting.ps -allhlp: wxhlp portinghlp prophlp +allhlp: wxhlp portinghlp cd $(WXDIR)\utils\dialoged\src ${MAKE} -f makefile.b32 hlp cd $(THISDIR) @@ -567,7 +547,7 @@ allhlp: wxhlp portinghlp prophlp # cd $(WXDIR)\utils\wxgrid\src # ${MAKE} -f makefile.b32 hlp -allhtml: wxhtml portinghtml prophtml +allhtml: wxhtml portinghtml cd $(WXDIR)\utils\dialoged\src ${MAKE} -f makefile.b32 html cd $(THISDIR) @@ -588,12 +568,12 @@ allhtml: wxhtml portinghtml prophtml # cd $(WXDIR)\utils\wxtree\src # ${MAKE} -f makefile.b32 html -allps: wxps referencps portingps propps +allps: wxps referencps portingps cd $(WXDIR)\utils\dialoged\src ${MAKE} -f makefile.b32 ps cd $(THISDIR) -allpdfrtf: pdfrtf portingpdfrtf proppdfrtf +allpdfrtf: pdfrtf portingpdfrtf cd $(WXDIR)\utils\dialoged\src ${MAKE} -f makefile.b32 pdfrtf cd $(THISDIR) @@ -626,14 +606,6 @@ $(DOCDIR)/winhelp/porting.hlp: $(DOCDIR)/latex/porting/porting.rtf $(DOC move porting.cnt $(DOCDIR)\winhelp\porting.cnt cd $(THISDIR) -$(DOCDIR)/winhelp/prop.hlp: $(DOCDIR)/latex/proplist/prop.rtf $(DOCDIR)/latex/proplist/prop.hpj - cd $(DOCDIR)/latex/proplist - -erase prop.ph - hc prop - move prop.hlp $(DOCDIR)\winhelp\prop.hlp - move prop.cnt $(DOCDIR)\winhelp\prop.cnt - cd $(THISDIR) - $(DOCDIR)/winhelp/techref.hlp: $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj cd $(DOCDIR)/latex/techref -erase techref.ph @@ -652,11 +624,6 @@ $(DOCDIR)/latex/porting/porting.rtf: $(DOCDIR)/latex/porting/porting.tex -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/latex/porting/porting.rtf -twice -winhelp cd $(THISDIR) -$(DOCDIR)/latex/proplist/prop.rtf: $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex - cd $(DOCDIR)\latex\proplist - -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/prop.rtf -twice -winhelp - cd $(THISDIR) - $(DOCDIR)/latex/techref/techref.rtf: $(DOCDIR)/latex/techref/techref.tex cd $(DOCDIR)\latex\techref -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/latex/techref/techref.rtf -twice -winhelp @@ -676,13 +643,6 @@ $(DOCDIR)/pdf/porting.rtf: $(DOCDIR)/latex/porting/porting.tex -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/pdf/porting.rtf -twice -rtf cd $(THISDIR) -$(DOCDIR)/pdf/prop.rtf: $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex - cd $(DOCDIR)\latex\proplist - -copy *.wmf $(DOCDIR)\pdf - -copy *.bmp $(DOCDIR)\pdf - -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/pdf/prop.rtf -twice -rtf - cd $(THISDIR) - $(DOCDIR)/pdf/techref.rtf: $(DOCDIR)/latex/techref/techref.tex cd $(DOCDIR)\latex\techref -copy *.wmf $(DOCDIR)\pdf @@ -716,16 +676,6 @@ $(DOCDIR)\html\porting\port.htm: $(DOCDIR)\latex\porting\porting.tex -erase $(DOCDIR)\latex\porting\*.ref cd $(THISDIR) -$(DOCDIR)\html\proplist\prop.htm: $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\latex\proplist\body.tex $(DOCDIR)\latex\proplist\classes.tex $(DOCDIR)\latex\proplist\changes.tex - cd $(DOCDIR)\latex\proplist - -mkdir $(DOCDIR)\html\proplist - -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\html\proplist\prop.htm -twice -html - -erase $(DOCDIR)\html\proplist\*.con - -erase $(DOCDIR)\html\proplist\*.ref - -erase $(DOCDIR)\latex\proplist\*.con - -erase $(DOCDIR)\latex\proplist\*.ref - cd $(THISDIR) - $(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex cd $(WXDIR)\docs\latex\wx -latex manual diff --git a/distrib/msw/tmake/bcc.t b/distrib/msw/tmake/bcc.t index 1cf95ae62f..4db2cffd9b 100644 --- a/distrib/msw/tmake/bcc.t +++ b/distrib/msw/tmake/bcc.t @@ -127,7 +127,6 @@ DOCDIR = $(WXDIR)\docs GENERICOBJS= #$ ExpandList("WXGENERICOBJS"); COMMONOBJS = \ - $(MSWDIR)\y_tab.obj \ #$ ExpandList("WXCOMMONOBJS"); MSWOBJS = #$ ExpandList("WXMSWOBJS"); @@ -150,18 +149,6 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(PERIPH_LIBS) dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h -$(MSWDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c - -# cl @<< -# $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ -# << - -$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c - copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c - -$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c - copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c - # $(OBJECTS): $(WXDIR)\include\wx\setup.h #${ @@ -284,8 +271,6 @@ clean: $(PERIPH_CLEAN_TARGET) erase *.pch erase *.csm erase *.cfg - erase ..\common\y_tab.c - erase ..\common\lex_yy.c cleanall: clean diff --git a/distrib/msw/tmake/dos.t b/distrib/msw/tmake/dos.t index 0a09de711c..a1fd396684 100644 --- a/distrib/msw/tmake/dos.t +++ b/distrib/msw/tmake/dos.t @@ -105,7 +105,6 @@ GENERICOBJS= #$ ExpandList("WXGENERICOBJS"); # we can't have all objects in one list because the library becomes too big COMMONOBJS1 = \ - $(COMMDIR)\y_tab.obj \ #$ ExpandList("WXCOMMONOBJS1"); COMMONOBJS2 = \ @@ -208,17 +207,6 @@ $(CPPFLAGS) /YcWX/WXPREC.H /c /Tp $*.$(SRCSUFF) } #$} -$(COMMDIR)/y_tab.obj: $*.c $(COMMDIR)/lex_yy.c - cl @<< -$(CPPFLAGS2) -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ /I ..\common /c $*.c -<< - -$(COMMDIR)/y_tab.c: $(COMMDIR)/dosyacc.c - copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c - -$(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.c - copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c - $(OBJECTS): $(WXDIR)/include/wx/setup.h # Peripheral components diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index c21352da02..320cc12fbd 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -103,9 +103,6 @@ panelg.cpp Generic printps.cpp Generic NotMSW prntdlgg.cpp Generic NotMSW progdlgg.cpp Generic -prop.cpp Generic -propform.cpp Generic -proplist.cpp Generic sashwin.cpp Generic scrlwing.cpp Generic spinctlg.cpp Generic @@ -120,7 +117,6 @@ timer.cpp Generic LowLevel,NotMSW,NotX,NotGTK,NotOS2,NotMac,NotMicro tipdlg.cpp Generic tipwin.cpp Generic treectlg.cpp Generic -treelay.cpp Generic wizard.cpp Generic accesscmn.cpp Common @@ -222,7 +218,6 @@ quantize.cpp Common radiocmn.cpp Common regex.cpp Common Base rgncmn.cpp Common -resource.cpp Common sckaddr.cpp Common Socket,Base sckfile.cpp Common Socket,Base sckipc.cpp Common Socket,Base @@ -253,7 +248,6 @@ variant.cpp Common Base wfstream.cpp Common Base wincmn.cpp Common wxchar.cpp Common Base -wxexpr.cpp Common xpmdecod.cpp Common zipstrm.cpp Common Base zstream.cpp Common Base @@ -876,7 +870,6 @@ dynload.h WXH Base effects.h WXH encconv.h WXH Base event.h WXH Base -expr.h WXH fdrepdlg.h WXH features.h WXH Base ffile.h WXH Base @@ -972,16 +965,12 @@ printdlg.h WXH prntbase.h WXH process.h WXH Base progdlg.h WXH -prop.h WXH -propform.h WXH -proplist.h WXH quantize.h WXH radiobox.h WXH radiobut.h WXH rawbmp.h WXH regex.h WXH Base region.h WXH -resource.h WXH sashwin.h WXH sckaddr.h WXH Base sckipc.h WXH Base @@ -1047,7 +1036,6 @@ wx_cw.h WXH wx_cw_cm.h WXH wx_cw_d.h WXH wxchar.h WXH Base -wxexpr.h WXH wxhtml.h WXH wxprec.h WXH Base zipstrm.h WXH Base diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t index f48d3a1692..9cafefc98a 100644 --- a/distrib/msw/tmake/g95.t +++ b/distrib/msw/tmake/g95.t @@ -167,7 +167,6 @@ COMMONOBJS_BASEONLY = \ COMMONOBJS = \ $(COMMONOBJS_BASE) \ - $(COMMDIR)/y_tab.$(OBJSUFF) \ #$ ExpandList("WXCOMMONOBJS"); HTMLOBJS = \ @@ -418,52 +417,11 @@ $(REGEXLIB): $(OBJECTS): $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(ARCHINCDIR)/wx/setup.h -$(COMMDIR)/y_tab.$(OBJSUFF): $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c - $(CCLEX) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c - -$(COMMDIR)/y_tab.c: $(COMMDIR)/dosyacc.c - $(COPY) ../common/dosyacc.c ../common/y_tab.c - -$(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.c - $(COPY) ../common/doslex.c ../common/lex_yy.c - -# Replace lex with flex if you run into compilation -# problems with lex_yy.c. See also note about LEX_SCANNER -# above. -# $(COMMDIR)/lex_yy.c: $(COMMDIR)/lexer.l -# $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l -# -# Try one of these if the above line doesn't work. -# Alternative syntax (1) -# $(LEX) -t -L $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c -# Alternative syntax (2) -# $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l -# -# sed -e "s/BUFSIZ/5000/g" < lex.yy.c | \ -# sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \ -# sed -e "s/YYLMAX 200/YYLMAX 5000/g" > lex_yy.c -# rm -f lex.yy.c -# -# Replace yacc with bison if you run into compilation -# problems with y_tab.c. -# -# $(COMMDIR)/y_tab.c: $(COMMDIR)/parser.y -# $(YACC) -o $(COMMDIR)/y_tab.c $(COMMDIR)/parser.y -# -# If you use e.g. gcc on Unix, uncomment these lines -# and comment out the above. -# -# $(COMMDIR)/y_tab.c: $(COMMDIR)/parser.y -# $(YACC) $(COMMDIR)/parser.y -# mv y.tab.c $(COMMDIR)/y_tab.c - clean: -$(RM) *.o -$(RM) ole/*.o -$(RM) *.bak -$(RM) core - -$(RM) ../common/y_tab.c - -$(RM) ../common/lex_yy.c -$(RM) ../common/*.o -$(RM) ../common/*.bak -$(RM) ../generic/*.o diff --git a/distrib/msw/tmake/vc6msw.t b/distrib/msw/tmake/vc6msw.t index 3fb5b18be2..5c9213fd9c 100644 --- a/distrib/msw/tmake/vc6msw.t +++ b/distrib/msw/tmake/vc6msw.t @@ -320,12 +320,6 @@ LIB32=link.exe -lib # PROP Default_Filter "" #$ ExpandGlue("WXCOMMONSRCS", "# Begin Source File\n\nSOURCE=.\\common\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\common\\", "\n# End Source File\n"); #$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n"); -# Begin Source File - -SOURCE=.\common\dosyacc.c -# ADD CPP /W1 /D "USE_DEFINE" /D "IDE_INVOKED" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File # End Group # Begin Group "Generic Files" diff --git a/distrib/msw/tmake/wat.t b/distrib/msw/tmake/wat.t index 9d177accb2..2782c9ae5d 100644 --- a/distrib/msw/tmake/wat.t +++ b/distrib/msw/tmake/wat.t @@ -90,7 +90,6 @@ GENERICOBJS= #$ ExpandGlue("WXGENERICOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTD NONESSENTIALOBJS= #$ ExpandGlue("WXNONESSENTIALOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\") COMMONOBJS = & - $(OUTPUTDIR)\y_tab.obj & #$ ExpandGlue("WXCOMMONOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\") MSWOBJS = #$ ExpandGlue("WXMSWOBJS", "\$(OUTPUTDIR)\\", " &\n\t\$(OUTPUTDIR)\\") @@ -183,15 +182,6 @@ cleanall: clean } #$} -$(OUTPUTDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c - *$(CC) $(CFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c - -$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c - copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c - -$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c - copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c - ######################################################## # Generic objects (not always compiled, depending on # whether platforms have native implementations) diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 421e34f0fb..b04e6f5209 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -95,14 +95,6 @@ # endif #endif /* !defined(wxUSE_MIMETYPE) */ -#ifndef wxUSE_PROLOGIO -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PROLOGIO must be defined." -# else -# define wxUSE_PROLOGIO 0 -# endif -#endif /* !defined(wxUSE_PROLOGIO) */ - #ifndef wxUSE_PROTOCOL # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_PROTOCOL must be defined." @@ -683,14 +675,6 @@ # endif #endif /* !defined(wxUSE_TREECTRL) */ -#ifndef wxUSE_WX_RESOURCES -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_WX_RESOURCES must be defined." -# else -# define wxUSE_WX_RESOURCES 0 -# endif -#endif /* !defined(wxUSE_WX_RESOURCES) */ - #ifndef wxUSE_WXHTML_HELP # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_WXHTML_HELP must be defined." diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h index b194ac453b..23f662c3f9 100644 --- a/include/wx/mac/setup0.h +++ b/include/wx/mac/setup0.h @@ -753,9 +753,6 @@ // OpenGL canvas #define wxUSE_GLCANVAS 0 -// wxTreeLayout class -#define wxUSE_TREELAYOUT 1 - // ---------------------------------------------------------------------------- // Data transfer // ---------------------------------------------------------------------------- @@ -813,12 +810,6 @@ #define wxUSE_SPLINES 1 // 0 for no splines -// use wxExpr (a.k.a. PrologIO) -#define wxUSE_PROLOGIO 0 - -// Use .wxr resource mechanism (requires PrologIO library) -#define wxUSE_WX_RESOURCES 0 - #define wxUSE_MOUSEWHEEL 1 // Include mouse wheel support diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 820338996b..3572eea40d 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -560,9 +560,6 @@ #define wxUSE_GRID 1 #define wxUSE_NEW_GRID 1 -// wxProperty[Value/Form/List] classes, used by Dialog Editor -#define wxUSE_PROPSHEET 0 - // ---------------------------------------------------------------------------- // Miscellaneous GUI stuff // ---------------------------------------------------------------------------- @@ -781,9 +778,6 @@ // Recommended setting: 1 if you intend to use OpenGL, 0 otherwise #define wxUSE_GLCANVAS 0 -// wxTreeLayout class -#define wxUSE_TREELAYOUT 1 - // ---------------------------------------------------------------------------- // Data transfer // ---------------------------------------------------------------------------- @@ -859,12 +853,6 @@ // supported this makes easier the issue // of portable icons and bitmaps. -// use wxExpr (a.k.a. PrologIO) -#define wxUSE_PROLOGIO 0 - -// Use .wxr resource mechanism (requires PrologIO library) -#define wxUSE_WX_RESOURCES 0 - #define wxUSE_MOUSEWHEEL 1 // Include mouse wheel support diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h index 38bba247cc..063a542b44 100644 --- a/include/wx/os2/setup0.h +++ b/include/wx/os2/setup0.h @@ -400,8 +400,5 @@ #define wxUSE_GENERIC_MDI_AS_NATIVE 1 -// use wxExpr (a.k.a. PrologIO) -#define wxUSE_PROLOGIO 1 - #endif // _WX_SETUP_H_ diff --git a/src/cocoa/files.lst b/src/cocoa/files.lst index 12103bae3c..12a65c4347 100644 --- a/src/cocoa/files.lst +++ b/src/cocoa/files.lst @@ -33,9 +33,6 @@ ALL_SOURCES = \ generic/printps.cpp \ generic/prntdlgg.cpp \ generic/progdlgg.cpp \ - generic/prop.cpp \ - generic/propform.cpp \ - generic/proplist.cpp \ generic/sashwin.cpp \ generic/scrlwing.cpp \ generic/spinctlg.cpp \ @@ -49,7 +46,6 @@ ALL_SOURCES = \ generic/tipdlg.cpp \ generic/tipwin.cpp \ generic/treectlg.cpp \ - generic/treelay.cpp \ generic/wizard.cpp \ common/accesscmn.cpp \ common/appcmn.cpp \ @@ -147,7 +143,6 @@ ALL_SOURCES = \ common/quantize.cpp \ common/radiocmn.cpp \ common/regex.cpp \ - common/resource.cpp \ common/sckaddr.cpp \ common/sckfile.cpp \ common/sckipc.cpp \ @@ -179,7 +174,6 @@ ALL_SOURCES = \ common/wfstream.cpp \ common/wincmn.cpp \ common/wxchar.cpp \ - common/wxexpr.cpp \ common/xpmdecod.cpp \ common/zipstrm.cpp \ common/zstream.cpp \ @@ -329,7 +323,6 @@ ALL_HEADERS = \ effects.h \ encconv.h \ event.h \ - expr.h \ fdrepdlg.h \ features.h \ ffile.h \ @@ -381,8 +374,6 @@ ALL_HEADERS = \ ioswrap.h \ ipc.h \ ipcbase.h \ - isql.h \ - isqlext.h \ joystick.h \ layout.h \ laywin.h \ @@ -422,15 +413,11 @@ ALL_HEADERS = \ prntbase.h \ process.h \ progdlg.h \ - prop.h \ - propform.h \ - proplist.h \ quantize.h \ radiobox.h \ radiobut.h \ regex.h \ region.h \ - resource.h \ sashwin.h \ sckaddr.h \ sckipc.h \ @@ -497,7 +484,6 @@ ALL_HEADERS = \ wx_cw_cm.h \ wx_cw_d.h \ wxchar.h \ - wxexpr.h \ wxhtml.h \ wxprec.h \ xpmdecod.h \ @@ -707,7 +693,6 @@ COMMONOBJS = \ quantize.o \ radiocmn.o \ regex.o \ - resource.o \ sckaddr.o \ sckfile.o \ sckipc.o \ @@ -739,7 +724,6 @@ COMMONOBJS = \ wfstream.o \ wincmn.o \ wxchar.o \ - wxexpr.o \ xpmdecod.o \ zipstrm.o \ zstream.o @@ -777,9 +761,6 @@ GENERICOBJS = \ printps.o \ prntdlgg.o \ progdlgg.o \ - prop.o \ - propform.o \ - proplist.o \ sashwin.o \ scrlwing.o \ spinctlg.o \ @@ -793,7 +774,6 @@ GENERICOBJS = \ tipdlg.o \ tipwin.o \ treectlg.o \ - treelay.o \ wizard.o GUIOBJS = \ diff --git a/src/gtk/files.lst b/src/gtk/files.lst index 38db3d4492..749c0a0457 100644 --- a/src/gtk/files.lst +++ b/src/gtk/files.lst @@ -31,9 +31,6 @@ ALL_SOURCES = \ generic/printps.cpp \ generic/prntdlgg.cpp \ generic/progdlgg.cpp \ - generic/prop.cpp \ - generic/propform.cpp \ - generic/proplist.cpp \ generic/sashwin.cpp \ generic/scrlwing.cpp \ generic/spinctlg.cpp \ @@ -46,7 +43,6 @@ ALL_SOURCES = \ generic/tipdlg.cpp \ generic/tipwin.cpp \ generic/treectlg.cpp \ - generic/treelay.cpp \ generic/wizard.cpp \ common/accesscmn.cpp \ common/appcmn.cpp \ @@ -143,7 +139,6 @@ ALL_SOURCES = \ common/quantize.cpp \ common/radiocmn.cpp \ common/regex.cpp \ - common/resource.cpp \ common/rgncmn.cpp \ common/sckaddr.cpp \ common/sckfile.cpp \ @@ -176,7 +171,6 @@ ALL_SOURCES = \ common/wfstream.cpp \ common/wincmn.cpp \ common/wxchar.cpp \ - common/wxexpr.cpp \ common/xpmdecod.cpp \ common/zipstrm.cpp \ common/zstream.cpp \ @@ -343,7 +337,6 @@ ALL_HEADERS = \ effects.h \ encconv.h \ event.h \ - expr.h \ fdrepdlg.h \ features.h \ ffile.h \ @@ -436,16 +429,12 @@ ALL_HEADERS = \ prntbase.h \ process.h \ progdlg.h \ - prop.h \ - propform.h \ - proplist.h \ quantize.h \ radiobox.h \ radiobut.h \ rawbmp.h \ regex.h \ region.h \ - resource.h \ sashwin.h \ sckaddr.h \ sckipc.h \ @@ -512,7 +501,6 @@ ALL_HEADERS = \ wx_cw_cm.h \ wx_cw_d.h \ wxchar.h \ - wxexpr.h \ wxhtml.h \ wxprec.h \ xpmdecod.h \ @@ -738,7 +726,6 @@ COMMONOBJS = \ quantize.o \ radiocmn.o \ regex.o \ - resource.o \ rgncmn.o \ sckaddr.o \ sckfile.o \ @@ -771,7 +758,6 @@ COMMONOBJS = \ wfstream.o \ wincmn.o \ wxchar.o \ - wxexpr.o \ xpmdecod.o \ zipstrm.o \ zstream.o @@ -807,9 +793,6 @@ GUIOBJS = \ printps.o \ prntdlgg.o \ progdlgg.o \ - prop.o \ - propform.o \ - proplist.o \ sashwin.o \ scrlwing.o \ spinctlg.o \ @@ -822,7 +805,6 @@ GUIOBJS = \ tipdlg.o \ tipwin.o \ treectlg.o \ - treelay.o \ wizard.o \ app.o \ bitmap.o \ @@ -919,9 +901,6 @@ GUI_LOWLEVEL_OBJS = \ printps.o \ prntdlgg.o \ progdlgg.o \ - prop.o \ - propform.o \ - proplist.o \ sashwin.o \ scrlwing.o \ spinctlg.o \ @@ -933,7 +912,6 @@ GUI_LOWLEVEL_OBJS = \ tipdlg.o \ tipwin.o \ treectlg.o \ - treelay.o \ wizard.o \ app.o \ bitmap.o \ diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst index 38db3d4492..749c0a0457 100644 --- a/src/gtk1/files.lst +++ b/src/gtk1/files.lst @@ -31,9 +31,6 @@ ALL_SOURCES = \ generic/printps.cpp \ generic/prntdlgg.cpp \ generic/progdlgg.cpp \ - generic/prop.cpp \ - generic/propform.cpp \ - generic/proplist.cpp \ generic/sashwin.cpp \ generic/scrlwing.cpp \ generic/spinctlg.cpp \ @@ -46,7 +43,6 @@ ALL_SOURCES = \ generic/tipdlg.cpp \ generic/tipwin.cpp \ generic/treectlg.cpp \ - generic/treelay.cpp \ generic/wizard.cpp \ common/accesscmn.cpp \ common/appcmn.cpp \ @@ -143,7 +139,6 @@ ALL_SOURCES = \ common/quantize.cpp \ common/radiocmn.cpp \ common/regex.cpp \ - common/resource.cpp \ common/rgncmn.cpp \ common/sckaddr.cpp \ common/sckfile.cpp \ @@ -176,7 +171,6 @@ ALL_SOURCES = \ common/wfstream.cpp \ common/wincmn.cpp \ common/wxchar.cpp \ - common/wxexpr.cpp \ common/xpmdecod.cpp \ common/zipstrm.cpp \ common/zstream.cpp \ @@ -343,7 +337,6 @@ ALL_HEADERS = \ effects.h \ encconv.h \ event.h \ - expr.h \ fdrepdlg.h \ features.h \ ffile.h \ @@ -436,16 +429,12 @@ ALL_HEADERS = \ prntbase.h \ process.h \ progdlg.h \ - prop.h \ - propform.h \ - proplist.h \ quantize.h \ radiobox.h \ radiobut.h \ rawbmp.h \ regex.h \ region.h \ - resource.h \ sashwin.h \ sckaddr.h \ sckipc.h \ @@ -512,7 +501,6 @@ ALL_HEADERS = \ wx_cw_cm.h \ wx_cw_d.h \ wxchar.h \ - wxexpr.h \ wxhtml.h \ wxprec.h \ xpmdecod.h \ @@ -738,7 +726,6 @@ COMMONOBJS = \ quantize.o \ radiocmn.o \ regex.o \ - resource.o \ rgncmn.o \ sckaddr.o \ sckfile.o \ @@ -771,7 +758,6 @@ COMMONOBJS = \ wfstream.o \ wincmn.o \ wxchar.o \ - wxexpr.o \ xpmdecod.o \ zipstrm.o \ zstream.o @@ -807,9 +793,6 @@ GUIOBJS = \ printps.o \ prntdlgg.o \ progdlgg.o \ - prop.o \ - propform.o \ - proplist.o \ sashwin.o \ scrlwing.o \ spinctlg.o \ @@ -822,7 +805,6 @@ GUIOBJS = \ tipdlg.o \ tipwin.o \ treectlg.o \ - treelay.o \ wizard.o \ app.o \ bitmap.o \ @@ -919,9 +901,6 @@ GUI_LOWLEVEL_OBJS = \ printps.o \ prntdlgg.o \ progdlgg.o \ - prop.o \ - propform.o \ - proplist.o \ sashwin.o \ scrlwing.o \ spinctlg.o \ @@ -933,7 +912,6 @@ GUI_LOWLEVEL_OBJS = \ tipdlg.o \ tipwin.o \ treectlg.o \ - treelay.o \ wizard.o \ app.o \ bitmap.o \ diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst index 49859d525c..2c728e8256 100644 --- a/src/mac/carbon/files.lst +++ b/src/mac/carbon/files.lst @@ -28,9 +28,6 @@ ALL_SOURCES = \ generic/printps.cpp \ generic/prntdlgg.cpp \ generic/progdlgg.cpp \ - generic/prop.cpp \ - generic/propform.cpp \ - generic/proplist.cpp \ generic/sashwin.cpp \ generic/scrlwing.cpp \ generic/spinctlg.cpp \ @@ -43,7 +40,6 @@ ALL_SOURCES = \ generic/tipdlg.cpp \ generic/tipwin.cpp \ generic/treectlg.cpp \ - generic/treelay.cpp \ generic/wizard.cpp \ common/accesscmn.cpp \ common/appcmn.cpp \ @@ -140,7 +136,6 @@ ALL_SOURCES = \ common/quantize.cpp \ common/radiocmn.cpp \ common/regex.cpp \ - common/resource.cpp \ common/rgncmn.cpp \ common/sckaddr.cpp \ common/sckfile.cpp \ @@ -441,16 +436,12 @@ ALL_HEADERS = \ prntbase.h \ process.h \ progdlg.h \ - prop.h \ - propform.h \ - proplist.h \ quantize.h \ radiobox.h \ radiobut.h \ rawbmp.h \ regex.h \ region.h \ - resource.h \ sashwin.h \ sckaddr.h \ sckipc.h \ @@ -765,7 +756,6 @@ COMMONOBJS = \ quantize.o \ radiocmn.o \ regex.o \ - resource.o \ rgncmn.o \ sckaddr.o \ sckfile.o \ @@ -831,9 +821,6 @@ GENERICOBJS = \ printps.o \ prntdlgg.o \ progdlgg.o \ - prop.o \ - propform.o \ - proplist.o \ sashwin.o \ scrlwing.o \ spinctlg.o \ @@ -846,7 +833,6 @@ GENERICOBJS = \ tipdlg.o \ tipwin.o \ treectlg.o \ - treelay.o \ wizard.o GUIOBJS = \ diff --git a/src/mac/files.lst b/src/mac/files.lst index 49859d525c..2c728e8256 100644 --- a/src/mac/files.lst +++ b/src/mac/files.lst @@ -28,9 +28,6 @@ ALL_SOURCES = \ generic/printps.cpp \ generic/prntdlgg.cpp \ generic/progdlgg.cpp \ - generic/prop.cpp \ - generic/propform.cpp \ - generic/proplist.cpp \ generic/sashwin.cpp \ generic/scrlwing.cpp \ generic/spinctlg.cpp \ @@ -43,7 +40,6 @@ ALL_SOURCES = \ generic/tipdlg.cpp \ generic/tipwin.cpp \ generic/treectlg.cpp \ - generic/treelay.cpp \ generic/wizard.cpp \ common/accesscmn.cpp \ common/appcmn.cpp \ @@ -140,7 +136,6 @@ ALL_SOURCES = \ common/quantize.cpp \ common/radiocmn.cpp \ common/regex.cpp \ - common/resource.cpp \ common/rgncmn.cpp \ common/sckaddr.cpp \ common/sckfile.cpp \ @@ -441,16 +436,12 @@ ALL_HEADERS = \ prntbase.h \ process.h \ progdlg.h \ - prop.h \ - propform.h \ - proplist.h \ quantize.h \ radiobox.h \ radiobut.h \ rawbmp.h \ regex.h \ region.h \ - resource.h \ sashwin.h \ sckaddr.h \ sckipc.h \ @@ -765,7 +756,6 @@ COMMONOBJS = \ quantize.o \ radiocmn.o \ regex.o \ - resource.o \ rgncmn.o \ sckaddr.o \ sckfile.o \ @@ -831,9 +821,6 @@ GENERICOBJS = \ printps.o \ prntdlgg.o \ progdlgg.o \ - prop.o \ - propform.o \ - proplist.o \ sashwin.o \ scrlwing.o \ spinctlg.o \ @@ -846,7 +833,6 @@ GENERICOBJS = \ tipdlg.o \ tipwin.o \ treectlg.o \ - treelay.o \ wizard.o GUIOBJS = \ diff --git a/src/mgl/files.lst b/src/mgl/files.lst index 0c0082ac01..a7e69bf264 100644 --- a/src/mgl/files.lst +++ b/src/mgl/files.lst @@ -31,9 +31,6 @@ ALL_SOURCES = \ generic/printps.cpp \ generic/prntdlgg.cpp \ generic/progdlgg.cpp \ - generic/prop.cpp \ - generic/propform.cpp \ - generic/proplist.cpp \ generic/sashwin.cpp \ generic/scrlwing.cpp \ generic/spinctlg.cpp \ @@ -144,7 +141,6 @@ ALL_SOURCES = \ common/quantize.cpp \ common/radiocmn.cpp \ common/regex.cpp \ - common/resource.cpp \ common/rgncmn.cpp \ common/sckaddr.cpp \ common/sckfile.cpp \ @@ -177,7 +173,6 @@ ALL_SOURCES = \ common/wfstream.cpp \ common/wincmn.cpp \ common/wxchar.cpp \ - common/wxexpr.cpp \ common/xpmdecod.cpp \ common/zipstrm.cpp \ common/zstream.cpp \ @@ -303,7 +298,6 @@ ALL_HEADERS = \ effects.h \ encconv.h \ event.h \ - expr.h \ fdrepdlg.h \ features.h \ ffile.h \ @@ -396,16 +390,12 @@ ALL_HEADERS = \ prntbase.h \ process.h \ progdlg.h \ - prop.h \ - propform.h \ - proplist.h \ quantize.h \ radiobox.h \ radiobut.h \ rawbmp.h \ regex.h \ region.h \ - resource.h \ sashwin.h \ sckaddr.h \ sckipc.h \ @@ -472,7 +462,6 @@ ALL_HEADERS = \ wx_cw_cm.h \ wx_cw_d.h \ wxchar.h \ - wxexpr.h \ wxhtml.h \ wxprec.h \ xpmdecod.h \ @@ -659,7 +648,6 @@ COMMONOBJS = \ quantize.o \ radiocmn.o \ regex.o \ - resource.o \ rgncmn.o \ sckaddr.o \ sckfile.o \ @@ -692,7 +680,6 @@ COMMONOBJS = \ wfstream.o \ wincmn.o \ wxchar.o \ - wxexpr.o \ xpmdecod.o \ zipstrm.o \ zstream.o @@ -728,9 +715,6 @@ GENERICOBJS = \ printps.o \ prntdlgg.o \ progdlgg.o \ - prop.o \ - propform.o \ - proplist.o \ sashwin.o \ scrlwing.o \ spinctlg.o \ diff --git a/src/motif/files.lst b/src/motif/files.lst index e4c12e3074..48d302f1c7 100644 --- a/src/motif/files.lst +++ b/src/motif/files.lst @@ -30,9 +30,6 @@ ALL_SOURCES = \ generic/printps.cpp \ generic/prntdlgg.cpp \ generic/progdlgg.cpp \ - generic/prop.cpp \ - generic/propform.cpp \ - generic/proplist.cpp \ generic/sashwin.cpp \ generic/scrlwing.cpp \ generic/spinctlg.cpp \ @@ -144,7 +141,6 @@ ALL_SOURCES = \ common/quantize.cpp \ common/radiocmn.cpp \ common/regex.cpp \ - common/resource.cpp \ common/rgncmn.cpp \ common/sckaddr.cpp \ common/sckfile.cpp \ @@ -177,7 +173,6 @@ ALL_SOURCES = \ common/wfstream.cpp \ common/wincmn.cpp \ common/wxchar.cpp \ - common/wxexpr.cpp \ common/xpmdecod.cpp \ common/zipstrm.cpp \ common/zstream.cpp \ @@ -340,7 +335,6 @@ ALL_HEADERS = \ effects.h \ encconv.h \ event.h \ - expr.h \ fdrepdlg.h \ features.h \ ffile.h \ @@ -433,16 +427,12 @@ ALL_HEADERS = \ prntbase.h \ process.h \ progdlg.h \ - prop.h \ - propform.h \ - proplist.h \ quantize.h \ radiobox.h \ radiobut.h \ rawbmp.h \ regex.h \ region.h \ - resource.h \ sashwin.h \ sckaddr.h \ sckipc.h \ @@ -509,7 +499,6 @@ ALL_HEADERS = \ wx_cw_cm.h \ wx_cw_d.h \ wxchar.h \ - wxexpr.h \ wxhtml.h \ wxprec.h \ xpmdecod.h \ @@ -737,7 +726,6 @@ COMMONOBJS = \ quantize.o \ radiocmn.o \ regex.o \ - resource.o \ rgncmn.o \ sckaddr.o \ sckfile.o \ @@ -770,7 +758,6 @@ COMMONOBJS = \ wfstream.o \ wincmn.o \ wxchar.o \ - wxexpr.o \ xpmdecod.o \ zipstrm.o \ zstream.o @@ -805,9 +792,6 @@ GENERICOBJS = \ printps.o \ prntdlgg.o \ progdlgg.o \ - prop.o \ - propform.o \ - proplist.o \ sashwin.o \ scrlwing.o \ spinctlg.o \ diff --git a/src/msw/files.lst b/src/msw/files.lst index 0ebd667270..62bafbb4a1 100644 --- a/src/msw/files.lst +++ b/src/msw/files.lst @@ -16,9 +16,6 @@ ALL_SOURCES = \ generic/numdlgg.cpp \ generic/panelg.cpp \ generic/progdlgg.cpp \ - generic/prop.cpp \ - generic/propform.cpp \ - generic/proplist.cpp \ generic/sashwin.cpp \ generic/scrlwing.cpp \ generic/spinctlg.cpp \ @@ -30,7 +27,6 @@ ALL_SOURCES = \ generic/tipdlg.cpp \ generic/tipwin.cpp \ generic/treectlg.cpp \ - generic/treelay.cpp \ generic/wizard.cpp \ common/accesscmn.cpp \ common/appcmn.cpp \ @@ -127,7 +123,6 @@ ALL_SOURCES = \ common/quantize.cpp \ common/radiocmn.cpp \ common/regex.cpp \ - common/resource.cpp \ common/rgncmn.cpp \ common/sckaddr.cpp \ common/sckfile.cpp \ @@ -160,7 +155,6 @@ ALL_SOURCES = \ common/wfstream.cpp \ common/wincmn.cpp \ common/wxchar.cpp \ - common/wxexpr.cpp \ common/xpmdecod.cpp \ common/zipstrm.cpp \ common/zstream.cpp \ @@ -364,7 +358,6 @@ ALL_HEADERS = \ effects.h \ encconv.h \ event.h \ - expr.h \ fdrepdlg.h \ features.h \ ffile.h \ @@ -457,16 +450,12 @@ ALL_HEADERS = \ prntbase.h \ process.h \ progdlg.h \ - prop.h \ - propform.h \ - proplist.h \ quantize.h \ radiobox.h \ radiobut.h \ rawbmp.h \ regex.h \ region.h \ - resource.h \ sashwin.h \ sckaddr.h \ sckipc.h \ @@ -533,7 +522,6 @@ ALL_HEADERS = \ wx_cw_cm.h \ wx_cw_d.h \ wxchar.h \ - wxexpr.h \ wxhtml.h \ wxprec.h \ xpmdecod.h \ @@ -799,7 +787,6 @@ COMMONOBJS = \ quantize.o \ radiocmn.o \ regex.o \ - resource.o \ rgncmn.o \ sckaddr.o \ sckfile.o \ @@ -832,7 +819,6 @@ COMMONOBJS = \ wfstream.o \ wincmn.o \ wxchar.o \ - wxexpr.o \ xpmdecod.o \ zipstrm.o \ zstream.o @@ -853,9 +839,6 @@ GENERICOBJS = \ numdlgg.o \ panelg.o \ progdlgg.o \ - prop.o \ - propform.o \ - proplist.o \ sashwin.o \ scrlwing.o \ spinctlg.o \ @@ -867,7 +850,6 @@ GENERICOBJS = \ tipdlg.o \ tipwin.o \ treectlg.o \ - treelay.o \ wizard.o GUIOBJS = \ diff --git a/src/msw/makebase.vc b/src/msw/makebase.vc index 0f544f5fce..30d299e364 100644 --- a/src/msw/makebase.vc +++ b/src/msw/makebase.vc @@ -59,7 +59,6 @@ $(CPPFLAGS2) /Fo$@ /c /Tc $< << COMMONOBJS = \ - ..\common\$D\y_tab.obj \ ..\common\$D\appcmn.obj \ ..\common\$D\clntdata.obj \ ..\common\$D\cmdline.obj \ @@ -183,17 +182,6 @@ $(DUMMYOBJ): $(DUMMY).$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(SETUP_H) cl $(CPPFLAGS) $(MAKEPRECOMP) /Fo$(DUMMYOBJ) /c /Tp $(DUMMY).cpp ######################################################## -..\common\$D\y_tab.obj: ..\common\y_tab.c ..\common\lex_yy.c - cl @<< -$(CPPFLAGS2) /c ..\common\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ -<< - -..\common\y_tab.c: ..\common\dosyacc.c - copy "..\common"\dosyacc.c "..\common"\y_tab.c - -..\common\lex_yy.c: ..\common\doslex.c - copy "..\common"\doslex.c "..\common"\lex_yy.c - $(OBJECTS): $(WXDIR)/include/wx/setup.h ..\common\$D\unzip.obj: ..\common\unzip.c @@ -265,8 +253,6 @@ clean: $(PERIPH_CLEAN_TARGET) -erase $(COMMDIR)\$D\*.sbr -erase $(COMMDIR)\$D\*.idb -erase $(COMMDIR)\$D\*.pch - -erase $(COMMDIR)\y_tab.c - -erase $(COMMDIR)\lex_yy.c -erase $(MSWDIR)\$D\*.idb -erase $(MSWDIR)\$D\*.pdb -erase $(MSWDIR)\$D\*.pch diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index b228f66ae1..5cf63a3db9 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -101,7 +101,6 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \ $(MSWDIR)\tipdlg.obj \ $(MSWDIR)\tipwin.obj \ $(MSWDIR)\treectlg.obj \ - $(MSWDIR)\treelay.obj \ $(MSWDIR)\wizard.obj MSWOBJS = $(MSWDIR)\accel.obj \ @@ -257,7 +256,6 @@ GENERICUNIVOBJS= $(MSWDIR)\accel.obj \ $(MSWDIR)\tipdlg.obj \ $(MSWDIR)\tipwin.obj \ $(MSWDIR)\treectlg.obj \ - $(MSWDIR)\treelay.obj \ $(MSWDIR)\wizard.obj MSWUNIVOBJS = $(MSWDIR)\app.obj \ @@ -383,7 +381,6 @@ HTMLOBJS = $(MSWDIR)\helpctrl.obj \ $(MSWDIR)\winpars.obj COMMONOBJS = \ - $(MSWDIR)\y_tab.obj \ $(MSWDIR)\accesscmn.obj \ $(MSWDIR)\appcmn.obj \ $(MSWDIR)\artprov.obj \ @@ -479,7 +476,6 @@ COMMONOBJS = \ $(MSWDIR)\quantize.obj \ $(MSWDIR)\radiocmn.obj \ $(MSWDIR)\regex.obj \ - $(MSWDIR)\resource.obj \ $(MSWDIR)\rgncmn.obj \ $(MSWDIR)\sckaddr.obj \ $(MSWDIR)\sckfile.obj \ @@ -574,20 +570,6 @@ dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\includ version.res: brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc -$(MSWDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c - -# cl @<< -# $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ -# << - -$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c - copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c - -$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c - copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c - -# $(OBJECTS): $(WXDIR)\include\wx\setup.h - !if "$(WXUSINGUNIV)" == "1" ######################################################## # MSW objects (compile Native or UNIV) - UNIV @@ -1224,8 +1206,6 @@ $(MSWDIR)\radiocmn.obj: $(COMMDIR)\radiocmn.$(SRCSUFF) $(MSWDIR)\regex.obj: $(COMMDIR)\regex.$(SRCSUFF) -$(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF) - $(MSWDIR)\rgncmn.obj: $(COMMDIR)\rgncmn.$(SRCSUFF) $(MSWDIR)\sckaddr.obj: $(COMMDIR)\sckaddr.$(SRCSUFF) @@ -1391,8 +1371,6 @@ $(MSWDIR)\tipwin.obj: $(GENDIR)\tipwin.$(SRCSUFF) $(MSWDIR)\treectlg.obj: $(GENDIR)\treectlg.$(SRCSUFF) -$(MSWDIR)\treelay.obj: $(GENDIR)\treelay.$(SRCSUFF) - $(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF) @@ -1461,8 +1439,6 @@ $(MSWDIR)\tipwin.obj: $(GENDIR)\tipwin.$(SRCSUFF) $(MSWDIR)\treectlg.obj: $(GENDIR)\treectlg.$(SRCSUFF) -$(MSWDIR)\treelay.obj: $(GENDIR)\treelay.$(SRCSUFF) - $(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF) @@ -1613,8 +1589,6 @@ clean: $(PERIPH_CLEAN_TARGET) -erase *.pch -erase *.csm -erase "wx32.#??" - -erase ..\common\y_tab.c - -erase ..\common\lex_yy.c cleanall: clean diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc index e7a470453c..61951b6e5a 100644 --- a/src/msw/makefile.bcc +++ b/src/msw/makefile.bcc @@ -87,9 +87,6 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \ $(MSWDIR)\panelg.obj \ $(MSWDIR)\prntdlgg.obj \ $(MSWDIR)\progdlgg.obj \ - $(MSWDIR)\prop.obj \ - $(MSWDIR)\propform.obj \ - $(MSWDIR)\proplist.obj \ $(MSWDIR)\sashwin.obj \ $(MSWDIR)\scrlwing.obj \ $(MSWDIR)\spinctlg.obj \ @@ -102,11 +99,9 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \ $(MSWDIR)\tipdlg.obj \ $(MSWDIR)\tipwin.obj \ $(MSWDIR)\treectlg.obj \ - $(MSWDIR)\treelay.obj \ $(MSWDIR)\wizard.obj COMMONOBJS = \ - $(MSWDIR)\y_tab.obj \ $(MSWDIR)\accesscmn.obj \ $(MSWDIR)\appcmn.obj \ $(MSWDIR)\artprov.obj \ @@ -189,7 +184,6 @@ COMMONOBJS = \ $(MSWDIR)\quantize.obj \ $(MSWDIR)\radiocmn.obj \ $(MSWDIR)\regex.obj \ - $(MSWDIR)\resource.obj \ $(MSWDIR)\rgncmn.obj \ $(MSWDIR)\settcmn.obj \ $(MSWDIR)\sizer.obj \ @@ -216,7 +210,6 @@ COMMONOBJS = \ $(MSWDIR)\wfstream.obj \ $(MSWDIR)\wincmn.obj \ $(MSWDIR)\wxchar.obj \ - $(MSWDIR)\wxexpr.obj \ $(MSWDIR)\xpmdecod.obj \ $(MSWDIR)\zipstrm.obj \ $(MSWDIR)\zstream.obj \ @@ -326,20 +319,6 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(PERIPH_LIBS) dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h -$(MSWDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c - -# cl @<< -# $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ -# << - -$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c - copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c - -$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c - copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c - -# $(OBJECTS): $(WXDIR)\include\wx\setup.h - $(MSWDIR)\accel.obj: $(MSWDIR)\accel.$(SRCSUFF) $(MSWDIR)\app.obj: $(MSWDIR)\app.$(SRCSUFF) @@ -679,8 +658,6 @@ $(MSWDIR)\radiocmn.obj: $(COMMDIR)\radiocmn.$(SRCSUFF) $(MSWDIR)\regex.obj: $(COMMDIR)\regex.$(SRCSUFF) -$(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF) - $(MSWDIR)\rgncmn.obj: $(COMMDIR)\rgncmn.$(SRCSUFF) $(MSWDIR)\settcmn.obj: $(COMMDIR)\settcmn.$(SRCSUFF) @@ -733,8 +710,6 @@ $(MSWDIR)\wincmn.obj: $(COMMDIR)\wincmn.$(SRCSUFF) $(MSWDIR)\wxchar.obj: $(COMMDIR)\wxchar.$(SRCSUFF) -$(MSWDIR)\wxexpr.obj: $(COMMDIR)\wxexpr.$(SRCSUFF) - $(MSWDIR)\xpmdecod.obj: $(COMMDIR)\xpmdecod.$(SRCSUFF) $(MSWDIR)\zipstrm.obj: $(COMMDIR)\zipstrm.$(SRCSUFF) @@ -791,12 +766,6 @@ $(MSWDIR)\prntdlgg.obj: $(GENDIR)\prntdlgg.$(SRCSUFF) $(MSWDIR)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF) -$(MSWDIR)\prop.obj: $(GENDIR)\prop.$(SRCSUFF) - -$(MSWDIR)\propform.obj: $(GENDIR)\propform.$(SRCSUFF) - -$(MSWDIR)\proplist.obj: $(GENDIR)\proplist.$(SRCSUFF) - $(MSWDIR)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF) $(MSWDIR)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF) @@ -821,8 +790,6 @@ $(MSWDIR)\tipwin.obj: $(GENDIR)\tipwin.$(SRCSUFF) $(MSWDIR)\treectlg.obj: $(GENDIR)\treectlg.$(SRCSUFF) -$(MSWDIR)\treelay.obj: $(GENDIR)\treelay.$(SRCSUFF) - $(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF) @@ -906,8 +873,6 @@ clean: $(PERIPH_CLEAN_TARGET) erase *.pch erase *.csm erase *.cfg - erase ..\common\y_tab.c - erase ..\common\lex_yy.c cleanall: clean diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index 095603f1f9..19ad4255c7 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -70,9 +70,6 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \ $(GENDIR)\panelg.obj \ $(GENDIR)\prntdlgg.obj \ $(GENDIR)\progdlgg.obj \ - $(GENDIR)\prop.obj \ - $(GENDIR)\propform.obj \ - $(GENDIR)\proplist.obj \ $(GENDIR)\sashwin.obj \ $(GENDIR)\scrlwing.obj \ $(GENDIR)\spinctlg.obj \ @@ -85,12 +82,10 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \ $(GENDIR)\tipdlg.obj \ $(GENDIR)\tipwin.obj \ $(GENDIR)\treectlg.obj \ - $(GENDIR)\treelay.obj \ $(GENDIR)\wizard.obj # we can't have all objects in one list because the library becomes too big COMMONOBJS1 = \ - $(COMMDIR)\y_tab.obj \ $(COMMDIR)\accesscmn.obj \ $(COMMDIR)\appcmn.obj \ $(COMMDIR)\artprov.obj \ @@ -1467,21 +1462,6 @@ $(GENDIR)/progdlgg.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << -$(GENDIR)/prop.obj: $*.$(SRCSUFF) - cl @<< -$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) -<< - -$(GENDIR)/propform.obj: $*.$(SRCSUFF) - cl @<< -$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) -<< - -$(GENDIR)/proplist.obj: $*.$(SRCSUFF) - cl @<< -$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) -<< - $(GENDIR)/sashwin.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -1542,11 +1522,6 @@ $(GENDIR)/treectlg.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << -$(GENDIR)/treelay.obj: $*.$(SRCSUFF) - cl @<< -$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) -<< - $(GENDIR)/wizard.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -1554,17 +1529,6 @@ $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) -$(COMMDIR)/y_tab.obj: $*.c $(COMMDIR)/lex_yy.c - cl @<< -$(CPPFLAGS2) -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ /I ..\common /c $*.c -<< - -$(COMMDIR)/y_tab.c: $(COMMDIR)/dosyacc.c - copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c - -$(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.c - copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c - $(OBJECTS): $(WXDIR)/include/wx/setup.h # Peripheral components diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index 3fd9b26240..1442d2273b 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -93,9 +93,6 @@ GENERICOBJS = \ $(GENDIR)/numdlgg.$(OBJSUFF) \ $(GENDIR)/panelg.$(OBJSUFF) \ $(GENDIR)/progdlgg.$(OBJSUFF) \ - $(GENDIR)/prop.$(OBJSUFF) \ - $(GENDIR)/propform.$(OBJSUFF) \ - $(GENDIR)/proplist.$(OBJSUFF) \ $(GENDIR)/sashwin.$(OBJSUFF) \ $(GENDIR)/scrlwing.$(OBJSUFF) \ $(GENDIR)/spinctlg.$(OBJSUFF) \ @@ -107,7 +104,6 @@ GENERICOBJS = \ $(GENDIR)/tipdlg.$(OBJSUFF) \ $(GENDIR)/tipwin.$(OBJSUFF) \ $(GENDIR)/treectlg.$(OBJSUFF) \ - $(GENDIR)/treelay.$(OBJSUFF) \ $(GENDIR)/wizard.$(OBJSUFF) COMMONOBJS_BASE = \ @@ -182,7 +178,6 @@ COMMONOBJS_BASEONLY = \ COMMONOBJS = \ $(COMMONOBJS_BASE) \ - $(COMMDIR)/y_tab.$(OBJSUFF) \ $(COMMDIR)/accesscmn.$(OBJSUFF) \ $(COMMDIR)/artprov.$(OBJSUFF) \ $(COMMDIR)/artstd.$(OBJSUFF) \ @@ -235,7 +230,6 @@ COMMONOBJS = \ $(COMMDIR)/prntbase.$(OBJSUFF) \ $(COMMDIR)/quantize.$(OBJSUFF) \ $(COMMDIR)/radiocmn.$(OBJSUFF) \ - $(COMMDIR)/resource.$(OBJSUFF) \ $(COMMDIR)/rgncmn.$(OBJSUFF) \ $(COMMDIR)/settcmn.$(OBJSUFF) \ $(COMMDIR)/sizer.$(OBJSUFF) \ @@ -248,7 +242,6 @@ COMMONOBJS = \ $(COMMDIR)/validate.$(OBJSUFF) \ $(COMMDIR)/valtext.$(OBJSUFF) \ $(COMMDIR)/wincmn.$(OBJSUFF) \ - $(COMMDIR)/wxexpr.$(OBJSUFF) \ $(COMMDIR)/xpmdecod.$(OBJSUFF) HTMLOBJS = \ @@ -623,15 +616,6 @@ $(REGEXLIB): $(OBJECTS): $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(ARCHINCDIR)/wx/setup.h -$(COMMDIR)/y_tab.$(OBJSUFF): $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c - $(CCLEX) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c - -$(COMMDIR)/y_tab.c: $(COMMDIR)/dosyacc.c - $(COPY) ../common/dosyacc.c ../common/y_tab.c - -$(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.c - $(COPY) ../common/doslex.c ../common/lex_yy.c - # Replace lex with flex if you run into compilation # problems with lex_yy.c. See also note about LEX_SCANNER # above. @@ -667,8 +651,6 @@ clean: -$(RM) ole/*.o -$(RM) *.bak -$(RM) core - -$(RM) ../common/y_tab.c - -$(RM) ../common/lex_yy.c -$(RM) ../common/*.o -$(RM) ../common/*.bak -$(RM) ../generic/*.o diff --git a/src/msw/makefile.mic b/src/msw/makefile.mic index 60d21f875b..1c4e04fd99 100644 --- a/src/msw/makefile.mic +++ b/src/msw/makefile.mic @@ -140,7 +140,6 @@ COMMONOBJS = \ $(COMMDIR)/process.$(OBJSUFF) \ $(COMMDIR)/quantize.$(OBJSUFF) \ $(COMMDIR)/radiocmn.$(OBJSUFF) \ - $(COMMDIR)/resource.$(OBJSUFF) \ $(COMMDIR)/sizer.$(OBJSUFF) \ $(COMMDIR)/statbar.$(OBJSUFF) \ $(COMMDIR)/strconv.$(OBJSUFF) \ diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index b542f82213..24e324c8a8 100644 --- a/src/msw/makefile.sc +++ b/src/msw/makefile.sc @@ -1,3 +1,4 @@ +; Last change: JS 30 Mar 103 10:30 pm # This file was automatically generated by tmake @@ -40,9 +41,6 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \ $(GENDIR)\numdlgg.obj \ $(GENDIR)\panelg.obj \ $(GENDIR)\progdlgg.obj \ - $(GENDIR)\prop.obj \ - $(GENDIR)\propform.obj \ - $(GENDIR)\proplist.obj \ $(GENDIR)\sashwin.obj \ $(GENDIR)\scrlwing.obj \ $(GENDIR)\spinctlg.obj \ @@ -54,11 +52,9 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \ $(GENDIR)\tipdlg.obj \ $(GENDIR)\tipwin.obj \ $(GENDIR)\treectlg.obj \ - $(GENDIR)\treelay.obj \ $(GENDIR)\wizard.obj COMMONOBJS = \ - $(COMMDIR)\y_tab.obj \ $(COMMDIR)\accesscmn.obj \ $(COMMDIR)\appcmn.obj \ $(COMMDIR)\artprov.obj \ @@ -154,7 +150,6 @@ COMMONOBJS = \ $(COMMDIR)\quantize.obj \ $(COMMDIR)\radiocmn.obj \ $(COMMDIR)\regex.obj \ - $(COMMDIR)\resource.obj \ $(COMMDIR)\rgncmn.obj \ $(COMMDIR)\sckaddr.obj \ $(COMMDIR)\sckfile.obj \ @@ -187,7 +182,6 @@ COMMONOBJS = \ $(COMMDIR)\wfstream.obj \ $(COMMDIR)\wincmn.obj \ $(COMMDIR)\wxchar.obj \ - $(COMMDIR)\wxexpr.obj \ $(COMMDIR)\xpmdecod.obj \ $(COMMDIR)\zipstrm.obj \ $(COMMDIR)\zstream.obj diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index a7235bb67f..0bb17c2a3d 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -103,9 +103,6 @@ GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \ $(GENDIR)\$D\numdlgg.obj \ $(GENDIR)\$D\panelg.obj \ $(GENDIR)\$D\progdlgg.obj \ - $(GENDIR)\$D\prop.obj \ - $(GENDIR)\$D\propform.obj \ - $(GENDIR)\$D\proplist.obj \ $(GENDIR)\$D\sashwin.obj \ $(GENDIR)\$D\scrlwing.obj \ $(GENDIR)\$D\spinctlg.obj \ @@ -117,7 +114,6 @@ GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \ $(GENDIR)\$D\tipdlg.obj \ $(GENDIR)\$D\tipwin.obj \ $(GENDIR)\$D\treectlg.obj \ - $(GENDIR)\$D\treelay.obj \ $(GENDIR)\$D\wizard.obj # These are generic things that don't need to be compiled on MSW, @@ -136,7 +132,6 @@ NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \ $(GENDIR)\$D\tabg.obj COMMONOBJS = \ - $(COMMDIR)\$D\y_tab.obj \ $(COMMDIR)\$D\accesscmn.obj \ $(COMMDIR)\$D\appcmn.obj \ $(COMMDIR)\$D\artprov.obj \ @@ -583,9 +578,6 @@ $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\gridsel.obj /c /Tp $(GENDIR)\gridsel.cpp << cl @<< $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\logg.obj /c /Tp $(GENDIR)\logg.cpp -<< - cl @<< -$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\proplist.obj /c /Tp $(GENDIR)\proplist.cpp << cl @<< $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\clipbrd.obj /c /Tp $(MSWDIR)\clipbrd.cpp @@ -615,17 +607,6 @@ $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\treectrl.obj /c /Tp $(MSWDIR)\treectrl.cpp $(CPPFLAGS2) /Od /Fo$(HTMLDIR)\$D\helpfrm.obj /c /Tp $(HTMLDIR)\helpfrm.cpp << -$(COMMDIR)\$D\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c - cl @<< -$(CPPFLAGS2) /c $(COMMDIR)\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ -<< - -$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c - copy "$(COMMDIR)"\dosyacc.c "$(COMMDIR)"\y_tab.c - -$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c - copy "$(COMMDIR)"\doslex.c "$(COMMDIR)"\lex_yy.c - $(OBJECTS): $(SETUP_H) $(COMMDIR)\$D\unzip.obj: $(COMMDIR)\unzip.c @@ -713,8 +694,6 @@ clean: $(PERIPH_CLEAN_TARGET) -erase $(COMMDIR)\$D\*.obj -erase $(COMMDIR)\$D\*.pdb -erase $(COMMDIR)\$D\*.sbr - -erase $(COMMDIR)\y_tab.c - -erase $(COMMDIR)\lex_yy.c -erase $(MSWDIR)\$D\*.obj -erase $(MSWDIR)\$D\*.sbr -erase $(MSWDIR)\$D\*.pdb diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index c7b7a8ab00..158f7d4b90 100644 --- a/src/msw/makefile.wat +++ b/src/msw/makefile.wat @@ -81,7 +81,6 @@ NONESSENTIALOBJS= $(OUTPUTDIR)\accel.obj & $(OUTPUTDIR)\timer.obj COMMONOBJS = & - $(OUTPUTDIR)\y_tab.obj & $(OUTPUTDIR)\accesscmn.obj & $(OUTPUTDIR)\appcmn.obj & $(OUTPUTDIR)\artprov.obj & @@ -210,7 +209,6 @@ COMMONOBJS = & $(OUTPUTDIR)\wfstream.obj & $(OUTPUTDIR)\wincmn.obj & $(OUTPUTDIR)\wxchar.obj & - $(OUTPUTDIR)\wxexpr.obj & $(OUTPUTDIR)\xpmdecod.obj & $(OUTPUTDIR)\zipstrm.obj & $(OUTPUTDIR)\zstream.obj @@ -1099,9 +1097,6 @@ $(OUTPUTDIR)\wincmn.obj: $(COMMDIR)\wincmn.cpp $(OUTPUTDIR)\wxchar.obj: $(COMMDIR)\wxchar.cpp *$(CXX) $(CXXFLAGS) $< -$(OUTPUTDIR)\wxexpr.obj: $(COMMDIR)\wxexpr.cpp - *$(CXX) $(CXXFLAGS) $< - $(OUTPUTDIR)\xpmdecod.obj: $(COMMDIR)\xpmdecod.cpp *$(CXX) $(CXXFLAGS) $< @@ -1112,16 +1107,6 @@ $(OUTPUTDIR)\zstream.obj: $(COMMDIR)\zstream.cpp *$(CXX) $(CXXFLAGS) $< - -$(OUTPUTDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c - *$(CC) $(CFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c - -$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c - copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c - -$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c - copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c - ######################################################## # Generic objects (not always compiled, depending on # whether platforms have native implementations) @@ -1171,15 +1156,6 @@ $(OUTPUTDIR)\panelg.obj: $(GENDIR)\panelg.cpp $(OUTPUTDIR)\progdlgg.obj: $(GENDIR)\progdlgg.cpp *$(CXX) $(CXXFLAGS) $< -$(OUTPUTDIR)\prop.obj: $(GENDIR)\prop.cpp - *$(CXX) $(CXXFLAGS) $< - -$(OUTPUTDIR)\propform.obj: $(GENDIR)\propform.cpp - *$(CXX) $(CXXFLAGS) $< - -$(OUTPUTDIR)\proplist.obj: $(GENDIR)\proplist.cpp - *$(CXX) $(CXXFLAGS) $< - $(OUTPUTDIR)\sashwin.obj: $(GENDIR)\sashwin.cpp *$(CXX) $(CXXFLAGS) $< diff --git a/src/x11/files.lst b/src/x11/files.lst index e92e63c1f3..5ba30be401 100644 --- a/src/x11/files.lst +++ b/src/x11/files.lst @@ -62,9 +62,6 @@ ALL_SOURCES = \ generic/printps.cpp \ generic/prntdlgg.cpp \ generic/progdlgg.cpp \ - generic/prop.cpp \ - generic/propform.cpp \ - generic/proplist.cpp \ generic/sashwin.cpp \ generic/scrlwing.cpp \ generic/spinctlg.cpp \ @@ -77,7 +74,6 @@ ALL_SOURCES = \ generic/tipdlg.cpp \ generic/tipwin.cpp \ generic/treectlg.cpp \ - generic/treelay.cpp \ generic/wizard.cpp \ common/accesscmn.cpp \ common/appcmn.cpp \ @@ -175,7 +171,6 @@ ALL_SOURCES = \ common/quantize.cpp \ common/radiocmn.cpp \ common/regex.cpp \ - common/resource.cpp \ common/rgncmn.cpp \ common/sckaddr.cpp \ common/sckfile.cpp \ @@ -208,7 +203,6 @@ ALL_SOURCES = \ common/wfstream.cpp \ common/wincmn.cpp \ common/wxchar.cpp \ - common/wxexpr.cpp \ common/xpmdecod.cpp \ common/zipstrm.cpp \ common/zstream.cpp \ @@ -312,7 +306,6 @@ ALL_HEADERS = \ effects.h \ encconv.h \ event.h \ - expr.h \ fdrepdlg.h \ features.h \ ffile.h \ @@ -405,16 +398,12 @@ ALL_HEADERS = \ prntbase.h \ process.h \ progdlg.h \ - prop.h \ - propform.h \ - proplist.h \ quantize.h \ radiobox.h \ radiobut.h \ rawbmp.h \ regex.h \ region.h \ - resource.h \ sashwin.h \ sckaddr.h \ sckipc.h \ @@ -481,7 +470,6 @@ ALL_HEADERS = \ wx_cw_cm.h \ wx_cw_d.h \ wxchar.h \ - wxexpr.h \ wxhtml.h \ wxprec.h \ xpmdecod.h \ @@ -748,7 +736,6 @@ COMMONOBJS = \ quantize.o \ radiocmn.o \ regex.o \ - resource.o \ rgncmn.o \ sckaddr.o \ sckfile.o \ @@ -781,7 +768,6 @@ COMMONOBJS = \ wfstream.o \ wincmn.o \ wxchar.o \ - wxexpr.o \ xpmdecod.o \ zipstrm.o \ zstream.o @@ -817,9 +803,6 @@ GENERICOBJS = \ printps.o \ prntdlgg.o \ progdlgg.o \ - prop.o \ - propform.o \ - proplist.o \ sashwin.o \ scrlwing.o \ spinctlg.o \ @@ -832,7 +815,6 @@ GENERICOBJS = \ tipdlg.o \ tipwin.o \ treectlg.o \ - treelay.o \ wizard.o UNIXOBJS = \ diff --git a/utils/dialoged/src/dialoged.cpp b/utils/dialoged/src/dialoged.cpp index 3b208d17cd..2e68783e70 100644 --- a/utils/dialoged/src/dialoged.cpp +++ b/utils/dialoged/src/dialoged.cpp @@ -23,6 +23,8 @@ #include "wx/wx.h" #endif +#include "wx/deprecated/setup.h" + #include "dialoged.h" #if !wxUSE_PROPSHEET diff --git a/utils/dialoged/src/dialoged.h b/utils/dialoged/src/dialoged.h index 505ffa8888..d717107c87 100644 --- a/utils/dialoged/src/dialoged.h +++ b/utils/dialoged/src/dialoged.h @@ -16,7 +16,7 @@ #ifndef dialogedh #define dialogedh -#include "wx/proplist.h" +#include "wx/deprecated/proplist.h" #include "reseditr.h" class MyChild; diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp index 2bf9a8d487..2d33bddd2c 100644 --- a/utils/dialoged/src/reseditr.cpp +++ b/utils/dialoged/src/reseditr.cpp @@ -950,7 +950,7 @@ bool wxResourceManager::Edit(wxItemResource *res) wxResourceEditorDialogHandler *handler = new wxResourceEditorDialogHandler(panel, res, panel->GetEventHandler(), this); - panel->LoadFromResource(m_editorPanel, res->GetName(), &m_resourceTable); + wxLoadFromResource(panel, m_editorPanel, res->GetName(), &m_resourceTable); panel->PushEventHandler(handler); @@ -1235,7 +1235,7 @@ bool wxResourceManager::TestCurrentDialog(wxWindow* parent) ResourceEditorDialogTester* dialog = new ResourceEditorDialogTester; bool success = FALSE; - if (dialog->LoadFromResource(parent, item->GetName(), & m_resourceTable)) + if (wxLoadFromResource(dialog, parent, item->GetName(), & m_resourceTable)) { dialog->Centre(); dialog->ShowModal(); diff --git a/utils/dialoged/src/reseditr.h b/utils/dialoged/src/reseditr.h index a57d56d560..3b479472e5 100644 --- a/utils/dialoged/src/reseditr.h +++ b/utils/dialoged/src/reseditr.h @@ -18,15 +18,19 @@ #pragma interface "reseditr.h" #endif +#include "wx/deprecated/setup.h" + #include "wx/wx.h" #include "wx/string.h" #include "wx/layout.h" -#include "wx/resource.h" #include "wx/toolbar.h" #include "wx/imaglist.h" #include "wx/treectrl.h" -#include "wx/proplist.h" #include "wx/txtstrm.h" + +#include "wx/deprecated/resource.h" +#include "wx/deprecated/proplist.h" + #include "symbtabl.h" #include "winstyle.h"