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
        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
        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
 
   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
   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
   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
   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
 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)
 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)
   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
   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
   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
 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)
     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
     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)
     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)
 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)
 
 
 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
+#
+
 
 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
+
+
 
 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
+
+
 
 HTMLOBJS = #$ ExpandList("WXHTMLOBJS");
 
 COMMONOBJS = \
-        $(MSWDIR)\y_tab.obj \
         #$ ExpandList("WXCOMMONOBJS");
 
 !if "$(WXUSINGUNIV)" == "1"
 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"
     -erase *.pch
     -erase *.csm
     -erase "wx32.#??"
-    -erase ..\common\y_tab.c
-    -erase ..\common\lex_yy.c
 
 cleanall: clean
 
 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
 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)
 #        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)
 #        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)
         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
         -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
         -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
         -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
 
 GENERICOBJS= #$ ExpandList("WXGENERICOBJS");
 
 COMMONOBJS = \
-               $(MSWDIR)\y_tab.obj \
                #$ ExpandList("WXCOMMONOBJS");
 
 MSWOBJS = #$ ExpandList("WXMSWOBJS");
 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
 
 #${
     erase *.pch
     erase *.csm
     erase *.cfg
-       erase ..\common\y_tab.c
-    erase ..\common\lex_yy.c
 
 cleanall: clean
 
 
 
 # we can't have all objects in one list because the library becomes too big
 COMMONOBJS1 = \
-               $(COMMDIR)\y_tab.obj \
                #$ ExpandList("WXCOMMONOBJS1");
 
 COMMONOBJS2 = \
     }
 #$}
 
-$(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
 
 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
 tipdlg.cpp     Generic
 tipwin.cpp     Generic
 treectlg.cpp   Generic
-treelay.cpp    Generic
 wizard.cpp     Generic
 
 accesscmn.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
 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
 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
 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
 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
 
 
 COMMONOBJS  = \
                 $(COMMONOBJS_BASE) \
-               $(COMMDIR)/y_tab.$(OBJSUFF) \
                #$ ExpandList("WXCOMMONOBJS");
 
 HTMLOBJS = \
 
 $(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
 
 # 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"
 
 
 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)\\")
     }
 #$}
 
-$(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)
 
 #   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."
 #   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."
 
 // OpenGL canvas
 #define wxUSE_GLCANVAS       0
 
-// wxTreeLayout class
-#define wxUSE_TREELAYOUT     1
-
 // ----------------------------------------------------------------------------
 // Data transfer
 // ----------------------------------------------------------------------------
 #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
 
 
 #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
 // ----------------------------------------------------------------------------
 // Recommended setting: 1 if you intend to use OpenGL, 0 otherwise
 #define wxUSE_GLCANVAS       0
 
-// wxTreeLayout class
-#define wxUSE_TREELAYOUT     1
-
 // ----------------------------------------------------------------------------
 // Data transfer
 // ----------------------------------------------------------------------------
                                 // 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
 
 
 
 #define wxUSE_GENERIC_MDI_AS_NATIVE 1
 
-// use wxExpr (a.k.a. PrologIO)
-#define wxUSE_PROLOGIO          1
-
 #endif
     // _WX_SETUP_H_
 
                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 \
                generic/tipdlg.cpp \
                generic/tipwin.cpp \
                generic/treectlg.cpp \
-               generic/treelay.cpp \
                generic/wizard.cpp \
                common/accesscmn.cpp \
                common/appcmn.cpp \
                common/quantize.cpp \
                common/radiocmn.cpp \
                common/regex.cpp \
-               common/resource.cpp \
                common/sckaddr.cpp \
                common/sckfile.cpp \
                common/sckipc.cpp \
                common/wfstream.cpp \
                common/wincmn.cpp \
                common/wxchar.cpp \
-               common/wxexpr.cpp \
                common/xpmdecod.cpp \
                common/zipstrm.cpp \
                common/zstream.cpp \
                effects.h \
                encconv.h \
                event.h \
-               expr.h \
                fdrepdlg.h \
                features.h \
                ffile.h \
                ioswrap.h \
                ipc.h \
                ipcbase.h \
-               isql.h \
-               isqlext.h \
                joystick.h \
                layout.h \
                laywin.h \
                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 \
                wx_cw_cm.h \
                wx_cw_d.h \
                wxchar.h \
-               wxexpr.h \
                wxhtml.h \
                wxprec.h \
                xpmdecod.h \
                quantize.o \
                radiocmn.o \
                regex.o \
-               resource.o \
                sckaddr.o \
                sckfile.o \
                sckipc.o \
                wfstream.o \
                wincmn.o \
                wxchar.o \
-               wxexpr.o \
                xpmdecod.o \
                zipstrm.o \
                zstream.o
                printps.o \
                prntdlgg.o \
                progdlgg.o \
-               prop.o \
-               propform.o \
-               proplist.o \
                sashwin.o \
                scrlwing.o \
                spinctlg.o \
                tipdlg.o \
                tipwin.o \
                treectlg.o \
-               treelay.o \
                wizard.o
 
 GUIOBJS = \
 
                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 \
                generic/tipdlg.cpp \
                generic/tipwin.cpp \
                generic/treectlg.cpp \
-               generic/treelay.cpp \
                generic/wizard.cpp \
                common/accesscmn.cpp \
                common/appcmn.cpp \
                common/quantize.cpp \
                common/radiocmn.cpp \
                common/regex.cpp \
-               common/resource.cpp \
                common/rgncmn.cpp \
                common/sckaddr.cpp \
                common/sckfile.cpp \
                common/wfstream.cpp \
                common/wincmn.cpp \
                common/wxchar.cpp \
-               common/wxexpr.cpp \
                common/xpmdecod.cpp \
                common/zipstrm.cpp \
                common/zstream.cpp \
                effects.h \
                encconv.h \
                event.h \
-               expr.h \
                fdrepdlg.h \
                features.h \
                ffile.h \
                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 \
                wx_cw_cm.h \
                wx_cw_d.h \
                wxchar.h \
-               wxexpr.h \
                wxhtml.h \
                wxprec.h \
                xpmdecod.h \
                quantize.o \
                radiocmn.o \
                regex.o \
-               resource.o \
                rgncmn.o \
                sckaddr.o \
                sckfile.o \
                wfstream.o \
                wincmn.o \
                wxchar.o \
-               wxexpr.o \
                xpmdecod.o \
                zipstrm.o \
                zstream.o
                printps.o \
                prntdlgg.o \
                progdlgg.o \
-               prop.o \
-               propform.o \
-               proplist.o \
                sashwin.o \
                scrlwing.o \
                spinctlg.o \
                tipdlg.o \
                tipwin.o \
                treectlg.o \
-               treelay.o \
                wizard.o \
                app.o \
                bitmap.o \
                printps.o \
                prntdlgg.o \
                progdlgg.o \
-               prop.o \
-               propform.o \
-               proplist.o \
                sashwin.o \
                scrlwing.o \
                spinctlg.o \
                tipdlg.o \
                tipwin.o \
                treectlg.o \
-               treelay.o \
                wizard.o \
                app.o \
                bitmap.o \
 
                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 \
                generic/tipdlg.cpp \
                generic/tipwin.cpp \
                generic/treectlg.cpp \
-               generic/treelay.cpp \
                generic/wizard.cpp \
                common/accesscmn.cpp \
                common/appcmn.cpp \
                common/quantize.cpp \
                common/radiocmn.cpp \
                common/regex.cpp \
-               common/resource.cpp \
                common/rgncmn.cpp \
                common/sckaddr.cpp \
                common/sckfile.cpp \
                common/wfstream.cpp \
                common/wincmn.cpp \
                common/wxchar.cpp \
-               common/wxexpr.cpp \
                common/xpmdecod.cpp \
                common/zipstrm.cpp \
                common/zstream.cpp \
                effects.h \
                encconv.h \
                event.h \
-               expr.h \
                fdrepdlg.h \
                features.h \
                ffile.h \
                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 \
                wx_cw_cm.h \
                wx_cw_d.h \
                wxchar.h \
-               wxexpr.h \
                wxhtml.h \
                wxprec.h \
                xpmdecod.h \
                quantize.o \
                radiocmn.o \
                regex.o \
-               resource.o \
                rgncmn.o \
                sckaddr.o \
                sckfile.o \
                wfstream.o \
                wincmn.o \
                wxchar.o \
-               wxexpr.o \
                xpmdecod.o \
                zipstrm.o \
                zstream.o
                printps.o \
                prntdlgg.o \
                progdlgg.o \
-               prop.o \
-               propform.o \
-               proplist.o \
                sashwin.o \
                scrlwing.o \
                spinctlg.o \
                tipdlg.o \
                tipwin.o \
                treectlg.o \
-               treelay.o \
                wizard.o \
                app.o \
                bitmap.o \
                printps.o \
                prntdlgg.o \
                progdlgg.o \
-               prop.o \
-               propform.o \
-               proplist.o \
                sashwin.o \
                scrlwing.o \
                spinctlg.o \
                tipdlg.o \
                tipwin.o \
                treectlg.o \
-               treelay.o \
                wizard.o \
                app.o \
                bitmap.o \
 
                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 \
                generic/tipdlg.cpp \
                generic/tipwin.cpp \
                generic/treectlg.cpp \
-               generic/treelay.cpp \
                generic/wizard.cpp \
                common/accesscmn.cpp \
                common/appcmn.cpp \
                common/quantize.cpp \
                common/radiocmn.cpp \
                common/regex.cpp \
-               common/resource.cpp \
                common/rgncmn.cpp \
                common/sckaddr.cpp \
                common/sckfile.cpp \
                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 \
                quantize.o \
                radiocmn.o \
                regex.o \
-               resource.o \
                rgncmn.o \
                sckaddr.o \
                sckfile.o \
                printps.o \
                prntdlgg.o \
                progdlgg.o \
-               prop.o \
-               propform.o \
-               proplist.o \
                sashwin.o \
                scrlwing.o \
                spinctlg.o \
                tipdlg.o \
                tipwin.o \
                treectlg.o \
-               treelay.o \
                wizard.o
 
 GUIOBJS = \
 
                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 \
                generic/tipdlg.cpp \
                generic/tipwin.cpp \
                generic/treectlg.cpp \
-               generic/treelay.cpp \
                generic/wizard.cpp \
                common/accesscmn.cpp \
                common/appcmn.cpp \
                common/quantize.cpp \
                common/radiocmn.cpp \
                common/regex.cpp \
-               common/resource.cpp \
                common/rgncmn.cpp \
                common/sckaddr.cpp \
                common/sckfile.cpp \
                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 \
                quantize.o \
                radiocmn.o \
                regex.o \
-               resource.o \
                rgncmn.o \
                sckaddr.o \
                sckfile.o \
                printps.o \
                prntdlgg.o \
                progdlgg.o \
-               prop.o \
-               propform.o \
-               proplist.o \
                sashwin.o \
                scrlwing.o \
                spinctlg.o \
                tipdlg.o \
                tipwin.o \
                treectlg.o \
-               treelay.o \
                wizard.o
 
 GUIOBJS = \
 
                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 \
                common/quantize.cpp \
                common/radiocmn.cpp \
                common/regex.cpp \
-               common/resource.cpp \
                common/rgncmn.cpp \
                common/sckaddr.cpp \
                common/sckfile.cpp \
                common/wfstream.cpp \
                common/wincmn.cpp \
                common/wxchar.cpp \
-               common/wxexpr.cpp \
                common/xpmdecod.cpp \
                common/zipstrm.cpp \
                common/zstream.cpp \
                effects.h \
                encconv.h \
                event.h \
-               expr.h \
                fdrepdlg.h \
                features.h \
                ffile.h \
                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 \
                wx_cw_cm.h \
                wx_cw_d.h \
                wxchar.h \
-               wxexpr.h \
                wxhtml.h \
                wxprec.h \
                xpmdecod.h \
                quantize.o \
                radiocmn.o \
                regex.o \
-               resource.o \
                rgncmn.o \
                sckaddr.o \
                sckfile.o \
                wfstream.o \
                wincmn.o \
                wxchar.o \
-               wxexpr.o \
                xpmdecod.o \
                zipstrm.o \
                zstream.o
                printps.o \
                prntdlgg.o \
                progdlgg.o \
-               prop.o \
-               propform.o \
-               proplist.o \
                sashwin.o \
                scrlwing.o \
                spinctlg.o \
 
                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 \
                common/quantize.cpp \
                common/radiocmn.cpp \
                common/regex.cpp \
-               common/resource.cpp \
                common/rgncmn.cpp \
                common/sckaddr.cpp \
                common/sckfile.cpp \
                common/wfstream.cpp \
                common/wincmn.cpp \
                common/wxchar.cpp \
-               common/wxexpr.cpp \
                common/xpmdecod.cpp \
                common/zipstrm.cpp \
                common/zstream.cpp \
                effects.h \
                encconv.h \
                event.h \
-               expr.h \
                fdrepdlg.h \
                features.h \
                ffile.h \
                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 \
                wx_cw_cm.h \
                wx_cw_d.h \
                wxchar.h \
-               wxexpr.h \
                wxhtml.h \
                wxprec.h \
                xpmdecod.h \
                quantize.o \
                radiocmn.o \
                regex.o \
-               resource.o \
                rgncmn.o \
                sckaddr.o \
                sckfile.o \
                wfstream.o \
                wincmn.o \
                wxchar.o \
-               wxexpr.o \
                xpmdecod.o \
                zipstrm.o \
                zstream.o
                printps.o \
                prntdlgg.o \
                progdlgg.o \
-               prop.o \
-               propform.o \
-               proplist.o \
                sashwin.o \
                scrlwing.o \
                spinctlg.o \
 
                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 \
                generic/tipdlg.cpp \
                generic/tipwin.cpp \
                generic/treectlg.cpp \
-               generic/treelay.cpp \
                generic/wizard.cpp \
                common/accesscmn.cpp \
                common/appcmn.cpp \
                common/quantize.cpp \
                common/radiocmn.cpp \
                common/regex.cpp \
-               common/resource.cpp \
                common/rgncmn.cpp \
                common/sckaddr.cpp \
                common/sckfile.cpp \
                common/wfstream.cpp \
                common/wincmn.cpp \
                common/wxchar.cpp \
-               common/wxexpr.cpp \
                common/xpmdecod.cpp \
                common/zipstrm.cpp \
                common/zstream.cpp \
                effects.h \
                encconv.h \
                event.h \
-               expr.h \
                fdrepdlg.h \
                features.h \
                ffile.h \
                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 \
                wx_cw_cm.h \
                wx_cw_d.h \
                wxchar.h \
-               wxexpr.h \
                wxhtml.h \
                wxprec.h \
                xpmdecod.h \
                quantize.o \
                radiocmn.o \
                regex.o \
-               resource.o \
                rgncmn.o \
                sckaddr.o \
                sckfile.o \
                wfstream.o \
                wincmn.o \
                wxchar.o \
-               wxexpr.o \
                xpmdecod.o \
                zipstrm.o \
                zstream.o
                numdlgg.o \
                panelg.o \
                progdlgg.o \
-               prop.o \
-               propform.o \
-               proplist.o \
                sashwin.o \
                scrlwing.o \
                spinctlg.o \
                tipdlg.o \
                tipwin.o \
                treectlg.o \
-               treelay.o \
                wizard.o
 
 GUIOBJS = \
 
 <<
 
 COMMONOBJS = \
-    ..\common\$D\y_tab.obj \
     ..\common\$D\appcmn.obj \
                ..\common\$D\clntdata.obj \
                ..\common\$D\cmdline.obj \
         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
         -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
 
                $(MSWDIR)\tipdlg.obj \
                $(MSWDIR)\tipwin.obj \
                $(MSWDIR)\treectlg.obj \
-               $(MSWDIR)\treelay.obj \
                $(MSWDIR)\wizard.obj
 
 MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\tipdlg.obj \
                $(MSWDIR)\tipwin.obj \
                $(MSWDIR)\treectlg.obj \
-               $(MSWDIR)\treelay.obj \
                $(MSWDIR)\wizard.obj
 
 MSWUNIVOBJS = $(MSWDIR)\app.obj \
                $(MSWDIR)\winpars.obj
 
 COMMONOBJS = \
-        $(MSWDIR)\y_tab.obj \
         $(MSWDIR)\accesscmn.obj \
                $(MSWDIR)\appcmn.obj \
                $(MSWDIR)\artprov.obj \
                $(MSWDIR)\quantize.obj \
                $(MSWDIR)\radiocmn.obj \
                $(MSWDIR)\regex.obj \
-               $(MSWDIR)\resource.obj \
                $(MSWDIR)\rgncmn.obj \
                $(MSWDIR)\sckaddr.obj \
                $(MSWDIR)\sckfile.obj \
 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
 
 $(MSWDIR)\regex.obj: $(COMMDIR)\regex.$(SRCSUFF)
 
-$(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF)
-
 $(MSWDIR)\rgncmn.obj: $(COMMDIR)\rgncmn.$(SRCSUFF)
 
 $(MSWDIR)\sckaddr.obj: $(COMMDIR)\sckaddr.$(SRCSUFF)
 
 $(MSWDIR)\treectlg.obj: $(GENDIR)\treectlg.$(SRCSUFF)
 
-$(MSWDIR)\treelay.obj: $(GENDIR)\treelay.$(SRCSUFF)
-
 $(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF)
 
 
 
 $(MSWDIR)\treectlg.obj: $(GENDIR)\treectlg.$(SRCSUFF)
 
-$(MSWDIR)\treelay.obj: $(GENDIR)\treelay.$(SRCSUFF)
-
 $(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF)
 
 
     -erase *.pch
     -erase *.csm
     -erase "wx32.#??"
-    -erase ..\common\y_tab.c
-    -erase ..\common\lex_yy.c
 
 cleanall: clean
 
 
                $(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 \
                $(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 \
                $(MSWDIR)\quantize.obj \
                $(MSWDIR)\radiocmn.obj \
                $(MSWDIR)\regex.obj \
-               $(MSWDIR)\resource.obj \
                $(MSWDIR)\rgncmn.obj \
                $(MSWDIR)\settcmn.obj \
                $(MSWDIR)\sizer.obj \
                $(MSWDIR)\wfstream.obj \
                $(MSWDIR)\wincmn.obj \
                $(MSWDIR)\wxchar.obj \
-               $(MSWDIR)\wxexpr.obj \
                $(MSWDIR)\xpmdecod.obj \
                $(MSWDIR)\zipstrm.obj \
                $(MSWDIR)\zstream.obj \
 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)
 
 $(MSWDIR)\regex.obj: $(COMMDIR)\regex.$(SRCSUFF)
 
-$(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF)
-
 $(MSWDIR)\rgncmn.obj: $(COMMDIR)\rgncmn.$(SRCSUFF)
 
 $(MSWDIR)\settcmn.obj: $(COMMDIR)\settcmn.$(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)
 
 $(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)
 
 $(MSWDIR)\treectlg.obj: $(GENDIR)\treectlg.$(SRCSUFF)
 
-$(MSWDIR)\treelay.obj: $(GENDIR)\treelay.$(SRCSUFF)
-
 $(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF)
 
 
     erase *.pch
     erase *.csm
     erase *.cfg
-       erase ..\common\y_tab.c
-    erase ..\common\lex_yy.c
 
 cleanall: clean
 
 
                $(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 \
                $(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 \
 $(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)
 $(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)
 
 
 
-$(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
 
                $(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) \
                $(GENDIR)/tipdlg.$(OBJSUFF) \
                $(GENDIR)/tipwin.$(OBJSUFF) \
                $(GENDIR)/treectlg.$(OBJSUFF) \
-               $(GENDIR)/treelay.$(OBJSUFF) \
                $(GENDIR)/wizard.$(OBJSUFF)
 
 COMMONOBJS_BASE  = \
 
 COMMONOBJS  = \
                 $(COMMONOBJS_BASE) \
-               $(COMMDIR)/y_tab.$(OBJSUFF) \
                $(COMMDIR)/accesscmn.$(OBJSUFF) \
                $(COMMDIR)/artprov.$(OBJSUFF) \
                $(COMMDIR)/artstd.$(OBJSUFF) \
                $(COMMDIR)/prntbase.$(OBJSUFF) \
                $(COMMDIR)/quantize.$(OBJSUFF) \
                $(COMMDIR)/radiocmn.$(OBJSUFF) \
-               $(COMMDIR)/resource.$(OBJSUFF) \
                $(COMMDIR)/rgncmn.$(OBJSUFF) \
                $(COMMDIR)/settcmn.$(OBJSUFF) \
                $(COMMDIR)/sizer.$(OBJSUFF) \
                $(COMMDIR)/validate.$(OBJSUFF) \
                $(COMMDIR)/valtext.$(OBJSUFF) \
                $(COMMDIR)/wincmn.$(OBJSUFF) \
-               $(COMMDIR)/wxexpr.$(OBJSUFF) \
                $(COMMDIR)/xpmdecod.$(OBJSUFF)
 
 HTMLOBJS = \
 
 $(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.
        -$(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
 
                $(COMMDIR)/process.$(OBJSUFF) \
                $(COMMDIR)/quantize.$(OBJSUFF) \
                $(COMMDIR)/radiocmn.$(OBJSUFF) \
-               $(COMMDIR)/resource.$(OBJSUFF) \
                $(COMMDIR)/sizer.$(OBJSUFF) \
                $(COMMDIR)/statbar.$(OBJSUFF) \
                $(COMMDIR)/strconv.$(OBJSUFF) \
 
+;    Last change:  JS   30 Mar 103   10:30 pm
 
 
 # This file was automatically generated by tmake 
                $(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 \
                $(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 \
                $(COMMDIR)\quantize.obj \
                $(COMMDIR)\radiocmn.obj \
                $(COMMDIR)\regex.obj \
-               $(COMMDIR)\resource.obj \
                $(COMMDIR)\rgncmn.obj \
                $(COMMDIR)\sckaddr.obj \
                $(COMMDIR)\sckfile.obj \
                $(COMMDIR)\wfstream.obj \
                $(COMMDIR)\wincmn.obj \
                $(COMMDIR)\wxchar.obj \
-               $(COMMDIR)\wxexpr.obj \
                $(COMMDIR)\xpmdecod.obj \
                $(COMMDIR)\zipstrm.obj \
                $(COMMDIR)\zstream.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 \
                $(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,
                $(GENDIR)\$D\tabg.obj
 
 COMMONOBJS = \
-               $(COMMDIR)\$D\y_tab.obj \
                $(COMMDIR)\$D\accesscmn.obj \
                $(COMMDIR)\$D\appcmn.obj \
                $(COMMDIR)\$D\artprov.obj \
 <<
        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
 $(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
         -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
 
        $(OUTPUTDIR)\timer.obj
 
 COMMONOBJS = &
-       $(OUTPUTDIR)\y_tab.obj &
        $(OUTPUTDIR)\accesscmn.obj &
        $(OUTPUTDIR)\appcmn.obj &
        $(OUTPUTDIR)\artprov.obj &
        $(OUTPUTDIR)\wfstream.obj &
        $(OUTPUTDIR)\wincmn.obj &
        $(OUTPUTDIR)\wxchar.obj &
-       $(OUTPUTDIR)\wxexpr.obj &
        $(OUTPUTDIR)\xpmdecod.obj &
        $(OUTPUTDIR)\zipstrm.obj &
        $(OUTPUTDIR)\zstream.obj
 $(OUTPUTDIR)\wxchar.obj:     $(COMMDIR)\wxchar.cpp
   *$(CXX) $(CXXFLAGS) $<
 
-$(OUTPUTDIR)\wxexpr.obj:     $(COMMDIR)\wxexpr.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
 $(OUTPUTDIR)\xpmdecod.obj:     $(COMMDIR)\xpmdecod.cpp
   *$(CXX) $(CXXFLAGS) $<
 
   *$(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)
 $(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) $<
 
 
                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 \
                generic/tipdlg.cpp \
                generic/tipwin.cpp \
                generic/treectlg.cpp \
-               generic/treelay.cpp \
                generic/wizard.cpp \
                common/accesscmn.cpp \
                common/appcmn.cpp \
                common/quantize.cpp \
                common/radiocmn.cpp \
                common/regex.cpp \
-               common/resource.cpp \
                common/rgncmn.cpp \
                common/sckaddr.cpp \
                common/sckfile.cpp \
                common/wfstream.cpp \
                common/wincmn.cpp \
                common/wxchar.cpp \
-               common/wxexpr.cpp \
                common/xpmdecod.cpp \
                common/zipstrm.cpp \
                common/zstream.cpp \
                effects.h \
                encconv.h \
                event.h \
-               expr.h \
                fdrepdlg.h \
                features.h \
                ffile.h \
                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 \
                wx_cw_cm.h \
                wx_cw_d.h \
                wxchar.h \
-               wxexpr.h \
                wxhtml.h \
                wxprec.h \
                xpmdecod.h \
                quantize.o \
                radiocmn.o \
                regex.o \
-               resource.o \
                rgncmn.o \
                sckaddr.o \
                sckfile.o \
                wfstream.o \
                wincmn.o \
                wxchar.o \
-               wxexpr.o \
                xpmdecod.o \
                zipstrm.o \
                zstream.o
                printps.o \
                prntdlgg.o \
                progdlgg.o \
-               prop.o \
-               propform.o \
-               proplist.o \
                sashwin.o \
                scrlwing.o \
                spinctlg.o \
                tipdlg.o \
                tipwin.o \
                treectlg.o \
-               treelay.o \
                wizard.o
 
 UNIXOBJS = \
 
 #include "wx/wx.h"
 #endif
 
+#include "wx/deprecated/setup.h"
+
 #include "dialoged.h"
 
 #if !wxUSE_PROPSHEET
 
 #ifndef dialogedh
 #define dialogedh
 
-#include "wx/proplist.h"
+#include "wx/deprecated/proplist.h"
 #include "reseditr.h"
 
 class MyChild;
 
         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);
         
         
         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();
 
 #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"