This commit was manufactured by cvs2svn to create tag 'WX_2_2_0'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_2_0@7732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-10 06:08:05 +00:00
1111 changed files with 47620 additions and 147984 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -21,23 +21,10 @@ linux-gnu.system.cache
 *.d
 *.swp
 *.swo
-*.swq
 Release
 Debug
-ReleaseDll
-DebugDll
-ReleaseUnicode
-DebugUnicode
-ReleaseUnicodeDll
-DebugUnicodeDll
-BaseRelease
-BaseDebug
-BaseReleaseDll
-BaseDebugDll
-BaseReleaseUnicode
-BaseDebugUnicode
-BaseReleaseUnicodeDll
-BaseDebugUnicodeDll
+ReleaseDLL
+DebugDLL
 robert
 stamp-h.in
 Makefile
--- a/BuildCVS.txt
+++ b/BuildCVS.txt
@@ -2,9 +2,6 @@
                How to build the sources from CVS
 ------------------------------------------------------------------------

-Please use the install.txt files in docs/gtk, docs/msw, docs/motif, docs/mac
-etc. alongside these instructions.
-
 I) Windows using plain makefiles
 ----------------------------------------

@@ -118,20 +115,6 @@ ftp server at ftp://sourceware.cygnus.com/pub/cygwin/.
 Of course, you can also build the library using plain makefiles (see
 section I).

-IV) wxBase
----------------------------------------
-
-wxBase is the non GUI part of wxWindows. Currently it can be only built using
-configure (i.e. under Unix and probably under Win32 with cygwin) and with
-Visual C++.
-
-To build it using configure, just add "--disable-gui" argument to it.
-
-To build wxBase with VC++, use the project files wxBase.dsp and wxBaseDll.dsp
-included in the CVS. See http://www.wxwindows.org/vadim/wxDocs/buildmsw.html
-for the instructions on how to generate the project files for the programs
-using wxBase.
-
 V) MacOS
 ----------------------------------------

--- a/Makefile.in
+++ b/Makefile.in
@@ -1,12 +1,11 @@
 #
 # File:     makefile.unx
-# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee
+# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
 # Created:  1993
-# Updated:  2001
+# Updated:  1999
 # Copyright:(c) 1993, AIAI, University of Edinburgh,
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling
-# Copyright:(c) 2001, Ron Lee
 #
 # Makefile for libwx_gtk.a, libwx_motif.a and libwx_msw.a

@@ -16,22 +15,24 @@ include ./src/make.env

 ############## override make.env for PIC ##########################

-%.o : %.c
-	$(CC) -c $(CFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
+# Clears all default suffixes
+.SUFFIXES:	.o .cpp .c .cxx

-%.o : %.cpp
-	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
+.c.o :
+	$(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) -o $@ $<

-%.o : %.cxx
-	$(CXX) -c $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
+.cpp.o :
+	$(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
+
+.cxx.o :
+	$(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<

 ########################### Paths #################################

 srcdir = @srcdir@
-top_srcdir = @top_srcdir@

-VP1 = @TOOLKIT_VPATH@
-VP2 = @top_srcdir@/src/common
+VP1 = @top_srcdir@/src/common
+VP2 = @top_srcdir@/src/@TOOLKIT_DIR@
 VP3 = @top_srcdir@/src/motif/xmcombo
 VP4 = @top_srcdir@/src/generic
 VP5 = @top_srcdir@/src/unix
@@ -41,51 +42,54 @@ VP8 = @top_srcdir@/src/jpeg
 VP9 = @top_srcdir@/src/tiff
 VP10 = @top_srcdir@/src/zlib
 VP11 = @top_srcdir@/src/iodbc
-VP12 = @top_srcdir@/src/msw/ole
-
-FTVP01 = @top_srcdir@/src/freetype/unix
-FTVP02 = @top_srcdir@/src/freetype/autohint
-FTVP03 = @top_srcdir@/src/freetype/base
-FTVP04 = @top_srcdir@/src/freetype/cff
-FTVP05 = @top_srcdir@/src/freetype/cid
-FTVP06 = @top_srcdir@/src/freetype/macfond
-FTVP07 = @top_srcdir@/src/freetype/otlayout
-FTVP08 = @top_srcdir@/src/freetype/psnames
-FTVP09 = @top_srcdir@/src/freetype/raster1
-FTVP10 = @top_srcdir@/src/freetype/sfnt
-FTVP11 = @top_srcdir@/src/freetype/smooth
-FTVP12 = @top_srcdir@/src/freetype/truetype
-FTVP13 = @top_srcdir@/src/freetype/type1
-FTVP14 = @top_srcdir@/src/freetype/type1z
-FTVP15 = @top_srcdir@/src/freetype/winfonts
-
-VP13 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@
-VP14 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_IFS@$(FTVP13)@PATH_IFS@$(FTVP14)@PATH_IFS@$(FTVP15)@PATH_IFS@

 # the comment at the end of the next line is needed because otherwise autoconf
 # would remove this line completely - it contains a built-in hack to remove
 # any VPATH assignment not containing ':'
-VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13)@PATH_IFS@$(VP14) # ':' for autoconf
+VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf

+top_srcdir = @top_srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@

 bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
 datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
 libdir = @libdir@
+infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =

 localedir = $(datadir)/locale

+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
 top_builddir = .
-build_libdir = $(top_builddir)/lib

 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+# my autoconf doesn't set this
+#INSTALL_SCRIPT = @INSTALL_SCRIPT@
+# maybe do an additional chmod if needed?
 INSTALL_SCRIPT = @INSTALL@
+transform = @program_transform_name@

+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
 build_alias = @build_alias@
 build_triplet = @build@
 host_alias = @host_alias@
@@ -114,9 +118,7 @@ GTKDIR   = $(WXDIR)/src/gtk
 MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
 PMDIR    = $(WXDIR)/src/os2
-MACDIR   = $(WXDIR)/src/mac
 ODBCDIR  = $(WXDIR)/src/iodbc
-FTDIR    = $(WXDIR)/src/freetype
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
 DEMODIR  = $(WXDIR)/demos
@@ -128,21 +130,12 @@ INTLDIR  = $(WXDIR)/locale

 ########################## Archive name ###############################

-# append a version suffix x.y.z to all file names
-VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
-WXARCHIVE = @DISTDIR@-$(VER_SUFFIX).tar.gz
-WXGLARCHIVE = @DISTDIR@-gl-$(VER_SUFFIX).tar.gz
-WXSAMPLES = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.gz
-WXDEMOS = wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.gz
-
-WXARCHIVE_BZIP = @DISTDIR@-$(VER_SUFFIX).tar.bz2
-WXGLARCHIVE_BZIP = @DISTDIR@-gl-$(VER_SUFFIX).tar.bz2
-WXSAMPLES_BZIP = wx$(TOOLKIT)-samples-$(VER_SUFFIX).tar.bz2
-WXDEMOS_BZIP = wx$(TOOLKIT)-demos-$(VER_SUFFIX).tar.bz2
-
+WXARCHIVE = @DISTDIR@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
+WXGLARCHIVE = @DISTDIR@-gl-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
+WXSAMPLES = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
+WXDEMOS = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
 DISTDIR = ./_dist_dir/@DISTDIR@

-
 ############################## Files ##################################

 WX_LINGUAS = `cd $(top_srcdir)/locale && ls *.mo 2> /dev/null | sed -n 's/\.mo//p'`
@@ -158,6 +151,7 @@ HEADERS = $(ALL_HEADERS)
 # for the objects and depfiles, we might be bulding only part of them
 # depending on configure arguments, so select a subset of ALL
 OBJECTS = @ALL_OBJECTS@
+DEPFILES = @ALL_DEPFILES@

 # the object files of sublibraries (we assume that they don't change [often],
 # so we don't generate these lists with tmake but embed them here)
@@ -194,24 +188,6 @@ PNGOBJS     = \
 		pngget.o \
 		pngset.o

-FREETYPEOBJS = \
-		ftsystem.o \
-		autohint.o \
-		ftbase.o \
-		ftdebug.o \
-		ftglyph.o \
-		ftinit.o \
-		ftmm.o \
-		cff.o \
-		type1cid.o \
-		psnames.o \
-		psmodule.o \
-		raster1.o \
-		sfnt.o \
-		smooth.o \
-		truetype.o \
-		type1z.o \
-		winfnt.o

 JPEGOBJS    = \
 		jcomapi.o \
@@ -315,45 +291,65 @@ IODBCOBJS = \
        
 ############################## Rules ##################################

-SONAME_FLAGS = @SONAME_FLAGS@
-SONAME_FLAGS_GL = @SONAME_FLAGS_GL@
+BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
+BURNT_LIBRARY_NAME_GL = @BURNT_LIBRARY_NAME_GL@

 all: @WX_ALL@

-$(build_libdir)/@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
-	@$(INSTALL) -d $(build_libdir)
-	@$(RM) $@
-	$(AR) $(AROPTIONS) $@ $(OBJECTS)
-	$(RANLIB) $@
+@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
+	@$(INSTALL) -d ./lib
+	$(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)
+	$(RANLIB) ./lib/$@

-$(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@:  glcanvas.o
-	@$(INSTALL) -d $(build_libdir)
-	@$(RM) $@
-	$(AR) $(AROPTIONS) $@ glcanvas.o
-	$(RANLIB) $@
+@WX_LIBRARY_NAME_STATIC_GL@:  glcanvas.o
+	@$(INSTALL) -d ./lib
+	$(AR) $(AROPTIONS) ./lib/$@ glcanvas.o
+	$(RANLIB) ./lib/$@

-$(build_libdir)/@WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
-	@$(INSTALL) -d $(build_libdir)
-	$(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS)
-
-$(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@:  glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
-	@$(INSTALL) -d $(build_libdir)
-	$(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o -L$(build_libdir) @WXCONFIG_LIBS@ $(EXTRALIBS) $(OPENGLLIBS)
-
-$(build_libdir)/@WX_LIBRARY_LINK1@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
-	@$(RM) $(build_libdir)/@WX_LIBRARY_LINK1@
-	@$(RM) $(build_libdir)/@WX_LIBRARY_LINK2@
-	cd $(build_libdir) \
+@WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
+	@$(INSTALL) -d ./lib
+	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
+	
+@WX_LIBRARY_NAME_SHARED_GL@:  glcanvas.o
+	@$(INSTALL) -d ./lib
+	$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS)
+	
+CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
+	@$(RM) ./lib/@WX_LIBRARY_LINK1@
+	@$(RM) ./lib/@WX_LIBRARY_LINK2@
+	@$(RM) ./lib/@WX_LIBRARY_LINK3@
+	cd lib \
 		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
-		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@
-
-$(build_libdir)/@WX_LIBRARY_LINK1_GL@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@
-	@$(RM) $(build_libdir)/@WX_LIBRARY_LINK1_GL@
-	@$(RM) $(build_libdir)/@WX_LIBRARY_LINK2_GL@
-	cd $(build_libdir) \
+		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
+		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
+	
+CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
+	@$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
+	@$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
+	@$(RM) ./lib/@WX_LIBRARY_LINK3_GL@
+	cd lib \
 		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \
-		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@
-
+		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \
+		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@
+	
+CREATE_INSTALLED_LINKS: preinstall
+	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
+	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
+	$(RM) $(libdir)/@WX_LIBRARY_LINK3@
+	cd $(libdir) \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
+	
+CREATE_INSTALLED_LINKS_GL: preinstall_gl
+	$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
+	$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
+	$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
+	cd $(libdir) \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@
+	
 $(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h

 parser.o:    parser.c lexer.c
@@ -377,22 +373,7 @@ lexer.c:	$(COMMDIR)/lexer.l
 	sed -e "s/unput/PROIO_unput/g"      > lexer.c
 	@$(RM) @LEX_STEM@.c

-include $(OBJECTS:.o=.d)
-
-
-CREATE_INSTALLED_LINKS: preinstall
-	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
-	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
-	cd $(libdir) \
-		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
-		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@
-
-CREATE_INSTALLED_LINKS_GL: preinstall_gl
-	$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
-	$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
-	cd $(libdir) \
-		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
-		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@
+-include $(DEPFILES)

 afminstall: preinstall
 	$(INSTALL) -d $(datadir)
@@ -404,7 +385,7 @@ afminstall: preinstall

 # this is the real install target: copies the library, wx-config and the
 # headers to the installation directory
-preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config
+preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_NAME@-config
 	@echo " "
 	@echo " Installing wxWindows..."
 	@echo " "
@@ -413,27 +394,20 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN
 	$(INSTALL) -d $(bindir)
 	$(INSTALL) -d $(libdir)

-	$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config
-	cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config
+	$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLKIT_NAME@-config $(bindir)/wx@TOOLKIT_NAME@-config
+	cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_NAME@-config wx-config
 	$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
-	@# this installs the import library for a MSW DLL
-	@# remember: for wxMSW DLL WX_LIBRARY_NAME_STATIC is the
-	@# import livraru name
-	@if test "@TOOLKIT_DIR@" = "msw" -a "@WX_LIBRARY_NAME_STATIC@" != "@WX_TARGET_LIBRARY@"; then $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_NAME_STATIC@ $(libdir)/@WX_LIBRARY_NAME_STATIC@; fi

 	$(INSTALL) -d $(libdir)/wx
 	$(INSTALL) -d $(libdir)/wx/include
-	$(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@
-	$(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx
-	$(INSTALL_DATA) $(top_builddir)/lib/wx/include/@TOOLCHAIN_NAME@/wx/setup.h $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
-
+	$(INSTALL) -d $(libdir)/wx/include/wx
+	$(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@
+	$(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
+	
 	$(INSTALL) -d $(includedir)/wx
-	@# FIXME: This will erroneously install a wx/base dir for wxBase..
 	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
 	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
 	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
-	@if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi
-
 	$(INSTALL) -d $(includedir)/wx/protocol
 	$(INSTALL) -d $(includedir)/wx/unix
 	@list='$(HEADERS)'; for p in $$list; do \
@@ -477,14 +451,16 @@ uninstall:
 	@$(RM) $(libdir)/@WX_TARGET_LIBRARY@
 	@$(RM) $(libdir)/@WX_LIBRARY_LINK1@
 	@$(RM) $(libdir)/@WX_LIBRARY_LINK2@
+	@$(RM) $(libdir)/@WX_LIBRARY_LINK3@
 	@echo " Removing GL library..."
 	@$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@
 	@$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
 	@$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
+	@$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
 	@echo " Removing helper files..."
-	@$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
+	@$(RM) $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
 	@$(RM) $(bindir)/wx-config
-	@$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config
+	@$(RM) $(bindir)/wx@TOOLKIT_NAME@-config
 	@$(RM) $(datadir)/wx/afm/*
 	@$(RM) $(datadir)/wx/gs_afm/*
 # FIXME: wxBase doesnt install these next 3 dirs.
@@ -503,8 +479,8 @@ uninstall:
 	done
 	@echo " Removing directories..."
 	@-rmdir $(localedir)
-	@if test -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx; then rmdir $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx; fi
-	@if test -d $(libdir)/wx/include/@TOOLCHAIN_NAME@; then rmdir $(libdir)/wx/include/@TOOLCHAIN_NAME@; fi
+	@if test -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@; then rmdir $(libdir)/wx/include/wx/@TOOLKIT_NAME@; fi
+	@if test -d $(libdir)/wx/include/wx; then rmdir $(libdir)/wx/include/wx; fi
 	@if test -d $(libdir)/wx/include; then rmdir $(libdir)/wx/include; fi
 	@if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi
 	@if test -d $(includedir)/wx/gtk; then rmdir $(includedir)/wx/gtk; fi
@@ -549,7 +525,6 @@ ALL_DIST: distclean
 # but is not used when building wxBase distribution
 ALL_GUI_DIST: ALL_DIST
 	cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR)
-	cp $(WXDIR)/wxBase.spec $(DISTDIR)
 	cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
 	cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt
 	cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt
@@ -616,21 +591,19 @@ BASE_DIST: ALL_DIST
 	mkdir $(DISTDIR)/include
 	mkdir $(DISTDIR)/include/wx
 	mkdir $(DISTDIR)/include/wx/protocol
-	mkdir $(DISTDIR)/include/wx/msw
 	mkdir $(DISTDIR)/include/wx/unix
 	mkdir $(DISTDIR)/src/common
-	mkdir $(DISTDIR)/src/msw
 	mkdir $(DISTDIR)/src/unix
 	cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
 	cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@
 	cp $(WXDIR)/@RPM_SPEC@ $(DISTDIR)/@RPM_SPEC@
-	cp $(WXDIR)/wxBase*.ds[pw] $(DISTDIR)
+	cp $(WXDIR)/wxBase.dsp $(DISTDIR)
+	cp $(DOCDIR)/install.txt $(DISTDIR)/INSTALL.txt
 	cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
 	cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
+	cp $(DOCDIR)/todo.txt $(DISTDIR)/TODO.txt
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
-	cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
-	cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
-	cp $(WXDIR)/src/common/unzip.h $(DISTDIR)/src/common
+	cp $(WXDIR)/src/common/unzip.h $(DISTDIR)/src/common/unzip.h
 	list='$(HEADERS)'; for p in $$list; do \
 	  cp $(WXDIR)/include/wx/$$p $(DISTDIR)/include/wx/$$p; \
 	done
@@ -638,18 +611,8 @@ BASE_DIST: ALL_DIST
 	  cp $(WXDIR)/src/$$p $(DISTDIR)/src/$$p; \
 	done

-	mkdir $(DISTDIR)/samples
-	cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
-	cp $(SAMPDIR)/configure $(DISTDIR)/samples
-	cp $(SAMPDIR)/configure.in $(DISTDIR)/samples
-
-	mkdir $(DISTDIR)/samples/console
-	cp $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console
-	cp $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console
-	cp $(SAMPDIR)/console/console.cpp $(DISTDIR)/samples/console
-	cp $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
-
 GTK_DIST: ALL_GUI_DIST
+	cp $(WXDIR)/wxGTK.spec $(DISTDIR)
 	cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
 	cp $(INCDIR)/wx/gtk/*.xpm $(DISTDIR)/include/wx/gtk
 	cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk
@@ -669,30 +632,17 @@ MOTIF_DIST: ALL_GUI_DIST
 	cp $(MOTIFDIR)/xmcombo/*.h $(DISTDIR)/src/motif/xmcombo
 	cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo

-MACX_DIST: ALL_GUI_DIST
-	echo "Apple Mac OS X specific distribution not complete"
-
 MSW_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxWINE.spec $(DISTDIR)
-	mkdir $(DISTDIR)/include/wx/msw/ctl3d
-	mkdir $(DISTDIR)/include/wx/msw/gnuwin32
-	mkdir $(DISTDIR)/include/wx/msw/gnuwin32/gl
-	mkdir $(DISTDIR)/include/wx/msw/ole
 	cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw
-	cp $(INCDIR)/wx/msw/ctl3d/*.h $(DISTDIR)/include/wx/msw/ctl3d
-	cp $(INCDIR)/wx/msw/gnuwin32/*.h $(DISTDIR)/include/wx/msw/gnuwin32
-	cp $(INCDIR)/wx/msw/gnuwin32/gl/*.h $(DISTDIR)/include/wx/msw/gnuwin32/gl
-	cp $(INCDIR)/wx/msw/gnuwin32/gl/*.def $(DISTDIR)/include/wx/msw/gnuwin32/gl
-	cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole
-
-	mkdir $(DISTDIR)/src/msw/ole
 	cp $(MSWDIR)/*.cpp $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.c $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
+	mkdir $(DISTDIR)/src/msw/ole
 	cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole

 DEMOS_DIST: ALL_GUI_DIST
@@ -700,9 +650,9 @@ DEMOS_DIST: ALL_GUI_DIST
 	cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos
 	cp $(DEMODIR)/configure $(DISTDIR)/demos
 	cp $(DEMODIR)/configure.in $(DISTDIR)/demos
-
+	
 	cp -R $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
-    
+	    
 	mkdir $(DISTDIR)/demos/bombs
 	cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs
 	cp $(DEMODIR)/bombs/makefile.unx $(DISTDIR)/demos/bombs
@@ -710,7 +660,7 @@ DEMOS_DIST: ALL_GUI_DIST
 	cp $(DEMODIR)/bombs/*.h $(DISTDIR)/demos/bombs
 	cp $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
 	cp $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
-
+	
 	mkdir $(DISTDIR)/demos/forty
 	cp $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
 	cp $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty
@@ -718,7 +668,7 @@ DEMOS_DIST: ALL_GUI_DIST
 	cp $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty
 	cp $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty
 	cp $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty
-
+	
 	mkdir $(DISTDIR)/demos/life
 	mkdir $(DISTDIR)/demos/life/bitmaps
 	cp $(DEMODIR)/life/Makefile.in $(DISTDIR)/demos/life
@@ -727,9 +677,8 @@ DEMOS_DIST: ALL_GUI_DIST
 	cp $(DEMODIR)/life/*.h $(DISTDIR)/demos/life
 	cp $(DEMODIR)/life/*.xpm $(DISTDIR)/demos/life
 	cp $(DEMODIR)/life/*.inc $(DISTDIR)/demos/life
-	cp $(DEMODIR)/life/*.lif $(DISTDIR)/demos/life
 	cp $(DEMODIR)/life/bitmaps/*.xpm $(DISTDIR)/demos/life/bitmaps
-
+	
 	mkdir $(DISTDIR)/demos/poem
 	cp $(DEMODIR)/poem/Makefile.in $(DISTDIR)/demos/poem
 	cp $(DEMODIR)/poem/makefile.unx $(DISTDIR)/demos/poem
@@ -738,12 +687,12 @@ DEMOS_DIST: ALL_GUI_DIST
 	cp $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem
 	cp $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem
 	cp $(DEMODIR)/poem/*.txt $(DISTDIR)/demos/poem
-
+    
 	mkdir $(DISTDIR)/demos/fractal
 	cp $(DEMODIR)/fractal/Makefile.in $(DISTDIR)/demos/fractal
 	cp $(DEMODIR)/fractal/makefile.unx $(DISTDIR)/demos/fractal
 	cp $(DEMODIR)/fractal/*.cpp $(DISTDIR)/demos/fractal
-
+	
 SAMPLES_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/samples
 	cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
@@ -931,10 +880,8 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/internat/*.po $(DISTDIR)/samples/internat
 	cp $(SAMPDIR)/internat/fr/*.mo $(DISTDIR)/samples/internat/fr
 	cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
-	cp $(SAMPDIR)/internat/ru/*.mo $(DISTDIR)/samples/internat/de
 	cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
 	cp $(SAMPDIR)/internat/de/*.po $(DISTDIR)/samples/internat/de
-	cp $(SAMPDIR)/internat/ru/*.po $(DISTDIR)/samples/internat/de

 	mkdir $(DISTDIR)/samples/ipc
 	cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
@@ -1039,6 +986,11 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/opengl/isosurf/*.h $(DISTDIR)/samples/opengl/isosurf
 	cp $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf

+	mkdir $(DISTDIR)/samples/plot
+	cp $(SAMPDIR)/plot/Makefile.in $(DISTDIR)/samples/plot
+	cp $(SAMPDIR)/plot/makefile.unx $(DISTDIR)/samples/plot
+	cp $(SAMPDIR)/plot/*.cpp $(DISTDIR)/samples/plot
+
 	mkdir $(DISTDIR)/samples/png
 	cp $(SAMPDIR)/png/Makefile.in $(DISTDIR)/samples/png
 	cp $(SAMPDIR)/png/makefile.unx $(DISTDIR)/samples/png
@@ -1241,6 +1193,7 @@ PYTHON_DIST:
 	mkdir $(DISTDIR)/wxPython/demo
 	mkdir $(DISTDIR)/wxPython/demo/bitmaps
 	mkdir $(DISTDIR)/wxPython/demo/data
+	mkdir $(DISTDIR)/wxPython/distrib
 	mkdir $(DISTDIR)/wxPython/src
 	mkdir $(DISTDIR)/wxPython/src/gtk
 	mkdir $(DISTDIR)/wxPython/wxPython
@@ -1249,9 +1202,7 @@ PYTHON_DIST:
 	mkdir $(DISTDIR)/wxPython/wxPython/lib/sizers

 	cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython
-	cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
-	cp $(WXDIR)/wxPython/setup.cfg $(DISTDIR)/wxPython
-	cp $(WXDIR)/wxPython/MANIFEST.in $(DISTDIR)/wxPython
+	cp $(WXDIR)/wxPython/contrib/buildall.py $(DISTDIR)/wxPython/contrib
 	-cp $(WXDIR)/wxPython/contrib/glcanvas/* $(DISTDIR)/wxPython/contrib/glcanvas
 	cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk
 	-cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl
@@ -1259,92 +1210,31 @@ PYTHON_DIST:
 	-cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo
 	-cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps
 	-cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data
+	cp $(WXDIR)/wxPython/distrib/build.py $(DISTDIR)/wxPython/distrib
 	-cp $(WXDIR)/wxPython/src/* $(DISTDIR)/wxPython/src
 	cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk
 	cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk
 	cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib
 	cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
+	cp $(WXDIR)/wxPython/wxPython/lib/sizers/*.py $(DISTDIR)/wxPython/wxPython/lib/sizers

 distclean:
 	$(RM) -r _dist_dir

-# VZ: the -only targets allow to do "make dist bzip-dist-only" without copying
-#     the files twice
-dist-only:
-	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
-	@cd _dist_dir; \
-	mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \
-	tar ch @DISTDIR@-$(VER_SUFFIX) | gzip -f9 > ../$(WXARCHIVE); \
-	mv @DISTDIR@-$(VER_SUFFIX) @DISTDIR@
-	@if test "$(USE_GUI)" = 1; then \
-	cd $(DISTDIR); \
-	mv samples wxSamples-$(VER_SUFFIX); \
-	echo "*** Creating wxSamples archive..."; \
-	tar ch wxSamples-$(VER_SUFFIX) | gzip -f9 > ../../$(WXSAMPLES); \
-	mv wxSamples-$(VER_SUFFIX) samples; \
-	mv demos wxDemos-$(VER_SUFFIX); \
-	echo "*** Creating wxDemos archive..."; \
-	tar ch wxDemos-$(VER_SUFFIX) | gzip -f9 > ../../$(WXDEMOS); \
-	mv wxDemos-$(VER_SUFFIX) demos; \
-	fi
-
 dist: @GUIDIST@
-	cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
 	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
-	@cd _dist_dir; \
-	mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \
-	tar ch @DISTDIR@-$(VER_SUFFIX) | gzip -f9 > ../$(WXARCHIVE); \
-	mv @DISTDIR@-$(VER_SUFFIX) @DISTDIR@
+	cd _dist_dir; tar ch @DISTDIR@ | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
 	@if test "$(USE_GUI)" = 1; then \
 	cd $(DISTDIR); \
-	mv samples wxSamples-$(VER_SUFFIX); \
-	echo "*** Creating wxSamples archive..."; \
-	tar ch wxSamples-$(VER_SUFFIX) | gzip -f9 > ../../$(WXSAMPLES); \
-	mv wxSamples-$(VER_SUFFIX) samples; \
-	mv demos wxDemos-$(VER_SUFFIX); \
-	echo "*** Creating wxDemos archive..."; \
-	tar ch wxDemos-$(VER_SUFFIX) | gzip -f9 > ../../$(WXDEMOS); \
-	mv wxDemos-$(VER_SUFFIX) demos; \
+	mv samples wxSamples; \
+	tar ch wxSamples | gzip -f9 > ../../$(WXSAMPLES); \
+	mv wxSamples samples; \
+	mv demos wxDemos; \
+	tar ch wxDemos | gzip -f9 > ../../$(WXDEMOS); \
+	mv wxDemos demos; \
 	fi

-bzip-dist-only:
-	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
-	@cd _dist_dir; \
-	mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \
-	tar ch @DISTDIR@-$(VER_SUFFIX) | bzip2 -f9 > ../$(WXARCHIVE_BZIP); \
-	mv @DISTDIR@-$(VER_SUFFIX) @DISTDIR@
-	@if test "$(USE_GUI)" = 1; then \
-	cd $(DISTDIR); \
-	mv samples wxSamples-${VER_SUFFIX}; \
-	echo "*** Creating wxSamples archive..."; \
-	tar ch wxSamples-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXSAMPLES_BZIP); \
-	mv wxSamples-${VER_SUFFIX} samples; \
-	mv demos wxDemos-${VER_SUFFIX}; \
-	echo "*** Creating wxDemos archive..."; \
-	tar ch wxDemos-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXDEMOS_BZIP); \
-	mv wxDemos-${VER_SUFFIX} demos; \
-	fi
-
-bzip-dist: @GUIDIST@
-	cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
-	@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
-	@cd _dist_dir; \
-	mv @DISTDIR@ @DISTDIR@-$(VER_SUFFIX); \
-	tar ch @DISTDIR@-$(VER_SUFFIX) | bzip2 -f9 > ../$(WXARCHIVE_BZIP); \
-	mv @DISTDIR@-$(VER_SUFFIX) @DISTDIR@
-	@if test "$(USE_GUI)" = 1; then \
-	cd $(DISTDIR); \
-	mv samples wxSamples-${VER_SUFFIX}; \
-	echo "*** Creating wxSamples archive..."; \
-	tar ch wxSamples-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXSAMPLES_BZIP); \
-	mv wxSamples-${VER_SUFFIX} samples; \
-	mv demos wxDemos-${VER_SUFFIX}; \
-	echo "*** Creating wxDemos archive..."; \
-	tar ch wxDemos-${VER_SUFFIX} | bzip2 -f9 > ../../$(WXDEMOS_BZIP); \
-	mv wxDemos-${VER_SUFFIX} demos; \
-	fi
-
-debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
+debian-dist: @GUIDIST@ MANUAL_DIST PYTHON_DIST
 	mkdir $(DISTDIR)/debian
 	-cp $(WXDIR)/debian/* $(DISTDIR)/debian
 	cp $(WXDIR)/src/files.lst $(DISTDIR)/src/
@@ -1352,32 +1242,14 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
 	cp $(DOCDIR)/licendoc.txt $(DISTDIR)/docs
 	cp $(DOCDIR)/preamble.txt $(DISTDIR)/docs
 	rm -f $(DISTDIR)/*.spec
-
-	@# now prune away a lot of the crap included by using cp -R
-	@# in other dist targets.  Ugly and hardly portable but it
-	@# will run on any Debian box and that's enough for now.
-
-	find $(DISTDIR) \( -name "CVS" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \
-			\( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
-			-print0 | xargs -0 rm -rf
-
 	rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
 	mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)

-debian-native-dist: @GUIDIST@ MANUAL_DIST PYTHON_DIST
-
-debian-msw-dirs:
-	mkdir $(DISTDIR)/include/wx/msw
-	mkdir $(DISTDIR)/src/msw
-	cp $(WXDIR)/src/msw/files.lst $(DISTDIR)/src/msw
-
-
 clean:
 	$(RM) *.o
 	$(RM) *.d
 	$(RM) parser.c
 	$(RM) lexer.c
-	$(RM) -r ./lib/wx/*
-	$(RM) ./lib/lib*
+	$(RM) -r ./lib/*

 cleanall: clean
--- a/config.guess
+++ b/config.guess
--- a/config.sub
+++ b/config.sub
@@ -1,10 +1,6 @@
 #! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
-
-timestamp='2001-09-07'
-
+# Configuration validation subroutine script, version 1.1.
+#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
@@ -29,8 +25,6 @@ timestamp='2001-09-07'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.

-# Please send patches to <config-patches@gnu.org>.
-#
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
@@ -51,73 +45,30 @@ timestamp='2001-09-07'
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.

-me=`echo "$0" | sed -e 's,.*/,,'`
+if [ x$1 = x ]
+then
+	echo Configuration name missing. 1>&2
+	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
+	echo "or     $0 ALIAS" 1>&2
+	echo where ALIAS is a recognized configuration type. 1>&2
+	exit 1
+fi

-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
+# First pass through any local machine types.
+case $1 in
+	*local*)
+		echo $1
+		exit 0
+		;;
+	*)
+	;;
 esac

 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
+  linux-gnu*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
@@ -143,7 +94,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
+	-apple)
 		os=
 		basic_machine=$1
 		;;
@@ -154,17 +105,9 @@ case $os in
 	-scout)
 		;;
 	-wrs)
-		os=-vxworks
+		os=vxworks
 		basic_machine=$1
 		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -213,60 +156,33 @@ case $os in
 	-psos*)
 		os=-psos
 		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
 esac

 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
-	| d10v | d30v | dsp16xx \
-	| fr30 \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
-	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-	| mipsisa32 \
-	| mn10200 | mn10300 \
-	| ns16k | ns32k \
-	| openrisc \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| s390 | s390x \
-	| sh | sh[34] | sh[34]eb | shbe | shle \
-	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
-	| stormy16 | strongarm \
-	| tahoe | thumb | tic80 | tron \
-	| v850 \
-	| we32k \
-	| x86 | xscale \
-	| z8k)
+	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+		| 580 | i960 | h8300 \
+		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
+		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
+		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
+		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+		| mips64vr5000 | miprs64vr5000el \
+		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+		| thumb | d10v)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
 		;;

 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
+	i[34567]86)
 	  basic_machine=$basic_machine-pc
 	  ;;
 	# Object if more than one company name word.
@@ -275,43 +191,23 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alphapca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armv*-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-	| clipper-* | cray2-* | cydra-* \
-	| d10v-* | d30v-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| m32r-* \
-	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| s390-* | s390x-* \
-	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
-	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
-	| v850-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
-	| ymp-* \
-	| z8k-*)
+	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+	      | xmp-* | ymp-* \
+	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
+	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
+	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+	      | clipper-* | orion-* \
+	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+	      | mips64el-* | mips64orion-* | mips64orionel-* \
+	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+	      | mipstx39-* | mipstx39el-* \
+	      | f301-* | armv*-* | t3e-* \
+	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -348,14 +244,14 @@ case $basic_machine in
 		os=-sysv
 		;;
 	amiga | amiga-*)
-		basic_machine=m68k-unknown
+		basic_machine=m68k-cbm
 		;;
 	amigaos | amigados)
-		basic_machine=m68k-unknown
+		basic_machine=m68k-cbm
 		os=-amigaos
 		;;
 	amigaunix | amix)
-		basic_machine=m68k-unknown
+		basic_machine=m68k-cbm
 		os=-sysv4
 		;;
 	apollo68)
@@ -402,16 +298,13 @@ case $basic_machine in
 		basic_machine=cray2-cray
 		os=-unicos
 		;;
-	[cjt]90)
-		basic_machine=${basic_machine}-cray
+	[ctj]90-cray)
+		basic_machine=c90-cray
 		os=-unicos
 		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -459,10 +352,6 @@ case $basic_machine in
 		basic_machine=tron-gmicro
 		os=-sysv
 		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
 	h3050r* | hiux*)
 		basic_machine=hppa1.1-hitachi
 		os=-hiuxwe2
@@ -536,21 +425,22 @@ case $basic_machine in
 		;;
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
+		os=-mvs
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
+	i[34567]86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
-	i*86v4*)
+	i[34567]86v4*)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
-	i*86v)
+	i[34567]86v)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
-	i*86sol2)
+	i[34567]86sol2)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
@@ -562,6 +452,14 @@ case $basic_machine in
 		basic_machine=i386-unknown
 		os=-vsta
 		;;
+	i386-go32 | go32)
+		basic_machine=i386-unknown
+		os=-go32
+		;;
+	i386-mingw32 | mingw32)
+		basic_machine=i386-unknown
+		os=-mingw32
+		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -587,14 +485,10 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+	*mint | *MiNT)
 		basic_machine=m68k-atari
 		os=-mint
 		;;
@@ -612,22 +506,14 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
 		;;
 	msdos)
-		basic_machine=i386-pc
+		basic_machine=i386-unknown
 		os=-msdos
 		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -637,7 +523,7 @@ case $basic_machine in
 		os=-netbsd
 		;;
 	netwinder)
-		basic_machine=armv4l-rebel
+		basic_machine=armv4l-corel
 		os=-linux
 		;;
 	news | news700 | news800 | news900)
@@ -685,16 +571,9 @@ case $basic_machine in
 		basic_machine=i960-intel
 		os=-mon960
 		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
 	np1)
 		basic_machine=np1-gould
 		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
@@ -724,28 +603,28 @@ case $basic_machine in
        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexgen)
+	pentium | p5 | k5 | k6 | nexen)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon)
+	pentiumpro | p6 | 6x86)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
-		basic_machine=i686-pc
+		basic_machine=i786-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+	pentiumpro-* | p6-* | 6x86-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
 		;;
-	power)	basic_machine=power-ibm
+	power)	basic_machine=rs6000-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
 	        ;;
@@ -757,23 +636,9 @@ case $basic_machine in
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppc64)	basic_machine=powerpc64-unknown
-	        ;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-	        ;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	ps2)
 		basic_machine=i386-ibm
 		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -853,10 +718,6 @@ case $basic_machine in
 	sun386 | sun386i | roadrunner)
 		basic_machine=i386-sun
 		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
 	symmetry)
 		basic_machine=i386-sequent
 		os=-dynix
@@ -865,10 +726,6 @@ case $basic_machine in
 		basic_machine=t3e-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -921,10 +778,6 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	windows32)
-		basic_machine=i386-pc
-		os=-windows32-msvcrt
-		;;
 	xmp)
 		basic_machine=xmp-cray
 		os=-unicos
@@ -968,20 +821,13 @@ case $basic_machine in
 	vax)
 		basic_machine=vax-dec
 		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
 	pdp11)
 		basic_machine=pdp11-dec
 		;;
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh3eb | sh4eb)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
+	sparc | sparcv9)
 		basic_machine=sparc-sun
 		;;
        cydra)
@@ -1003,9 +849,6 @@ case $basic_machine in
 		basic_machine=c4x-none
 		os=-coff
 		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
@@ -1062,30 +905,14 @@ case $os in
 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos*)
+	      | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto*)
-		os=-nto-qnx
-		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
@@ -1099,12 +926,6 @@ case $os in
 	-sunos6*)
 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
 		;;
-	-opened*)
-		os=-openedition
-		;;
-	-wince*)
-		os=-wince
-		;;
 	-osfrose*)
 		os=-osfrose
 		;;
@@ -1129,9 +950,6 @@ case $os in
 	-ns2 )
 	        os=-nextstep2
 		;;
-	-nsk*)
-		os=-nsk
-		;;
 	# Preserve the version number of sinix5.
 	-sinix5.*)
 		os=`echo $os | sed -e 's|sinix|sysv|'`
@@ -1166,7 +984,7 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+        -*mint | -*MiNT)
 	        os=-mint
 		;;
 	-none)
@@ -1194,15 +1012,12 @@ case $basic_machine in
 	*-acorn)
 		os=-riscix1.2
 		;;
-	arm*-rebel)
+	arm*-corel)
 		os=-linux
 		;;
 	arm*-semi)
 		os=-aout
 		;;
-	pdp10-*)
-		os=-tops20
-		;;
        pdp11-*)
 		os=-none
 		;;
@@ -1311,7 +1126,7 @@ case $basic_machine in
 	*-masscomp)
 		os=-rtu
 		;;
-	f30[01]-fujitsu | f700-fujitsu)
+	f301-fujitsu)
 		os=-uxpv
 		;;
 	*-rom68k)
@@ -1371,7 +1186,7 @@ case $basic_machine in
 			-genix*)
 				vendor=ns
 				;;
-			-mvs* | -opened*)
+			-mvs*)
 				vendor=ibm
 				;;
 			-ptx*)
@@ -1389,23 +1204,12 @@ case $basic_machine in
 			-mpw* | -macos*)
 				vendor=apple
 				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+			-*mint | -*MiNT)
 				vendor=atari
 				;;
-			-vos*)
-				vendor=stratus
-				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
 esac

 echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
--- a/4419
+++ b/4419
--- a/configure.in
+++ b/configure.in
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -3,11 +3,11 @@
 #

 all:
-	cd src; $(MAKE)
+	cd src; make

 clean:
-	cd src; $(MAKE) clean
-	cd samples; $(MAKE) clean
+	cd src; make clean
+	cd samples; make clean

 samples:
-	cd samples; $(MAKE)
+	cd samples; make
--- a/contrib/docs/.cvsignore
+++ b/contrib/docs/.cvsignore
@@ -1,5 +0,0 @@
-html
-htmlhelp
-pdf
-winhelp
-htb
--- a/contrib/include/wx/stc/SciLexer.h
+++ b/contrib/include/wx/stc/SciLexer.h
@@ -0,0 +1,181 @@
+// Scintilla source code edit control
+// SciLexer - interface to the added lexer functions in the SciLexer version of the edit control
+// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef SCILEXER_H
+#define SCILEXER_H
+
+// SciLexer features - not in standard Scintilla
+
+#define SCLEX_CONTAINER 0
+#define SCLEX_NULL 1
+#define SCLEX_PYTHON 2
+#define SCLEX_CPP 3
+#define SCLEX_HTML 4
+#define SCLEX_XML 5
+#define SCLEX_PERL 6
+#define SCLEX_SQL 7
+#define SCLEX_VB 8
+#define SCLEX_PROPERTIES 9
+#define SCLEX_ERRORLIST 10
+#define SCLEX_MAKEFILE 11
+#define SCLEX_BATCH 12
+#define SCLEX_XCODE 13
+#define SCLEX_LATEX 14
+
+// Lexical states for SCLEX_PYTHON
+#define SCE_P_DEFAULT 0
+#define SCE_P_COMMENTLINE 1
+#define SCE_P_NUMBER 2
+#define SCE_P_STRING 3
+#define SCE_P_CHARACTER 4
+#define SCE_P_WORD 5
+#define SCE_P_TRIPLE 6
+#define SCE_P_TRIPLEDOUBLE 7
+#define SCE_P_CLASSNAME 8
+#define SCE_P_DEFNAME 9
+#define SCE_P_OPERATOR 10
+#define SCE_P_IDENTIFIER 11
+#define SCE_P_COMMENTBLOCK 12
+#define SCE_P_STRINGEOL 13
+
+// Lexical states for SCLEX_CPP, SCLEX_VB
+#define SCE_C_DEFAULT 0
+#define SCE_C_COMMENT 1
+#define SCE_C_COMMENTLINE 2
+#define SCE_C_COMMENTDOC 3
+#define SCE_C_NUMBER 4
+#define SCE_C_WORD 5
+#define SCE_C_STRING 6
+#define SCE_C_CHARACTER 7
+#define SCE_C_UUID 8
+#define SCE_C_PREPROCESSOR 9
+#define SCE_C_OPERATOR 10
+#define SCE_C_IDENTIFIER 11
+#define SCE_C_STRINGEOL 12
+
+// Lexical states for SCLEX_HTML, SCLEX_xML
+#define SCE_H_DEFAULT 0
+#define SCE_H_TAG 1
+#define SCE_H_TAGUNKNOWN 2
+#define SCE_H_ATTRIBUTE 3
+#define SCE_H_ATTRIBUTEUNKNOWN 4
+#define SCE_H_NUMBER 5
+#define SCE_H_DOUBLESTRING 6
+#define SCE_H_SINGLESTRING 7
+#define SCE_H_OTHER 8
+#define SCE_H_COMMENT 9
+#define SCE_H_ENTITY 10
+// XML and ASP
+#define SCE_H_TAGEND 11
+#define SCE_H_XMLSTART 12
+#define SCE_H_XMLEND 13
+#define SCE_H_SCRIPT 14
+#define SCE_H_ASP 15
+#define SCE_H_ASPAT 16
+// Embedded Javascript
+#define SCE_HJ_START 40
+#define SCE_HJ_DEFAULT 41
+#define SCE_HJ_COMMENT 42
+#define SCE_HJ_COMMENTLINE 43
+#define SCE_HJ_COMMENTDOC 44
+#define SCE_HJ_NUMBER 45
+#define SCE_HJ_WORD 46
+#define SCE_HJ_KEYWORD 47
+#define SCE_HJ_DOUBLESTRING 48
+#define SCE_HJ_SINGLESTRING 49
+#define SCE_HJ_SYMBOLS 50
+#define SCE_HJ_STRINGEOL 51
+// ASP Javascript
+#define SCE_HJA_START 55
+#define SCE_HJA_DEFAULT 56
+#define SCE_HJA_COMMENT 57
+#define SCE_HJA_COMMENTLINE 58
+#define SCE_HJA_COMMENTDOC 59
+#define SCE_HJA_NUMBER 60
+#define SCE_HJA_WORD 61
+#define SCE_HJA_KEYWORD 62
+#define SCE_HJA_DOUBLESTRING 63
+#define SCE_HJA_SINGLESTRING 64
+#define SCE_HJA_SYMBOLS 65
+#define SCE_HJA_STRINGEOL 66
+// Embedded VBScript
+#define SCE_HB_START 70
+#define SCE_HB_DEFAULT 71
+#define SCE_HB_COMMENTLINE 72
+#define SCE_HB_NUMBER 73
+#define SCE_HB_WORD 74
+#define SCE_HB_STRING 75
+#define SCE_HB_IDENTIFIER 76
+#define SCE_HB_STRINGEOL 77
+// ASP VBScript
+#define SCE_HBA_START 80
+#define SCE_HBA_DEFAULT 81
+#define SCE_HBA_COMMENTLINE 82
+#define SCE_HBA_NUMBER 83
+#define SCE_HBA_WORD 84
+#define SCE_HBA_STRING 85
+#define SCE_HBA_IDENTIFIER 86
+#define SCE_HBA_STRINGEOL 87
+// Embedded Python
+#define SCE_HP_START 90
+#define SCE_HP_DEFAULT 91
+#define SCE_HP_COMMENTLINE 92
+#define SCE_HP_NUMBER 93
+#define SCE_HP_STRING 94
+#define SCE_HP_CHARACTER 95
+#define SCE_HP_WORD 96
+#define SCE_HP_TRIPLE 97
+#define SCE_HP_TRIPLEDOUBLE 98
+#define SCE_HP_CLASSNAME 99
+#define SCE_HP_DEFNAME 100
+#define SCE_HP_OPERATOR 101
+#define SCE_HP_IDENTIFIER 102
+// ASP Python
+#define SCE_HPA_START 105
+#define SCE_HPA_DEFAULT 106
+#define SCE_HPA_COMMENTLINE 107
+#define SCE_HPA_NUMBER 108
+#define SCE_HPA_STRING 109
+#define SCE_HPA_CHARACTER 110
+#define SCE_HPA_WORD 111
+#define SCE_HPA_TRIPLE 112
+#define SCE_HPA_TRIPLEDOUBLE 113
+#define SCE_HPA_CLASSNAME 114
+#define SCE_HPA_DEFNAME 115
+#define SCE_HPA_OPERATOR 116
+#define SCE_HPA_IDENTIFIER 117
+
+// Lexical states for SCLEX_PERL
+#define SCE_PL_DEFAULT 0
+#define SCE_PL_HERE 1
+#define SCE_PL_COMMENTLINE 2
+#define SCE_PL_POD 3
+#define SCE_PL_NUMBER 4
+#define SCE_PL_WORD 5
+#define SCE_PL_STRING 6
+#define SCE_PL_CHARACTER 7
+#define SCE_PL_PUNCTUATION 8
+#define SCE_PL_PREPROCESSOR 9
+#define SCE_PL_OPERATOR 10
+#define SCE_PL_IDENTIFIER 11
+#define SCE_PL_SCALAR 12
+#define SCE_PL_ARRAY 13
+#define SCE_PL_HASH 14
+#define SCE_PL_SYMBOLTABLE 15
+#define SCE_PL_REF 16
+#define SCE_PL_REGEX 17
+#define SCE_PL_REGSUBST 18
+#define SCE_PL_LONGQUOTE 19
+#define SCE_PL_BACKTICKS 20
+#define SCE_PL_DATASECTION 21
+    
+// Lexical states for SCLEX_LATEX
+#define SCE_L_DEFAULT 0
+#define SCE_L_COMMAND 1
+#define SCE_L_TAG 2
+#define SCE_L_MATH 3
+#define SCE_L_COMMENT 4
+
+#endif
--- a/contrib/include/wx/stc/stc.h
+++ b/contrib/include/wx/stc/stc.h
--- a/contrib/samples/mmedia/MMboardVC.dsp
+++ b/contrib/samples/mmedia/MMboardVC.dsp
@@ -1,235 +0,0 @@
-# Microsoft Developer Studio Project File - Name="MMboardVC" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# (Actually, generated by MakeProject, (c) Julian Smart, 1998)
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=MMboardVC - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "MMboardVC.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "MMboardVC.mak" CFG="MMboardVC - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "MMboardVC - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "MMboardVC - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE "MMboardVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
-!MESSAGE "MMboardVC - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "MMboardVC - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib mmedia.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/mmboard.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
-
-!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib mmediad.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/mmboard.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
-
-!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug DLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "DebugDLL"
-# PROP BASE Intermediate_Dir "DebugDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugDLL"
-# PROP Intermediate_Dir "DebugDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9d.lib mmediad.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/mmboard.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
-
-!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Release DLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ReleaseDLL"
-# PROP BASE Intermediate_Dir "ReleaseDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseDLL"
-# PROP Intermediate_Dir "ReleaseDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9.lib mmedia.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/mmboard.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "MMboardVC - Win32 Release"
-# Name "MMboardVC - Win32 Debug"
-# Name "MMboardVC - Win32 Debug DLL"
-# Name "MMboardVC - Win32 Release DLL"
-# Begin Source File
-
-SOURCE=.\mmboard.cpp
-
-!IF  "$(CFG)" == "MMboardVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\mmboard.h
-
-!IF  "$(CFG)" == "MMboardVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\mmbman.cpp
-
-!IF  "$(CFG)" == "MMboardVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\mmbman.h
-
-!IF  "$(CFG)" == "MMboardVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "MMboardVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\mmboard.rc
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../../include" /i "../../../contrib/include"
-# End Source File
-# End Target
-# End Project
--- a/contrib/samples/mmedia/MMboardVC.dsw
+++ b/contrib/samples/mmedia/MMboardVC.dsw
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "MMboardVC"=.\MMboardVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
--- a/contrib/samples/ogl/ogledit/OGLEditVC.dsp
+++ b/contrib/samples/ogl/ogledit/OGLEditVC.dsp
@@ -1,315 +0,0 @@
-# Microsoft Developer Studio Project File - Name="OGLEditVC" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# (Actually, generated by MakeProject, (c) Julian Smart, 1998)
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=OGLEditVC - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "OGLEditVC.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "OGLEditVC.mak" CFG="OGLEditVC - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "OGLEditVC - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "OGLEditVC - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE "OGLEditVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
-!MESSAGE "OGLEditVC - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "OGLEditVC - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/ogledit.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/ogledit.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "DebugDLL"
-# PROP BASE Intermediate_Dir "DebugDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugDLL"
-# PROP Intermediate_Dir "DebugDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9d.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/ogledit.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Release DLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ReleaseDLL"
-# PROP BASE Intermediate_Dir "ReleaseDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseDLL"
-# PROP Intermediate_Dir "ReleaseDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/ogledit.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "OGLEditVC - Win32 Release"
-# Name "OGLEditVC - Win32 Debug"
-# Name "OGLEditVC - Win32 Debug DLL"
-# Name "OGLEditVC - Win32 Release DLL"
-# Begin Source File
-
-SOURCE=.\ogledit.cpp
-
-!IF  "$(CFG)" == "OGLEditVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\doc.cpp
-
-!IF  "$(CFG)" == "OGLEditVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\palette.cpp
-
-!IF  "$(CFG)" == "OGLEditVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\view.cpp
-
-!IF  "$(CFG)" == "OGLEditVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\doc.h
-
-!IF  "$(CFG)" == "OGLEditVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\ogledit.h
-
-!IF  "$(CFG)" == "OGLEditVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\palette.h
-
-!IF  "$(CFG)" == "OGLEditVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\view.h
-
-!IF  "$(CFG)" == "OGLEditVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\ogledit.rc
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../../../include" /i "../../../../contrib/include"
-# End Source File
-# End Target
-# End Project
--- a/contrib/samples/ogl/ogledit/OGLEditVC.dsw
+++ b/contrib/samples/ogl/ogledit/OGLEditVC.dsw
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "OGLEditVC"=.\OGLEditVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
--- a/contrib/samples/ogl/ogledit/view.cpp
+++ b/contrib/samples/ogl/ogledit/view.cpp
@@ -292,7 +292,7 @@ void MyCanvas::OnLeftClick(double x, double y, int keys)
  }
  if (info)
  {
-    view->GetDocument()->GetCommandProcessor()->Submit(new DiagramCommand((char*) info->GetClassName(), OGLEDIT_ADD_SHAPE, (DiagramDocument *)view->GetDocument(), info,
+    view->GetDocument()->GetCommandProcessor()->Submit(new DiagramCommand(info->GetClassName(), OGLEDIT_ADD_SHAPE, (DiagramDocument *)view->GetDocument(), info,
      x, y));
  }
 }
--- a/contrib/samples/ogl/studio/StudioVC.dsp
+++ b/contrib/samples/ogl/studio/StudioVC.dsp
@@ -1,391 +0,0 @@
-# Microsoft Developer Studio Project File - Name="StudioVC" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=StudioVC - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "StudioVC.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "StudioVC.mak" CFG="StudioVC - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "StudioVC - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "StudioVC - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE "StudioVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
-!MESSAGE "StudioVC - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "StudioVC - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/studio.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/studio.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "DebugDLL"
-# PROP BASE Intermediate_Dir "DebugDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugDLL"
-# PROP Intermediate_Dir "DebugDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9d.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/studio.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ReleaseDLL"
-# PROP BASE Intermediate_Dir "ReleaseDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseDLL"
-# PROP Intermediate_Dir "ReleaseDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/studio.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "StudioVC - Win32 Release"
-# Name "StudioVC - Win32 Debug"
-# Name "StudioVC - Win32 Debug DLL"
-# Name "StudioVC - Win32 Release DLL"
-# Begin Source File
-
-SOURCE=.\cspalette.cpp
-
-!IF  "$(CFG)" == "StudioVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\cspalette.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\csprint.cpp
-
-!IF  "$(CFG)" == "StudioVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\dialogs.cpp
-
-!IF  "$(CFG)" == "StudioVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\dialogs.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\doc.cpp
-
-!IF  "$(CFG)" == "StudioVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\doc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mainfrm.cpp
-
-!IF  "$(CFG)" == "StudioVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\mainfrm.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\project.cpp
-
-!IF  "$(CFG)" == "StudioVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\project.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\shapes.cpp
-
-!IF  "$(CFG)" == "StudioVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\shapes.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\studio.cpp
-
-!IF  "$(CFG)" == "StudioVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\studio.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\studio.rc
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../../../include" /i "../../../../contrib/include"
-# End Source File
-# Begin Source File
-
-SOURCE=.\symbols.cpp
-
-!IF  "$(CFG)" == "StudioVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\symbols.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\view.cpp
-
-!IF  "$(CFG)" == "StudioVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\view.h
-# End Source File
-# End Target
-# End Project
--- a/contrib/samples/ogl/studio/StudioVC.dsw
+++ b/contrib/samples/ogl/studio/StudioVC.dsw
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "StudioVC"=.\StudioVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
--- a/contrib/samples/stc/StcTestVC.dsp
+++ b/contrib/samples/stc/StcTestVC.dsp
@@ -1,175 +0,0 @@
-# Microsoft Developer Studio Project File - Name="StcTestVC" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# (Actually, generated by MakeProject, (c) Julian Smart, 1998)
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=StcTestVC - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "StcTestVC.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "StcTestVC.mak" CFG="StcTestVC - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "StcTestVC - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "StcTestVC - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE "StcTestVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
-!MESSAGE "StcTestVC - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "StcTestVC - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib stc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib,libci.lib,msvcrtd.lib" /out:"Release/stctest.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
-
-!ELSEIF  "$(CFG)" == "StcTestVC - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib stcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib,libcid.lib,msvcrt.lib" /out:"Debug/stctest.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
-
-!ELSEIF  "$(CFG)" == "StcTestVC - Win32 Debug DLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "DebugDLL"
-# PROP BASE Intermediate_Dir "DebugDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugDLL"
-# PROP Intermediate_Dir "DebugDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9d.lib stcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/stctest.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
-
-!ELSEIF  "$(CFG)" == "StcTestVC - Win32 Release DLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ReleaseDLL"
-# PROP BASE Intermediate_Dir "ReleaseDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseDLL"
-# PROP Intermediate_Dir "ReleaseDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx22_9.lib stc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/stctest.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "StcTestVC - Win32 Release"
-# Name "StcTestVC - Win32 Debug"
-# Name "StcTestVC - Win32 Debug DLL"
-# Name "StcTestVC - Win32 Release DLL"
-# Begin Source File
-
-SOURCE=.\stctest.cpp
-
-!IF  "$(CFG)" == "StcTestVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "StcTestVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StcTestVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "StcTestVC - Win32 Release DLL"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\stctest.rc
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../../include" /i "../../../contrib/include"
-# End Source File
-# End Target
-# End Project
--- a/contrib/samples/stc/StcTestVC.dsw
+++ b/contrib/samples/stc/StcTestVC.dsw
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "StcTestVC"=.\StcTestVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
--- a/contrib/samples/stc/stctest.cpp
+++ b/contrib/samples/stc/stctest.cpp
@@ -165,7 +165,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
    ed->EmptyUndoBuffer();

    ed->SetLexer(wxSTC_LEX_CPP);
-    ed->SetKeyWords(0,
+    ed->SetKeywords(0,
                    "asm auto bool break case catch char class const "
                    "const_cast continue default delete do double "
                    "dynamic_cast else enum explicit export extern "
--- a/contrib/src/mmedia/sndwav.cpp
+++ b/contrib/src/mmedia/sndwav.cpp
@@ -312,14 +312,8 @@ FAIL_WITH(s->Write(&signature, 4).LastWrite() != 4, wxSOUND_INVSTRM);
        
        delete frmt;
    }
-
-#ifdef wxSIZE_T_IS_ULONG
-    // FIXME: we still need this horrible cast until wxDataOutputStream
-    // is made 64 bit friendly.
-    data << (unsigned int)(fmt_data.GetSize() + m_sndformat->GetBytesFromTime(time));
-#else
+    
    data << (fmt_data.GetSize() + m_sndformat->GetBytesFromTime(time));
-#endif

    // We, finally, copy the header block to the output stream 
    {
--- a/contrib/src/mmedia/vidxanm.cpp
+++ b/contrib/src/mmedia/vidxanm.cpp
@@ -18,10 +18,8 @@
 #include <wx/wx.h>
 #endif

-#ifdef __WXGTK__
 // Pizza !
 #include <wx/gtk/win_gtk.h>
-#endif

 #include <X11/Xlib.h>
 #include <X11/Intrinsic.h>
--- a/contrib/src/stc/Makefile.in
+++ b/contrib/src/stc/Makefile.in
@@ -26,7 +26,6 @@ OBJECTS=PlatWX.o ScintillaWX.o stc.o \
 	DocumentAccessor.o	\
 	LexCPP.o		\
 	LexHTML.o		\
-	LexLua.o		\
 	LexOthers.o		\
 	LexPerl.o		\
 	LexPython.o		\
@@ -48,7 +47,6 @@ OBJECTS=PlatWX.o ScintillaWX.o stc.o \
        ScintillaBase.o	    	\
        Style.o		        \
        ViewStyle.o		\
-	PosRegExp.o		\


 APPEXTRADEFS=-D__WX__ -DSCI_LEXER -I$(scintilla_dir)/src -I$(scintilla_dir)/include -I$(top_srcdir)/contrib/include
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -9,18 +9,13 @@
 #include "Platform.h"
 #include "wx/stc/stc.h"

-
-#ifdef __WXGTK__
-#include <gtk/gtk.h>
-#endif
-
 Point Point::FromLong(long lpoint) {
    return Point(lpoint & 0xFFFF, lpoint >> 16);
 }

 wxRect wxRectFromPRectangle(PRectangle prc) {
    wxRect rc(prc.left, prc.top,
-              prc.right-prc.left, prc.bottom-prc.top);
+              prc.right-prc.left+1, prc.bottom-prc.top+1);
    return rc;
 }

@@ -174,7 +169,7 @@ void Surface::InitPixMap(int width, int height, Surface *surface_) {
    Release();
    hdc = new wxMemoryDC(surface_->hdc);
    hdcOwned = true;
-    bitmap = new wxBitmap(width, height);
+    bitmap = new wxBitmap(width, height+1);
    ((wxMemoryDC*)hdc)->SelectObject(*bitmap);
    // **** ::SetTextAlign(hdc, TA_BASELINE);
 }
@@ -188,7 +183,12 @@ void Surface::BrushColor(Colour back) {
 }

 void Surface::SetFont(Font &font_) {
-  if (font_.GetID()) {
+
+  // I think the following check is valid.
+  // It eliminates a crash for me.  -- eric@sourcegear.com
+
+  if (font_.GetID())
+    {
      hdc->SetFont(*font_.GetID());
    }
 }
@@ -361,6 +361,9 @@ void Surface::SetClip(PRectangle rc) {
 }

 void Surface::FlushCachedState() {
+  // TODO Is there anything we need to do here? eric@sourcegear.com
+  // TODO I had to add this method when I merged new Scintilla code
+  // TODO from Neil.
 }

 Window::~Window() {
@@ -392,7 +395,7 @@ void Window::SetPositionRelative(PRectangle rc, Window) {

 PRectangle Window::GetClientPosition() {
    wxSize sz = id->GetClientSize();
-    return  PRectangle(0, 0, sz.x, sz.y);
+    return  PRectangle(0, 0, sz.x - 1, sz.y - 1);
 }

 void Window::Show(bool show) {
@@ -451,76 +454,6 @@ void Window::SetTitle(const char *s) {
 }


-class wxSTCListBox : public wxListBox {
-public:
-    wxSTCListBox(wxWindow* parent, wxWindowID id)
-        : wxListBox(parent, id, wxDefaultPosition, wxDefaultSize,
-                    0, NULL, wxLB_SINGLE | wxLB_SORT | wxSIMPLE_BORDER)
-        {}
-
-    void OnFocus(wxFocusEvent& event) {
-        GetParent()->SetFocus();
-        event.Skip();
-    }
-
-#ifdef __WXGTK__
-    void DoSetFirstItem(int n);
-#endif
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-BEGIN_EVENT_TABLE(wxSTCListBox, wxListBox)
-    EVT_SET_FOCUS(wxSTCListBox::OnFocus)
-END_EVENT_TABLE()
-
-
-
-
-#ifdef __WXGTK__
-    // This can be removed after 2.2.2 I think
-void wxSTCListBox::DoSetFirstItem( int n )
-{
-    wxCHECK_RET( m_list, wxT("invalid listbox") );
-
-    if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (m_list))
-        return;
-
-    // terribly efficient
-    const gchar *vadjustment_key = "gtk-vadjustment";
-    guint vadjustment_key_id = g_quark_from_static_string (vadjustment_key);
-
-    GtkAdjustment *adjustment =
-       (GtkAdjustment*) gtk_object_get_data_by_id (GTK_OBJECT (m_list), vadjustment_key_id);
-    wxCHECK_RET( adjustment, wxT("invalid listbox code") );
-
-    GList *target = g_list_nth( m_list->children, n );
-    wxCHECK_RET( target, wxT("invalid listbox index") );
-
-    GtkWidget *item = GTK_WIDGET(target->data);
-    wxCHECK_RET( item, wxT("invalid listbox code") );
-
-    // find the last item before this one which is already realized
-    size_t nItemsBefore;
-    for ( nItemsBefore = 0; item && (item->allocation.y == -1); nItemsBefore++ )
-    {
-        target = target->prev;
-        if ( !target )
-        {
-            // nothing we can do if there are no allocated items yet
-            return;
-        }
-
-        item = GTK_WIDGET(target->data);
-    }
-
-    gtk_adjustment_set_value(adjustment,
-                             item->allocation.y +
-                                nItemsBefore*item->allocation.height);
-}
-#endif
-

 ListBox::ListBox() {
 }
@@ -529,32 +462,8 @@ ListBox::~ListBox() {
 }

 void ListBox::Create(Window &parent, int ctrlID) {
-    id = new wxSTCListBox(parent.id, ctrlID);
-//    id = new wxListBox(parent.id, ctrlID,  wxDefaultPosition, wxDefaultSize,
-//                       0, NULL, wxLB_SINGLE | wxLB_SORT | wxSIMPLE_BORDER);
-}
-
-PRectangle ListBox::GetDesiredRect() {
-    wxSize sz = ((wxListBox*)id)->GetBestSize();
-    PRectangle rc;
-    rc.top = 0;
-    rc.left = 0;
-    if (sz.x > 150)   // TODO: A better way to determine these max sizes
-        sz.x = 150;
-    if (sz.y > 100)
-        sz.y = 100;
-    rc.right = sz.x;
-    rc.bottom = sz.y;
-
-    return rc;
-}
-
-void ListBox::SetAverageCharWidth(int width) {
-    aveCharWidth = width;
-}
-
-void ListBox::SetFont(Font &font) {
-    Window::SetFont(font);
+    id = new wxListBox(parent.id, ctrlID, wxDefaultPosition, wxDefaultSize,
+                       0, NULL, wxLB_SINGLE | wxLB_SORT);
 }

 void ListBox::Clear() {
@@ -571,13 +480,6 @@ int ListBox::Length() {

 void ListBox::Select(int n) {
    ((wxListBox*)id)->SetSelection(n);
-#ifdef __WXGTK__
-    if (n > 4)
-        n = n - 4;
-    else
-        n = 1;
-    ((wxListBox*)id)->SetFirstItem(n);
-#endif
 }

 int ListBox::GetSelection() {
@@ -585,12 +487,10 @@ int ListBox::GetSelection() {
 }

 int ListBox::Find(const char *prefix) {
-    if (prefix) {
-        for (int x=0; x < ((wxListBox*)id)->Number(); x++) {
-            wxString text = ((wxListBox*)id)->GetString(x);
-            if (text.StartsWith(prefix))
-                return x;
-        }
+    for (int x=0; x < ((wxListBox*)id)->Number(); x++) {
+        wxString text = ((wxListBox*)id)->GetString(x);
+        if (text.StartsWith(prefix))
+            return x;
    }
    return -1;
 }
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -273,6 +273,8 @@ void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) {

    if (!enabled)
        popup.GetID()->Enable(cmd, enabled);
+
+    // TODO:  need to create event handler mappings for the cmd ID
 }


@@ -281,18 +283,18 @@ void ScintillaWX::ClaimSelection() {
 }


-long ScintillaWX::DefWndProc(unsigned int /*iMessage*/, unsigned long /*wParam*/, long /*lParam*/) {
+LRESULT ScintillaWX::DefWndProc(UINT /*iMessage*/, WPARAM /*wParam*/, LPARAM /*lParam*/) {
    return 0;
 }

-long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lParam) {
-//      switch (iMessage) {
-//      case EM_CANPASTE:
-//          return CanPaste();
-//      default:
+LRESULT ScintillaWX::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) {
+    switch (iMessage) {
+    case EM_CANPASTE:
+        return CanPaste();
+    default:
        return ScintillaBase::WndProc(iMessage, wParam, lParam);
-//      }
-//      return 0;
+    }
+    return 0;
 }


@@ -315,11 +317,6 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
        FullPaint();
    }
    paintState = notPainting;
-#ifdef __WXGTK__
-    // On wxGTK the editor window paints can overwrite the listbox...
-    if (ac.Active())
-        ((wxWindow*)ac.lb.GetID())->Refresh(TRUE);
-#endif
 }


@@ -418,29 +415,6 @@ void ScintillaWX::DoAddChar(char ch) {
 }

 int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt) {
-    switch (key) {
-        case WXK_DOWN: key = SCK_DOWN; break;
-        case WXK_UP: key = SCK_UP; break;
-        case WXK_LEFT: key = SCK_LEFT; break;
-        case WXK_RIGHT: key = SCK_RIGHT; break;
-        case WXK_HOME: key = SCK_HOME; break;
-        case WXK_END: key = SCK_END; break;
-        case WXK_PRIOR: key = SCK_PRIOR; break;
-        case WXK_NEXT: key = SCK_NEXT; break;
-        case WXK_DELETE: key = SCK_DELETE; break;
-        case WXK_INSERT: key = SCK_INSERT; break;
-        case WXK_ESCAPE: key = SCK_ESCAPE; break;
-        case WXK_BACK: key = SCK_BACK; break;
-        case WXK_TAB: key = SCK_TAB; break;
-        case WXK_RETURN: key = SCK_RETURN; break;
-        case WXK_ADD: key = SCK_ADD; break;
-        case WXK_SUBTRACT: key = SCK_SUBTRACT; break;
-        case WXK_DIVIDE: key = SCK_DIVIDE; break;
-        case WXK_CONTROL: key = 0; break;
-        case WXK_ALT: key = 0; break;
-        case WXK_SHIFT: key = 0; break;
-    }
-
    return KeyDown(key, shift, ctrl, alt);
 }

@@ -489,16 +463,13 @@ void ScintillaWX::DoDragLeave() {
 // Redraw all of text area. This paint will not be abandoned.
 void ScintillaWX::FullPaint() {
    paintState = painting;
-    rcPaint = GetTextRectangle();
-    paintingAllText = true;
-    wxClientDC dc(wMain.GetID());
-    Surface surfaceWindow;
-    surfaceWindow.Init(&dc);
-    Paint(&surfaceWindow, rcPaint);
-    surfaceWindow.Release();
-
-//     wMain.GetID()->Refresh(FALSE);
-
+//      rcPaint = GetTextRectangle();
+//      wxClientDC dc(wMain.GetID());
+//      Surface surfaceWindow;
+//      surfaceWindow.Init(&dc);
+//      Paint(&surfaceWindow, rcPaint);
+//      surfaceWindow.Release();
+    wMain.GetID()->Refresh(FALSE);
    paintState = notPainting;
 }

--- a/contrib/src/stc/ScintillaWX.h
+++ b/contrib/src/stc/ScintillaWX.h
@@ -97,12 +97,8 @@ public:
    virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true);
    virtual void ClaimSelection();

-    virtual long DefWndProc(unsigned int iMessage,
-                            unsigned long wParam,
-                            long lParam);
-    virtual long WndProc(unsigned int iMessage,
-                         unsigned long wParam,
-                         long lParam);
+    virtual LRESULT DefWndProc(UINT iMessage, WPARAM wParam, LPARAM lParam);
+    virtual LRESULT WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam);

    virtual void NotifyChange();
    virtual void NotifyParent(SCNotification scn);
--- a/contrib/src/stc/gen_iface.py
+++ b/contrib/src/stc/gen_iface.py
@@ -1,684 +0,0 @@
-#!/bin/env python
-#----------------------------------------------------------------------------
-# Name:         gen_iface.py
-# Purpose:      Generate stc.h and stc.cpp from the info in Scintilla.iface
-#
-# Author:       Robin Dunn
-#
-# Created:      5-Sept-2000
-# RCS-ID:       $Id$
-# Copyright:    (c) 2000 by Total Control Software
-# Licence:      wxWindows license
-#----------------------------------------------------------------------------
-
-
-import sys, string, re
-from fileinput import FileInput
-
-
-IFACE         = './scintilla/include/Scintilla.iface'
-H_TEMPLATE    = './stc.h.in'
-CPP_TEMPLATE  = './stc.cpp.in'
-H_DEST        = '../../include/wx/stc/stc.h' # './stc_test.h' #
-CPP_DEST      = './stc.cpp' #'./stc_test.cpp'
-
-
-# Value prefixes to convert
-valPrefixes = [('SCI_', ''),
-               ('SC_',  ''),
-               ('SCN_', None),  # just toss these...
-               ('SCEN_', None),
-               ('SCE_', ''),
-               ('SCLEX_', 'LEX_'),
-               ('SCK_', 'KEY_'),
-               ('SCFIND_', 'FIND_'),
-               ('SCWS_', 'WS_'),
-]
-
-# Message funcion values that should have a CMD_ constant as well
-cmdValues = [ (2300, 2350), 2011, 2013, (2176, 2180) ]
-
-
-# Map some generic typenames to wx types, using return value syntax
-retTypeMap = {
-    'position': 'int',
-    'string':   'wxString',
-    'colour':   'wxColour',
-    }
-
-# Map some generic typenames to wx types, using parameter syntax
-paramTypeMap = {
-    'position': 'int',
-    'string':   'const wxString&',
-    'colour':   'const wxColour&',
-    'keymod':   'int',
-}
-
-# Map of method info that needs tweaked.  Either the name needs changed, or
-# the method definition/implementation.  Tuple items are:
-#
-#         1. New method name.  None to skip the method, 0 to leave the
-#            default name.
-#         2. Method definition for the .h file, 0 to leave alone
-#         3. Method implementation for the .cpp file, 0 to leave alone.
-#         4. tuple of Doc string lines, or 0 to leave alone.
-#
-methodOverrideMap = {
-    'AddText' : (0,
-                 'void %s(const wxString& text);',
-
-                 '''void %s(const wxString& text) {
-                    SendMsg(%s, text.Len(), (long)text.c_str());''',
-                 0),
-
-    'AddStyledText' : (0,
-                       'void %s(const wxString& text);',
-
-                       '''void %s(const wxString& text) {
-                          SendMsg(%s, text.Len(), (long)text.c_str());''',
-                       0),
-
-    'GetViewWS' : ( 'GetViewWhiteSpace', 0, 0, 0),
-    'SetViewWS' : ( 'SetViewWhiteSpace', 0, 0, 0),
-
-    'GetStyledText' : (0,
-                       'wxString %s(int startPos, int endPos);',
-
-                       '''wxString %s(int startPos, int endPos) {
-                          wxString text;
-                          int len = endPos - startPos;
-                          TextRange tr;
-                          tr.lpstrText = text.GetWriteBuf(len*2+1);
-                          tr.chrg.cpMin = startPos;
-                          tr.chrg.cpMax = endPos;
-                          SendMsg(%s, 0, (long)&tr);
-                          text.UngetWriteBuf(len*2);
-                          return text;''',
-
-                       ('Retrieve a buffer of cells.',)),
-
-
-    'PositionFromPoint' : (0,
-                           'int %s(wxPoint pt);',
-
-                           '''int %s(wxPoint pt) {
-                              return SendMsg(%s, pt.x, pt.y);''',
-
-                           0),
-
-    'GetCurLine' : (0,
-                    'wxString %s(int* OUTPUT=NULL);',
-
-                    '''wxString %s(int* linePos) {
-                       wxString text;
-                       int len = LineLength(GetCurrentLine());
-                       char* buf = text.GetWriteBuf(len+1);
-
-                       int pos = SendMsg(%s, len, (long)buf);
-                       text.UngetWriteBuf();
-                       if (linePos)  *linePos = pos;
-
-                       return text;''',
-
-                    0),
-
-    'SetUsePalette' : (None, 0,0,0),
-
-    'MarkerSetFore' : ('MarkerSetForeground', 0, 0, 0),
-    'MarkerSetBack' : ('MarkerSetBackground', 0, 0, 0),
-
-    'MarkerDefine' : (0,
-                      '''void %s(int markerNumber, int markerSymbol,
-                         const wxColour& foreground = wxNullColour,
-                         const wxColour& background = wxNullColour);''',
-
-                      '''void %s(int markerNumber, int markerSymbol,
-                            const wxColour& foreground,
-                            const wxColour& background) {
-
-                            SendMsg(%s, markerNumber, markerSymbol);
-                            if (foreground.Ok())
-                                MarkerSetForeground(markerNumber, foreground);
-                            if (background.Ok())
-                                MarkerSetBackground(markerNumber, background);''',
-
-                      ('Set the symbol used for a particular marker number,',
-                       'and optionally the for and background colours.')),
-
-    'SetMarginTypeN' : ('SetMarginType', 0, 0, 0),
-    'GetMarginTypeN' : ('GetMarginType', 0, 0, 0),
-    'SetMarginWidthN' : ('SetMarginWidth', 0, 0, 0),
-    'GetMarginWidthN' : ('GetMarginWidth', 0, 0, 0),
-    'SetMarginMaskN' : ('SetMarginMask', 0, 0, 0),
-    'GetMarginMaskN' : ('GetMarginMask', 0, 0, 0),
-    'SetMarginSensitiveN' : ('SetMarginSensitive', 0, 0, 0),
-    'GetMarginSensitiveN' : ('GetMarginSensitive', 0, 0, 0),
-
-    'StyleSetFore' : ('StyleSetForeground', 0, 0, 0),
-    'StyleSetBack' : ('StyleSetBackground', 0, 0, 0),
-    'SetSelFore' : ('SetSelForeground', 0, 0, 0),
-    'SetSelBack' : ('SetSelBackground', 0, 0, 0),
-    'SetCaretFore' : ('SetCaretForeground', 0, 0, 0),
-    'StyleSetFont' : ('StyleSetFaceName', 0, 0, 0),
-
-    # need to fix this to map between wx and scintilla encoding flags, leave it out for now...
-    'StyleSetCharacterSet' : (None, 0, 0, 0),
-
-    'AssignCmdKey' : ('CmdKeyAssign',
-                      'void %s(int key, int modifiers, int cmd);',
-
-                      '''void %s(int key, int modifiers, int cmd) {
-                          SendMsg(%s, MAKELONG(key, modifiers), cmd);''',
-
-                      0),
-
-    'ClearCmdKey' : ('CmdKeyClear',
-                      'void %s(int key, int modifiers);',
-
-                      '''void %s(int key, int modifiers) {
-                          SendMsg(%s, MAKELONG(key, modifiers));''',
-
-                      0),
-
-    'ClearAllCmdKeys' : ('CmdKeyClearAll', 0, 0, 0),
-
-
-    'SetStylingEx' : ('SetStyleBytes',
-                      'void %s(int length, char* styleBytes);',
-
-                      '''void %s(int length, char* styleBytes) {
-                          SendMsg(%s, length, (long)styleBytes);''',
-
-                      0),
-
-
-    'IndicSetStyle' : ('IndicatorSetStyle', 0, 0, 0),
-    'IndicGetStyle' : ('IndicatorGetStyle', 0, 0, 0),
-    'IndicSetFore' : ('IndicatorSetForeground', 0, 0, 0),
-    'IndicGetFore' : ('IndicatorGetForeground', 0, 0, 0),
-
-    'AutoCShow' : ('AutoCompShow', 0, 0, 0),
-    'AutoCCancel' : ('AutoCompCancel', 0, 0, 0),
-    'AutoCActive' : ('AutoCompActive', 0, 0, 0),
-    'AutoCPosStart' : ('AutoCompPosStart', 0, 0, 0),
-    'AutoCComplete' : ('AutoCompComplete', 0, 0, 0),
-    'AutoCStops' : ('AutoCompStops', 0, 0, 0),
-    'AutoCSetSeparator' : ('AutoCompSetSeparator', 0, 0, 0),
-    'AutoCGetSeparator' : ('AutoCompGetSeparator', 0, 0, 0),
-    'AutoCSelect' : ('AutoCompSelect', 0, 0, 0),
-    'AutoCSetCancelAtStart' : ('AutoCompSetCancelAtStart', 0, 0, 0),
-    'AutoCGetCancelAtStart' : ('AutoCompGetCancelAtStart', 0, 0, 0),
-    'AutoCSetFillUps' : ('AutoCompSetFillUps', 0, 0, 0),
-    'AutoCSetChooseSingle' : ('AutoCompSetChooseSingle', 0, 0, 0),
-    'AutoCGetChooseSingle' : ('AutoCompGetChooseSingle', 0, 0, 0),
-    'AutoCSetIgnoreCase' : ('AutoCompSetIgnoreCase', 0, 0, 0),
-    'AutoCGetIgnoreCase' : ('AutoCompGetIgnoreCase', 0, 0, 0),
-
-    'SetHScrollBar' : ('SetUseHorizontalScrollBar', 0, 0, 0),
-    'GetHScrollBar' : ('GetUseHorizontalScrollBar', 0, 0, 0),
-
-    'GetCaretFore' : ('GetCaretForeground', 0, 0, 0),
-
-    'GetUsePalette' : (None, 0, 0, 0),
-
-    'FindText' : (0,
-                  '''int %s(int minPos, int maxPos,
-                               const wxString& text,
-                               bool caseSensitive, bool wholeWord);''',
-                  '''int %s(int minPos, int maxPos,
-                               const wxString& text,
-                               bool caseSensitive, bool wholeWord) {
-                     TextToFind  ft;
-                     int         flags = 0;
-
-                     flags |= caseSensitive ? SCFIND_MATCHCASE : 0;
-                     flags |= wholeWord     ? SCFIND_WHOLEWORD : 0;
-                     ft.chrg.cpMin = minPos;
-                     ft.chrg.cpMax = maxPos;
-                     ft.lpstrText = (char*)text.c_str();
-
-                     return SendMsg(%s, flags, (long)&ft);''',
-                  0),
-
-    'FormatRange' : (0,
-                     '''int %s(bool   doDraw,
-                               int    startPos,
-                               int    endPos,
-                               wxDC*  draw,
-                               wxDC*  target,  // Why does it use two? Can they be the same?
-                               wxRect renderRect,
-                               wxRect pageRect);''',
-                     ''' int %s(bool   doDraw,
-                                int    startPos,
-                                int    endPos,
-                                wxDC*  draw,
-                                wxDC*  target,  // Why does it use two? Can they be the same?
-                                wxRect renderRect,
-                                wxRect pageRect) {
-                            RangeToFormat fr;
-
-                            fr.hdc = draw;
-                            fr.hdcTarget = target;
-                            fr.rc.top = renderRect.GetTop();
-                            fr.rc.left = renderRect.GetLeft();
-                            fr.rc.right = renderRect.GetRight();
-                            fr.rc.bottom = renderRect.GetBottom();
-                            fr.rcPage.top = pageRect.GetTop();
-                            fr.rcPage.left = pageRect.GetLeft();
-                            fr.rcPage.right = pageRect.GetRight();
-                            fr.rcPage.bottom = pageRect.GetBottom();
-                            fr.chrg.cpMin = startPos;
-                            fr.chrg.cpMax = endPos;
-
-                            return SendMsg(%s, doDraw, (long)&fr);''',
-                     0),
-
-
-    'GetLine' : (0,
-                    'wxString %s(int line);',
-
-                    '''wxString %s(int line) {
-                       wxString text;
-                       int len = LineLength(line);
-                       char* buf = text.GetWriteBuf(len+1);
-
-                       int pos = SendMsg(%s, line, (long)buf);
-                       text.UngetWriteBuf();
-
-                       return text;''',
-
-                    ('Retrieve the contents of a line.',)),
-
-    'SetSel' : ('SetSelection', 0, 0, 0),
-    'GetSelText' : ('GetSelectedText',
-                    'wxString %s();',
-
-                    '''wxString %s() {
-                            wxString text;
-                            int   start;
-                            int   end;
-
-                            GetSelection(&start, &end);
-                            int   len  = end - start;
-                            char* buff = text.GetWriteBuf(len+1);
-
-                            SendMsg(%s, 0, (long)buff);
-                            text.UngetWriteBuf();
-                            return text;''',
-
-                    ('Retrieve the selected text.',)),
-
-    'GetTextRange' : (0,
-                      'wxString %s(int startPos, int endPos);',
-
-                      '''wxString %s(int startPos, int endPos) {
-                            wxString text;
-                            int   len  = endPos - startPos;
-                            char* buff = text.GetWriteBuf(len+1);
-                            TextRange tr;
-                            tr.lpstrText = buff;
-                            tr.chrg.cpMin = startPos;
-                            tr.chrg.cpMax = endPos;
-
-                            SendMsg(%s, 0, (long)&tr);
-                            text.UngetWriteBuf();
-                            return text;''',
-
-                       ('Retrieve a range of text.',)),
-
-    'PointXFromPosition' : (None, 0, 0, 0),
-    'PointYFromPosition' : (None, 0, 0, 0),
-
-    'ScrollCaret' : ('EnsureCaretVisible', 0, 0, 0),
-    'ReplaceSel' : ('ReplaceSelection', 0, 0, 0),
-    'Null' : (None, 0, 0, 0),
-
-    'GetText' : (0,
-                 'wxString %s();',
-
-                 '''wxString %s() {
-                        wxString text;
-                        int   len  = GetTextLength()+1;
-                        char* buff = text.GetWriteBuf(len+1);
-
-                        SendMsg(%s, len, (long)buff);
-                        buff[len] = 0;
-                        text.UngetWriteBuf();
-                        return text;''',
-
-                 ('Retrieve all the text in the document.', )),
-
-    'GetDirectFunction' : (None, 0, 0, 0),
-    'GetDirectPointer' : (None, 0, 0, 0),
-
-    'CallTipPosStart' : ('CallTipPosAtStart', 0, 0, 0),
-    'CallTipSetHlt' : ('CallTipSetHighlight', 0, 0, 0),
-    'CallTipSetBack' : ('CallTipSetBackground', 0, 0, 0),
-
-
-    # Remove all methods that are key commands since they can be
-    # executed with CmdKeyExecute
-    'LineDown' : (None, 0, 0, 0),
-    'LineDownExtend' : (None, 0, 0, 0),
-    'LineUp' : (None, 0, 0, 0),
-    'LineUpExtend' : (None, 0, 0, 0),
-    'CharLeft' : (None, 0, 0, 0),
-    'CharLeftExtend' : (None, 0, 0, 0),
-    'CharRight' : (None, 0, 0, 0),
-    'CharRightExtend' : (None, 0, 0, 0),
-    'WordLeft' : (None, 0, 0, 0),
-    'WordLeftExtend' : (None, 0, 0, 0),
-    'WordRight' : (None, 0, 0, 0),
-    'WordRightExtend' : (None, 0, 0, 0),
-    'Home' : (None, 0, 0, 0),
-    'HomeExtend' : (None, 0, 0, 0),
-    'LineEnd' : (None, 0, 0, 0),
-    'LineEndExtend' : (None, 0, 0, 0),
-    'DocumentStart' : (None, 0, 0, 0),
-    'DocumentStartExtend' : (None, 0, 0, 0),
-    'DocumentEnd' : (None, 0, 0, 0),
-    'DocumentEndExtend' : (None, 0, 0, 0),
-    'PageUp' : (None, 0, 0, 0),
-    'PageUpExtend' : (None, 0, 0, 0),
-    'PageDown' : (None, 0, 0, 0),
-    'PageDownExtend' : (None, 0, 0, 0),
-    'EditToggleOvertype' : (None, 0, 0, 0),
-    'Cancel' : (None, 0, 0, 0),
-    'DeleteBack' : (None, 0, 0, 0),
-    'Tab' : (None, 0, 0, 0),
-    'BackTab' : (None, 0, 0, 0),
-    'NewLine' : (None, 0, 0, 0),
-    'FormFeed' : (None, 0, 0, 0),
-    'VCHome' : (None, 0, 0, 0),
-    'VCHomeExtend' : (None, 0, 0, 0),
-    'ZoomIn' : (None, 0, 0, 0),
-    'ZoomOut' : (None, 0, 0, 0),
-    'DelWordLeft' : (None, 0, 0, 0),
-    'DelWordRight' : (None, 0, 0, 0),
-    'LineCut' : (None, 0, 0, 0),
-    'LineDelete' : (None, 0, 0, 0),
-    'LineTranspose' : (None, 0, 0, 0),
-    'LowerCase' : (None, 0, 0, 0),
-    'UpperCase' : (None, 0, 0, 0),
-    'LineScrollDown' : (None, 0, 0, 0),
-    'LineScrollUp' : (None, 0, 0, 0),
-
-
-    'GetDocPointer' : (0,
-                       'void* %s();',
-                       '''void* %s() {
-                           return (void*)SendMsg(%s);''',
-                       0),
-
-    'SetDocPointer' : (0,
-                       'void %s(void* docPointer);',
-                       '''void %s(void* docPointer) {
-                           SendMsg(%s, (long)docPointer);''',
-                       0),
-
-    'CreateDocument' : (0,
-                       'void* %s();',
-                       '''void* %s() {
-                           return (void*)SendMsg(%s);''',
-                        0),
-
-    'AddRefDocument' : (0,
-                       'void %s(void* docPointer);',
-                       '''void %s(void* docPointer) {
-                           SendMsg(%s, (long)docPointer);''',
-                        0),
-
-    'ReleaseDocument' : (0,
-                       'void %s(void* docPointer);',
-                       '''void %s(void* docPointer) {
-                           SendMsg(%s, (long)docPointer);''',
-                         0),
-
-    'GrabFocus' : (None, 0, 0, 0),
-
-    '' : ('', 0, 0, 0),
-
-    }
-
-#----------------------------------------------------------------------------
-
-def processIface(iface, h_tmplt, cpp_tmplt, h_dest, cpp_dest):
-    curDocStrings = []
-    values = []
-    methods = []
-
-    # parse iface file
-    fi = FileInput(iface)
-    for line in fi:
-        line = line[:-1]
-        if line[:2] == '##' or line == '':
-            #curDocStrings = []
-            continue
-
-        op = line[:4]
-        if line[:2] == '# ':   # a doc string
-            curDocStrings.append(line[2:])
-
-        elif op == 'val ':
-            parseVal(line[4:], values, curDocStrings)
-            curDocStrings = []
-
-        elif op == 'fun ' or op == 'set ' or op == 'get ':
-            parseFun(line[4:], methods, curDocStrings, values)
-            curDocStrings = []
-
-        elif op == 'cat ':
-            if string.strip(line[4:]) == 'Deprecated':
-                break    # skip the rest of the file
-
-        elif op == 'evt ':
-            pass
-
-        else:
-            print '***** Unknown line type: ', line
-
-
-    # process templates
-    data = {}
-    data['VALUES'] = processVals(values)
-    defs, imps = processMethods(methods)
-    data['METHOD_DEFS'] = defs
-    data['METHOD_IMPS'] = imps
-
-    # get template text
-    h_text = open(h_tmplt).read()
-    cpp_text = open(cpp_tmplt).read()
-
-    # do the substitutions
-    h_text = h_text % data
-    cpp_text = cpp_text % data
-
-    # write out destination files
-    open(h_dest, 'w').write(h_text)
-    open(cpp_dest, 'w').write(cpp_text)
-
-
-
-#----------------------------------------------------------------------------
-
-def processVals(values):
-    text = []
-    for name, value, docs in values:
-        if docs:
-            text.append('')
-            for x in docs:
-                text.append('// ' + x)
-        text.append('#define %s %s' % (name, value))
-    return string.join(text, '\n')
-
-#----------------------------------------------------------------------------
-
-def processMethods(methods):
-    defs = []
-    imps = []
-
-    for retType, name, number, param1, param2, docs in methods:
-        retType = retTypeMap.get(retType, retType)
-        params = makeParamString(param1, param2)
-
-        name, theDef, theImp, docs = checkMethodOverride(name, number, docs)
-
-        if name is None:
-            continue
-
-        # Build the method definition for the .h file
-        if docs:
-            defs.append('')
-            for x in docs:
-                defs.append('    // ' + x)
-        if not theDef:
-            theDef = '    %s %s(%s);' % (retType, name, params)
-        defs.append(theDef)
-
-        # Build the method implementation string
-        if docs:
-            imps.append('')
-            for x in docs:
-                imps.append('// ' + x)
-        if not theImp:
-            theImp = '%s wxStyledTextCtrl::%s(%s) {\n    ' % (retType, name, params)
-
-            if retType == 'wxColour':
-                theImp = theImp + 'long c = '
-            elif retType != 'void':
-                theImp = theImp + 'return '
-            theImp = theImp + 'SendMsg(%s, %s, %s)' % (number,
-                                                       makeArgString(param1),
-                                                       makeArgString(param2))
-            if retType == 'bool':
-                theImp = theImp + ' != 0'
-            if retType == 'wxColour':
-                theImp = theImp + ';\n    return wxColourFromLong(c)'
-
-            theImp = theImp + ';\n}'
-        imps.append(theImp)
-
-
-    return string.join(defs, '\n'), string.join(imps, '\n')
-
-
-#----------------------------------------------------------------------------
-
-def checkMethodOverride(name, number, docs):
-    theDef = theImp = None
-    if methodOverrideMap.has_key(name):
-        item = methodOverrideMap[name]
-
-        if item[0] != 0:
-            name = item[0]
-        if item[1] != 0:
-            theDef = '    ' + (item[1] % name)
-        if item[2] != 0:
-            theImp = item[2] % ('wxStyledTextCtrl::'+name, number) + '\n}'
-        if item[3] != 0:
-            docs = item[3]
-
-    return name, theDef, theImp, docs
-
-#----------------------------------------------------------------------------
-
-def makeArgString(param):
-    if not param:
-        return '0'
-
-    typ, name = param
-
-    if typ == 'string':
-        return '(long)%s.c_str()' % name
-    if typ == 'colour':
-        return 'wxColourAsLong(%s)' % name
-
-    return name
-
-#----------------------------------------------------------------------------
-
-def makeParamString(param1, param2):
-    def doOne(param):
-        if param:
-            aType = paramTypeMap.get(param[0], param[0])
-            return aType + ' ' + param[1]
-        else:
-            return ''
-
-    st = doOne(param1)
-    if st and param2:
-        st = st + ', '
-    st = st + doOne(param2)
-    return st
-
-
-#----------------------------------------------------------------------------
-
-def parseVal(line, values, docs):
-    name, val = string.split(line, '=')
-
-    # remove prefixes such as SCI, etc.
-    for old, new in valPrefixes:
-        lo = len(old)
-        if name[:lo] == old:
-            if new is None:
-                return
-            name = new + name[lo:]
-
-    # add it to the list
-    values.append( ('wxSTC_' + name, val, docs) )
-
-#----------------------------------------------------------------------------
-
-funregex = re.compile(r'\s*([a-zA-Z0-9_]+)'  # <ws>return type
-                      '\s+([a-zA-Z0-9_]+)='  # <ws>name=
-                      '([0-9]+)'             # number
-                      '\(([ a-zA-Z0-9_]*),'  # (param,
-                      '([ a-zA-Z0-9_]*)\)')  # param)
-
-def parseFun(line, methods, docs, values):
-    def parseParam(param):
-        param = string.strip(param)
-        if param == '':
-            param = None
-        else:
-            param = tuple(string.split(param))
-        return param
-
-    mo = funregex.match(line)
-    if mo is None:
-        print "***** Line doesn't match! : " + line
-
-    retType, name, number, param1, param2 = mo.groups()
-
-    param1 = parseParam(param1)
-    param2 = parseParam(param2)
-
-    # Special case.  For the key command functionss we want a value defined too
-    num = string.atoi(number)
-    for v in cmdValues:
-        if (type(v) == type(()) and v[0] <= num < v[1]) or v == num:
-            parseVal('CMD_%s=%s' % (string.upper(name), number), values, ())
-
-    #if retType == 'void' and not param1 and not param2:
-
-    methods.append( (retType, name, number, param1, param2, tuple(docs)) )
-
-
-#----------------------------------------------------------------------------
-
-
-def main(args):
-    # TODO: parse command line args to replace default input/output files???
-
-    # Now just do it
-    processIface(IFACE, H_TEMPLATE, CPP_TEMPLATE, H_DEST, CPP_DEST)
-
-
-
-if __name__ == '__main__':
-    main(sys.argv)
-
-#----------------------------------------------------------------------------
-
-
--- a/contrib/src/stc/makefile.b32
+++ b/contrib/src/stc/makefile.b32
@@ -34,7 +34,6 @@ OBJECTS = \
 	KeyWords.obj		\
 	LexCPP.obj		\
 	LexHTML.obj		\
-	LexLua.obj		\
 	LexOthers.obj		\
 	LexPerl.obj		\
 	LexPython.obj		\
@@ -42,7 +41,6 @@ OBJECTS = \
 	LexVB.obj		\
 	LineMarker.obj		\
 	PropSet.obj		\
-	PosRegExp.obj		\
 	ScintillaBase.obj	\
 	Style.obj		\
 	UniConversion.obj	\
--- a/contrib/src/stc/makefile.g95
+++ b/contrib/src/stc/makefile.g95
@@ -27,7 +27,6 @@ OBJECTS = \
 	$(S)/ViewStyle.$(OBJSUFF) \
 	$(S)/LexCPP.$(OBJSUFF)	\
 	$(S)/LexHTML.$(OBJSUFF)	\
-	$(S)/LexLua.$(OBJSUFF) \
 	$(S)/LexOthers.$(OBJSUFF) \
 	$(S)/LexPerl.$(OBJSUFF)	\
 	$(S)/LexPython.$(OBJSUFF) \
@@ -36,7 +35,6 @@ OBJECTS = \
 	$(S)/DocumentAccessor.$(OBJSUFF)\
 	$(S)/UniConversion.$(OBJSUFF)	\
 	$(S)/WindowAccessor.$(OBJSUFF)	\
-	$(S)/PosRegExp.$(OBJSUFF) \
 	PlatWX.$(OBJSUFF) \
 	ScintillaWX.$(OBJSUFF) \
 	stc.$(OBJSUFF)
--- a/contrib/src/stc/makefile.vc
+++ b/contrib/src/stc/makefile.vc
@@ -27,14 +27,12 @@ OBJECTS = \
 	$(D)\KeyWords.obj	\
 	$(D)\LexCPP.obj		\
 	$(D)\LexHTML.obj	\
-	$(D)\LexLua.obj		\
 	$(D)\LexOthers.obj	\
 	$(D)\LexPerl.obj	\
 	$(D)\LexPython.obj	\
 	$(D)\LexSQL.obj		\
 	$(D)\LexVB.obj		\
 	$(D)\LineMarker.obj	\
-	$(D)\PosRegExp.obj	\
 	$(D)\PropSet.obj	\
 	$(D)\ScintillaBase.obj	\
 	$(D)\Style.obj		\
--- a/contrib/src/stc/scintilla/README.txt
+++ b/contrib/src/stc/scintilla/README.txt
@@ -3,5 +3,6 @@ scintilla/include directories from the Scintilla/SCiTE source
 distribution.  All other code needed to implement Scintilla on top of
 wxWindows is located in the directory above this one.

-The current version of the Scintilla code is 1.32
+The current version of the Scintilla code is 1.25+ (from their CVS on
+5-19-2000).

--- a/contrib/src/stc/scintilla/include/Platform.h
+++ b/contrib/src/stc/scintilla/include/Platform.h
@@ -80,6 +80,12 @@ typedef wxWindow* WindowID;
 typedef wxMenu* MenuID;
 #endif

+#if PLAT_GTK || PLAT_WX
+#define SHIFT_PRESSED 1
+#define LEFT_CTRL_PRESSED 2
+#define LEFT_ALT_PRESSED 4
+#endif
+
 // Point is exactly the same as the Win32 POINT and GTK+ GdkPoint so can be used interchangeably

 class Point {
@@ -193,7 +199,6 @@ public:
 };

 class Font {
-protected:
 	FontID id;
 #if PLAT_WX
 	int ascent;
@@ -203,10 +208,10 @@ protected:
 	Font &operator=(const Font &) { id=0; return *this; }
 public:
 	Font();
-	virtual ~Font();
+	~Font();

-	virtual void Create(const char *faceName, int characterSet, int size, bool bold, bool italic);
-	virtual void Release();
+	void Create(const char *faceName, int characterSet, int size, bool bold, bool italic);
+	void Release();

 	FontID GetID() { return id; }
 	// Alias another font - caller guarantees not to Release
@@ -322,7 +327,7 @@ public:
 	void Show(bool show=true);
 	void InvalidateAll();
 	void InvalidateRectangle(PRectangle rc);
-	virtual void SetFont(Font &font);
+	void SetFont(Font &font);
 	enum Cursor { cursorText, cursorArrow, cursorUp, cursorWait, cursorHoriz, cursorVert, cursorReverseArrow };
 	void SetCursor(Cursor curs);
 	void SetTitle(const char *s);
@@ -339,17 +344,14 @@ class ListBox : public Window {
 	WindowID scroller;
 	int current;
 #endif
-	int desiredVisibleRows;
-	unsigned int maxItemCharacters;
-	unsigned int aveCharWidth;
 public:
 	ListBox();
 	virtual ~ListBox();
+	ListBox &operator=(WindowID id_) {
+		id = id_;
+		return *this;
+	}
 	void Create(Window &parent, int ctrlID);
-	virtual void SetFont(Font &font);
-	void SetAverageCharWidth(int width);
-	void SetVisibleRows(int rows);
-	PRectangle GetDesiredRect();
 	void Clear();
 	void Append(char *s);
 	int Length();
@@ -394,16 +396,6 @@ public:
 	// These are utility functions not really tied to a platform
 	static int Minimum(int a, int b);
 	static int Maximum(int a, int b);
-	// Next three assume 16 bit shorts and 32 bit longs
-	static long LongFromTwoShorts(short a,short b) {
-		return (a) | ((b) << 16);
-	}
-	static short HighShortFromLong(long x) {
-		return static_cast<short>(x >> 16);
-	}
-	static short LowShortFromLong(long x) {
-		return static_cast<short>(x & 0xffff);
-	}
 	static void DebugPrintf(const char *format, ...);
 	static int Clamp(int val, int minVal, int maxVal);
 };
--- a/contrib/src/stc/scintilla/include/PosRegExp.h
+++ b/contrib/src/stc/scintilla/include/PosRegExp.h
@@ -1,138 +0,0 @@
-#ifndef POSREGEXP_H
-#define POSREGEXP_H
-
-#define MatchesNum 0x10
-
-enum EOps
-{
-  ReBlockOps = 0x1000,
-  ReMul,              // *
-  RePlus,             // +
-  ReQuest,            // ?
-  ReNGMul,            // *?
-  ReNGPlus,           // +?
-  ReNGQuest,          // ??
-  ReRangeN,           // {n,}
-  ReRangeNM,          // {n,m}
-  ReNGRangeN,         // {n,}?
-  ReNGRangeNM,        // {n,m}?
-  ReOr,               // |
-  ReBehind  = 0x1100, // ?#n
-  ReNBehind = 0x1200, // ?~n
-  ReAhead   = 0x1300, // ?=
-  ReNAhead  = 0x1400, // ?!
-
-  ReSymbolOps = 0x2000,
-  ReEmpty,
-  ReSymb,             // a b \W \s ...
-  ReEnum,             // []
-  ReNEnum,            // [^]
-  ReBrackets,         // (...)
-  ReBkTrace = 0x2100, // \yN
-  ReBkBrack = 0x2200 // \N
-};
-
-enum ESymbols
-{
-  ReAnyChr = 0x4000,  // .
-  ReSoL,              // ^
-  ReEoL,              // $
-  ReDigit,            // \d
-  ReNDigit,           // \D
-  ReWordSymb,         // \w
-  ReNWordSymb,        // \W
-  ReWSpace,           // \s
-  ReNWSpace,          // \S
-  ReUCase,            // \u
-  ReNUCase ,          // \l
-  ReWBound,           // \b
-  ReNWBound,          // \B
-  RePreNW,            // \c
-  ReStart,            // \m
-  ReEnd,              // \M
-
-  ReChr    = 0x0      // Char in Lower Byte
-};
-enum ETempSymb
-{
-  ReTemp = 0x7000,
-  ReLBrack, ReRBrack,
-  ReEnumS, ReEnumE, ReNEnumS,
-  ReRangeS, ReRangeE, ReNGRangeE, ReFrToEnum
-};
-
-#define BackSlash '\\'
-
-typedef union SCharData
-{
-  int  IArr[8];
-  char CArr[32];
-  void SetBit(unsigned char Bit);
-  void ClearBit(unsigned char Bit);
-  bool GetBit(unsigned char Bit);
-} *PCharData;
-
-typedef struct SRegInfo
-{
-  SRegInfo();
-  ~SRegInfo();
-
-  EOps   Op;
-  union{
-    SRegInfo *Param;
-    int Symb;
-    PCharData ChrClass;
-  }un;
-  int s,e;
-  SRegInfo *Parent;
-  SRegInfo *Next;
-} *PRegInfo;
-
-typedef struct SMatches
-{
-  int s[MatchesNum];
-  int e[MatchesNum];
-  int CurMatch;
-} *PMatches;
-
-typedef class PosRegExp
-{
-  PRegInfo Info;
-  PMatches BkTrace;
-  bool NoCase,Extend,NoMoves;
-  bool Error;
-  int  *Exprn;
-  int  posParse;
-  int  posEnd,posStart;
-  int  posBkStr;
-  int  FirstChar;
-
-  bool SetExprLow(const char *Expr);
-  bool SetStructs(PRegInfo &Info,int st,int end);
-  void Optimize();
-  bool CheckSymb(int Symb,bool Inc);
-  bool LowParse(PRegInfo Re);
-  bool LowParseRe(PRegInfo &Next);
-  bool LowCheckNext(PRegInfo Re);
-  bool ParseRe(int posStr);
-  bool QuickCheck();
-public:
-  PMatches Matches;
-  int Ok, CurMatch;
-
-  void *param;
-  char (*CharAt)(int pos, void *param);
-
-  PosRegExp();
-  ~PosRegExp();
-
-  bool isok();
-  bool SetNoMoves(bool Moves);
-  bool SetBkTrace(int posStr,PMatches Trace);
-  bool SetExpr(const char *Expr);
-  bool Parse(int posStr, int posStop, PMatches Mtch);
-  bool Parse(int posStr,int posSol, int posEol, PMatches Mtch, int Moves = -1);
-  bool Evaluate(char *Expr, int posStr, PMatches Mtch, char **Res);
-} *PPosRegExp;
-
-#endif /* POSREGEXP_H */
--- a/contrib/src/stc/scintilla/include/PropSet.h
+++ b/contrib/src/stc/scintilla/include/PropSet.h
@@ -8,92 +8,44 @@

 bool EqualCaseInsensitive(const char *a, const char *b);

-#if PLAT_WIN
-#define strcasecmp  stricmp
-#define strncasecmp strnicmp
-#endif
-
-#ifdef __WXMSW__
-#define strcasecmp  stricmp
-#define strncasecmp strnicmp
-#endif
-
 // Define another string class.
 // While it would be 'better' to use std::string, that doubles the executable size.

-inline char *StringDup(const char *s, int len=-1) {
+inline char *StringDup(const char *s) {
 	if (!s)
 		return 0;
-	if (len == -1)
-		len = strlen(s);
-	char *sNew = new char[len + 1];
-	if (sNew) {
-		strncpy(sNew, s, len);
-		sNew[len] = '\0';
-	}
+	char *sNew = new char[strlen(s) + 1];
+	if (sNew)
+		strcpy(sNew, s);
 	return sNew;
 }

 class SString {
 	char *s;
-	int ssize;
 public:
-	typedef const char* const_iterator;
-	typedef int size_type;
-	static size_type npos;
-	const char* begin(void) const {
-		return s;
-	}
-	const char* end(void) const {
-		return &s[ssize];
-	}
-	size_type size(void) const {
-		if (s)
-			return ssize;
-		else
-			return 0;
-	}
-	SString &assign(const char* sother, int size_ = -1) {
-		char *t = s;
-		s = StringDup(sother,size_);
-		ssize = (s) ? strlen(s) : 0;
-		delete []t;
-		return *this;
-	}
-	SString &assign(const SString& sother, int size_ = -1) {
-		return assign(sother.s,size_);
-	}
-	SString &assign(const_iterator ibeg, const_iterator iend) {
-		return assign(ibeg,iend - ibeg);
-	}
 	SString() {
 		s = 0;
-		ssize = 0;
 	}
 	SString(const SString &source) {
 		s = StringDup(source.s);
-		ssize = (s) ? strlen(s) : 0;
 	}
 	SString(const char *s_) {
 		s = StringDup(s_);
-		ssize = (s) ? strlen(s) : 0;
 	}
 	SString(int i) {
 		char number[100];
 		sprintf(number, "%0d", i);
+		//itoa(i, number, 10);
 		s = StringDup(number);
-		ssize = (s) ? strlen(s) : 0;
 	}
 	~SString() {
 		delete []s;
 		s = 0;
-		ssize = 0;
 	}
 	SString &operator=(const SString &source) {
 		if (this != &source) {
 			delete []s;
 			s = StringDup(source.s);
-			ssize = (s) ? strlen(s) : 0;
 		}
 		return *this;
 	}
@@ -104,9 +56,6 @@ public:
 			return false;
 		return strcmp(s, other.s) == 0;
 	}
-	bool operator!=(const SString &other) const {
-		return !operator==(other);
-	}
 	bool operator==(const char *sother) const {
 		if ((s == 0) && (sother == 0))
 			return true;
@@ -114,9 +63,6 @@ public:
 			return false;
 		return strcmp(s, sother) == 0;
 	}
-	bool operator!=(const char *sother) const {
-		return !operator==(sother);
-	}
 	const char *c_str() const {
 		if (s)
 			return s;
@@ -136,109 +82,99 @@ public:
 			return '\0';
 	}
 	SString &operator +=(const char *sother) {
-		return append(sother,-1);
-	}
-	SString &operator +=(const SString &sother) {
-		return append(sother.s,sother.ssize);
-	}
-	SString &operator +=(char ch) {
-		return append(&ch,1);
-	}
-	SString &append(const char* sother, int lenOther) {
 		int len = length();
-		if(lenOther < 0)
-			lenOther = strlen(sother);
+		int lenOther = strlen(sother);
 		char *sNew = new char[len + lenOther + 1];
 		if (sNew) {
 			if (s)
 				memcpy(sNew, s, len);
-			strncpy(&sNew[len], sother, lenOther);
+			memcpy(sNew + len, sother, lenOther);
 			sNew[len + lenOther] = '\0';
 			delete []s;
 			s = sNew;
-			ssize = (s) ? strlen(s) : 0;
 		}
 		return *this;
 	}
 	int value() const {
 		if (s)
 			return atoi(s);
-		else
+		else 
 			return 0;
 	}
-	void substitute(char find, char replace) {
-		char *t = s;
-		while (t) {
-			t = strchr(t, find);
-			if (t)
-				*t = replace;
-		}
-	}
-	// I don't think this really belongs here -- Neil
-	void correctPath() {
-#ifdef unix
-		substitute('\\', '/');
-#else
-		substitute('/', '\\');
-#endif
-	}
-};
-
-struct Property {
-	unsigned int hash;
-	char *key;
-	char *val;
-	Property *next;
-	Property() : hash(0), key(0), val(0), next(0) {}
 };

 class PropSet {
 private:
-	enum { hashRoots=31 };
-	Property *props[hashRoots];
+	char **vals;
+	int size;
+	int used;
 public:
 	PropSet *superPS;
 	PropSet();
 	~PropSet();
+	void EnsureCanAddEntry();
 	void Set(const char *key, const char *val);
 	void Set(char *keyval);
 	SString Get(const char *key);
-	SString GetExpanded(const char *key);
-	SString Expand(const char *withvars);
 	int GetInt(const char *key, int defaultValue=0);
 	SString GetWild(const char *keybase, const char *filename);
 	SString GetNewExpand(const char *keybase, const char *filename);
 	void Clear();
-	void ReadFromMemory(const char *data, int len, const char *directoryForImports=0);
-	void Read(const char *filename, const char *directoryForImports);
+	void ReadFromMemory(const char *data, int len);
+	void Read(const char *filename);
+};
+
+// This is a fixed length list of strings suitable for display  in combo boxes
+// as a memory of user entries
+template<int sz>
+class EntryMemory {
+	SString entries[sz];
+public:
+	void Insert(SString s) {
+		for (int i=0;i<sz;i++) {
+			if (entries[i] == s) {
+				for (int j=i;j>0;j--) {
+					entries[j] = entries[j-1];
+				}
+				entries[0] = s;
+				return;
+			}
+		}
+		for (int k=sz-1;k>0;k--) {
+			entries[k] = entries[k-1];
+		}
+		entries[0] = s;
+	}
+	int Length() const {
+		int len = 0;
+		for (int i=0;i<sz;i++)
+			if (entries[i].length())
+				len++;
+		return len;
+	}
+	SString At(int n) const {
+		return entries[n];
+	}
 };

 class WordList {
 public:
 	// Each word contains at least one character - a empty word acts as sentinal at the end.
 	char **words;
-	char **wordsNoCase;
 	char *list;
 	int len;
 	bool onlyLineEnds;	// Delimited by any white space or only line ends
-	bool sorted;
 	int starts[256];
-	WordList(bool onlyLineEnds_ = false) :
-		words(0), wordsNoCase(0), list(0), len(0), onlyLineEnds(onlyLineEnds_), sorted(false) {}
+	WordList(bool onlyLineEnds_ = false) : 
+		words(0), list(0), len(0), onlyLineEnds(onlyLineEnds_) {}
 	~WordList() { Clear(); }
-	operator bool() { return words ? true : false; }
+	operator bool() { return list ? true : false; }
 	const char *operator[](int ind) { return words[ind]; }
 	void Clear();
 	void Set(const char *s);
 	char *Allocate(int size);
 	void SetFromAllocated();
 	bool InList(const char *s);
-	const char *GetNearestWord(const char *wordStart, int searchLen = -1, bool ignoreCase = false);
-	char *GetNearestWords(const char *wordStart, int searchLen = -1, bool ignoreCase = false);
 };

-inline bool nonFuncChar(char ch) {
-	return strchr("\t\n\r !\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~", ch) != NULL;
-}
-
 #endif
--- a/contrib/src/stc/scintilla/include/SciLexer.h
+++ b/contrib/src/stc/scintilla/include/SciLexer.h
@@ -3,15 +3,11 @@
 // Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.

-// Most of this file is automatically generated from the Scintilla.iface interface definition
-// file which contains any comments about the definitions. HFacer.py does the generation.
-
 #ifndef SCILEXER_H
 #define SCILEXER_H

 // SciLexer features - not in standard Scintilla

-//++Autogenerated -- start of section automatically generated from Scintilla.iface
 #define SCLEX_CONTAINER 0
 #define SCLEX_NULL 1
 #define SCLEX_PYTHON 2
@@ -27,8 +23,8 @@
 #define SCLEX_BATCH 12
 #define SCLEX_XCODE 13
 #define SCLEX_LATEX 14
-#define SCLEX_LUA 15
-#define SCLEX_DIFF 16
+
+// Lexical states for SCLEX_PYTHON
 #define SCE_P_DEFAULT 0
 #define SCE_P_COMMENTLINE 1
 #define SCE_P_NUMBER 2
@@ -43,6 +39,8 @@
 #define SCE_P_IDENTIFIER 11
 #define SCE_P_COMMENTBLOCK 12
 #define SCE_P_STRINGEOL 13
+
+// Lexical states for SCLEX_CPP, SCLEX_VB
 #define SCE_C_DEFAULT 0
 #define SCE_C_COMMENT 1
 #define SCE_C_COMMENTLINE 2
@@ -56,7 +54,8 @@
 #define SCE_C_OPERATOR 10
 #define SCE_C_IDENTIFIER 11
 #define SCE_C_STRINGEOL 12
-#define SCE_C_VERBATIM 13
+
+// Lexical states for SCLEX_HTML, SCLEX_xML
 #define SCE_H_DEFAULT 0
 #define SCE_H_TAG 1
 #define SCE_H_TAGUNKNOWN 2
@@ -68,15 +67,14 @@
 #define SCE_H_OTHER 8
 #define SCE_H_COMMENT 9
 #define SCE_H_ENTITY 10
+// XML and ASP
 #define SCE_H_TAGEND 11
 #define SCE_H_XMLSTART 12
 #define SCE_H_XMLEND 13
 #define SCE_H_SCRIPT 14
 #define SCE_H_ASP 15
 #define SCE_H_ASPAT 16
-#define SCE_H_CDATA 17
-#define SCE_H_QUESTION 18
-#define SCE_H_VALUE 19
+// Embedded Javascript
 #define SCE_HJ_START 40
 #define SCE_HJ_DEFAULT 41
 #define SCE_HJ_COMMENT 42
@@ -89,6 +87,7 @@
 #define SCE_HJ_SINGLESTRING 49
 #define SCE_HJ_SYMBOLS 50
 #define SCE_HJ_STRINGEOL 51
+// ASP Javascript
 #define SCE_HJA_START 55
 #define SCE_HJA_DEFAULT 56
 #define SCE_HJA_COMMENT 57
@@ -101,6 +100,7 @@
 #define SCE_HJA_SINGLESTRING 64
 #define SCE_HJA_SYMBOLS 65
 #define SCE_HJA_STRINGEOL 66
+// Embedded VBScript
 #define SCE_HB_START 70
 #define SCE_HB_DEFAULT 71
 #define SCE_HB_COMMENTLINE 72
@@ -109,6 +109,7 @@
 #define SCE_HB_STRING 75
 #define SCE_HB_IDENTIFIER 76
 #define SCE_HB_STRINGEOL 77
+// ASP VBScript
 #define SCE_HBA_START 80
 #define SCE_HBA_DEFAULT 81
 #define SCE_HBA_COMMENTLINE 82
@@ -117,6 +118,7 @@
 #define SCE_HBA_STRING 85
 #define SCE_HBA_IDENTIFIER 86
 #define SCE_HBA_STRINGEOL 87
+// Embedded Python
 #define SCE_HP_START 90
 #define SCE_HP_DEFAULT 91
 #define SCE_HP_COMMENTLINE 92
@@ -130,6 +132,7 @@
 #define SCE_HP_DEFNAME 100
 #define SCE_HP_OPERATOR 101
 #define SCE_HP_IDENTIFIER 102
+// ASP Python
 #define SCE_HPA_START 105
 #define SCE_HPA_DEFAULT 106
 #define SCE_HPA_COMMENTLINE 107
@@ -143,15 +146,8 @@
 #define SCE_HPA_DEFNAME 115
 #define SCE_HPA_OPERATOR 116
 #define SCE_HPA_IDENTIFIER 117
-#define SCE_HPHP_DEFAULT 118
-#define SCE_HPHP_HSTRING 119
-#define SCE_HPHP_SIMPLESTRING 120
-#define SCE_HPHP_WORD 121
-#define SCE_HPHP_NUMBER 122
-#define SCE_HPHP_VARIABLE 123
-#define SCE_HPHP_COMMENT 124
-#define SCE_HPHP_COMMENTLINE 125
-#define SCE_HPHP_STRINGEOL 126
+
+// Lexical states for SCLEX_PERL
 #define SCE_PL_DEFAULT 0
 #define SCE_PL_HERE 1
 #define SCE_PL_COMMENTLINE 2
@@ -174,31 +170,12 @@
 #define SCE_PL_LONGQUOTE 19
 #define SCE_PL_BACKTICKS 20
 #define SCE_PL_DATASECTION 21
+    
+// Lexical states for SCLEX_LATEX
 #define SCE_L_DEFAULT 0
 #define SCE_L_COMMAND 1
 #define SCE_L_TAG 2
 #define SCE_L_MATH 3
 #define SCE_L_COMMENT 4
-#define SCE_LUA_DEFAULT 0
-#define SCE_LUA_COMMENT 1
-#define SCE_LUA_COMMENTLINE 2
-#define SCE_LUA_COMMENTDOC 3
-#define SCE_LUA_NUMBER 4
-#define SCE_LUA_WORD 5
-#define SCE_LUA_STRING 6
-#define SCE_LUA_CHARACTER 7
-#define SCE_LUA_LITERALSTRING 8
-#define SCE_LUA_PREPROCESSOR 9
-#define SCE_LUA_OPERATOR 10
-#define SCE_LUA_IDENTIFIER 11
-#define SCE_LUA_STRINGEOL 12
-#define SCE_ERR_DEFAULT 0
-#define SCE_ERR_PYTHON 1
-#define SCE_ERR_GCC 2
-#define SCE_ERR_MS 3
-#define SCE_ERR_CMD 4
-#define SCE_ERR_BORLAND 5
-#define SCE_ERR_PERL 6
-//--Autogenerated -- end of section automatically generated from Scintilla.iface

 #endif
--- a/contrib/src/stc/scintilla/include/Scintilla.h
+++ b/contrib/src/stc/scintilla/include/Scintilla.h
@@ -3,74 +3,119 @@
 // Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.

-// Most of this file is automatically generated from the Scintilla.iface interface definition
-// file which contains any comments about the definitions. HFacer.py does the generation.
-
 #ifndef SCINTILLA_H
 #define SCINTILLA_H

 // Compile-time configuration options
 #define MACRO_SUPPORT 1  // Comment out to remove macro hooks

-#if PLAT_WIN
-#ifdef STATIC_BUILD
-void Scintilla_RegisterClasses(HINSTANCE hInstance);
-#endif
+#if PLAT_GTK
+#include <gdk/gdk.h>
+#include <gtk/gtkvbox.h>
+
+#ifdef __cplusplus
+extern "C" {
 #endif

-typedef long (*SciFnDirect)(long ptr, unsigned int iMessage, unsigned long wParam, long lParam);
+#define SCINTILLA(obj)          GTK_CHECK_CAST (obj, scintilla_get_type (), ScintillaObject)
+#define SCINTILLA_CLASS(klass)  GTK_CHECK_CLASS_CAS	T (klass, scintilla_get_type (), ScintillaClass)
+#define IS_SCINTILLA(obj)       GTK_CHECK_TYPE (obj, scintilla_get_type ())

-//++Autogenerated -- start of section automatically generated from Scintilla.iface
-#define INVALID_POSITION -1
+	typedef struct _ScintillaObject ScintillaObject;
+	typedef struct _ScintillaClass  ScintillaClass;
+
+	struct _ScintillaObject
+	{
+		GtkFixed vbox;
+		void *pscin;
+	};
+
+	struct _ScintillaClass
+	{
+		GtkFixedClass parent_class;
+
+		void (* command) (ScintillaObject *ttt);
+		void (* notify) (ScintillaObject *ttt);
+	};
+
+	guint		scintilla_get_type	(void);
+	GtkWidget*	scintilla_new		(void);
+	void		scintilla_set_id	(ScintillaObject *sci,int id);
+	long 		scintilla_send_message	(ScintillaObject *sci,int iMessage,int wParam,int lParam);
+
+#include "WinDefs.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+#if PLAT_WX
+#include "WinDefs.h"
+#endif
+
+// Both GTK and Windows
+
+#define INVALID_POSITION -1 
+
+// Define start of Scintilla messages to be greater than all edit (EM_*) messages
+// as many EM_ messages can be used.
 #define SCI_START 2000
 #define SCI_OPTIONAL_START 3000
 #define SCI_LEXER_START 4000
-#define SCI_ADDTEXT 2001
-#define SCI_ADDSTYLEDTEXT 2002
-#define SCI_INSERTTEXT 2003
-#define SCI_CLEARALL 2004
-#define SCI_CLEARDOCUMENTSTYLE 2005
-#define SCI_GETLENGTH 2006
-#define SCI_GETCHARAT 2007
-#define SCI_GETCURRENTPOS 2008
-#define SCI_GETANCHOR 2009
-#define SCI_GETSTYLEAT 2010
-#define SCI_REDO 2011
-#define SCI_SETUNDOCOLLECTION 2012
-#define SCI_SELECTALL 2013
-#define SCI_SETSAVEPOINT 2014
-#define SCI_GETSTYLEDTEXT 2015
-#define SCI_CANREDO 2016
-#define SCI_MARKERLINEFROMHANDLE 2017
-#define SCI_MARKERDELETEHANDLE 2018
-#define SCI_GETUNDOCOLLECTION 2019
-#define SCWS_INVISIBLE 0
-#define SCWS_VISIBLEALWAYS 1
-#define SCWS_VISIBLEAFTERINDENT 2
-#define SCI_GETVIEWWS 2020
-#define SCI_SETVIEWWS 2021
-#define SCI_POSITIONFROMPOINT 2022
-#define SCI_GOTOLINE 2024
-#define SCI_GOTOPOS 2025
-#define SCI_SETANCHOR 2026
-#define SCI_GETCURLINE 2027
-#define SCI_GETENDSTYLED 2028
-#define SCI_CONVERTEOLS 2029
+
+#define SCI_ADDTEXT SCI_START + 1
+#define SCI_ADDSTYLEDTEXT SCI_START + 2
+#define SCI_INSERTTEXT SCI_START + 3
+#define SCI_CLEARALL SCI_START + 4
+#define SCI_GETLENGTH SCI_START + 6
+#define SCI_GETCHARAT SCI_START + 7
+#define SCI_GETCURRENTPOS SCI_START + 8
+#define SCI_GETANCHOR SCI_START + 9
+#define SCI_GETSTYLEAT SCI_START + 10
+
+#define SCI_REDO SCI_START + 11
+#define SCI_SETUNDOCOLLECTION SCI_START + 12
+#define SCI_SELECTALL SCI_START + 13
+#define SCI_SETSAVEPOINT SCI_START + 14
+#define SCI_GETSTYLEDTEXT SCI_START + 15
+#define SCI_CANREDO SCI_START + 16
+#define SCI_MARKERLINEFROMHANDLE SCI_START + 17
+#define SCI_MARKERDELETEHANDLE SCI_START + 18
+
+#define SC_UNDOCOLLECT_NONE 0
+#define SC_UNDOCOLLECT_AUTOSTART 1
+
+#define SCI_GETVIEWWS SCI_START + 20
+#define SCI_SETVIEWWS SCI_START + 21
+#define SCI_GOTOLINE SCI_START + 24
+#define SCI_GOTOPOS SCI_START + 25
+#define SCI_SETANCHOR SCI_START + 26
+#define SCI_GETCURLINE SCI_START + 27
+#define SCI_GETENDSTYLED SCI_START + 28
+#define SCI_CONVERTEOLS SCI_START + 29
+
+#define SCI_GETEOLMODE SCI_START + 30
+#define SCI_SETEOLMODE SCI_START + 31
+
 #define SC_EOL_CRLF 0
 #define SC_EOL_CR 1
 #define SC_EOL_LF 2
-#define SCI_GETEOLMODE 2030
-#define SCI_SETEOLMODE 2031
-#define SCI_STARTSTYLING 2032
-#define SCI_SETSTYLING 2033
-#define SCI_GETBUFFEREDDRAW 2034
-#define SCI_SETBUFFEREDDRAW 2035
-#define SCI_SETTABWIDTH 2036
-#define SCI_GETTABWIDTH 2121
+
+#define SCI_STARTSTYLING SCI_START + 32
+#define SCI_SETSTYLING SCI_START + 33
+
+// This is the same value as CP_UTF8 in Windows
 #define SC_CP_UTF8 65001
-#define SCI_SETCODEPAGE 2037
-#define SCI_SETUSEPALETTE 2039
+
+#define SCI_SETBUFFEREDDRAW SCI_START + 35
+#define SCI_SETTABWIDTH SCI_START + 36
+#define SCI_SETCODEPAGE SCI_START + 37
+#define SCI_SETUSEPALETTE SCI_START + 39
+
 #define MARKER_MAX 31
+
 #define SC_MARK_CIRCLE 0
 #define SC_MARK_ROUNDRECT 1
 #define SC_MARK_ARROW 2
@@ -80,296 +125,255 @@ typedef long (*SciFnDirect)(long ptr, unsigned int iMessage, unsigned long wPara
 #define SC_MARK_ARROWDOWN 6
 #define SC_MARK_MINUS 7
 #define SC_MARK_PLUS 8
+
+#define SCI_MARKERDEFINE SCI_START + 40
+#define SCI_MARKERSETFORE SCI_START + 41
+#define SCI_MARKERSETBACK SCI_START + 42
+#define SCI_MARKERADD SCI_START + 43
+#define SCI_MARKERDELETE SCI_START + 44
+#define SCI_MARKERDELETEALL SCI_START + 45
+#define SCI_MARKERGET SCI_START + 46
+#define SCI_MARKERNEXT SCI_START + 47
+#define SCI_MARKERPREVIOUS SCI_START + 48
+
 #define SC_MARKNUM_FOLDER 30
 #define SC_MARKNUM_FOLDEROPEN 31
-#define SCI_MARKERDEFINE 2040
-#define SCI_MARKERSETFORE 2041
-#define SCI_MARKERSETBACK 2042
-#define SCI_MARKERADD 2043
-#define SCI_MARKERDELETE 2044
-#define SCI_MARKERDELETEALL 2045
-#define SCI_MARKERGET 2046
-#define SCI_MARKERNEXT 2047
-#define SCI_MARKERPREVIOUS 2048
+
+#define SC_MASK_FOLDERS ((1<<SC_MARKNUM_FOLDER) | (1<<SC_MARKNUM_FOLDEROPEN))
+
 #define SC_MARGIN_SYMBOL 0
 #define SC_MARGIN_NUMBER 1
-#define SCI_SETMARGINTYPEN 2240
-#define SCI_GETMARGINTYPEN 2241
-#define SCI_SETMARGINWIDTHN 2242
-#define SCI_GETMARGINWIDTHN 2243
-#define SCI_SETMARGINMASKN 2244
-#define SCI_GETMARGINMASKN 2245
-#define SCI_SETMARGINSENSITIVEN 2246
-#define SCI_GETMARGINSENSITIVEN 2247
+
+#define SCI_SETMARGINTYPEN SCI_START + 240
+#define SCI_GETMARGINTYPEN SCI_START + 241
+#define SCI_SETMARGINWIDTHN SCI_START + 242
+#define SCI_GETMARGINWIDTHN SCI_START + 243
+#define SCI_SETMARGINMASKN SCI_START + 244
+#define SCI_GETMARGINMASKN SCI_START + 245
+#define SCI_SETMARGINSENSITIVEN SCI_START + 246
+#define SCI_GETMARGINSENSITIVEN SCI_START + 247
+
 #define STYLE_DEFAULT 32
 #define STYLE_LINENUMBER 33
 #define STYLE_BRACELIGHT 34
 #define STYLE_BRACEBAD 35
 #define STYLE_CONTROLCHAR 36
-#define STYLE_INDENTGUIDE 37
 #define STYLE_MAX 127
+
 #define SC_CHARSET_ANSI 0
 #define SC_CHARSET_DEFAULT 1
-#define SC_CHARSET_BALTIC 186
-#define SC_CHARSET_CHINESEBIG5 136
-#define SC_CHARSET_EASTEUROPE 238
-#define SC_CHARSET_GB2312 134
-#define SC_CHARSET_GREEK 161
-#define SC_CHARSET_HANGUL 129
-#define SC_CHARSET_MAC 77
-#define SC_CHARSET_OEM 255
 #define SC_CHARSET_RUSSIAN 204
-#define SC_CHARSET_SHIFTJIS 128
-#define SC_CHARSET_SYMBOL 2
-#define SC_CHARSET_TURKISH 162
-#define SC_CHARSET_JOHAB 130
-#define SC_CHARSET_HEBREW 177
-#define SC_CHARSET_ARABIC 178
-#define SC_CHARSET_VIETNAMESE 163
-#define SC_CHARSET_THAI 222
-#define SCI_STYLECLEARALL 2050
-#define SCI_STYLESETFORE 2051
-#define SCI_STYLESETBACK 2052
-#define SCI_STYLESETBOLD 2053
-#define SCI_STYLESETITALIC 2054
-#define SCI_STYLESETSIZE 2055
-#define SCI_STYLESETFONT 2056
-#define SCI_STYLESETEOLFILLED 2057
-#define SCI_STYLERESETDEFAULT 2058
-#define SCI_STYLESETUNDERLINE 2059
-#define SCI_STYLESETCHARACTERSET 2066
-#define SCI_SETSELFORE 2067
-#define SCI_SETSELBACK 2068
-#define SCI_SETCARETFORE 2069
-#define SCI_ASSIGNCMDKEY 2070
-#define SCI_CLEARCMDKEY 2071
-#define SCI_CLEARALLCMDKEYS 2072
-#define SCI_SETSTYLINGEX 2073
-#define SCI_STYLESETVISIBLE 2074
-#define SCI_GETCARETPERIOD 2075
-#define SCI_SETCARETPERIOD 2076
-#define SCI_SETWORDCHARS 2077
-#define SCI_BEGINUNDOACTION 2078
-#define SCI_ENDUNDOACTION 2079
+
+#define SCI_STYLECLEARALL SCI_START + 50
+#define SCI_STYLESETFORE SCI_START + 51
+#define SCI_STYLESETBACK SCI_START + 52
+#define SCI_STYLESETBOLD SCI_START + 53
+#define SCI_STYLESETITALIC SCI_START + 54
+#define SCI_STYLESETSIZE SCI_START + 55
+#define SCI_STYLESETFONT SCI_START + 56
+#define SCI_STYLESETEOLFILLED SCI_START + 57
+#define SCI_STYLERESETDEFAULT SCI_START + 58
+#define SCI_STYLESETUNDERLINE SCI_START + 59
+#define SCI_STYLESETCHARACTERSET SCI_START + 66
+
+#define SCI_SETSELFORE SCI_START + 67
+#define SCI_SETSELBACK SCI_START + 68
+#define SCI_SETCARETFORE SCI_START + 69
+
+#define SCI_ASSIGNCMDKEY SCI_START + 70
+#define SCI_CLEARCMDKEY SCI_START + 71
+#define SCI_CLEARALLCMDKEYS SCI_START + 72
+
+#define SCI_SETSTYLINGEX SCI_START + 73
+
+#define SCI_GETCARETPERIOD SCI_START + 75
+#define SCI_SETCARETPERIOD SCI_START + 76
+#define SCI_SETWORDCHARS SCI_START + 77
+
+#define SCI_BEGINUNDOACTION SCI_START + 78
+#define SCI_ENDUNDOACTION SCI_START + 79
+
 #define INDIC_MAX 7
+
 #define INDIC_PLAIN 0
 #define INDIC_SQUIGGLE 1
 #define INDIC_TT 2
 #define INDIC_DIAGONAL 3
 #define INDIC_STRIKE 4
+
 #define INDIC0_MASK 32
 #define INDIC1_MASK 64
 #define INDIC2_MASK 128
-#define INDICS_MASK INDIC0_MASK | INDIC1_MASK | INDIC2_MASK
-#define SCI_INDICSETSTYLE 2080
-#define SCI_INDICGETSTYLE 2081
-#define SCI_INDICSETFORE 2082
-#define SCI_INDICGETFORE 2083
-#define SCI_SETSTYLEBITS 2090
-#define SCI_GETSTYLEBITS 2091
-#define SCI_SETLINESTATE 2092
-#define SCI_GETLINESTATE 2093
-#define SCI_GETMAXLINESTATE 2094
-#define SCI_AUTOCSHOW 2100
-#define SCI_AUTOCCANCEL 2101
-#define SCI_AUTOCACTIVE 2102
-#define SCI_AUTOCPOSSTART 2103
-#define SCI_AUTOCCOMPLETE 2104
-#define SCI_AUTOCSTOPS 2105
-#define SCI_AUTOCSETSEPARATOR 2106
-#define SCI_AUTOCGETSEPARATOR 2107
-#define SCI_AUTOCSELECT 2108
-#define SCI_AUTOCSETCANCELATSTART 2110
-#define SCI_AUTOCGETCANCELATSTART 2111
-#define SCI_AUTOCSETFILLUPS 2112
-#define SCI_AUTOCSETCHOOSESINGLE 2113
-#define SCI_AUTOCGETCHOOSESINGLE 2114
-#define SCI_AUTOCSETIGNORECASE 2115
-#define SCI_AUTOCGETIGNORECASE 2116
-#define SCI_SETINDENT 2122
-#define SCI_GETINDENT 2123
-#define SCI_SETUSETABS 2124
-#define SCI_GETUSETABS 2125
-#define SCI_SETLINEINDENTATION 2126
-#define SCI_GETLINEINDENTATION 2127
-#define SCI_GETLINEINDENTPOSITION 2128
-#define SCI_GETCOLUMN 2129
-#define SCI_SETHSCROLLBAR 2130
-#define SCI_GETHSCROLLBAR 2131
-#define SCI_SETINDENTATIONGUIDES 2132
-#define SCI_GETINDENTATIONGUIDES 2133
-#define SCI_SETHIGHLIGHTGUIDE 2134
-#define SCI_GETHIGHLIGHTGUIDE 2135
-#define SCI_GETLINEENDPOSITION 2136
-#define SCI_GETCODEPAGE 2137
-#define SCI_GETCARETFORE 2138
-#define SCI_GETUSEPALETTE 2139
-#define SCI_GETREADONLY 2140
-#define SCI_SETCURRENTPOS 2141
-#define SCI_SETSELECTIONSTART 2142
-#define SCI_GETSELECTIONSTART 2143
-#define SCI_SETSELECTIONEND 2144
-#define SCI_GETSELECTIONEND 2145
-#define SCI_SETPRINTMAGNIFICATION 2146
-#define SCI_GETPRINTMAGNIFICATION 2147
-#define SC_PRINT_NORMAL 0
-#define SC_PRINT_INVERTLIGHT 1
-#define SC_PRINT_BLACKONWHITE 2
-#define SCI_SETPRINTCOLOURMODE 2148
-#define SCI_GETPRINTCOLOURMODE 2149
-#define SCFIND_DOWN 1
-#define SCFIND_WHOLEWORD 2
-#define SCFIND_MATCHCASE 4
-#define SCFIND_WORDSTART 0x00100000
-#define SCFIND_REGEXP 0x00200000
-#define SCI_FINDTEXT 2150
-#define SCI_FORMATRANGE 2151
-#define SCI_GETFIRSTVISIBLELINE 2152
-#define SCI_GETLINE 2153
-#define SCI_GETLINECOUNT 2154
-#define SCI_SETMARGINLEFT 2155
-#define SCI_GETMARGINLEFT 2156
-#define SCI_SETMARGINRIGHT 2157
-#define SCI_GETMARGINRIGHT 2158
-#define SCI_GETMODIFY 2159
-#define SCI_SETSEL 2160
-#define SCI_GETSELTEXT 2161
-#define SCI_GETTEXTRANGE 2162
-#define SCI_HIDESELECTION 2163
-#define SCI_POINTXFROMPOSITION 2164
-#define SCI_POINTYFROMPOSITION 2165
-#define SCI_LINEFROMPOSITION 2166
-#define SCI_POSITIONFROMLINE 2167
-#define SCI_LINESCROLL 2168
-#define SCI_SCROLLCARET 2169
-#define SCI_REPLACESEL 2170
-#define SCI_SETREADONLY 2171
-#define SCI_NULL 2172
-#define SCI_CANPASTE 2173
-#define SCI_CANUNDO 2174
-#define SCI_EMPTYUNDOBUFFER 2175
-#define SCI_UNDO 2176
-#define SCI_CUT 2177
-#define SCI_COPY 2178
-#define SCI_PASTE 2179
-#define SCI_CLEAR 2180
-#define SCI_SETTEXT 2181
-#define SCI_GETTEXT 2182
-#define SCI_GETTEXTLENGTH 2183
-#define SCI_GETDIRECTFUNCTION 2184
-#define SCI_GETDIRECTPOINTER 2185
-#define SCI_SETOVERTYPE 2186
-#define SCI_GETOVERTYPE 2187
-#define SCI_CALLTIPSHOW 2200
-#define SCI_CALLTIPCANCEL 2201
-#define SCI_CALLTIPACTIVE 2202
-#define SCI_CALLTIPPOSSTART 2203
-#define SCI_CALLTIPSETHLT 2204
-#define SCI_CALLTIPSETBACK 2205
-#define SCI_VISIBLEFROMDOCLINE 2220
-#define SCI_DOCLINEFROMVISIBLE 2221
+#define INDICS_MASK (INDIC0_MASK | INDIC1_MASK | INDIC2_MASK)
+
+#define SCI_INDICSETSTYLE SCI_START + 80
+#define SCI_INDICGETSTYLE SCI_START + 81
+#define SCI_INDICSETFORE SCI_START + 82
+#define SCI_INDICGETFORE SCI_START + 83
+
+#define SCI_SETSTYLEBITS SCI_START + 90
+#define SCI_GETSTYLEBITS SCI_START + 91
+#define SCI_SETLINESTATE SCI_START + 92
+#define SCI_GETLINESTATE SCI_START + 93
+#define SCI_GETMAXLINESTATE SCI_START + 94
+
+#define SCI_AUTOCSHOW SCI_START + 100
+#define SCI_AUTOCCANCEL SCI_START + 101
+#define SCI_AUTOCACTIVE SCI_START + 102
+#define SCI_AUTOCPOSSTART SCI_START + 103
+#define SCI_AUTOCCOMPLETE SCI_START + 104
+#define SCI_AUTOCSTOPS SCI_START + 105
+#define SCI_AUTOCSETSEPARATOR SCI_START + 106
+#define SCI_AUTOCGETSEPARATOR SCI_START + 107
+#define SCI_AUTOCSELECT SCI_START + 108
+
+#define SCI_GETTABWIDTH SCI_START + 121
+#define SCI_SETINDENT SCI_START + 122
+#define SCI_GETINDENT SCI_START + 123
+#define SCI_SETUSETABS SCI_START + 124
+#define SCI_GETUSETABS SCI_START + 125
+#define SCI_SETLINEINDENTATION SCI_START + 126
+#define SCI_GETLINEINDENTATION SCI_START + 127
+#define SCI_GETLINEINDENTPOSITION SCI_START + 128
+
+#define SCI_SETHSCROLLBAR SCI_START + 130
+#define SCI_GETHSCROLLBAR SCI_START + 131
+
+#define SCI_CALLTIPSHOW SCI_START + 200
+#define SCI_CALLTIPCANCEL SCI_START + 201
+#define SCI_CALLTIPACTIVE SCI_START + 202
+#define SCI_CALLTIPPOSSTART SCI_START + 203
+#define SCI_CALLTIPSETHLT SCI_START + 204
+#define SCI_CALLTIPSETBACK SCI_START + 205
+
 #define SC_FOLDLEVELBASE 0x400
 #define SC_FOLDLEVELWHITEFLAG 0x1000
 #define SC_FOLDLEVELHEADERFLAG 0x2000
 #define SC_FOLDLEVELNUMBERMASK 0x0FFF
-#define SCI_SETFOLDLEVEL 2222
-#define SCI_GETFOLDLEVEL 2223
-#define SCI_GETLASTCHILD 2224
-#define SCI_GETFOLDPARENT 2225
-#define SCI_SHOWLINES 2226
-#define SCI_HIDELINES 2227
-#define SCI_GETLINEVISIBLE 2228
-#define SCI_SETFOLDEXPANDED 2229
-#define SCI_GETFOLDEXPANDED 2230
-#define SCI_TOGGLEFOLD 2231
-#define SCI_ENSUREVISIBLE 2232
-#define SCI_SETFOLDFLAGS 2233
-#define SCI_LINEDOWN 2300
-#define SCI_LINEDOWNEXTEND 2301
-#define SCI_LINEUP 2302
-#define SCI_LINEUPEXTEND 2303
-#define SCI_CHARLEFT 2304
-#define SCI_CHARLEFTEXTEND 2305
-#define SCI_CHARRIGHT 2306
-#define SCI_CHARRIGHTEXTEND 2307
-#define SCI_WORDLEFT 2308
-#define SCI_WORDLEFTEXTEND 2309
-#define SCI_WORDRIGHT 2310
-#define SCI_WORDRIGHTEXTEND 2311
-#define SCI_HOME 2312
-#define SCI_HOMEEXTEND 2313
-#define SCI_LINEEND 2314
-#define SCI_LINEENDEXTEND 2315
-#define SCI_DOCUMENTSTART 2316
-#define SCI_DOCUMENTSTARTEXTEND 2317
-#define SCI_DOCUMENTEND 2318
-#define SCI_DOCUMENTENDEXTEND 2319
-#define SCI_PAGEUP 2320
-#define SCI_PAGEUPEXTEND 2321
-#define SCI_PAGEDOWN 2322
-#define SCI_PAGEDOWNEXTEND 2323
-#define SCI_EDITTOGGLEOVERTYPE 2324
-#define SCI_CANCEL 2325
-#define SCI_DELETEBACK 2326
-#define SCI_TAB 2327
-#define SCI_BACKTAB 2328
-#define SCI_NEWLINE 2329
-#define SCI_FORMFEED 2330
-#define SCI_VCHOME 2331
-#define SCI_VCHOMEEXTEND 2332
-#define SCI_ZOOMIN 2333
-#define SCI_ZOOMOUT 2334
-#define SCI_DELWORDLEFT 2335
-#define SCI_DELWORDRIGHT 2336
-#define SCI_LINECUT 2337
-#define SCI_LINEDELETE 2338
-#define SCI_LINETRANSPOSE 2339
-#define SCI_LOWERCASE 2340
-#define SCI_UPPERCASE 2341
-#define SCI_LINESCROLLDOWN 2342
-#define SCI_LINESCROLLUP 2343
-#define SCI_LINELENGTH 2350
-#define SCI_BRACEHIGHLIGHT 2351
-#define SCI_BRACEBADLIGHT 2352
-#define SCI_BRACEMATCH 2353
-#define SCI_GETVIEWEOL 2355
-#define SCI_SETVIEWEOL 2356
-#define SCI_GETDOCPOINTER 2357
-#define SCI_SETDOCPOINTER 2358
-#define SCI_SETMODEVENTMASK 2359
+
+#define SCI_VISIBLEFROMDOCLINE SCI_START + 220
+#define SCI_DOCLINEFROMVISIBLE SCI_START + 221
+#define SCI_SETFOLDLEVEL SCI_START + 222
+#define SCI_GETFOLDLEVEL SCI_START + 223
+#define SCI_GETLASTCHILD SCI_START + 224
+#define SCI_GETFOLDPARENT SCI_START + 225
+#define SCI_SHOWLINES SCI_START + 226
+#define SCI_HIDELINES SCI_START + 227
+#define SCI_GETLINEVISIBLE SCI_START + 228
+#define SCI_SETFOLDEXPANDED SCI_START + 229
+#define SCI_GETFOLDEXPANDED SCI_START + 230
+#define SCI_TOGGLEFOLD SCI_START + 231
+#define SCI_ENSUREVISIBLE SCI_START + 232
+#define SCI_SETFOLDFLAGS SCI_START + 233
+
+// Key messages
+#define SCI_LINEDOWN SCI_START + 300
+#define SCI_LINEDOWNEXTEND SCI_START + 301
+#define SCI_LINEUP SCI_START + 302
+#define SCI_LINEUPEXTEND SCI_START + 303
+#define SCI_CHARLEFT SCI_START + 304
+#define SCI_CHARLEFTEXTEND SCI_START + 305
+#define SCI_CHARRIGHT SCI_START + 306
+#define SCI_CHARRIGHTEXTEND SCI_START + 307
+#define SCI_WORDLEFT SCI_START + 308
+#define SCI_WORDLEFTEXTEND SCI_START + 309
+#define SCI_WORDRIGHT SCI_START + 310
+#define SCI_WORDRIGHTEXTEND SCI_START + 311
+#define SCI_HOME SCI_START + 312
+#define SCI_HOMEEXTEND SCI_START + 313
+#define SCI_LINEEND SCI_START + 314
+#define SCI_LINEENDEXTEND SCI_START + 315
+#define SCI_DOCUMENTSTART SCI_START + 316
+#define SCI_DOCUMENTSTARTEXTEND SCI_START + 317
+#define SCI_DOCUMENTEND SCI_START + 318
+#define SCI_DOCUMENTENDEXTEND SCI_START + 319
+#define SCI_PAGEUP SCI_START + 320
+#define SCI_PAGEUPEXTEND SCI_START + 321
+#define SCI_PAGEDOWN SCI_START + 322
+#define SCI_PAGEDOWNEXTEND SCI_START + 323
+#define SCI_EDITTOGGLEOVERTYPE SCI_START + 324
+#define SCI_CANCEL SCI_START + 325
+#define SCI_DELETEBACK SCI_START + 326
+#define SCI_TAB SCI_START + 327
+#define SCI_BACKTAB SCI_START + 328
+#define SCI_NEWLINE SCI_START + 329
+#define SCI_FORMFEED SCI_START + 330
+#define SCI_VCHOME SCI_START + 331
+#define SCI_VCHOMEEXTEND SCI_START + 332
+#define SCI_ZOOMIN SCI_START + 333
+#define SCI_ZOOMOUT SCI_START + 334
+#define SCI_DELWORDLEFT SCI_START + 335
+#define SCI_DELWORDRIGHT SCI_START + 336
+#define SCI_LINECUT SCI_START + 337
+#define SCI_LINEDELETE SCI_START + 338
+#define SCI_LINETRANSPOSE SCI_START + 339
+#define SCI_LOWERCASE SCI_START + 340
+#define SCI_UPPERCASE SCI_START + 341
+#define SCI_LINESCROLLDOWN SCI_START + 342
+#define SCI_LINESCROLLUP SCI_START + 343
+
+#define SCI_LINELENGTH SCI_START + 350
+#define SCI_BRACEHIGHLIGHT SCI_START + 351
+#define SCI_BRACEBADLIGHT SCI_START + 352
+#define SCI_BRACEMATCH SCI_START + 353
+#define SCI_GETVIEWEOL SCI_START + 355
+#define SCI_SETVIEWEOL SCI_START + 356
+#define SCI_GETDOCPOINTER SCI_START + 357
+#define SCI_SETDOCPOINTER SCI_START + 358
+#define SCI_SETMODEVENTMASK SCI_START + 359
+
 #define EDGE_NONE 0
 #define EDGE_LINE 1
 #define EDGE_BACKGROUND 2
-#define SCI_GETEDGECOLUMN 2360
-#define SCI_SETEDGECOLUMN 2361
-#define SCI_GETEDGEMODE 2362
-#define SCI_SETEDGEMODE 2363
-#define SCI_GETEDGECOLOUR 2364
-#define SCI_SETEDGECOLOUR 2365
-#define SCI_SEARCHANCHOR 2366
-#define SCI_SEARCHNEXT 2367
-#define SCI_SEARCHPREV 2368
-#define CARET_SLOP 0x01
-#define CARET_CENTER 0x02
-#define CARET_STRICT 0x04
-#define SCI_SETCARETPOLICY 2369
-#define SCI_LINESONSCREEN 2370
-#define SCI_USEPOPUP 2371
-#define SCI_SELECTIONISRECTANGLE 2372
-#define SCI_SETZOOM 2373
-#define SCI_GETZOOM 2374
-#define SCI_CREATEDOCUMENT 2375
-#define SCI_ADDREFDOCUMENT 2376
-#define SCI_RELEASEDOCUMENT 2377
-#define SCI_GETMODEVENTMASK 2378
-#define SCI_GRABFOCUS 2400
-#define SCI_STARTRECORD 3001
-#define SCI_STOPRECORD 3002
-#define SCI_SETLEXER 4001
-#define SCI_GETLEXER 4002
-#define SCI_COLOURISE 4003
-#define SCI_SETPROPERTY 4004
-#define SCI_SETKEYWORDS 4005
+
+#define SCI_GETEDGECOLUMN SCI_START + 360
+#define SCI_SETEDGECOLUMN SCI_START + 361
+#define SCI_GETEDGEMODE SCI_START + 362
+#define SCI_SETEDGEMODE SCI_START + 363
+#define SCI_GETEDGECOLOUR SCI_START + 364
+#define SCI_SETEDGECOLOUR SCI_START + 365
+
+#define SCI_SEARCHANCHOR SCI_START + 366
+#define SCI_SEARCHNEXT SCI_START + 367
+#define SCI_SEARCHPREV SCI_START + 368
+
+#define CARET_SLOP 0x01    // Show caret within N lines of edge when it's scrolled to view
+#define CARET_CENTER 0x02  // Center caret on screen when it's scrolled to view
+#define CARET_STRICT 0x04  // OR this with CARET_CENTER to reposition even when visible, or
+                           // OR this with CARET_SLOP to reposition whenever outside slop border
+
+#define SCI_SETCARETPOLICY SCI_START + 369
+#define SCI_LINESONSCREEN SCI_START + 370
+#define SCI_USEPOPUP SCI_START + 371
+#define SCI_SELECTIONISRECTANGLE SCI_START + 372
+#define SCI_SETZOOM SCI_START + 373
+#define SCI_GETZOOM SCI_START + 374
+
+#define SCI_ADDREFDOC SCI_START + 375
+#define SCI_RELEASEDOC SCI_START + 376
+
+// GTK+ Specific
+#define SCI_GRABFOCUS SCI_START + 400
+
+// Optional module for macro recording
+#ifdef MACRO_SUPPORT
+typedef void (tMacroRecorder)(UINT iMessage, WPARAM wParam, LPARAM lParam, 
+                              void *userData);
+#define SCI_STARTRECORD SCI_OPTIONAL_START + 1
+#define SCI_STOPRECORD SCI_OPTIONAL_START + 2
+#endif
+
+#define SCI_SETLEXER SCI_LEXER_START + 1
+#define SCI_GETLEXER SCI_LEXER_START + 2
+#define SCI_COLOURISE SCI_LEXER_START + 3
+#define SCI_SETPROPERTY SCI_LEXER_START + 4
+#define SCI_SETKEYWORDS SCI_LEXER_START + 5
+
+// Notifications
+
+// Type of modification and the action which caused the modification
+// These are defined as a bit mask to make it easy to specify which notifications are wanted.
+// One bit is set from each of SC_MOD_* and SC_PERFORMED_*.
 #define SC_MOD_INSERTTEXT 0x1
 #define SC_MOD_DELETETEXT 0x2
 #define SC_MOD_CHANGESTYLE 0x4
@@ -381,98 +385,11 @@ typedef long (*SciFnDirect)(long ptr, unsigned int iMessage, unsigned long wPara
 #define SC_MOD_CHANGEMARKER 0x200
 #define SC_MOD_BEFOREINSERT 0x400
 #define SC_MOD_BEFOREDELETE 0x800
+
 #define SC_MODEVENTMASKALL 0xF77
-#define SCEN_CHANGE 768
-#define SCEN_SETFOCUS 512
-#define SCEN_KILLFOCUS 256
-#define SCK_DOWN 300
-#define SCK_UP 301
-#define SCK_LEFT 302
-#define SCK_RIGHT 303
-#define SCK_HOME 304
-#define SCK_END 305
-#define SCK_PRIOR 306
-#define SCK_NEXT 307
-#define SCK_DELETE 308
-#define SCK_INSERT 309
-#define SCK_ESCAPE 7
-#define SCK_BACK 8
-#define SCK_TAB 9
-#define SCK_RETURN 13
-#define SCK_ADD 310
-#define SCK_SUBTRACT 311
-#define SCK_DIVIDE 312
-#define SCMOD_SHIFT 1
-#define SCMOD_CTRL 2
-#define SCMOD_ALT 4
-#define SCN_STYLENEEDED 2000
-#define SCN_CHARADDED 2001
-#define SCN_SAVEPOINTREACHED 2002
-#define SCN_SAVEPOINTLEFT 2003
-#define SCN_MODIFYATTEMPTRO 2004
-#define SCN_KEY 2005
-#define SCN_DOUBLECLICK 2006
-#define SCN_UPDATEUI 2007
-#define SCN_CHECKBRACE 2007
-#define SCN_MODIFIED 2008
-#define SCN_MACRORECORD 2009
-#define SCN_MARGINCLICK 2010
-#define SCN_NEEDSHOWN 2011
-#define SCN_POSCHANGED 2012
-//--Autogenerated -- end of section automatically generated from Scintilla.iface
-
-// Optional module for macro recording
-#ifdef MACRO_SUPPORT
-typedef void (tMacroRecorder)(unsigned int iMessage, unsigned long wParam, 
-	long lParam, void *userData);
-#endif
-
-// These structures are defined to be exactly the same shape as the Win32
-// CHARRANGE, TEXTRANGE, FINDTEXTEX, FORMATRANGE, and NMHDR structs.
-// So older code that treats Scintilla as a RichEdit will work.
-
-struct CharacterRange {
-	long cpMin;
-	long cpMax;
-};
-
-struct TextRange {
-	CharacterRange chrg;
-	char *lpstrText;
-};
-
-struct TextToFind {
-	CharacterRange chrg;
-	char *lpstrText;
-	CharacterRange chrgText;
-};
-
-#ifdef PLATFORM_H
-
-// This structure is used in printing and requires some of the graphics types 
-// from Platform.h.  Not needed by most client code.
-
-struct RangeToFormat {
-	SurfaceID hdc;
-	SurfaceID hdcTarget;
-	PRectangle rc;
-	PRectangle rcPage;
-	CharacterRange chrg;
-};
-
-#endif
-
-struct NotifyHeader {
-    // hwndFrom is really an environment specifc window handle or pointer
-    // but most clients of Scintilla.h do not have this type visible.
-	//WindowID hwndFrom;
-	void *hwndFrom; 
-	unsigned int idFrom;
-	unsigned int code;
-};

 struct SCNotification {
-	NotifyHeader nmhdr;
+	NMHDR nmhdr;
 	int position;			// SCN_STYLENEEDED, SCN_MODIFIED
 	int ch;					// SCN_CHARADDED, SCN_KEY
 	int modifiers;			// SCN_KEY
@@ -491,7 +408,28 @@ struct SCNotification {
 	int margin;	// SCN_MARGINCLICK
 };

-#define SC_MASK_FOLDERS ((1<<SC_MARKNUM_FOLDER) | (1<<SC_MARKNUM_FOLDEROPEN))
+#define SCN_STYLENEEDED 2000
+#define SCN_CHARADDED 2001
+#define SCN_SAVEPOINTREACHED 2002
+#define SCN_SAVEPOINTLEFT 2003
+#define SCN_MODIFYATTEMPTRO 2004
+// GTK+ Specific to work around focus and accelerator problems:
+#define SCN_KEY 2005
+#define SCN_DOUBLECLICK 2006
+#define SCN_UPDATEUI 2007
+// The old name for SCN_UPDATEUI:
+#define SCN_CHECKBRACE 2007
+#define SCN_MODIFIED 2008
+// Optional module for macro recording
+#ifdef MACRO_SUPPORT
+#define SCN_MACRORECORD 2009
+#endif
+#define SCN_MARGINCLICK 2010
+#define SCN_NEEDSHOWN 2011
+
+#ifdef STATIC_BUILD
+void Scintilla_RegisterClasses(HINSTANCE hInstance);
+#endif

 // Deprecation section listing all API features that are deprecated and will
 // will be removed completely in a future version.
@@ -499,9 +437,23 @@ struct SCNotification {

 #ifdef INCLUDE_DEPRECATED_FEATURES

-// Deprecated in 1.27
-#define SC_UNDOCOLLECT_NONE 0
-#define SC_UNDOCOLLECT_AUTOSTART 1
+#define SCI_CHANGEPOSITION SCI_START + 22
+
+// Default style settings. These are deprecated and will be removed in a future version.
+#define SCI_SETFORE SCI_START + 60
+#define SCI_SETBACK SCI_START + 61
+#define SCI_SETBOLD SCI_START + 62
+#define SCI_SETITALIC SCI_START + 63
+#define SCI_SETSIZE SCI_START + 64
+#define SCI_SETFONT SCI_START + 65
+
+#define SCI_APPENDUNDOSTARTACTION SCI_START + 74
+
+#define SC_UNDOCOLLECT_MANUALSTART 2
+
+// Deprecated in release 1.22
+#define SCI_SETMARGINWIDTH SCI_START + 34
+#define SCI_SETLINENUMBERWIDTH SCI_START + 38

 #endif

--- a/contrib/src/stc/scintilla/include/Scintilla.iface
+++ b/contrib/src/stc/scintilla/include/Scintilla.iface
--- a/contrib/src/stc/scintilla/include/ScintillaWidget.h
+++ b/contrib/src/stc/scintilla/include/ScintillaWidget.h
@@ -1,46 +0,0 @@
-// Scintilla source code edit control
-// ScintillaWidget.h - definition of Scintilla widget for GTK+
-// Only needed by GTK+ code but is harmless on other platforms.
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef SCINTILLAWIDGET_H
-#define SCINTILLAWIDGET_H
-
-#if PLAT_GTK
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SCINTILLA(obj)          GTK_CHECK_CAST (obj, scintilla_get_type (), ScintillaObject)
-#define SCINTILLA_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, scintilla_get_type (), ScintillaClass)
-#define IS_SCINTILLA(obj)       GTK_CHECK_TYPE (obj, scintilla_get_type ())
-
-typedef struct _ScintillaObject ScintillaObject;
-typedef struct _ScintillaClass  ScintillaClass;
-
-struct _ScintillaObject {
-	GtkFixed vbox;
-	void *pscin;
-};
-
-struct _ScintillaClass {
-	GtkFixedClass parent_class;
-
-	void (* command) (ScintillaObject *ttt);
-	void (* notify) (ScintillaObject *ttt);
-};
-
-guint		scintilla_get_type	(void);
-GtkWidget*	scintilla_new		(void);
-void		scintilla_set_id	(ScintillaObject *sci,int id);
-long 		scintilla_send_message	(ScintillaObject *sci,int iMessage,int wParam,int lParam);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-#endif
--- a/contrib/src/stc/scintilla/include/WinDefs.h
+++ b/contrib/src/stc/scintilla/include/WinDefs.h
@@ -16,7 +16,6 @@
 #define LPSTR char *
 #define LONG long

-//#if 0
 /* RTF control */
 #define EM_CANPASTE	(1074)
 #define EM_CANUNDO	(198)
@@ -53,10 +52,12 @@

 #define WM_NULL		(0)
 #define WM_CLEAR	(771)
+#define WM_COMMAND	(273)
 #define WM_COPY	(769)
 #define WM_CUT	(768)
 #define WM_GETTEXT	(13)
 #define WM_GETTEXTLENGTH	(14)
+#define WM_NOTIFY	(78)
 #define WM_PASTE	(770)
 #define WM_SETTEXT	(12)
 #define WM_UNDO	(772)
@@ -69,9 +70,6 @@
 #define EC_RIGHTMARGIN 2
 #define EC_USEFONTINFO 0xffff

-//#endif
-
-#if 0
 #if PLAT_GTK
 #define VK_DOWN GDK_Down
 #define VK_UP GDK_Up
@@ -111,16 +109,12 @@
 #define VK_SUBTRACT     WXK_SUBTRACT
 //TODO:
 #define VK_DIVIDE	WXK_DIVIDE
-#endif
-
-#define SHIFT_PRESSED 1
-#define LEFT_CTRL_PRESSED 2
-#define LEFT_ALT_PRESSED 4

 // Are these needed any more
 #define LPSTR char *
 #define LONG long
 #define LPDWORD (long *)
+#endif

 /* SELCHANGE structure */
 #define SEL_EMPTY	(0)
@@ -129,6 +123,15 @@
 #define SEL_MULTICHAR	(4)
 #define SEL_MULTIOBJECT	(8)

+/* FINDREPLACE structure */
+#define FR_MATCHCASE	(0x4)
+#define FR_WHOLEWORD	(0x2)
+#define FR_DOWN		(0x1)
+
+#define SHIFT_PRESSED 1
+#define LEFT_CTRL_PRESSED 2
+#define LEFT_ALT_PRESSED 4
+
 struct RECT {
 	LONG left;
 	LONG top;
@@ -136,15 +139,6 @@ struct RECT {
 	LONG bottom;
 };

-/* FINDREPLACE structure */
-
-#define FR_MATCHCASE	(0x4)
-#define FR_WHOLEWORD	(0x2)
-#define FR_DOWN		(0x1)
-
-#endif
-
-#if 0
 struct CHARRANGE {
 	LONG cpMin;
 	LONG cpMax;
@@ -174,10 +168,9 @@ struct FORMATRANGE {
 	RECT rcPage;
 	CHARRANGE chrg;
 };
-#endif

-//#define MAKELONG(a, b) ((a) | ((b) << 16))
-//#define LOWORD(x) (x & 0xffff)
-//#define HIWORD(x) (x >> 16)
+#define MAKELONG(a, b) ((a) | ((b) << 16))
+#define LOWORD(x) (x & 0xffff)
+#define HIWORD(x) (x >> 16)

 #endif
--- a/contrib/src/stc/scintilla/include/WindowAccessor.h
+++ b/contrib/src/stc/scintilla/include/WindowAccessor.h
@@ -22,7 +22,7 @@ protected:
 public:
 	WindowAccessor(WindowID id_, PropSet &props_) : 
 		Accessor(), id(id_), props(props_), 
-		lenDoc(-1), validLen(0), chFlags(0), chWhile(0) {
+		lenDoc(-1), validLen(0), chFlags(0) {
 	}
 	~WindowAccessor();
 	char StyleAt(int position);
--- a/contrib/src/stc/scintilla/src/AutoComplete.cxx
+++ b/contrib/src/stc/scintilla/src/AutoComplete.cxx
@@ -10,16 +10,12 @@

 #include "AutoComplete.h"

-AutoComplete::AutoComplete() : 
-	active(false),
-	separator(' '),
-	ignoreCase(false),
-	chooseSingle(false),
-	posStart(0),
-	startLen(0),
-	cancelAtStartPos(true) {
-	stopChars[0] = '\0';
-	fillUpChars[0] = '\0';
+AutoComplete::AutoComplete() {
+	lb = 0;
+	active = false;
+	posStart = 0;
+	strcpy(stopChars, "");
+	separator = ' ';
 }

 AutoComplete::~AutoComplete() {
@@ -49,15 +45,6 @@ bool AutoComplete::IsStopChar(char ch) {
 	return ch && strchr(stopChars, ch);
 }

-void AutoComplete::SetFillUpChars(const char *fillUpChars_) {
-	strncpy(fillUpChars, fillUpChars_, sizeof(fillUpChars));
-	fillUpChars[sizeof(fillUpChars) - 1] = '\0';
-}
-
-bool AutoComplete::IsFillUpChar(char ch) {
-	return ch && strchr(fillUpChars, ch);
-}
- 
 void AutoComplete::SetSeparator(char separator_) {
 	separator = separator_;
 }
@@ -66,7 +53,8 @@ char AutoComplete::GetSeparator() {
 	return separator;
 }

-void AutoComplete::SetList(const char *list) {
+int AutoComplete::SetList(const char *list) {
+	int maxStrLen = 12;
 	lb.Clear();
 	char *words = new char[strlen(list) + 1];
 	if (words) {
@@ -77,15 +65,18 @@ void AutoComplete::SetList(const char *list) {
 			if (words[i] == separator) {
 				words[i] = '\0';
 				lb.Append(startword);
+				maxStrLen = Platform::Maximum(maxStrLen, strlen(startword));
 				startword = words + i + 1;
 			}
 		}
 		if (startword) {
 			lb.Append(startword);
+			maxStrLen = Platform::Maximum(maxStrLen, strlen(startword));
 		}
 		delete []words;
 	}
 	lb.Sort();
+	return maxStrLen;
 }

 void AutoComplete::Show() {
@@ -96,6 +87,7 @@ void AutoComplete::Show() {
 void AutoComplete::Cancel() {
 	if (lb.Created()) {
 		lb.Destroy();
+		lb = 0;
 		active = false;
 	}
 }
--- a/contrib/src/stc/scintilla/src/AutoComplete.h
+++ b/contrib/src/stc/scintilla/src/AutoComplete.h
@@ -9,16 +9,11 @@
 class AutoComplete {
 	bool active;
 	char stopChars[256];
-	char fillUpChars[256];
 	char separator;
 public:
-	bool ignoreCase;
-	bool chooseSingle;
 	ListBox lb;
 	int posStart;
 	int startLen;
-	// Should autocompletion be canceled if editor's currentPos <= startPos?
-	bool cancelAtStartPos;
 	
 	AutoComplete();
 	~AutoComplete();
@@ -33,16 +28,12 @@ public:
 	void SetStopChars(const char *stopChars_);
 	bool IsStopChar(char ch);
 	
-	// The fillup chars are characters which, when typed, fill up the selected word
-	void SetFillUpChars(const char *fillUpChars_);
-	bool IsFillUpChar(char ch);
-
 	// The separator character is used when interpreting the list in SetList
 	void SetSeparator(char separator_);
 	char GetSeparator();
 	
 	// The list string contains a sequence of words separated by the separator character
-	void SetList(const char *list);
+	int SetList(const char *list);
 	
 	void Show();
 	void Cancel();
--- a/contrib/src/stc/scintilla/src/CellBuffer.cxx
+++ b/contrib/src/stc/scintilla/src/CellBuffer.cxx
@@ -88,7 +88,7 @@ void MarkerHandleSet::RemoveHandle(int handle) {
 		if (mhn->handle == handle) {
 			*pmhn = mhn->next;
 			delete mhn;
-			return ;
+			return;
 		}
 		pmhn = &((*pmhn)->next);
 	}
@@ -101,7 +101,7 @@ void MarkerHandleSet::RemoveNumber(int markerNum) {
 		if (mhn->number == markerNum) {
 			*pmhn = mhn->next;
 			delete mhn;
-			return ;
+			return;
 		}
 		pmhn = &((*pmhn)->next);
 	}
@@ -119,11 +119,7 @@ void MarkerHandleSet::CombineWith(MarkerHandleSet *other) {
 LineVector::LineVector() {
 	linesData = 0;
 	lines = 0;
-	size = 0;
 	levels = 0;
-	sizeLevels = 0;
-	handleCurrent = 1;
-
 	Init();
 }

@@ -165,7 +161,6 @@ void LineVector::Expand(int sizeNew) {
 		Platform::DebugPrintf("No memory available\n");
 		// TODO: Blow up
 	}
-
 }

 void LineVector::ExpandLevels(int sizeNew) {
@@ -185,13 +180,6 @@ void LineVector::ExpandLevels(int sizeNew) {
 		Platform::DebugPrintf("No memory available\n");
 		// TODO: Blow up
 	}
-
-}
-
-void LineVector::ClearLevels() {
-	delete []levels;
-	levels = 0;
-	sizeLevels = 0;
 }

 void LineVector::InsertValue(int pos, int value) {
@@ -214,10 +202,10 @@ void LineVector::InsertValue(int pos, int value) {
 		}
 		if (pos == 0) {
 			levels[pos] = SC_FOLDLEVELBASE;
-		} else if (pos == (lines - 1)) {	// Last line will not be a folder
+		} else if (pos == (lines-1)) {	// Last line will not be a folder
 			levels[pos] = SC_FOLDLEVELBASE;
 		} else {
-			levels[pos] = levels[pos - 1];
+			levels[pos] = levels[pos-1];
 		}
 	}
 }
@@ -246,10 +234,10 @@ void LineVector::Remove(int pos) {
 		linesData[i] = linesData[i + 1];
 	}
 	if (levels) {
-		// Level information merges back onto previous line
-		int posAbove = pos - 1;
-		if (posAbove < 0)
-			posAbove = 0;
+        // Level information merges back onto previous line
+        int posAbove = pos-1;
+        if (posAbove < 0)
+            posAbove = 0;
 		for (int j = posAbove; j < lines; j++) {
 			levels[j] = levels[j + 1];
 		}
@@ -292,12 +280,11 @@ int LineVector::AddMark(int line, int markerNum) {
 }

 void LineVector::MergeMarkers(int pos) {
-	if (linesData[pos + 1].handleSet != NULL) {
-		if (linesData[pos].handleSet == NULL )
-			linesData[pos].handleSet = new MarkerHandleSet;
-		linesData[pos].handleSet->CombineWith(linesData[pos + 1].handleSet);
-		delete linesData[pos + 1].handleSet;
-		linesData[pos + 1].handleSet = NULL;
+	if (linesData[pos].handleSet || linesData[pos + 1].handleSet) {
+		if (linesData[pos].handleSet && linesData[pos + 1].handleSet) {
+			linesData[pos].handleSet->CombineWith(linesData[pos].handleSet);
+			linesData[pos].handleSet = 0;
+		}
 	}
 }

@@ -371,7 +358,7 @@ void Action::Grab(Action *source) {
 	data = source->data;
 	lenData = source->lenData;
 	mayCoalesce = source->mayCoalesce;
-
+	
 	// Ownership of source data transferred to this
 	source->position = 0;
 	source->at = startAction;
@@ -380,21 +367,21 @@ void Action::Grab(Action *source) {
 	source->mayCoalesce = true;
 }

-// The undo history stores a sequence of user operations that represent the user's view of the
-// commands executed on the text.
+// The undo history stores a sequence of user operations that represent the user's view of the 
+// commands executed on the text. 
 // Each user operation contains a sequence of text insertion and text deletion actions.
 // All the user operations are stored in a list of individual actions with 'start' actions used
 // as delimiters between user operations.
-// Initially there is one start action in the history.
-// As each action is performed, it is recorded in the history. The action may either become
+// Initially there is one start action in the history. 
+// As each action is performed, it is recorded in the history. The action may either become 
 // part of the current user operation or may start a new user operation. If it is to be part of the
-// current operation, then it overwrites the current last action. If it is to be part of a new
+// current operation, then it overwrites the current last action. If it is to be part of a new 
 // operation, it is appended after the current last action.
 // After writing the new action, a new start action is appended at the end of the history.
-// The decision of whether to start a new user operation is based upon two factors. If a
+// The decision of whether to start a new user operation is based upon two factors. If a 
 // compound operation has been explicitly started by calling BeginUndoAction and no matching
-// EndUndoAction (these calls nest) has been called, then the action is coalesced into the current
-// operation. If there is no outstanding BeginUndoAction call then a new operation is started
+// EndUndoAction (these calls nest) has been called, then the action is coalesced into the current 
+// operation. If there is no outstanding BeginUndoAction call then a new operation is started 
 // unless it looks as if the new action is caused by the user typing or deleting a stream of text.
 // Sequences that look like typing or deletion are coalesced into a single user operation.

@@ -425,7 +412,7 @@ void UndoHistory::EnsureUndoRoom() {
 			int lenActionsNew = lenActions * 2;
 			Action *actionsNew = new Action[lenActionsNew];
 			if (!actionsNew)
-				return ;
+				return;
 			for (int act = 0; act <= currentAction; act++)
 				actionsNew[act].Grab(&actions[act]);
 			delete []actions;
@@ -438,11 +425,11 @@ void UndoHistory::EnsureUndoRoom() {
 void UndoHistory::AppendAction(actionType at, int position, char *data, int lengthData) {
 	EnsureUndoRoom();
 	//Platform::DebugPrintf("%% %d action %d %d %d\n", at, position, lengthData, currentAction);
-	//Platform::DebugPrintf("^ %d action %d %d\n", actions[currentAction - 1].at,
+	//Platform::DebugPrintf("^ %d action %d %d\n", actions[currentAction - 1].at, 
 	//	actions[currentAction - 1].position, actions[currentAction - 1].lenData);
 	if (currentAction >= 1) {
 		if (0 == undoSequenceDepth) {
-			// Top level actions may not always be coalesced
+		// Top level actions may not always be coalesced
 			Action &actPrevious = actions[currentAction - 1];
 			// See if current action can be coalesced into previous action
 			// Will work if both are inserts or deletes and position is same
@@ -450,23 +437,22 @@ void UndoHistory::AppendAction(actionType at, int position, char *data, int leng
 				currentAction++;
 			} else if (currentAction == savePoint) {
 				currentAction++;
-			} else if ((at == removeAction) &&
-			           ((position + lengthData * 2) != actPrevious.position)) {
+			} else if ((at == removeAction) && 
+				((position + lengthData * 2) != actPrevious.position)) {
 				// Removals must be at same position to coalesce
 				currentAction++;
-			} else if ((at == insertAction) &&
-			           (position != (actPrevious.position + actPrevious.lenData*2))) {
+			} else if ((at == insertAction) && 
+				(position != (actPrevious.position + actPrevious.lenData*2))) {
 				// Insertions must be immediately after to coalesce
 				currentAction++;
 			} else {
 				//Platform::DebugPrintf("action coalesced\n");
 			}
-
 		} else {
 			// Actions not at top level are always coalesced unless this is after return to top level
 			if (!actions[currentAction].mayCoalesce)
 				currentAction++;
-		}
+		} 
 	} else {
 		currentAction++;
 	}
@@ -501,7 +487,7 @@ void UndoHistory::EndUndoAction() {
 		actions[currentAction].mayCoalesce = false;
 	}
 }
-
+	
 void UndoHistory::DropUndoSequence() {
 	undoSequenceDepth = 0;
 }
@@ -531,9 +517,9 @@ int UndoHistory::StartUndo() {
 	// Drop any trailing startAction
 	if (actions[currentAction].at == startAction && currentAction > 0)
 		currentAction--;
-
+	
 	// Count the steps in this action
-	int act = currentAction;
+	int act = currentAction; 
 	while (actions[act].at != startAction && act > 0) {
 		act--;
 	}
@@ -556,9 +542,9 @@ int UndoHistory::StartRedo() {
 	// Drop any leading startAction
 	if (actions[currentAction].at == startAction && currentAction < maxAction)
 		currentAction++;
-
+	
 	// Count the steps in this action
-	int act = currentAction;
+	int act = currentAction; 
 	while (actions[act].at != startAction && act < maxAction) {
 		act++;
 	}
@@ -577,11 +563,11 @@ CellBuffer::CellBuffer(int initialLength) {
 	body = new char[initialLength];
 	size = initialLength;
 	length = 0;
-	part1len = 0;
+	part1len = 0;   
 	gaplen = initialLength;
 	part2body = body + gaplen;
 	readOnly = false;
-	collectingUndo = true;
+	collectingUndo = undoCollectAutoStart;
 }

 CellBuffer::~CellBuffer() {
@@ -591,7 +577,7 @@ CellBuffer::~CellBuffer() {

 void CellBuffer::GapTo(int position) {
 	if (position == part1len)
-		return ;
+		return;
 	if (position < part1len) {
 		int diff = part1len - position;
 		//Platform::DebugPrintf("Move gap backwards to %d diff = %d part1len=%d length=%d \n", position,diff, part1len, length);
@@ -623,7 +609,6 @@ void CellBuffer::RoomFor(int insertionLength) {
 		size = newSize;
 		//Platform::DebugPrintf("end need room %d %d - size=%d length=%d\n", gaplen, insertionLength,size,length);
 	}
-
 }

 // To make it easier to write code that uses ByteAt, a position outside the range of the buffer
@@ -648,16 +633,16 @@ void CellBuffer::SetByteAt(int position, char ch) {

 	if (position < 0) {
 		//Platform::DebugPrintf("Bad position %d\n",position);
-		return ;
+		return;
 	}
 	if (position >= length + 11) {
 		Platform::DebugPrintf("Very Bad position %d of %d\n", position, length);
 		//exit(2);
-		return ;
+		return;
 	}
 	if (position >= length) {
 		//Platform::DebugPrintf("Bad position %d of %d\n",position,length);
-		return ;
+		return;
 	}

 	if (position < part1len) {
@@ -673,20 +658,20 @@ char CellBuffer::CharAt(int position) {

 void CellBuffer::GetCharRange(char *buffer, int position, int lengthRetrieve) {
 	if (lengthRetrieve < 0)
-		return ;
+		return;
 	if (position < 0)
-		return ;
+		return;
 	int bytePos = position * 2;
 	if ((bytePos + lengthRetrieve * 2) > length) {
-		Platform::DebugPrintf("Bad GetCharRange %d for %d of %d\n", bytePos,
-		                      lengthRetrieve, length);
-		return ;
+		Platform::DebugPrintf("Bad GetCharRange %d for %d of %d\n",bytePos,
+			lengthRetrieve, length);
+		return;
 	}
 	GapTo(0); 	// Move the buffer so its easy to subscript into it
 	char *pb = part2body + bytePos;
 	while (lengthRetrieve--) {
 		*buffer++ = *pb;
-		pb += 2;
+		pb +=2;
 	}
 }

@@ -721,7 +706,7 @@ void CellBuffer::InsertCharStyle(int position, char ch, char style) {
 }

 bool CellBuffer::SetStyleAt(int position, char style, char mask) {
-	char curVal = ByteAt(position * 2 + 1);
+	char curVal = ByteAt(position*2 + 1);
 	if ((curVal & mask) != style) {
 		SetByteAt(position*2 + 1, static_cast<char>((curVal & ~mask) | style));
 		return true;
@@ -838,7 +823,7 @@ int CellBuffer::LineFromHandle(int markerHandle) {
 void CellBuffer::BasicInsertString(int position, char *s, int insertLength) {
 	//Platform::DebugPrintf("Inserting at %d for %d\n", position, insertLength);
 	if (insertLength == 0)
-		return ;
+		return;
 	RoomFor(insertLength);
 	GapTo(position);

@@ -898,7 +883,7 @@ void CellBuffer::BasicInsertString(int position, char *s, int insertLength) {
 void CellBuffer::BasicDeleteChars(int position, int deleteLength) {
 	//Platform::DebugPrintf("Deleting at %d for %d\n", position, deleteLength);
 	if (deleteLength == 0)
-		return ;
+		return;

 	if ((position == 0) && (deleteLength == length)) {
 		// If whole buffer is being deleted, faster to reinitialise lines data
@@ -930,7 +915,6 @@ void CellBuffer::BasicDeleteChars(int position, int deleteLength) {
 			ignoreNL = true; 	// First \n is not real deletion
 		}

-
 		char ch = chNext;
 		for (int i = 0; i < deleteLength; i += 2) {
 			chNext = ' ';
@@ -948,7 +932,6 @@ void CellBuffer::BasicDeleteChars(int position, int deleteLength) {
 				ignoreNL = false; 	// Further \n are not real deletions
 			}

-
 			ch = chNext;
 		}
 		// May have to fix up end if last deletion causes cr to be next to lf
@@ -969,7 +952,7 @@ void CellBuffer::BasicDeleteChars(int position, int deleteLength) {
 	part2body = body + gaplen;
 }

-bool CellBuffer::SetUndoCollection(bool collectUndo) {
+undoCollectionType CellBuffer::SetUndoCollection(undoCollectionType collectUndo) {
 	collectingUndo = collectUndo;
 	uh.DropUndoSequence();
 	return collectingUndo;
@@ -1011,12 +994,12 @@ void CellBuffer::PerformUndoStep() {
 		char *styledData = new char[actionStep.lenData * 2];
 		for (int i = 0; i < actionStep.lenData; i++) {
 			styledData[i*2] = actionStep.data[i];
-			styledData[i*2 + 1] = 0;
+			styledData[i*2+1] = 0;
 		}
 		BasicInsertString(actionStep.position, styledData, actionStep.lenData*2);
 		delete []styledData;
 	}
-	uh.CompletedUndoStep();
+    uh.CompletedUndoStep();
 }

 bool CellBuffer::CanRedo() {
@@ -1037,14 +1020,14 @@ void CellBuffer::PerformRedoStep() {
 		char *styledData = new char[actionStep.lenData * 2];
 		for (int i = 0; i < actionStep.lenData; i++) {
 			styledData[i*2] = actionStep.data[i];
-			styledData[i*2 + 1] = 0;
+			styledData[i*2+1] = 0;
 		}
 		BasicInsertString(actionStep.position, styledData, actionStep.lenData*2);
 		delete []styledData;
 	} else if (actionStep.at == removeAction) {
 		BasicDeleteChars(actionStep.position, actionStep.lenData*2);
 	}
-	uh.CompletedRedoStep();
+    uh.CompletedRedoStep();
 }

 int CellBuffer::SetLineState(int line, int state) {
@@ -1060,7 +1043,7 @@ int CellBuffer::GetLineState(int line) {
 int CellBuffer::GetMaxLineState() {
 	return lineStates.Length();
 }
-
+		
 int CellBuffer::SetLevel(int line, int level) {
 	int prev = 0;
 	if ((line >= 0) && (line < lv.lines)) {
@@ -1083,6 +1066,3 @@ int CellBuffer::GetLevel(int line) {
 	}
 }

-void CellBuffer::ClearLevels() {
-	lv.ClearLevels();
-}
--- a/contrib/src/stc/scintilla/src/CellBuffer.h
+++ b/contrib/src/stc/scintilla/src/CellBuffer.h
@@ -58,7 +58,6 @@ public:

 	void Expand(int sizeNew);
 	void ExpandLevels(int sizeNew=-1);
-    void ClearLevels();
 	void InsertValue(int pos, int value);
 	void SetValue(int pos, int value);
 	void Remove(int pos);
@@ -89,6 +88,8 @@ public:
 	void Grab(Action *source);
 };

+enum undoCollectionType { undoCollectNone, undoCollectAutoStart, undoCollectManualStart };
+
 class UndoHistory {
 	Action *actions;
 	int lenActions;
@@ -140,12 +141,12 @@ private:
 	char *part2body;
 	bool readOnly;

-	bool collectingUndo;
+	undoCollectionType collectingUndo;
 	UndoHistory uh;

 	LineVector lv;

-	SVector lineStates;
+	SVector<int, 4000> lineStates;

 	void GapTo(int position);
 	void RoomFor(int insertionLength);
@@ -198,7 +199,7 @@ public:
 	void BasicInsertString(int position, char *s, int insertLength);
 	void BasicDeleteChars(int position, int deleteLength);

-	bool SetUndoCollection(bool collectUndo);
+	undoCollectionType SetUndoCollection(undoCollectionType collectUndo);
 	bool IsCollectingUndo();
 	void BeginUndoAction();
 	void EndUndoAction();
@@ -221,7 +222,6 @@ public:
 		
 	int SetLevel(int line, int level);
 	int GetLevel(int line);
-    void ClearLevels();
 };

 #define CELL_SIZE	2
--- a/contrib/src/stc/scintilla/src/ContractionState.cxx
+++ b/contrib/src/stc/scintilla/src/ContractionState.cxx
@@ -171,6 +171,12 @@ bool ContractionState::SetVisible(int lineDocStart, int lineDocEnd, bool visible
 				delta += visible ? 1 : -1;		
 				lines[line].visible = visible;
 			}
+			lines[line].displayLine += delta;
+		}
+		if (delta != 0) {
+			for (int line=lineDocEnd+1; line <= linesInDoc; line++) {
+				lines[line].displayLine += delta;
+			}
 		}
 	}
 	linesInDisplay += delta;
@@ -200,9 +206,3 @@ bool ContractionState::SetExpanded(int lineDoc, bool expanded) {
 	}
 	return false;
 }
-
-void ContractionState::ShowAll() {
-	delete []lines;
-	lines = 0;
-	size = 0;
-}
--- a/contrib/src/stc/scintilla/src/ContractionState.h
+++ b/contrib/src/stc/scintilla/src/ContractionState.h
@@ -42,11 +42,9 @@ public:
 	
 	bool GetVisible(int lineDoc) const;
 	bool SetVisible(int lineDocStart, int lineDocEnd, bool visible);
-        
+	
 	bool GetExpanded(int lineDoc) const;
 	bool SetExpanded(int lineDoc, bool expanded);
-
-    void ShowAll();
 };

 #endif
--- a/contrib/src/stc/scintilla/src/Document.cxx
+++ b/contrib/src/stc/scintilla/src/Document.cxx
@@ -54,7 +54,7 @@ int Document::AddRef() {
 	return refCount++;
 }

-// Decrease reference count and return its previous value.
+// Decrease reference count and return its provius value.
 // Delete the document if reference count reaches zero.
 int Document::Release() {
 	int curRefCount = --refCount;
@@ -201,8 +201,8 @@ bool Document::IsCrLf(int pos) {
 	return (cb.CharAt(pos) == '\r') && (cb.CharAt(pos + 1) == '\n');
 }

-#if PLAT_WIN
 bool Document::IsDBCS(int pos) {
+#if PLAT_WIN
 	if (dbcsCodePage) {
 		if (SC_CP_UTF8 == dbcsCodePage) {
 			unsigned char ch = static_cast<unsigned char>(cb.CharAt(pos));
@@ -224,14 +224,10 @@ bool Document::IsDBCS(int pos) {
 		}
 	}
 	return false;
-}
 #else
-// PLAT_GTK or PLAT_WX
-// TODO: support DBCS under GTK+ and WX
-bool Document::IsDBCS(int) {
 	return false;
-}
 #endif
+}

 int Document::LenChar(int pos) {
 	if (IsCrLf(pos)) {
@@ -338,8 +334,6 @@ void Document::ModifiedAt(int pos) {

 // Unlike Undo, Redo, and InsertStyledString, the pos argument is a cell number not a char number
 void Document::DeleteChars(int pos, int len) {
-    if ((pos + len) > Length())
-        return;
 	if (cb.IsReadOnly() && enteredReadOnlyCount==0) {
 		enteredReadOnlyCount++;
 		NotifyModifyAttempt();
@@ -596,8 +590,6 @@ void Document::SetLineIndentation(int line, int indent) {
 }

 int Document::GetLineIndentPosition(int line) {
-    if (line < 0)
-        return 0;
 	int pos = LineStart(line);
 	int length = Length();
 	while ((pos < length) && isindentchar(cb.CharAt(pos))) {
@@ -606,25 +598,6 @@ int Document::GetLineIndentPosition(int line) {
 	return pos;
 }

-int Document::GetColumn(int pos) {
-	int column = 0;
-	int line = LineFromPosition(pos);
-	if ((line >= 0) && (line < LinesTotal())) {
-		for (int i=LineStart(line);i<pos;i++) {
-			char ch = cb.CharAt(i);
-			if (ch == '\t')
-				column = NextTab(column, tabInChars);
-			else if (ch == '\r')
-				return column;
-			else if (ch == '\n')
-				return column;
-			else
-				column++;
-		}
-	}
-	return column;
-}
-
 void Document::Indent(bool forwards, int lineBottom, int lineTop) {
 	// Dedent - suck white space off the front of the line to dedent by equivalent of a tab
 	for (int line = lineBottom; line >= lineTop; line--) {
@@ -717,29 +690,25 @@ int Document::NextWordStart(int pos, int delta) {
 	return pos;
 }

-bool Document::IsWordStartAt(int pos) {
-	if (pos > 0) {
-		return !IsWordChar(CharAt(pos - 1));
-	}
-	return true;
-}
-
-bool Document::IsWordEndAt(int pos) {
-	if (pos < Length() - 1) {
-		return !IsWordChar(CharAt(pos));
-	}
-	return true;
-}
-
 bool Document::IsWordAt(int start, int end) {
-	return IsWordStartAt(start) && IsWordEndAt(end);
+	int lengthDoc = Length();
+	if (start > 0) {
+		char ch = CharAt(start - 1);
+		if (IsWordChar(ch))
+			return false;
+	}
+	if (end < lengthDoc - 1) {
+		char ch = CharAt(end);
+		if (IsWordChar(ch))
+			return false;
+	}
+	return true;
 }

 // Find text in document, supporting both forward and backward
 // searches (just pass minPos > maxPos to do a backward search)
 // Has not been tested with backwards DBCS searches yet.
-long Document::FindText(int minPos, int maxPos, const char *s, 
-	bool caseSensitive, bool word, bool wordStart) {
+long Document::FindText(int minPos, int maxPos, const char *s, bool caseSensitive, bool word) {
 	bool forward = minPos <= maxPos;
 	int increment = forward ? 1 : -1;

@@ -769,10 +738,8 @@ long Document::FindText(int minPos, int maxPos, const char *s,
 						found = false;
 				}
 				if (found) {
-					if ((!word && !wordStart) ||
-						word && IsWordAt(pos, pos + lengthFind) ||
-						wordStart && IsWordStartAt(pos))
- 						return pos;
+					if ((!word) || IsWordAt(pos, pos + lengthFind))
+						return pos;
 				}
 			}
 		} else {
@@ -784,10 +751,8 @@ long Document::FindText(int minPos, int maxPos, const char *s,
 						found = false;
 				}
 				if (found) {
-					if (!(word && wordStart) ||
-						word && IsWordAt(pos, pos + lengthFind) ||
-						wordStart && IsWordStartAt(pos))
- 						return pos;
+					if ((!word) || IsWordAt(pos, pos + lengthFind))
+						return pos;
 				}
 			}
 		}
--- a/contrib/src/stc/scintilla/src/Document.h
+++ b/contrib/src/stc/scintilla/src/Document.h
@@ -113,10 +113,9 @@ public:
 	bool CanUndo() { return cb.CanUndo(); }
 	bool CanRedo() { return cb.CanRedo(); }
 	void DeleteUndoHistory() { cb.DeleteUndoHistory(); }
-	bool SetUndoCollection(bool collectUndo) {
+	undoCollectionType SetUndoCollection(undoCollectionType collectUndo) {
 		return cb.SetUndoCollection(collectUndo);
 	}
-	bool IsCollectingUndo() { return cb.IsCollectingUndo(); }
 	void BeginUndoAction() { cb.BeginUndoAction(); }
 	void EndUndoAction() { cb.EndUndoAction(); }
 	void SetSavePoint();
@@ -125,11 +124,9 @@ public:
 	int GetLineIndentation(int line);
 	void SetLineIndentation(int line, int indent);
 	int GetLineIndentPosition(int line);
-	int GetColumn(int position);
 	void Indent(bool forwards, int lineBottom, int lineTop);
 	void ConvertLineEnds(int eolModeSet);
 	void SetReadOnly(bool set) { cb.SetReadOnly(set); }
-	bool IsReadOnly() { return cb.IsReadOnly(); }

 	void InsertChar(int pos, char ch);
 	void InsertString(int position, const char *s);
@@ -156,7 +153,6 @@ public:

 	int SetLevel(int line, int level);
 	int GetLevel(int line) { return cb.GetLevel(line); }
-	void ClearLevels() { cb.ClearLevels(); }
 	int GetLastChild(int lineParent, int level=-1);
 	int GetFoldParent(int line);

@@ -164,9 +160,8 @@ public:
 	int ExtendWordSelect(int pos, int delta);
 	int NextWordStart(int pos, int delta);
 	int Length() { return cb.Length(); }
-	long FindText(int minPos, int maxPos, const char *s, 
-		bool caseSensitive, bool word, bool wordStart);
-	long FindText(int iMessage, unsigned long wParam, long lParam);
+	long FindText(int minPos, int maxPos, const char *s, bool caseSensitive, bool word);
+	long FindText(WORD iMessage,WPARAM wParam,LPARAM lParam);
 	int LinesTotal();
 	
 	void ChangeCase(Range r, bool makeUpperCase);
@@ -191,8 +186,6 @@ public:
 private:
 	bool IsDBCS(int pos);
 	bool IsWordChar(unsigned char ch);
-	bool IsWordStartAt(int pos);
-	bool IsWordEndAt(int pos);
 	bool IsWordAt(int start, int end);
 	void ModifiedAt(int pos);
 	
--- a/contrib/src/stc/scintilla/src/DocumentAccessor.cxx
+++ b/contrib/src/stc/scintilla/src/DocumentAccessor.cxx
@@ -4,7 +4,6 @@
 // The License.txt file describes the conditions under which this software may be distributed.

 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h> 
 #include <stdio.h>

@@ -21,22 +20,21 @@
 DocumentAccessor::~DocumentAccessor() {
 }

-#if PLAT_WIN 
 bool DocumentAccessor::InternalIsLeadByte(char ch) {
+#if PLAT_GTK
+	// TODO: support DBCS under GTK+
+	return false;
+#elif PLAT_WIN 
 	if (SC_CP_UTF8 == codePage)
 		// For lexing, all characters >= 0x80 are treated the
 		// same so none is considered a lead byte.
 		return false;	
 	else
 		return IsDBCSLeadByteEx(codePage, ch);
-}
-#else
-// PLAT_GTK or PLAT_WX
-// TODO: support DBCS under GTK+ and WX
-bool DocumentAccessor::InternalIsLeadByte(char) {
+#elif PLAT_WX 
 	return false;
-}
 #endif 
+}

 void DocumentAccessor::Fill(int position) {
 	if (lenDoc == -1)
--- a/contrib/src/stc/scintilla/src/DocumentAccessor.h
+++ b/contrib/src/stc/scintilla/src/DocumentAccessor.h
@@ -24,7 +24,7 @@ protected:
 public:
 	DocumentAccessor(Document *pdoc_, PropSet &props_) : 
 		Accessor(), pdoc(pdoc_), props(props_), 
-		lenDoc(-1), validLen(0), chFlags(0), chWhile(0) {
+		lenDoc(-1), validLen(0), chFlags(0) {
 	}
 	~DocumentAccessor();
 	char StyleAt(int position);
--- a/contrib/src/stc/scintilla/src/Editor.cxx
+++ b/contrib/src/stc/scintilla/src/Editor.cxx
--- a/contrib/src/stc/scintilla/src/Editor.h
+++ b/contrib/src/stc/scintilla/src/Editor.h
@@ -31,15 +31,10 @@ public:
 	// Drawing is only performed for maxLineLength characters on each line.
 	enum {maxLineLength = 4000};
 	int numCharsInLine;
-	int xHighlightGuide;
-	bool highlightColumn;
-	int selStart;
-	int selEnd;
-	int edgeColumn;
-	char chars[maxLineLength+1];
-	char styles[maxLineLength+1];
-	char indicators[maxLineLength+1];
-	int positions[maxLineLength+1];
+	char chars[maxLineLength];
+	char styles[maxLineLength];
+	char indicators[maxLineLength];
+	int positions[maxLineLength];
 };

 class Editor : public DocWatcher {
@@ -59,8 +54,6 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	bool stylesValid;	
 	ViewStyle vs;
 	Palette palette;
-	int printMagnification;
-	int printColourMode;
 	
 	bool hideSelection;
 	bool inOverstrike;
@@ -76,8 +69,6 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	Surface pixmapLine;
 	Surface pixmapSelMargin;
 	Surface pixmapSelPattern;
-	Surface pixmapIndentGuide;
-	Surface pixmapIndentGuideHighlight;
 	// Intellimouse support - currently only implemented for Windows
 	unsigned int ucWheelScrollLines;
 	int cWheelDelta; //wheel delta from roll
@@ -107,8 +98,8 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	bool needUpdateUI;
 	Position braces[2];
 	int bracesMatchStyle;
-	int highlightGuideColumn;
 	
+	int edgeState;
 	int theEdge;

 	enum { notPainting, painting, paintAbandoned } paintState;
@@ -123,7 +114,6 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	enum { selStream, selRectangle, selRectangleFixed } selType;
 	int xStartSelect;
 	int xEndSelect;
-	bool primarySelection;
 	
 	int caretPolicy;
 	int caretSlop;
@@ -178,7 +168,6 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	void SetSelection(int currentPos_, int anchor_);
 	void SetSelection(int currentPos_);
 	void SetEmptySelection(int currentPos_);
-	int MovePositionOutsideChar(int pos, int moveDir, bool checkLineEnd=true);
 	int MovePositionTo(int newPos, bool extend = false);
 	int MovePositionSoVisible(int pos, int moveDir);
 	void SetLastXChosen();
@@ -194,10 +183,10 @@ protected:	// ScintillaBase subclass needs access to much of Editor

 	void PaintSelMargin(Surface *surface, PRectangle &rc);
        void LayoutLine(int line, Surface *surface, ViewStyle &vstyle, LineLayout &ll);
-	void DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVisible, int xStart, 
+	void DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int xStart, 
 		PRectangle rcLine, LineLayout &ll);
 	void Paint(Surface *surfaceWindow, PRectangle rcArea);
-	long FormatRange(bool draw, RangeToFormat *pfr);
+	long FormatRange(bool draw, FORMATRANGE *pfr);

 	virtual void SetVerticalScrollPos() = 0;
 	virtual void SetHorizontalScrollPos() = 0;
@@ -210,7 +199,6 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	virtual void AddCharUTF(char *s, unsigned int len);
 	void ClearSelection();
 	void ClearAll();
-    	void ClearDocumentStyle();
 	void Cut();
 	void PasteRectangular(int pos, const char *ptr, int len);
 	virtual void Copy() = 0;
@@ -228,7 +216,6 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	virtual void NotifyParent(SCNotification scn) = 0;
 	virtual void NotifyStyleToNeeded(int endStyleNeeded);
 	void NotifyChar(char ch);
-	void NotifyMove(int position);
 	void NotifySavePoint(bool isSavePoint);
 	void NotifyModifyAttempt();
 	virtual void NotifyDoubleClick(Point pt, bool shift);
@@ -244,25 +231,24 @@ protected:	// ScintillaBase subclass needs access to much of Editor

 	
 #ifdef MACRO_SUPPORT
-	void NotifyMacroRecord(unsigned int iMessage, unsigned long wParam, long lParam);
+	void NotifyMacroRecord(UINT iMessage, WPARAM wParam, LPARAM lParam);
 #endif

 	void PageMove(int direction, bool extend=false);
 	void ChangeCaseOfSelection(bool makeUpperCase);
 	void LineTranspose();
-    	virtual void CancelModes();
-	virtual int KeyCommand(unsigned int iMessage);
+	virtual int KeyCommand(UINT iMessage);
 	virtual int KeyDefault(int /* key */, int /*modifiers*/);
 	int KeyDown(int key, bool shift, bool ctrl, bool alt);

-	int GetWhitespaceVisible();
-	void SetWhitespaceVisible(int view);
+	bool GetWhitespaceVisible();
+	void SetWhitespaceVisible(bool view);

 	void Indent(bool forwards);

-	long FindText(unsigned int iMessage, unsigned long wParam, long lParam);
+	long FindText(UINT iMessage,WPARAM wParam,LPARAM lParam);
 	void SearchAnchor();
-	long SearchText(unsigned int iMessage, unsigned long wParam, long lParam);
+	long SearchText(UINT iMessage,WPARAM wParam,LPARAM lParam);
 	void GoToLine(int lineNo);

 	char *CopyRange(int start, int end);
@@ -296,11 +282,11 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	void ToggleContraction(int line);
 	void EnsureLineVisible(int line);

-	virtual long DefWndProc(unsigned int iMessage, unsigned long wParam, long lParam) = 0;
+	virtual LRESULT DefWndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) = 0;
 	
 public:
 	// Public so scintilla_send_message can use it
-	virtual long WndProc(unsigned int iMessage, unsigned long wParam, long lParam);
+	virtual LRESULT WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam);
 	// Public so scintilla_set_id can use it
 	int ctrlID;	
 };
--- a/contrib/src/stc/scintilla/src/KeyMap.cxx
+++ b/contrib/src/stc/scintilla/src/KeyMap.cxx
@@ -28,7 +28,7 @@ void KeyMap::Clear() {
 	alloc = 0;
 }

-void KeyMap::AssignCmdKey(int key, int modifiers, unsigned int msg) {
+void KeyMap::AssignCmdKey(int key, int modifiers, UINT msg) {
 	if ((len+1) >= alloc) {
 		KeyToCommand *ktcNew = new KeyToCommand[alloc + 5];
 		if (!ktcNew)
@@ -51,7 +51,7 @@ void KeyMap::AssignCmdKey(int key, int modifiers, unsigned int msg) {
 	len++;
 }

-unsigned int KeyMap::Find(int key, int modifiers) {
+UINT KeyMap::Find(int key, int modifiers) {
 	for (int i=0; i < len; i++) {
 		if ((key == kmap[i].key) && (modifiers == kmap[i].modifiers)) {
 			return kmap[i].msg;
@@ -61,55 +61,53 @@ unsigned int KeyMap::Find(int key, int modifiers) {
 }

 KeyToCommand KeyMap::MapDefault[] = {
-    {SCK_DOWN,		SCI_NORM,	SCI_LINEDOWN},
-    {SCK_DOWN,		SCI_SHIFT,	SCI_LINEDOWNEXTEND},
-    {SCK_DOWN,		SCI_CTRL,	SCI_LINESCROLLDOWN},
-    {SCK_UP,			SCI_NORM,	SCI_LINEUP},
-    {SCK_UP,			SCI_SHIFT,	SCI_LINEUPEXTEND},
-    {SCK_UP,			SCI_CTRL,	SCI_LINESCROLLUP},
-    {SCK_LEFT,		SCI_NORM,	SCI_CHARLEFT},
-    {SCK_LEFT,		SCI_SHIFT,	SCI_CHARLEFTEXTEND},
-    {SCK_LEFT,		SCI_CTRL,	SCI_WORDLEFT},
-    {SCK_LEFT,		SCI_CSHIFT,	SCI_WORDLEFTEXTEND},
-    {SCK_RIGHT,		SCI_NORM,	SCI_CHARRIGHT},
-    {SCK_RIGHT,		SCI_SHIFT,	SCI_CHARRIGHTEXTEND},
-    {SCK_RIGHT,		SCI_CTRL,	SCI_WORDRIGHT},
-    {SCK_RIGHT,		SCI_CSHIFT,	SCI_WORDRIGHTEXTEND},
-    {SCK_HOME, 		SCI_NORM, 	SCI_VCHOME},
-    {SCK_HOME, 		SCI_SHIFT, 	SCI_VCHOMEEXTEND},
-    {SCK_HOME, 		SCI_CTRL, 	SCI_DOCUMENTSTART},
-    {SCK_HOME, 		SCI_CSHIFT, 	SCI_DOCUMENTSTARTEXTEND},
-    {SCK_END,	 	SCI_NORM, 	SCI_LINEEND},
-    {SCK_END,	 	SCI_SHIFT, 	SCI_LINEENDEXTEND},
-    {SCK_END, 		SCI_CTRL, 	SCI_DOCUMENTEND},
-    {SCK_END, 		SCI_CSHIFT, 	SCI_DOCUMENTENDEXTEND},
-    {SCK_PRIOR,		SCI_NORM, 	SCI_PAGEUP},
-    {SCK_PRIOR,		SCI_SHIFT, 	SCI_PAGEUPEXTEND},
-    {SCK_NEXT, 		SCI_NORM, 	SCI_PAGEDOWN},
-    {SCK_NEXT, 		SCI_SHIFT, 	SCI_PAGEDOWNEXTEND},
-    {SCK_DELETE, 	SCI_NORM,	SCI_CLEAR},
-    {SCK_DELETE, 	SCI_SHIFT,	SCI_CUT},
-    {SCK_DELETE, 	SCI_CTRL,	SCI_DELWORDRIGHT},
-    {SCK_INSERT, 		SCI_NORM,	SCI_EDITTOGGLEOVERTYPE},
-    {SCK_INSERT, 		SCI_SHIFT,	SCI_PASTE},
-    {SCK_INSERT, 		SCI_CTRL,	SCI_COPY},
-    {SCK_ESCAPE,  	SCI_NORM,	SCI_CANCEL},
-    {SCK_BACK,		SCI_NORM, 	SCI_DELETEBACK},
-    {SCK_BACK,		SCI_SHIFT, 	SCI_DELETEBACK},
-    {SCK_BACK,		SCI_CTRL, 	SCI_DELWORDLEFT},
-    {SCK_BACK, 		SCI_ALT,	SCI_UNDO},
-    {'Z', 			SCI_CTRL,	SCI_UNDO},
+    {VK_DOWN,		SCI_NORM,	SCI_LINEDOWN},
+    {VK_DOWN,		SCI_SHIFT,	SCI_LINEDOWNEXTEND},
+    {VK_DOWN,		SCI_CTRL,	SCI_LINESCROLLDOWN},
+    {VK_UP,			SCI_NORM,	SCI_LINEUP},
+    {VK_UP,			SCI_SHIFT,	SCI_LINEUPEXTEND},
+    {VK_UP,			SCI_CTRL,	SCI_LINESCROLLUP},
+    {VK_LEFT,		SCI_NORM,	SCI_CHARLEFT},
+    {VK_LEFT,		SCI_SHIFT,	SCI_CHARLEFTEXTEND},
+    {VK_LEFT,		SCI_CTRL,	SCI_WORDLEFT},
+    {VK_LEFT,		SCI_CSHIFT,	SCI_WORDLEFTEXTEND},
+    {VK_RIGHT,		SCI_NORM,	SCI_CHARRIGHT},
+    {VK_RIGHT,		SCI_SHIFT,	SCI_CHARRIGHTEXTEND},
+    {VK_RIGHT,		SCI_CTRL,	SCI_WORDRIGHT},
+    {VK_RIGHT,		SCI_CSHIFT,	SCI_WORDRIGHTEXTEND},
+    {VK_HOME, 		SCI_NORM, 	SCI_VCHOME},
+    {VK_HOME, 		SCI_SHIFT, 	SCI_VCHOMEEXTEND},
+    {VK_HOME, 		SCI_CTRL, 	SCI_DOCUMENTSTART},
+    {VK_HOME, 		SCI_CSHIFT, 	SCI_DOCUMENTSTARTEXTEND},
+    {VK_END,	 	SCI_NORM, 	SCI_LINEEND},
+    {VK_END,	 	SCI_SHIFT, 	SCI_LINEENDEXTEND},
+    {VK_END, 		SCI_CTRL, 	SCI_DOCUMENTEND},
+    {VK_END, 		SCI_CSHIFT, 	SCI_DOCUMENTENDEXTEND},
+    {VK_PRIOR,		SCI_NORM, 	SCI_PAGEUP},
+    {VK_PRIOR,		SCI_SHIFT, 	SCI_PAGEUPEXTEND},
+    {VK_NEXT, 		SCI_NORM, 	SCI_PAGEDOWN},
+    {VK_NEXT, 		SCI_SHIFT, 	SCI_PAGEDOWNEXTEND},
+    {VK_DELETE, 	SCI_NORM,	WM_CLEAR},
+    {VK_DELETE, 	SCI_SHIFT,	WM_CUT},
+    {VK_DELETE, 	SCI_CTRL,	SCI_DELWORDRIGHT},
+    {VK_INSERT, 		SCI_NORM,	SCI_EDITTOGGLEOVERTYPE},
+    {VK_INSERT, 		SCI_SHIFT,	WM_PASTE},
+    {VK_INSERT, 		SCI_CTRL,	WM_COPY},
+    {VK_ESCAPE,  	SCI_NORM,	SCI_CANCEL},
+    {VK_BACK,		SCI_NORM, 	SCI_DELETEBACK},
+    {VK_BACK,		SCI_CTRL, 	SCI_DELWORDLEFT},
+    {'Z', 			SCI_CTRL,	WM_UNDO},
    {'Y', 			SCI_CTRL,	SCI_REDO},
-    {'X', 			SCI_CTRL,	SCI_CUT},
-    {'C', 			SCI_CTRL,	SCI_COPY},
-    {'V', 			SCI_CTRL,	SCI_PASTE},
+    {'X', 			SCI_CTRL,	WM_CUT},
+    {'C', 			SCI_CTRL,	WM_COPY},
+    {'V', 			SCI_CTRL,	WM_PASTE},
    {'A', 			SCI_CTRL,	SCI_SELECTALL},
-    {SCK_TAB,		SCI_NORM,	SCI_TAB},
-    {SCK_TAB,		SCI_SHIFT,	SCI_BACKTAB},
-    {SCK_RETURN, 	SCI_NORM,	SCI_NEWLINE},
-    {SCK_ADD, 		SCI_CTRL,	SCI_ZOOMIN},
-    {SCK_SUBTRACT,	SCI_CTRL,	SCI_ZOOMOUT},
-    {SCK_DIVIDE,	SCI_CTRL,	SCI_SETZOOM},
+    {VK_TAB,		SCI_NORM,	SCI_TAB},
+    {VK_TAB,		SCI_SHIFT,	SCI_BACKTAB},
+    {VK_RETURN, 	SCI_NORM,	SCI_NEWLINE},
+    {VK_ADD, 		SCI_CTRL,	SCI_ZOOMIN},
+    {VK_SUBTRACT,	SCI_CTRL,	SCI_ZOOMOUT},
+    {VK_DIVIDE,	SCI_CTRL,	SCI_SETZOOM},
    //'L', 			SCI_CTRL,		SCI_FORMFEED,
    {'L', 			SCI_CTRL,	SCI_LINECUT},
    {'L', 			SCI_CSHIFT,	SCI_LINEDELETE},
--- a/contrib/src/stc/scintilla/src/KeyMap.h
+++ b/contrib/src/stc/scintilla/src/KeyMap.h
@@ -7,9 +7,9 @@
 #define KEYTOCOMMAND_H

 #define SCI_NORM 0
-#define SCI_SHIFT SCMOD_SHIFT
-#define SCI_CTRL SCMOD_CTRL
-#define SCI_ALT SCMOD_ALT
+#define SCI_SHIFT SHIFT_PRESSED
+#define SCI_CTRL LEFT_CTRL_PRESSED
+#define SCI_ALT LEFT_ALT_PRESSED
 #define SCI_CSHIFT (SCI_CTRL | SCI_SHIFT)
 #define SCI_ASHIFT (SCI_ALT | SCI_SHIFT)

@@ -17,7 +17,7 @@ class KeyToCommand {
 public:
 	int key;
 	int modifiers;
-	unsigned int msg;
+	UINT msg;
 };

 class KeyMap {
@@ -29,8 +29,8 @@ public:
 	KeyMap();
 	~KeyMap();
 	void Clear();
-	void AssignCmdKey(int key, int modifiers, unsigned int msg);
-	unsigned int Find(int key, int modifiers);	// 0 returned on failure
+	void AssignCmdKey(int key, int modifiers, UINT msg);
+	UINT Find(int key, int modifiers);	// 0 returned on failure
 };

 #endif
--- a/contrib/src/stc/scintilla/src/LexCPP.cxx
+++ b/contrib/src/stc/scintilla/src/LexCPP.cxx
@@ -19,13 +19,14 @@

 static bool classifyWordCpp(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler) {
 	char s[100];
+	bool wordIsNumber = isdigit(styler[start]) || (styler[start] == '.');
+	bool wordIsUUID = false;
 	for (unsigned int i = 0; i < end - start + 1 && i < 30; i++) {
 		s[i] = styler[start + i];
 		s[i + 1] = '\0';
 	}
-	bool wordIsUUID = false;
 	char chAttr = SCE_C_IDENTIFIER;
-	if (isdigit(s[0]) || (s[0] == '.'))
+	if (wordIsNumber)
 		chAttr = SCE_C_NUMBER;
 	else {
 		if (keywords.InList(s)) {
@@ -45,7 +46,6 @@ static void ColouriseCppDoc(unsigned int startPos, int length, int initStyle, Wo
 	styler.StartAt(startPos);
 	
 	bool fold = styler.GetPropertyInt("fold");
-	bool stylingWithinPreprocessor = styler.GetPropertyInt("styling.within.preprocessor");
 	int lineCurrent = styler.GetLine(startPos);
 	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
 	int levelCurrent = levelPrev;
@@ -56,7 +56,7 @@ static void ColouriseCppDoc(unsigned int startPos, int length, int initStyle, Wo
 	char chPrev = ' ';
 	char chNext = styler[startPos];
 	unsigned int lengthDoc = startPos + length;
-	int visibleChars = 0;
+	int visChars = 0;
 	styler.StartSegment(startPos);
 	bool lastWordWasUUID = false;
 	for (unsigned int i = startPos; i < lengthDoc; i++) {
@@ -64,8 +64,6 @@ static void ColouriseCppDoc(unsigned int startPos, int length, int initStyle, Wo
 		chNext = styler.SafeGetCharAt(i + 1);

 		if ((ch == '\r' && chNext != '\n') || (ch == '\n')) {
-			// Trigger on CR only (Mac style) or either on LF from CR+LF (Dos/Win) or on LF alone (Unix)
-			// Avoid triggering two times on Dos/Win
 			// End of line
 			if (state == SCE_C_STRINGEOL) {
 				styler.ColourTo(i, state);
@@ -73,18 +71,18 @@ static void ColouriseCppDoc(unsigned int startPos, int length, int initStyle, Wo
 			}
 			if (fold) {
 				int lev = levelPrev;
-				if (visibleChars == 0)
+				if (visChars == 0)
 					lev |= SC_FOLDLEVELWHITEFLAG;
-				if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				if ((levelCurrent > levelPrev) && (visChars > 0))
 					lev |= SC_FOLDLEVELHEADERFLAG;
 				styler.SetLevel(lineCurrent, lev);
 				lineCurrent++;
+				visChars = 0;
 				levelPrev = levelCurrent;
 			}
-			visibleChars = 0;
 		}
 		if (!isspace(ch))
-			visibleChars++;
+			visChars++;

 		if (styler.IsLeadByte(ch)) {
 			chNext = styler.SafeGetCharAt(i + 2);
@@ -94,19 +92,13 @@ static void ColouriseCppDoc(unsigned int startPos, int length, int initStyle, Wo
 		}

 		if (state == SCE_C_DEFAULT) {
-			if (ch == '@' && chNext == '\"') {
-				styler.ColourTo(i-1, state);
-				state = SCE_C_VERBATIM;
-				i++;
-				ch = chNext;
-				chNext = styler.SafeGetCharAt(i + 1);
-			} else if (iswordstart(ch) || (ch == '@')) {
+			if (iswordstart(ch)) {
 				styler.ColourTo(i-1, state);
 				if (lastWordWasUUID) {
 					state = SCE_C_UUID;
 					lastWordWasUUID = false;
 				} else {
-					state = SCE_C_IDENTIFIER;
+					state = SCE_C_WORD;
 				}
 			} else if (ch == '/' && chNext == '*') {
 				styler.ColourTo(i-1, state);
@@ -123,16 +115,9 @@ static void ColouriseCppDoc(unsigned int startPos, int length, int initStyle, Wo
 			} else if (ch == '\'') {
 				styler.ColourTo(i-1, state);
 				state = SCE_C_CHARACTER;
-			} else if (ch == '#' && visibleChars == 1) {
-				// Preprocessor commands are alone on their line
+			} else if (ch == '#') {
 				styler.ColourTo(i-1, state);
 				state = SCE_C_PREPROCESSOR;
-				// Skip whitespace between # and preprocessor word
-				do {
-					i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				} while (isspace(ch) && (i < lengthDoc));
 			} else if (isoperator(ch)) {
 				styler.ColourTo(i-1, state);
 				styler.ColourTo(i, SCE_C_OPERATOR);
@@ -140,7 +125,7 @@ static void ColouriseCppDoc(unsigned int startPos, int length, int initStyle, Wo
 					levelCurrent += (ch == '{') ? 1 : -1;
 				}
 			}
-		} else if (state == SCE_C_IDENTIFIER) {
+		} else if (state == SCE_C_WORD) {
 			if (!iswordchar(ch)) {
 				lastWordWasUUID = classifyWordCpp(styler.GetStartSegment(), i - 1, keywords, styler);
 				state = SCE_C_DEFAULT;
@@ -155,6 +140,8 @@ static void ColouriseCppDoc(unsigned int startPos, int length, int initStyle, Wo
 					state = SCE_C_STRING;
 				} else if (ch == '\'') {
 					state = SCE_C_CHARACTER;
+				} else if (ch == '#') {
+					state = SCE_C_PREPROCESSOR;
 				} else if (isoperator(ch)) {
 					styler.ColourTo(i, SCE_C_OPERATOR);
 					if ((ch == '{') || (ch == '}')) {
@@ -164,16 +151,9 @@ static void ColouriseCppDoc(unsigned int startPos, int length, int initStyle, Wo
 			}
 		} else {
 			if (state == SCE_C_PREPROCESSOR) {
-				if (stylingWithinPreprocessor) {
-					if (isspace(ch)) {
-						styler.ColourTo(i-1, state);
-						state = SCE_C_DEFAULT;
-					}
-				} else {
-					if ((ch == '\r' || ch == '\n') && !(chPrev == '\\' || chPrev == '\r')) {
-						styler.ColourTo(i-1, state);
-						state = SCE_C_DEFAULT;
-					}
+				if ((ch == '\r' || ch == '\n') && !(chPrev == '\\' || chPrev == '\r')) {
+					styler.ColourTo(i-1, state);
+					state = SCE_C_DEFAULT;
 				}
 			} else if (state == SCE_C_COMMENT) {
 				if (ch == '/' && chPrev == '*') {
@@ -208,10 +188,13 @@ static void ColouriseCppDoc(unsigned int startPos, int length, int initStyle, Wo
 				} else if (ch == '\"') {
 					styler.ColourTo(i, state);
 					state = SCE_C_DEFAULT;
-				} else if (chNext == '\r' || chNext == '\n') {
+					i++;
+					ch = chNext;
+					chNext = styler.SafeGetCharAt(i + 1);
+                } else if (chNext == '\r' || chNext == '\n') {
 					styler.ColourTo(i-1, SCE_C_STRINGEOL);
 					state = SCE_C_STRINGEOL;
-				}
+                }
 			} else if (state == SCE_C_CHARACTER) {
 				if ((ch == '\r' || ch == '\n') && (chPrev != '\\')) {
 					styler.ColourTo(i-1, SCE_C_STRINGEOL);
@@ -225,26 +208,39 @@ static void ColouriseCppDoc(unsigned int startPos, int length, int initStyle, Wo
 				} else if (ch == '\'') {
 					styler.ColourTo(i, state);
 					state = SCE_C_DEFAULT;
-				}
-			} else if (state == SCE_C_VERBATIM) {
-				if (ch == '\"') {
-					if (chNext == '\"') {
-						i++;
-						ch = chNext;
-						chNext = styler.SafeGetCharAt(i + 1);
-					} else {
-						styler.ColourTo(i, state);
-						state = SCE_C_DEFAULT;
-					}
+					i++;
+					ch = chNext;
+					chNext = styler.SafeGetCharAt(i + 1);
 				}
 			} else if (state == SCE_C_UUID) {
 				if (ch == '\r' || ch == '\n' || ch == ')') {
 					styler.ColourTo(i-1, state);
-					if (ch == ')')
-						styler.ColourTo(i, SCE_C_OPERATOR);
 					state = SCE_C_DEFAULT;
 				}
 			}
+			if (state == SCE_C_DEFAULT) {    // One of the above succeeded
+				if (ch == '/' && chNext == '*') {
+					if (styler.SafeGetCharAt(i + 2) == '*')
+						state = SCE_C_COMMENTDOC;
+					else
+						state = SCE_C_COMMENT;
+				} else if (ch == '/' && chNext == '/') {
+					state = SCE_C_COMMENTLINE;
+				} else if (ch == '\"') {
+					state = SCE_C_STRING;
+				} else if (ch == '\'') {
+					state = SCE_C_CHARACTER;
+				} else if (ch == '#') {
+					state = SCE_C_PREPROCESSOR;
+				} else if (iswordstart(ch)) {
+					state = SCE_C_WORD;
+				} else if (isoperator(ch)) {
+					styler.ColourTo(i, SCE_C_OPERATOR);
+					if ((ch == '{') || (ch == '}')) {
+						levelCurrent += (ch == '{') ? 1 : -1;
+					}
+				}
+			}
 		}
 		chPrev = ch;
 	}
--- a/contrib/src/stc/scintilla/src/LexHTML.cxx
+++ b/contrib/src/stc/scintilla/src/LexHTML.cxx
--- a/contrib/src/stc/scintilla/src/LexLua.cxx
+++ b/contrib/src/stc/scintilla/src/LexLua.cxx
@@ -1,298 +0,0 @@
-// LexLua.cxx - lexer for Lua language
-// Written by Paul Winwood 
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <fcntl.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static void classifyWordLua(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler)
-{
-    char s[100];
-    bool wordIsNumber = isdigit(styler[start]) || (styler[start] == '.');
-    
-    for (unsigned int i = 0; i < end - start + 1 && i < 30; i++)
-    {
-        s[i] = styler[start + i];
-        s[i + 1] = '\0';
-    }
-
-    char chAttr = SCE_LUA_IDENTIFIER;
-    
-    if (wordIsNumber)
-        chAttr = SCE_LUA_NUMBER;
-    else
-    {
-        if (keywords.InList(s))
-        {
-            chAttr = SCE_LUA_WORD;
-        }
-    }
-    styler.ColourTo(end, chAttr);
-}
-
-static void ColouriseLuaDoc(unsigned int startPos, 
-                            int          length, 
-                            int          initStyle, 
-                            WordList    *keywordlists[],
-                            Accessor    &styler)
-{
-
-    WordList &keywords = *keywordlists[0];
-
-    styler.StartAt(startPos);
-    styler.GetLine(startPos);
-
-    int  state = initStyle;
-    char chPrev = ' ';
-    char chNext = styler[startPos];
-    unsigned int lengthDoc = startPos + length;
-    bool firstChar = true;
-    int  literalString = 0;
-
-    styler.StartSegment(startPos);
-    for (unsigned int i = startPos; i <= lengthDoc; i++)
-    {
-        char ch = chNext;
-        chNext = styler.SafeGetCharAt(i + 1);
-
-        if (styler.IsLeadByte(ch))
-        {
-            chNext = styler.SafeGetCharAt(i + 2);
-            chPrev = ' ';
-            i += 1;
-            continue;
-        }
-
-        if (state == SCE_LUA_STRINGEOL)
-        {
-            if (ch != '\r' && ch != '\n')
-            {
-                styler.ColourTo(i-1, state);
-                state = SCE_LUA_DEFAULT;
-            }
-        }
-
-        if (state == SCE_LUA_LITERALSTRING && ch == '[' && chNext == '[')
-        {
-            literalString++;
-        }
-        else
-        if (state == SCE_LUA_DEFAULT)
-        {
-            if (ch == '-' && chNext == '-')
-            {
-                styler.ColourTo(i-1, state);
-                state = SCE_LUA_COMMENTLINE;
-            }
-            else
-            if (ch == '[' && chNext == '[')
-            {
-                state = SCE_LUA_LITERALSTRING;
-                literalString = 1;
-            }
-            else
-            if (iswordstart(ch))
-            {
-                styler.ColourTo(i-1, state);
-                state = SCE_LUA_WORD;
-            }
-            else
-            if (ch == '\"')
-            {
-                styler.ColourTo(i-1, state);
-                state = SCE_LUA_STRING;
-            }
-            else
-            if (ch == '\'')
-            {
-                styler.ColourTo(i-1, state);
-                state = SCE_LUA_CHARACTER;
-            }
-            else
-            if (ch == '$' && firstChar)
-            {
-                styler.ColourTo(i-1, state);
-                state = SCE_LUA_PREPROCESSOR;
-            }
-            else
-            if (isoperator(ch))
-            {
-                styler.ColourTo(i-1, state);
-                styler.ColourTo(i, SCE_LUA_OPERATOR);
-            }
-        }
-        else
-        if (state == SCE_LUA_WORD)
-        {
-            if (!iswordchar(ch))
-            {
-                classifyWordLua(styler.GetStartSegment(), i - 1, keywords, styler);
-                state = SCE_LUA_DEFAULT;
-                if (ch == '[' && chNext == '[')
-                {
-                    literalString = 1;
-                    state = SCE_LUA_LITERALSTRING;
-                }
-                else
-                if (ch == '-' && chNext == '-')
-                {
-                    state = SCE_LUA_COMMENTLINE;
-                }
-                else
-                if (ch == '\"')
-                {
-                    state = SCE_LUA_STRING;
-                }
-                else
-                if (ch == '\'')
-                {
-                    state = SCE_LUA_CHARACTER;
-                }
-                else
-                if (ch == '$' && firstChar)
-                {
-                    state = SCE_LUA_PREPROCESSOR;
-                }
-                else
-                if (isoperator(ch))
-                {
-                    styler.ColourTo(i, SCE_LUA_OPERATOR);
-                }
-            }
-        }
-        else
-        {
-            if (state == SCE_LUA_LITERALSTRING)
-            {
-                if (ch == ']' && (chPrev == ']') && (--literalString == 0))
-                {
-                    styler.ColourTo(i, state);
-                    state = SCE_LUA_DEFAULT;
-                }
-            }
-            else
-            if (state == SCE_LUA_PREPROCESSOR)
-            {
-                if ((ch == '\r' || ch == '\n') && (chPrev != '\\'))
-                {
-                    styler.ColourTo(i-1, state);
-                    state = SCE_LUA_DEFAULT;
-                }
-            }
-            else
-            if (state == SCE_LUA_COMMENTLINE)
-            {
-                if (ch == '\r' || ch == '\n')
-                {
-                    styler.ColourTo(i-1, state);
-                    state = SCE_LUA_DEFAULT;
-                }
-            }
-            else
-            if (state == SCE_LUA_STRING)
-            {
-                if ((ch == '\r' || ch == '\n') && (chPrev != '\\'))
-                {
-                    styler.ColourTo(i-1, state);
-                    state = SCE_LUA_STRINGEOL;
-                }
-                else
-                if (ch == '\\')
-                {
-                    if (chNext == '\"' || chNext == '\\')
-                    {
-                        i++;
-                        ch = chNext;
-                        chNext = styler.SafeGetCharAt(i + 1);
-                    }
-                }
-                else
-                if (ch == '\"')
-                {
-                    styler.ColourTo(i, state);
-                    state = SCE_LUA_DEFAULT;
-                    i++;
-                    ch = chNext;
-                    chNext = styler.SafeGetCharAt(i + 1);
-                }
-            }
-            else
-            if (state == SCE_LUA_CHARACTER)
-            {
-                if ((ch == '\r' || ch == '\n') && (chPrev != '\\'))
-                {
-                    styler.ColourTo(i-1, state);
-                    state = SCE_LUA_STRINGEOL;
-                }
-                else
-                if (ch == '\\')
-                {
-                    if (chNext == '\'' || chNext == '\\')
-                    {
-                        i++;
-                        ch = chNext;
-                        chNext = styler.SafeGetCharAt(i + 1);
-                    }
-                }
-                else
-                if (ch == '\'')
-                {
-                    styler.ColourTo(i, state);
-                    state = SCE_LUA_DEFAULT;
-                    i++;
-                    ch = chNext;
-                    chNext = styler.SafeGetCharAt(i + 1);
-                }
-            }
-
-            if (state == SCE_LUA_DEFAULT)
-            {    
-                if (ch == '-' && chNext == '-')
-                {
-                    state = SCE_LUA_COMMENTLINE;
-                }
-                else
-                if (ch == '\"')
-                {
-                    state = SCE_LUA_STRING;
-                }
-                else
-                if (ch == '\'')
-                {
-                    state = SCE_LUA_CHARACTER;
-                }
-                else
-                if (ch == '$' && firstChar)
-                {
-                    state = SCE_LUA_PREPROCESSOR;
-                }
-                else
-                if (iswordstart(ch))
-                {
-                    state = SCE_LUA_WORD;
-                }
-                else
-                if (isoperator(ch))
-                {
-                    styler.ColourTo(i, SCE_LUA_OPERATOR);
-                }
-            }
-        }
-        chPrev = ch;
-        firstChar = (ch == '\r' || ch == '\n');
-    }
-    styler.ColourTo(lengthDoc - 1, state);
-}
-
-LexerModule lmLua(SCLEX_LUA, ColouriseLuaDoc);
--- a/contrib/src/stc/scintilla/src/LexOthers.cxx
+++ b/contrib/src/stc/scintilla/src/LexOthers.cxx
@@ -49,46 +49,6 @@ static void ColouriseBatchDoc(unsigned int startPos, int length, int, WordList *
 		ColouriseBatchLine(lineBuffer, startPos + length, styler);
 }

-static void ColouriseDiffLine(char *lineBuffer, int endLine, Accessor &styler) {
-	// It is needed to remember the current state to recognize starting
-	// comment lines before the first "diff " or "--- ". If a real
-	// difference starts then each line starting with ' ' is a whitespace
-	// otherwise it is considered a comment (Only in..., Binary file...)
-	if (0 == strncmp(lineBuffer, "diff ", 3)) {
-		styler.ColourTo(endLine, 2);
-	} else if (0 == strncmp(lineBuffer, "--- ", 3)) {
-		styler.ColourTo(endLine, 3);
-	} else if (0 == strncmp(lineBuffer, "+++ ", 3)) {
-		styler.ColourTo(endLine, 3);
-	} else if (lineBuffer[0] == '@') {
-		styler.ColourTo(endLine, 4);
-	} else if (lineBuffer[0] == '-') {
-		styler.ColourTo(endLine, 5);
-	} else if (lineBuffer[0] == '+') {
-		styler.ColourTo(endLine, 6);
-	} else if (lineBuffer[0] != ' ') {
-		styler.ColourTo(endLine, 1);
-	} else {
-		styler.ColourTo(endLine, 0);
-	}
-}
-
-static void ColouriseDiffDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
-	char lineBuffer[1024];
-	styler.StartAt(startPos);
-	styler.StartSegment(startPos);
-	unsigned int linePos = 0;
-	for (unsigned int i = startPos; i < startPos + length; i++) {
-		lineBuffer[linePos++] = styler[i];
-		if (styler[i] == '\r' || styler[i] == '\n' || (linePos >= sizeof(lineBuffer) - 1)) {
-			ColouriseDiffLine(lineBuffer, i, styler);
-			linePos = 0;
-		}
-	}
-	if (linePos > 0)
-		ColouriseDiffLine(lineBuffer, startPos + length, styler);
-}
-
 static void ColourisePropsLine(char *lineBuffer, int lengthLine, int startLine, int endPos, Accessor &styler) {
 	int i = 0;
 	while (isspace(lineBuffer[i]) && (i < lengthLine))	// Skip initial spaces
@@ -166,21 +126,15 @@ static void ColouriseMakeDoc(unsigned int startPos, int length, int, WordList *[
 static void ColouriseErrorListLine(char *lineBuffer, int lengthLine, int endPos, Accessor &styler) {
 	if (lineBuffer[0] == '>') {
 		// Command or return status
-		styler.ColourTo(endPos, SCE_ERR_CMD);
+		styler.ColourTo(endPos, 4);
 	} else if (strstr(lineBuffer, "File \"") && strstr(lineBuffer, ", line ")) {
-		styler.ColourTo(endPos, SCE_ERR_PYTHON);
+		styler.ColourTo(endPos, 1);
 	} else if (0 == strncmp(lineBuffer, "Error ", strlen("Error "))) {
 		// Borland error message
-		styler.ColourTo(endPos, SCE_ERR_BORLAND);
+		styler.ColourTo(endPos, 5);
 	} else if (0 == strncmp(lineBuffer, "Warning ", strlen("Warning "))) {
 		// Borland warning message
-		styler.ColourTo(endPos, SCE_ERR_BORLAND);
-	} else if (strstr(lineBuffer, " at "  ) && 
-		strstr(lineBuffer, " at "  ) < lineBuffer+lengthLine && 
-		strstr(lineBuffer, " line ") && 
-		strstr(lineBuffer, " line ") < lineBuffer+lengthLine) {
-		// perl error message
-		styler.ColourTo(endPos, SCE_ERR_PERL);
+		styler.ColourTo(endPos, 5);
 	} else {
 		// Look for <filename>:<line>:message
 		// Look for <filename>(line)message
@@ -214,11 +168,11 @@ static void ColouriseErrorListLine(char *lineBuffer, int lengthLine, int endPos,
 			}
 		}
 		if (state == 3) {
-			styler.ColourTo(endPos, SCE_ERR_GCC);
+			styler.ColourTo(endPos, 2);
 		} else if ((state == 13) || (state == 14) || (state == 15)) {
-			styler.ColourTo(endPos, SCE_ERR_MS);
+			styler.ColourTo(endPos, 3);
 		} else {
-			styler.ColourTo(endPos, SCE_ERR_DEFAULT);
+			styler.ColourTo(endPos, 0);
 		}
 	}
 }
@@ -343,9 +297,8 @@ static void ColouriseLatexDoc(unsigned int startPos, int length, int initStyle,
 	styler.ColourTo(lengthDoc, state);
 }

-LexerModule lmBatch(SCLEX_BATCH, ColouriseBatchDoc);
-LexerModule lmDiff(SCLEX_DIFF, ColouriseDiffDoc);
 LexerModule lmProps(SCLEX_PROPERTIES, ColourisePropsDoc);
-LexerModule lmMake(SCLEX_MAKEFILE, ColouriseMakeDoc);
 LexerModule lmErrorList(SCLEX_ERRORLIST, ColouriseErrorListDoc);
+LexerModule lmMake(SCLEX_MAKEFILE, ColouriseMakeDoc);
+LexerModule lmBatch(SCLEX_BATCH, ColouriseBatchDoc);
 LexerModule lmLatex(SCLEX_LATEX, ColouriseLatexDoc);
--- a/contrib/src/stc/scintilla/src/LexPerl.cxx
+++ b/contrib/src/stc/scintilla/src/LexPerl.cxx
@@ -107,7 +107,7 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 		state = SCE_PL_DEFAULT;
 	}
 	styler.StartAt(startPos);
-	char chPrev = styler.SafeGetCharAt(startPos - 1);
+	char chPrev = ' ';
 	char chNext = styler[startPos];
 	styler.StartSegment(startPos);
 	for (int i = startPos; i < lengthDoc; i++) {
@@ -230,7 +230,7 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 				quotes = 0;
 				sookedpos = 0;
 				sooked[sookedpos] = '\0';
-			} else if (ch == '=' && (chPrev == '\r' || chPrev == '\n') && isalpha(chNext)) {
+			} else if (ch == '=' && isalpha(chNext)) {
 				styler.ColourTo(i - 1, state);
 				state = SCE_PL_POD;
 				quotes = 0;
@@ -284,7 +284,7 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 					state = SCE_PL_DEFAULT;
 				}
 			} else if (state == SCE_PL_HERE) {
-				if ((isalnum(ch) || ch == '_') && quotes < 2) {
+				if (isalnum(ch) && quotes < 2) {
 					sooked[sookedpos++] = ch;
 					sooked[sookedpos] = '\0';
 					if (quotes == 0)
@@ -292,17 +292,14 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 				} else {
 					quotes++;
 				}
-				if ((quotes > 1) && 
-					(chPrev == '\n' || chPrev == '\r') &&
-					isMatch(styler, lengthDoc, i, sooked)) {
+				if (quotes > 1 && isMatch(styler, lengthDoc, i, sooked) && (chPrev == '\n' || chPrev == '\r') ) {
+					styler.ColourTo(i + sookedpos - 1, SCE_PL_HERE);
 					i += sookedpos;
 					chNext = styler.SafeGetCharAt(i);
 					if (chNext == '\n' || chNext == '\r') {
-						styler.ColourTo(i - 1, SCE_PL_HERE);
 						state = SCE_PL_DEFAULT;
 					}
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
+					chNext = ' ';
 				}
 			} else if (state == SCE_PL_STRING) {
 				if (ch == '\\') {
@@ -341,13 +338,13 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 					chNext = styler.SafeGetCharAt(i + 1);
 				}
 			} else if (state == SCE_PL_POD) {
-				if (ch == '=' && (chPrev == '\r' || chPrev == '\n')) {
+				if (ch == '=') {
 					if (isMatch(styler, lengthDoc, i, "=cut")) {
 						styler.ColourTo(i - 1 + 4, state);
 						i += 4;
 						state = SCE_PL_DEFAULT;
-						ch = styler.SafeGetCharAt(i);
-						chNext = styler.SafeGetCharAt(i + 1);
+						chNext = ' ';
+						ch = ' ';
 					}
 				}
 			} else if (state == SCE_PL_SCALAR) {
@@ -412,32 +409,7 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
 					quoteDown = opposite(ch);
 					quotes++;
 				} else {
-					if (quotes == 0 && quoteRep == 1) {
-						/* We matched something like s(...) or tr{...}
-						* and are looking for the next matcher characters,
-						* which could be either bracketed ({...}) or non-bracketed
-						* (/.../).
-						*
-						* Number-signs are problematic.  If they occur after
-						* the close of the first part, treat them like
-						* a quoteUp char, even if they actually start comments.
-						*
-						* If we find an alnum, we end the regsubst, and punt.
-						*
-						* Eric Promislow   ericp@activestate.com  Aug 9,2000
-						*/
-						if (isspace(ch)) {
-							// Keep going
-						} else if (isalnum(ch)) {
-							styler.ColourTo(i, state);
-							state = SCE_PL_DEFAULT;
-							ch = ' ';
-						} else {
-							quoteUp = ch;
-							quoteDown = opposite(ch);
-							quotes++;
-						}
-					} else if (ch == quoteDown && chPrev != '\\') {
+					if (ch == quoteDown && chPrev != '\\') {
 						quotes--;
 						if (quotes == 0) {
 							quoteRep--;
--- a/contrib/src/stc/scintilla/src/LexPython.cxx
+++ b/contrib/src/stc/scintilla/src/LexPython.cxx
@@ -33,13 +33,6 @@ static void ClassifyWordPy(unsigned int start, unsigned int end, WordList &keywo
 		chAttr = SCE_P_NUMBER;
 	else if (keywords.InList(s))
 		chAttr = SCE_P_WORD;
-	// make sure that dot-qualifiers inside the word are lexed correct
-	else for (unsigned int i = 0; i < end - start + 1; i++) {
-		if (styler[start + i] == '.') {
-			styler.ColourTo(start + i - 1, chAttr);
-			styler.ColourTo(start + i, SCE_P_OPERATOR);
-		}
-	}
 	styler.ColourTo(end, chAttr);
 	strcpy(prevWord, s);
 }
--- a/contrib/src/stc/scintilla/src/LexVB.cxx
+++ b/contrib/src/stc/scintilla/src/LexVB.cxx
@@ -20,21 +20,20 @@
 static int classifyWordVB(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler) {

 	char s[100];
-	bool wordIsNumber = isdigit(styler[start]) || (styler[start] == '.') ||
-		(styler[start] == '&' && tolower(styler[start+1]) == 'h');
-	unsigned int i;
-	for (i = 0; i < end - start + 1 && i < 30; i++) {
+	bool wordIsNumber = isdigit(styler[start]) || (styler[start] == '.');
+	for (unsigned int i = 0; i < end - start + 1 && i < 30; i++) {
 		s[i] = static_cast<char>(tolower(styler[start + i]));
+		s[i + 1] = '\0';
 	}
-	s[i] = '\0';
 	char chAttr = SCE_C_DEFAULT;
 	if (wordIsNumber)
 		chAttr = SCE_C_NUMBER;
 	else {
-		if (strcmp(s, "rem") == 0)
-			chAttr = SCE_C_COMMENTLINE;
-		else if (keywords.InList(s))
+		if (keywords.InList(s)) {
 			chAttr = SCE_C_WORD;
+			if (strcmp(s, "rem") == 0)
+				chAttr = SCE_C_COMMENTLINE;
+		}
 	}
 	styler.ColourTo(end, chAttr);
 	if (chAttr == SCE_C_COMMENTLINE)
@@ -50,7 +49,6 @@ static void ColouriseVBDoc(unsigned int startPos, int length, int initStyle,
 	
 	styler.StartAt(startPos);

-	int visibleChars = 0;
 	int state = initStyle;
 	char chNext = styler[startPos];
 	styler.StartSegment(startPos);
@@ -65,17 +63,6 @@ static void ColouriseVBDoc(unsigned int startPos, int length, int initStyle,
 			continue;
 		}

-		if (ch == '\r' || ch == '\n') {
-			// End of line
-			if (state == SCE_C_COMMENTLINE || state == SCE_C_PREPROCESSOR) {
-				styler.ColourTo(i - 1, state);
-				state = SCE_C_DEFAULT;
-			}
-			visibleChars = 0;
-		}
-		if (!isspace(ch))
-			visibleChars++;
-
 		if (state == SCE_C_DEFAULT) {
 			if (iswordstart(ch)) {
 				styler.ColourTo(i - 1, state);
@@ -86,16 +73,6 @@ static void ColouriseVBDoc(unsigned int startPos, int length, int initStyle,
 			} else if (ch == '\"') {
 				styler.ColourTo(i - 1, state);
 				state = SCE_C_STRING;
-			} else if (ch == '#' && visibleChars == 1) {
-				// Preprocessor commands are alone on their line
-				styler.ColourTo(i - 1, state);
-				state = SCE_C_PREPROCESSOR;
-			} else if (ch == '&' && tolower(chNext) == 'h') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_C_WORD;
-			} else if (isoperator(ch)) {
-				styler.ColourTo(i - 1, state);
-				styler.ColourTo(i, SCE_C_OPERATOR);
 			}
 		} else if (state == SCE_C_WORD) {
 			if (!iswordchar(ch)) {
@@ -105,14 +82,16 @@ static void ColouriseVBDoc(unsigned int startPos, int length, int initStyle,
 						state = SCE_C_COMMENTLINE;
 					} else if (ch == '\"') {
 						state = SCE_C_STRING;
-					} else if (isoperator(ch)) {
-						styler.ColourTo(i - 1, state);
-						styler.ColourTo(i, SCE_C_OPERATOR);
 					}
 				}
 			}
 		} else {
-			if (state == SCE_C_STRING) {
+			if (state == SCE_C_COMMENTLINE) {
+				if (ch == '\r' || ch == '\n') {
+					styler.ColourTo(i - 1, state);
+					state = SCE_C_DEFAULT;
+				}
+			} else if (state == SCE_C_STRING) {
 				// VB doubles quotes to preserve them
 				if (ch == '\"') {
 					styler.ColourTo(i, state);
--- a/contrib/src/stc/scintilla/src/PosRegExp.cxx
+++ b/contrib/src/stc/scintilla/src/PosRegExp.cxx
--- a/contrib/src/stc/scintilla/src/PropSet.cxx
+++ b/contrib/src/stc/scintilla/src/PropSet.cxx
@@ -24,18 +24,6 @@ bool EqualCaseInsensitive(const char *a, const char *b) {
 #endif
 }

-SString::size_type SString::npos = -1;
-
-inline unsigned int HashString(const char *s) {
-    unsigned int ret = 0;
-    while (*s) {
-        ret <<= 4;
-        ret ^= *s;
-        s++;
-    }
-    return ret;
-}
-
 // Get a line of input. If end of line escaped with '\\' then continue reading.
 static bool GetFullLine(const char *&fpc, int &lenData, char *s, int len) {
 	bool continuation = true;
@@ -68,39 +56,47 @@ static bool GetFullLine(const char *&fpc, int &lenData, char *s, int len) {

 PropSet::PropSet() {
 	superPS = 0;
-    for (int root=0; root < hashRoots; root++)
-        props[root] = 0;
+	size = 10;
+	used = 0;
+	vals = new char * [size];
 }

 PropSet::~PropSet() {
 	superPS = 0;
 	Clear();
+	delete []vals;
+}
+
+void PropSet::EnsureCanAddEntry() {
+	if (used >= size - 2) {
+		int newsize = size + 10;
+		char **newvals = new char * [newsize];
+
+		for (int i = 0; i < used; i++) {
+			newvals[i] = vals[i];
+		}
+		delete []vals;
+		vals = newvals;
+		size = newsize;
+	}
 }

 void PropSet::Set(const char *key, const char *val) {
-    unsigned int hash = HashString(key);
-	for (Property *p=props[hash % hashRoots]; p; p=p->next) {
-		if ((hash == p->hash) && (0 == strcmp(p->key, key))) {
+	EnsureCanAddEntry();
+	for (int i = 0; i < used; i += 2) {
+		if (EqualCaseInsensitive(vals[i], key)) {
 			// Replace current value
-			delete [](p->val);
-			p->val = StringDup(val);
+			delete [](vals[i + 1]);
+			vals[i + 1] = StringDup(val);
 			return;
 		}
 	}
 	// Not found
-    Property *pNew = new Property;
-    if (pNew) {
-        pNew->hash = HashString(key);
-	    pNew->key = StringDup(key);
-	    pNew->val = StringDup(val);
-	    pNew->next = props[hash % hashRoots];
-        props[hash % hashRoots] = pNew;
-    }
+	vals[used++] = StringDup(key);
+	vals[used++] = StringDup(val);
 }

 void PropSet::Set(char *keyval) {
-    while (isspace(*keyval))
-        keyval++;
 	char *eqat = strchr(keyval, '=');
 	if (eqat) {
 		*eqat = '\0';
@@ -110,12 +106,11 @@ void PropSet::Set(char *keyval) {
 }

 SString PropSet::Get(const char *key) {
-    unsigned int hash = HashString(key);
-	for (Property *p=props[hash % hashRoots]; p; p=p->next) {
-		if ((hash == p->hash) && (0 == strcmp(p->key, key))) {
-            return p->val;
-        }
-    }
+	for (int i = 0; i < used; i += 2) {
+		if (EqualCaseInsensitive(vals[i], key)) {
+			return vals[i + 1];
+		}
+	}
 	if (superPS) {
 		// Failed here, so try in base property set
 		return superPS->Get(key);
@@ -124,36 +119,6 @@ SString PropSet::Get(const char *key) {
 	}
 }

-SString PropSet::GetExpanded(const char *key) {
-    SString val = Get(key);
-    return Expand(val.c_str());
-}
-
-SString PropSet::Expand(const char *withvars) {
-	char *base = StringDup(withvars);
-	char *cpvar = strstr(base, "$(");
-	while (cpvar) {
-		char *cpendvar = strchr(cpvar, ')');
-		if (cpendvar) {
-			int lenvar = cpendvar - cpvar - 2;  	// Subtract the $()
-			char *var = StringDup(cpvar+2, lenvar);
-			SString val = GetExpanded(var);
-			int newlenbase = strlen(base) + val.length() - lenvar;
-			char *newbase = new char[newlenbase];
-			strncpy(newbase, base, cpvar - base);
-			strcpy(newbase + (cpvar - base), val.c_str());
-			strcpy(newbase + (cpvar - base) + val.length(), cpendvar + 1);
-			delete []var;
-			delete []base;
-			base = newbase;
-		}
-		cpvar = strstr(base, "$(");
-	}
-	SString sret = base;
-	delete []base;
-	return sret;
-}
-
 int PropSet::GetInt(const char *key, int defaultValue) {
 	SString val = Get(key);
 	if (val.length())
@@ -162,9 +127,9 @@ int PropSet::GetInt(const char *key, int defaultValue) {
 		return defaultValue;
 }

-inline bool isprefix(const char *target, const char *prefix) {
+bool isprefix(const char *target, const char *prefix) {
 	while (*target && *prefix) {
-		if (*target != *prefix)
+		if (toupper(*target) != toupper(*prefix))
 			return false;
 		target++;
 		prefix++;
@@ -181,63 +146,64 @@ bool issuffix(const char *target, const char *suffix) {
 	if (lensuffix > lentarget)
 		return false;
 	for (int i = lensuffix - 1; i >= 0; i--) {
-		if (target[i + lentarget - lensuffix] != suffix[i])
+		if (toupper(target[i + lentarget - lensuffix]) != toupper(suffix[i]))
 			return false;
 	}
 	return true;
 }

 SString PropSet::GetWild(const char *keybase, const char *filename) {
-    for (int root=0; root < hashRoots; root++) {
-	    for (Property *p=props[root]; p; p=p->next) {
-		    if (isprefix(p->key, keybase)) {
-			    char *orgkeyfile = p->key + strlen(keybase);
-			    char *keyfile = NULL;
+	for (int i = 0; i < used; i += 2) {
+		if (isprefix(vals[i], keybase)) {
+			char *orgkeyfile = vals[i] + strlen(keybase);
+			char *keyfile = NULL;

-			    if (strstr(orgkeyfile, "$(") == orgkeyfile) {
-				    char *cpendvar = strchr(orgkeyfile, ')');
-				    if (cpendvar) {
-					    *cpendvar = '\0';
-					    SString s = Get(orgkeyfile + 2);
-					    *cpendvar= ')';
-					    keyfile = strdup(s.c_str());
-				    }
-			    }
-			    char *keyptr = keyfile;
+			if (strstr(orgkeyfile, "$(") == orgkeyfile) {
+				char *cpendvar = strchr(orgkeyfile, ')');
+				if (cpendvar) {
+					int lenvar = cpendvar - orgkeyfile - 2; 	// Subtract the $()
+					char *var = static_cast<char *>(malloc(lenvar + 1));
+					strncpy(var, orgkeyfile + 2, lenvar);
+					var[lenvar] = '\0';
+					SString s = Get(var);
+					free(var);
+					keyfile = strdup(s.c_str());
+				}
+			}
+			char *keyptr = keyfile;

-			    if (keyfile == NULL)
-				    keyfile = orgkeyfile;
+			if (keyfile == NULL)
+				keyfile = orgkeyfile;

-			    for (; ; ) {
-				    char *del = strchr(keyfile, ';');
-				    if (del == NULL)
-					    del = keyfile + strlen(keyfile);
-				    char delchr = *del;
-				    *del = '\0';
-				    if (*keyfile == '*') {
-					    if (issuffix(filename, keyfile + 1)) {
-						    *del = delchr;
-						    free(keyptr);
-						    return p->val;
-					    }
-				    } else if (0 == strcmp(keyfile, filename)) {
-					    *del = delchr;
-					    free(keyptr);
-					    return p->val;
-				    }
-				    if (delchr == '\0')
-					    break;
-				    *del = delchr;
-				    keyfile = del + 1;
-			    }
-			    free(keyptr);
+			for (; ; ) {
+				char *del = strchr(keyfile, ';');
+				if (del == NULL)
+					del = keyfile + strlen(keyfile);
+				char delchr = *del;
+				*del = '\0';
+				if (*keyfile == '*') {
+					if (issuffix(filename, keyfile + 1)) {
+						*del = delchr;
+						free(keyptr);
+						return vals[i + 1];
+					}
+				} else if (EqualCaseInsensitive(keyfile, filename)) {
+					*del = delchr;
+					free(keyptr);
+					return vals[i + 1];
+				}
+				if (delchr == '\0')
+					break;
+				*del = delchr;
+				keyfile = del + 1;
+			}
+			free(keyptr);

-			    if (0 == strcmp(p->key, keybase)) {
-				    return p->val;
-			    }
-		    }
-	    }
-    }
+			if (EqualCaseInsensitive(vals[i], keybase)) {
+				return vals[i + 1];
+			}
+		}
+	}
 	if (superPS) {
 		// Failed here, so try in base property set
 		return superPS->GetWild(keybase, filename);
@@ -253,7 +219,9 @@ SString PropSet::GetNewExpand(const char *keybase, const char *filename) {
 		char *cpendvar = strchr(cpvar, ')');
 		if (cpendvar) {
 			int lenvar = cpendvar - cpvar - 2;  	// Subtract the $()
-			char *var = StringDup(cpvar+2, lenvar);
+			char *var = new char[lenvar + 1];
+			strncpy(var, cpvar + 2, lenvar);
+			var[lenvar] = '\0';
 			SString val = GetWild(var, filename);
 			int newlenbase = strlen(base) + val.length() - lenvar;
 			char *newbase = new char[newlenbase];
@@ -272,54 +240,36 @@ SString PropSet::GetNewExpand(const char *keybase, const char *filename) {
 }

 void PropSet::Clear() {
-    for (int root=0; root < hashRoots; root++) {
-        Property *p=props[root];
-	    while (p) {
-            Property *pNext=p->next;
-		    p->hash = 0;
-		    delete p->key;
-		    p->key = 0;
-		    delete p->val;
-		    p->val = 0;
-            delete p;
-            p = pNext;
-        }
-        props[root] = 0;
-    }
+	for (int i = 0; i < used; i++) {
+		delete [](vals[i]);
+		vals[i] = 0;
+	}
+	used = 0;
 }

-void PropSet::ReadFromMemory(const char *data, int len, const char *directoryForImports) {
-	const char *pd = data;
-	char linebuf[60000];
-	bool ifIsTrue = true;
-	while (len > 0) {
-		GetFullLine(pd, len, linebuf, sizeof(linebuf));
-		if (isalpha(linebuf[0]))    // If clause ends with first non-indented line
-			ifIsTrue = true;
-		if (isprefix(linebuf, "if ")) {
-			const char *expr = linebuf + strlen("if") + 1;
-			ifIsTrue = GetInt(expr);
-		} else if (isprefix(linebuf, "import ") && directoryForImports) {
-			char importPath[1024];
-			strcpy(importPath, directoryForImports);
-			strcat(importPath, linebuf + strlen("import") + 1);
-			strcat(importPath, ".properties");
-            		Read(importPath,directoryForImports);
-		} else if (isalpha(linebuf[0])) {
-			Set(linebuf);
-		} else if (isspace(linebuf[0]) && ifIsTrue) {
-			Set(linebuf);
+void PropSet::ReadFromMemory(const char *data, int len) {
+	if (len > 0) {
+		const char *pd = data;
+		char linebuf[60000];
+		while (GetFullLine(pd, len, linebuf, sizeof(linebuf))) {
+			if (isalpha(linebuf[0]))
+				Set(linebuf);
 		}
+		// If there is a final line:
+		if (isalpha(linebuf[0]))
+			Set(linebuf);
 	}
 }

-void PropSet::Read(const char *filename, const char *directoryForImports) {
+void PropSet::Read(const char *filename) {
+	//printf("Opening properties <%s>\n", filename);
+	Clear();
 	char propsData[60000];
 	FILE *rcfile = fopen(filename, "rb");
 	if (rcfile) {
 		int lenFile = fread(propsData, 1, sizeof(propsData), rcfile);
 		fclose(rcfile);
-		ReadFromMemory(propsData, lenFile, directoryForImports);
+		ReadFromMemory(propsData, lenFile);
 	} else {
 		//printf("Could not open <%s>\n", filename);
 	}
@@ -335,8 +285,7 @@ static bool iswordsep(char ch, bool onlyLineEnds) {

 // Creates an array that points into each word in the string and puts \0 terminators
 // after each word.
-static char **ArrayFromWordList(char *wordlist, int *len, bool onlyLineEnds = false) {
-#if 1
+static char **ArrayFromWordList(char *wordlist, bool onlyLineEnds = false) {
 	char prev = '\n';
 	int words = 0;
 	for (int j = 0; wordlist[j]; j++) {
@@ -348,8 +297,8 @@ static char **ArrayFromWordList(char *wordlist, int *len, bool onlyLineEnds = fa
 	if (keywords) {
 		words = 0;
 		prev = '\0';
-		int slen = strlen(wordlist);
-		for (int k = 0; k < slen; k++) {
+		int len = strlen(wordlist);
+		for (int k = 0; k < len; k++) {
 			if (!iswordsep(wordlist[k], onlyLineEnds)) {
 				if (!prev) {
 					keywords[words] = &wordlist[k];
@@ -360,69 +309,25 @@ static char **ArrayFromWordList(char *wordlist, int *len, bool onlyLineEnds = fa
 			}
 			prev = wordlist[k];
 		}
-		keywords[words] = &wordlist[slen];
-		*len = words;
-	} else {
-		*len = 0;
+		keywords[words] = &wordlist[len];
 	}
-#else
-	int words = 0; // length of the returned buffer of pointers
-	#undef APICHUNK // how many pointers will be pre-allocated (to avoid buffer reallocation on each new pointer)
-	#define APICHUNK 256
-	int size = APICHUNK; // real size of the returned buffer of pointers
-	char **keywords; // buffer for the pointers returned
-	int slen = strlen(wordlist); //length of the buffer with api file
-	keywords = (char**) malloc((size + 1) * sizeof (*keywords));
-	words = 0;
-	for (int k = 0;;) {
-		while (iswordsep(wordlist[k], onlyLineEnds))
-			wordlist[k++] = '\0';
-		if (k >= slen)
-			break;
-		if (words >= size) {
-			do
-				size += APICHUNK;
-			while (size <= words);
-			keywords = (char**) realloc(keywords, (size + 1) * sizeof (*keywords));
-		}
-		keywords[words++] = wordlist + k;
-		do
-			if (k < slen)
-				k++;
-			else
-				goto out;
-		while (!iswordsep(wordlist[k], onlyLineEnds));
-	}
-out:
-	keywords[words] = wordlist + slen;
-	*len = words;
-#endif
 	return keywords;
 }

 void WordList::Clear() {
 	if (words) {
+		delete []words;
 		delete []list;
-#if 1
-        delete []words;
-#else
-		free(words);
-#endif
-		free(wordsNoCase);
 	}
 	words = 0;
-	wordsNoCase = 0;
 	list = 0;
 	len = 0;
-	sorted = false;
 }

 void WordList::Set(const char *s) {
+	len = 0;
 	list = StringDup(s);
-	sorted = false;
-	words = ArrayFromWordList(list, &len, onlyLineEnds);
-	wordsNoCase = (char**) malloc ((len + 1) * sizeof (*wordsNoCase));
-	memcpy(wordsNoCase, words, (len + 1) * sizeof (*words));
+	words = ArrayFromWordList(list, onlyLineEnds);
 }

 char *WordList::Allocate(int size) {
@@ -432,35 +337,45 @@ char *WordList::Allocate(int size) {
 }

 void WordList::SetFromAllocated() {
-	sorted = false;
-	words = ArrayFromWordList(list, &len, onlyLineEnds);
-	wordsNoCase = (char**) malloc ((len + 1) * sizeof (*wordsNoCase));
-	memcpy(wordsNoCase, words, (len + 1) * sizeof (*words));
+	len = 0;
+	words = ArrayFromWordList(list, onlyLineEnds);
 }

-int cmpString(const void *a1, const void *a2) {
-    // Can't work out the correct incantation to use modern casts here
-    return strcmp(*(char**)(a1), *(char**)(a2));
+// Shell sort based upon public domain C implementation by Raymond Gardner 1991
+// Used here because of problems with mingw qsort.
+static void SortWordList(char **words, unsigned int len) {
+	unsigned int gap = len / 2;
+
+	while (gap > 0) {
+		unsigned int i = gap;
+		while (i < len) {
+			unsigned int j = i;
+			char **a = words + j;
+			do {
+				j -= gap;
+				char **b = a;
+				a -= gap;
+				if (strcmp(*a, *b) > 0) {
+					char *tmp = *a;
+					*a = *b;
+					*b = tmp;
+				} else {
+					break;
+				}
+			} while (j >= gap);
+			i++;
+		}
+		gap = gap / 2;
+	}
 }

-int cmpStringNoCase(const void *a1, const void *a2) {
-    // Can't work out the correct incantation to use modern casts here
-    return strcasecmp(*(char**)(a1), *(char**)(a2));
-}
-
-static void SortWordList(char **words, char **wordsNoCase, unsigned int len) {
-	qsort(reinterpret_cast<void*>(words), len, sizeof(*words),
-		cmpString);
-	qsort(reinterpret_cast<void*>(wordsNoCase), len, sizeof(*wordsNoCase),
-		cmpStringNoCase);
-}
- 
 bool WordList::InList(const char *s) {
 	if (0 == words)
 		return false;
-	if (!sorted) {
-		sorted = true;
-		SortWordList(words, wordsNoCase, len);
+	if (len == 0) {
+		for (int i = 0; words[i][0]; i++)
+			len++;
+		SortWordList(words, len);
 		for (unsigned int k = 0; k < (sizeof(starts) / sizeof(starts[0])); k++)
 			starts[k] = -1;
 		for (int l = len - 1; l >= 0; l--) {
@@ -487,256 +402,3 @@ bool WordList::InList(const char *s) {
 	}
 	return false;
 }
-
-/**
- * Returns an element (complete) of the wordlist array which has the beginning
- * the same as the passed string. The length of the word to compare is passed
- * too. Letter case can be ignored or preserved (default).
- */
-const char *WordList::GetNearestWord(const char *wordStart, int searchLen /*= -1*/, bool ignoreCase /*= false*/) {
-	int start = 0; // lower bound of the api array block to search
-	int end = len - 1; // upper bound of the api array block to search
-	int pivot; // index of api array element just being compared
-	int cond; // comparison result (in the sense of strcmp() result)
-	const char *word; // api array element just being compared
-
-	if (0 == words)
-		return NULL;
-	if (!sorted) {
-		sorted = true;
-		SortWordList(words, wordsNoCase, len);
-	}
-	if (ignoreCase)
-		while (start <= end) { // binary searching loop
-			pivot = (start + end) >> 1;
-			word = wordsNoCase[pivot];
-			cond = strncasecmp(wordStart, word, searchLen);
-			if (!cond && nonFuncChar(word[searchLen])) // maybe there should be a "non-word character" test here?
-				return word; // result must not be freed with free()
-			else if (cond < 0)
-				end = pivot - 1;
-			else if (cond > 0)
-				start = pivot + 1;
-		}
-	else // preserve the letter case
-		while (start <= end) { // binary searching loop
-			pivot = (start + end) >> 1;
-			word = words[pivot];
-			cond = strncmp(wordStart, word, searchLen);
-			if (!cond && nonFuncChar(word[searchLen])) // maybe there should be a "non-word character" test here?
-				return word; // result must not be freed with free()
-			else if (cond >= 0)
-				start = pivot + 1;
-			else if (cond < 0)
-				end = pivot - 1;
-		}
-	return NULL;
-}
-	
-/**
- * Returns elements (first words of them) of the wordlist array which have
- * the beginning the same as the passed string. The length of the word to
- * compare is passed too. Letter case can be ignored or preserved (default).
- * If there are more words meeting the condition they are returned all of
- * them in the ascending order separated with spaces.
- *
- * NOTE: returned buffer has to be freed with a free() call.
- */
-char *WordList::GetNearestWords(const char *wordStart, int searchLen /*= -1*/, bool ignoreCase /*= false*/) {
-	int wordlen; // length of the word part (before the '(' brace) of the api array element
-	int length = 0; // length of the returned buffer of words (string)
-	int newlength; // length of the new buffer before the reallocating itself
-	#undef WORDCHUNK // how many characters will be pre-allocated (to avoid buffer reallocation on each new word)
-	#define WORDCHUNK 100
-	int size = WORDCHUNK; // real size of the returned buffer of words
-	char *buffer; // buffer for the words returned
-	int start = 0; // lower bound of the api array block to search
-	int end = len - 1; // upper bound of the api array block to search
-	int pivot; // index of api array element just being compared
-	int cond; // comparison result (in the sense of strcmp() result)
-	int oldpivot; // pivot storage to be able to browse the api array upwards and then downwards
-	const char *word; // api array element just being compared
-	const char *brace; // position of the opening brace in the api array element just being compared
-
-	if (0 == words)
-		return NULL;
-	if (!sorted) {
-		sorted = true;
-		SortWordList(words, wordsNoCase, len);
-	}
-	buffer = (char*) malloc(size);
-	*buffer = '\0';
-	if (ignoreCase)
-		while (start <= end) { // binary searching loop
-			pivot = (start + end) >> 1;
-			word = wordsNoCase[pivot];
-			cond = strncasecmp(wordStart, word, searchLen);
-			if (!cond) {
-				oldpivot = pivot;
-				do { // browse sequentially the rest after the hit
-					brace = strchr(word, '(');
-					if (brace)
-						do
-							if (--brace < word)
-								break;
-						while (isspace(*brace));
-					else {
-						brace = word + strlen(word);
-						do
-							if (--brace < word)
-								break;
-						while (isspace(*brace));
-					}
-					wordlen = brace - word + 1;
-					newlength = length + wordlen; // stretch the buffer
-					if (length)
-						newlength++;
-					if (newlength >= size) {
-						do
-							size += WORDCHUNK;
-						while (size <= newlength);
-						buffer = (char*) realloc(buffer, size);
-					}
-					if (length) // append a new entry
-						buffer[length++] = ' ';
-					memcpy(buffer + length, word, wordlen);
-					length = newlength;
-					buffer[length] = '\0';
-					if (++pivot > end)
-						break;
-					word = wordsNoCase[pivot];
-				} while (!strncasecmp(wordStart, word, searchLen));
-
-				pivot = oldpivot;
-				for (;;) { // browse sequentially the rest before the hit
-					if (--pivot < start)
-						break;
-					word = wordsNoCase[pivot];
-					if (strncasecmp(wordStart, word, searchLen))
-						break;                 
-					brace = strchr(word, '(');
-					if (brace)
-						do
-							if (--brace < word)
-								break;
-						while (isspace(*brace));
-					else {
-						brace = word + strlen(word);
-						do
-							if (--brace < word)
-								break;
-						while (isspace(*brace));
-					}
-					wordlen = brace - word + 1;
-					newlength = length + wordlen; // stretch the buffer
-					if (length)
-						newlength++;
-					if (newlength >= size)
-					{
-						do
-							size += WORDCHUNK;
-						while (size <= newlength);
-						buffer = (char*) realloc(buffer, size);
-					}
-					if (length) // append a new entry
-						buffer[length++] = ' ';
-					memcpy(buffer + length, word, wordlen);
-					length = newlength;
-					buffer[length] = '\0';
-				}
-				return buffer; // result has to be freed with free()
-			}
-			else if (cond < 0)
-				end = pivot - 1;
-			else if (cond > 0)
-				start = pivot + 1;
-		}
-	else // preserve the letter case
-		while (start <= end) { // binary searching loop
-			pivot = (start + end) >> 1;
-			word = words[pivot];
-			cond = strncmp(wordStart, word, searchLen);
-			if (!cond) {
-				oldpivot = pivot;
-				do { // browse sequentially the rest after the hit
-					brace = strchr(word, '(');
-					if (brace)
-						do
-							if (--brace < word)
-								break;
-						while (isspace(*brace));
-					else {
-						brace = word + strlen(word);
-						do
-							if (--brace < word)
-								break;
-						while (isspace(*brace));
-					}
-					wordlen = brace - word + 1;
-					newlength = length + wordlen; // stretch the buffer
-					if (length)
-						newlength++;
-					if (newlength >= size)
-					{
-						do
-							size += WORDCHUNK;
-						while (size <= newlength);
-						buffer = (char*) realloc(buffer, size);
-					}
-					if (length) // append a new entry
-						buffer[length++] = ' ';
-					memcpy(buffer + length, word, wordlen);
-					length = newlength;
-					buffer[length] = '\0';
-					if (++pivot > end)
-						break;
-					word = words[pivot];
-				} while (!strncmp(wordStart, word, searchLen));
-
-				pivot = oldpivot;
-				for (;;) { // browse sequentially the rest before the hit
-					if (--pivot < start)
-						break;
-					word = words[pivot];
-					if (strncmp(wordStart, word, searchLen))
-						break;
-					brace = strchr(word, '(');
-					if (brace)
-						do
-							if (--brace < word)
-								break;
-						while (isspace(*brace));
-					else {
-						brace = word + strlen(word);
-						do
-							if (--brace < word)
-								break;
-						while (isspace(*brace));
-					}
-					wordlen = brace - word + 1;
-					newlength = length + wordlen; // stretch the buffer
-					if (length)
-						newlength++;
-					if (newlength >= size)
-					{
-						do
-							size += WORDCHUNK;
-						while (size <= newlength);
-						buffer = (char*) realloc(buffer, size);
-					}
-					if (length) // append a new entry
-						buffer[length++] = ' ';
-					memcpy(buffer + length, word, wordlen);
-					length = newlength;
-					buffer[length] = '\0';
-				}
-				return buffer; // result has to be freed with free()
-			}
-			else if (cond < 0)
-				end = pivot - 1;
-			else if (cond > 0)
-				start = pivot + 1;
-		}
-	free(buffer);
-	return NULL;
-}
--- a/contrib/src/stc/scintilla/src/SVector.h
+++ b/contrib/src/stc/scintilla/src/SVector.h
@@ -6,12 +6,13 @@
 #ifndef SVECTOR_H
 #define SVECTOR_H

-// A simple expandable integer vector. 
+// A simple expandable vector. 
+// T must support assignment.
 // Storage not allocated for elements until an element is used. 
 // This makes it very lightweight unless used so is a good match for optional features.
-
+template<class T, int sizeIncrement>
 class SVector {
-	int *v;
+	T *v;
 	unsigned int size;	// Number of elements allocated
 	unsigned int len;	// Number of elements in vector
 	bool allocFailure;	// A memory allocation call has failed
@@ -19,23 +20,19 @@ class SVector {
 	// Internally allocate more elements than the user wants to avoid 
 	// thrashng the memory allocator
 	void SizeTo(int newSize) {
-		if (newSize < 4000)
-			newSize += 4000;
+		if (newSize < sizeIncrement)
+			newSize += sizeIncrement;
 		else 
 			newSize = (newSize * 3) / 2;
-		int* newv = new int[newSize];
+		T* newv = new T[newSize];
 		if (!newv) {
 			allocFailure = true;
 			return;
 		}
 		size = newSize;
-        	unsigned int i=0;
-		for (; i<len; i++) {
+		for (unsigned int i=0; i<len; i++) {
 			newv[i] = v[i];
 		}
-		for (; i<size; i++) {
-			newv[i] = 0;
-		}
 		delete []v;
 		v = newv;
 	}
@@ -82,7 +79,7 @@ public:
 		}
 		return *this;
 	}
-	int &operator[](unsigned int i) {
+	T &operator[](unsigned int i) {
 		if (i >= len) {
 			if (i >= size) {
 				SizeTo(i);
--- a/contrib/src/stc/scintilla/src/ScintillaBase.cxx
+++ b/contrib/src/stc/scintilla/src/ScintillaBase.cxx
@@ -11,9 +11,9 @@
 #include "Platform.h"

 #include "Scintilla.h"
-#include "PropSet.h"
 #ifdef SCI_LEXER
 #include "SciLexer.h"
+#include "PropSet.h"
 #include "Accessor.h"
 #include "WindowAccessor.h"
 #include "DocumentAccessor.h"
@@ -41,15 +41,9 @@ ScintillaBase::ScintillaBase() {
 #endif
 }

-ScintillaBase::~ScintillaBase() {
-#ifdef SCI_LEXER	
-	for (int wl=0;wl<numWordLists;wl++)
-		delete keyWordLists[wl];
-#endif
-}
+ScintillaBase::~ScintillaBase() {}

 void ScintillaBase::Finalise() {
-    Editor::Finalise();
 	popup.Destroy();
 }

@@ -60,8 +54,7 @@ void ScintillaBase::RefreshColourPalette(Palette &pal, bool want) {

 void ScintillaBase::AddCharUTF(char *s, unsigned int len) {
 	bool acActiveBeforeCharAdded = ac.Active();
-	if (!acActiveBeforeCharAdded || !ac.IsFillUpChar(*s))
-		Editor::AddCharUTF(s, len);
+	Editor::AddCharUTF(s, len);
 	if (acActiveBeforeCharAdded)
 		AutoCompleteChanged(s[0]);
 }
@@ -77,7 +70,7 @@ void ScintillaBase::Command(int cmdId) {
 		break;

 	case idcmdUndo:
-		WndProc(SCI_UNDO, 0, 0);
+		WndProc(WM_UNDO, 0, 0);
 		break;

 	case idcmdRedo:
@@ -85,19 +78,19 @@ void ScintillaBase::Command(int cmdId) {
 		break;

 	case idcmdCut:
-		WndProc(SCI_CUT, 0, 0);
+		WndProc(WM_CUT, 0, 0);
 		break;

 	case idcmdCopy:
-		WndProc(SCI_COPY, 0, 0);
+		WndProc(WM_COPY, 0, 0);
 		break;

 	case idcmdPaste:
-		WndProc(SCI_PASTE, 0, 0);
+		WndProc(WM_PASTE, 0, 0);
 		break;

 	case idcmdDelete:
-		WndProc(SCI_CLEAR, 0, 0);
+		WndProc(WM_CLEAR, 0, 0);
 		break;

 	case idcmdSelectAll:
@@ -106,7 +99,7 @@ void ScintillaBase::Command(int cmdId) {
 	}
 }

-int ScintillaBase::KeyCommand(unsigned int iMessage) {
+int ScintillaBase::KeyCommand(UINT iMessage) {
 	// Most key commands cancel autocompletion mode
 	if (ac.Active()) {
 		switch (iMessage) {
@@ -137,9 +130,6 @@ int ScintillaBase::KeyCommand(unsigned int iMessage) {
 		case SCI_TAB:
 			AutoCompleteCompleted();
 			return 0;
-		case SCI_NEWLINE:
-			AutoCompleteCompleted();
-			return 0;

 		default:
 			ac.Cancel();
@@ -167,30 +157,15 @@ int ScintillaBase::KeyCommand(unsigned int iMessage) {
 }

 void ScintillaBase::AutoCompleteStart(int lenEntered, const char *list) {
-	//Platform::DebugPrintf("AutoComplete %s\n", list);
+	//Platform::DebugPrintf("AutoCOmplete %s\n", list);
 	ct.CallTipCancel();

-	if (ac.chooseSingle) {
-		if (list && !strchr(list, ac.GetSeparator())) {
-			if (ac.ignoreCase) {
-				SetEmptySelection(currentPos - lenEntered);
-				pdoc->DeleteChars(currentPos, lenEntered);
-				SetEmptySelection(currentPos);
-				pdoc->InsertString(currentPos, list);
-				SetEmptySelection(currentPos + strlen(list));
-			} else {
-				SetEmptySelection(currentPos);
-				pdoc->InsertString(currentPos, list + lenEntered);
-				SetEmptySelection(currentPos + strlen(list + lenEntered));
-			}
-			return;
-		}
-	}
 	ac.Start(wDraw, idAutoComplete, currentPos, lenEntered);

 	PRectangle rcClient = GetClientRectangle();
 	Point pt = LocationFromPosition(currentPos-lenEntered);

+	//Platform::DebugPrintf("Auto complete %x\n", lbAutoComplete);
 	int heightLB = 100;
 	int widthLB = 100;
 	if (pt.x >= rcClient.right - widthLB) {
@@ -213,18 +188,16 @@ void ScintillaBase::AutoCompleteStart(int lenEntered, const char *list) {
 	rcac.right = rcac.left + widthLB;
 	rcac.bottom = Platform::Minimum(rcac.top + heightLB, rcClient.bottom);
 	ac.lb.SetPositionRelative(rcac, wMain);
-	ac.lb.SetFont(vs.styles[STYLE_DEFAULT].font);
-	ac.lb.SetAverageCharWidth(vs.styles[STYLE_DEFAULT].aveCharWidth);
+	ac.lb.SetFont(vs.styles[0].font);

-	ac.SetList(list);
+	int maxStrLen = ac.SetList(list);

 	// Fiddle the position of the list so it is right next to the target and wide enough for all its strings
-	PRectangle rcList = ac.lb.GetDesiredRect();
+	PRectangle rcList = ac.lb.GetPosition();
 	int heightAlloced = rcList.bottom - rcList.top;
-	widthLB = Platform::Maximum(widthLB, rcList.right - rcList.left);
 	// Make an allowance for large strings in list
 	rcList.left = pt.x - 5;
-	rcList.right = rcList.left + widthLB;
+	rcList.right = rcList.left + Platform::Maximum(widthLB, maxStrLen * 8 + 16);
 	if (pt.y >= rcClient.bottom - heightLB && // Wont fit below.
 	    pt.y >= (rcClient.bottom + rcClient.top) / 2) { // and there is more room above.
 		rcList.top = pt.y - heightAlloced;
@@ -233,10 +206,8 @@ void ScintillaBase::AutoCompleteStart(int lenEntered, const char *list) {
 	}
 	rcList.bottom = rcList.top + heightAlloced;
 	ac.lb.SetPositionRelative(rcList, wMain);
+	//lbAutoComplete.SetPosition(rcList);
 	ac.Show();
-	if (lenEntered != 0) {
-		AutoCompleteMoveToCurrentWord();
-	}		
 }

 void ScintillaBase::AutoCompleteCancel() {
@@ -247,63 +218,36 @@ void ScintillaBase::AutoCompleteMove(int delta) {
 	ac.Move(delta);
 }

-void ScintillaBase::AutoCompleteMoveToCurrentWord() {
-	char wordCurrent[1000];
-	int i;
-	int startWord = ac.posStart - ac.startLen;
-	for (i = startWord; i < currentPos; i++)
-		wordCurrent[i - startWord] = pdoc->CharAt(i);
-	wordCurrent[i - startWord] = '\0';
-	ac.Select(wordCurrent);
-}
-
 void ScintillaBase::AutoCompleteChanged(char ch) {
-	if (ac.IsFillUpChar(ch)) {
-		AutoCompleteCompleted(ch);
-	} else if (currentPos <= ac.posStart - ac.startLen) {
-		ac.Cancel();
-	} else if (ac.cancelAtStartPos && currentPos <= ac.posStart) {
+	if (currentPos <= ac.posStart) {
 		ac.Cancel();
 	} else if (ac.IsStopChar(ch)) {
 		ac.Cancel();
 	} else {
-		AutoCompleteMoveToCurrentWord();
+		char wordCurrent[1000];
+		int i;
+		int startWord = ac.posStart - ac.startLen;
+		for (i = startWord; i < currentPos; i++)
+			wordCurrent[i - startWord] = pdoc->CharAt(i);
+		wordCurrent[i - startWord] = '\0';
+		ac.Select(wordCurrent);
 	}
 }

-void ScintillaBase::AutoCompleteCompleted(char fillUp/*='\0'*/) {
+void ScintillaBase::AutoCompleteCompleted() {
 	int item = ac.lb.GetSelection();
-	char selected[1000];
+	char selected[200];
 	if (item != -1) {
 		ac.lb.GetValue(item, selected, sizeof(selected));
 	}
 	ac.Cancel();
-	
-	if (ac.ignoreCase) {
-		if (currentPos != ac.posStart) {
-			pdoc->DeleteChars(ac.posStart, currentPos - ac.posStart);
-		}
-		SetEmptySelection(ac.posStart - ac.startLen);
-		pdoc->DeleteChars(ac.posStart - ac.startLen, ac.startLen);
-		if (item != -1) {
-			SString piece = selected;
-			if (fillUp)
-				piece += fillUp;
-			pdoc->InsertString(currentPos, piece.c_str());
-			SetEmptySelection(currentPos + piece.length());
-		}
-	} else {
-		if (currentPos != ac.posStart) {
-			pdoc->DeleteChars(ac.posStart, currentPos - ac.posStart);
-		}
-		SetEmptySelection(ac.posStart);
-		if (item != -1) {
-			SString piece = selected + ac.startLen;
-			if (fillUp)
-				piece += fillUp;
-			pdoc->InsertString(currentPos, piece.c_str());
-			SetEmptySelection(currentPos + piece.length());
-		}
+	if (currentPos != ac.posStart) {
+		pdoc->DeleteChars(ac.posStart, currentPos - ac.posStart);
+	}
+	SetEmptySelection(ac.posStart);
+	if (item != -1) {
+		pdoc->InsertString(currentPos, selected + ac.startLen);
+		SetEmptySelection(currentPos + strlen(selected + ac.startLen));
 	}
 }

@@ -314,21 +258,16 @@ void ScintillaBase::ContextMenu(Point pt) {
 	AddToPopUp("");
 	AddToPopUp("Cut", idcmdCut, currentPos != anchor);
 	AddToPopUp("Copy", idcmdCopy, currentPos != anchor);
-	AddToPopUp("Paste", idcmdPaste, WndProc(SCI_CANPASTE, 0, 0));
+	AddToPopUp("Paste", idcmdPaste, WndProc(EM_CANPASTE, 0, 0));
 	AddToPopUp("Delete", idcmdDelete, currentPos != anchor);
 	AddToPopUp("");
 	AddToPopUp("Select All", idcmdSelectAll);
 	popup.Show(pt, wMain);
 }

-void ScintillaBase::CancelModes() {
+void ScintillaBase::ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt) {
 	AutoCompleteCancel();
 	ct.CallTipCancel();
-	Editor::CancelModes();
-}
-
-void ScintillaBase::ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt) {
-	CancelModes();
 	Editor::ButtonDown(pt, curTime, shift, ctrl, alt);
 }

@@ -356,8 +295,8 @@ void ScintillaBase::NotifyStyleToNeeded(int endStyleNeeded) {
 #ifdef SCI_LEXER
 	if (lexLanguage != SCLEX_CONTAINER) {
 		int endStyled = Platform::SendScintilla(wMain.GetID(), SCI_GETENDSTYLED, 0, 0);
-		int lineEndStyled = Platform::SendScintilla(wMain.GetID(), SCI_LINEFROMPOSITION, endStyled, 0);
-		endStyled = Platform::SendScintilla(wMain.GetID(), SCI_POSITIONFROMLINE, lineEndStyled, 0);
+		int lineEndStyled = Platform::SendScintilla(wMain.GetID(), EM_LINEFROMCHAR, endStyled, 0);
+		endStyled = Platform::SendScintilla(wMain.GetID(), EM_LINEINDEX, lineEndStyled, 0);
 		Colourise(endStyled, endStyleNeeded);
 		return;
 	}
@@ -365,7 +304,7 @@ void ScintillaBase::NotifyStyleToNeeded(int endStyleNeeded) {
 	Editor::NotifyStyleToNeeded(endStyleNeeded);
 }

-long ScintillaBase::WndProc(unsigned int iMessage, unsigned long wParam, long lParam) {
+LRESULT ScintillaBase::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) {
 	switch (iMessage) {
 	case SCI_AUTOCSHOW:
 		AutoCompleteStart(wParam, reinterpret_cast<const char *>(lParam));
@@ -386,7 +325,7 @@ long ScintillaBase::WndProc(unsigned int iMessage, unsigned long wParam, long lP
 		break;

 	case SCI_AUTOCSETSEPARATOR:
-		ac.SetSeparator(static_cast<char>(wParam));
+		ac.SetSeparator(wParam);
 		break;

 	case SCI_AUTOCGETSEPARATOR:
@@ -399,38 +338,13 @@ long ScintillaBase::WndProc(unsigned int iMessage, unsigned long wParam, long lP
 	case SCI_AUTOCSELECT:
 		ac.Select(reinterpret_cast<char *>(lParam));
 		break;
-	
-	case SCI_AUTOCSETCANCELATSTART:
-		ac.cancelAtStartPos = wParam;
-		break;
-	
-	case SCI_AUTOCGETCANCELATSTART:
-		return ac.cancelAtStartPos;

-	case SCI_AUTOCSETFILLUPS:
-		ac.SetFillUpChars(reinterpret_cast<char *>(lParam));
-		break;
-
-	case SCI_AUTOCSETCHOOSESINGLE:
-		ac.chooseSingle = wParam;
-		break;
-
-	case SCI_AUTOCGETCHOOSESINGLE:
-		return ac.chooseSingle;
-		
-	case SCI_AUTOCSETIGNORECASE:
-		ac.ignoreCase = wParam;
-		break;
-		
-	case SCI_AUTOCGETIGNORECASE:
-		return ac.ignoreCase;
-		
 	case SCI_CALLTIPSHOW: {
 			AutoCompleteCancel();
 			if (!ct.wCallTip.Created()) {
 				PRectangle rc = ct.CallTipStart(currentPos, LocationFromPosition(wParam),
 				                                reinterpret_cast<char *>(lParam),
-				                                vs.styles[STYLE_DEFAULT].fontName, vs.styles[STYLE_DEFAULT].size);
+				                                vs.styles[0].fontName, vs.styles[0].size);
 				// If the call-tip window would be out of the client
 				// space, adjust so it displays above the text.
 				PRectangle rcClient = GetClientRectangle();
--- a/contrib/src/stc/scintilla/src/ScintillaBase.h
+++ b/contrib/src/stc/scintilla/src/ScintillaBase.h
@@ -47,15 +47,13 @@ protected:
 	
 	virtual void AddCharUTF(char *s, unsigned int len);
 	void Command(int cmdId);
-	virtual void CancelModes();
-	virtual int KeyCommand(unsigned int iMessage);
+	virtual int KeyCommand(UINT iMessage);
 	
 	void AutoCompleteStart(int lenEntered, const char *list);
 	void AutoCompleteCancel();
 	void AutoCompleteMove(int delta);
 	void AutoCompleteChanged(char ch=0);
-	void AutoCompleteCompleted(char fillUp='\0');
-	void AutoCompleteMoveToCurrentWord();
+	void AutoCompleteCompleted();

 	virtual void CreateCallTipWindow(PRectangle rc) = 0;
 		
@@ -67,7 +65,7 @@ protected:
 	virtual void NotifyStyleToNeeded(int endStyleNeeded);
 public:
 	// Public so scintilla_send_message can use it
-	virtual long WndProc(unsigned int iMessage, unsigned long wParam, long lParam);
+	virtual LRESULT WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam);
 };

 #endif
--- a/contrib/src/stc/scintilla/src/Style.cxx
+++ b/contrib/src/stc/scintilla/src/Style.cxx
@@ -14,13 +14,13 @@ Style::Style() {
 	aliasOfDefaultFont = true;
 	Clear(Colour(0,0,0), Colour(0xff,0xff,0xff),
 	        Platform::DefaultFontSize(), 0, SC_CHARSET_DEFAULT,
-		false, false, false, false, true);
+		false, false, false, false);
 }
 	
 Style::Style(const Style &source) {
 	Clear(Colour(0,0,0), Colour(0xff,0xff,0xff),
 	        0, 0, 0,
-		false, false, false, false, true);
+		false, false, false, false);
 	fore.desired = source.fore.desired;
 	back.desired = source.back.desired;
 	characterSet = source.characterSet;
@@ -29,7 +29,6 @@ Style::Style(const Style &source) {
 	size = source.size;
 	eolFilled = source.eolFilled;
 	underline = source.underline;
-    visible = source.visible;
 }

 Style::~Style() {
@@ -45,7 +44,7 @@ Style &Style::operator=(const Style &source) {
 		return *this;
 	Clear(Colour(0,0,0), Colour(0xff,0xff,0xff),
 	        0, 0, SC_CHARSET_DEFAULT,
-		false, false, false, false, true);
+		false, false, false, false);
 	fore.desired = source.fore.desired;
 	back.desired = source.back.desired;
 	characterSet = source.characterSet;
@@ -54,13 +53,12 @@ Style &Style::operator=(const Style &source) {
 	size = source.size;
 	eolFilled = source.eolFilled;
 	underline = source.underline;
-    visible = source.visible;
 	return *this;
 }

 void Style::Clear(Colour fore_, Colour back_, int size_, 
 	const char *fontName_, int characterSet_,
-	bool bold_, bool italic_, bool eolFilled_, bool underline_, bool visible_) {
+	bool bold_, bool italic_, bool eolFilled_, bool underline_) {
 	fore.desired = fore_;
 	back.desired = back_;
 	characterSet = characterSet_;
@@ -70,7 +68,6 @@ void Style::Clear(Colour fore_, Colour back_, int size_,
 	fontName = fontName_;
 	eolFilled = eolFilled_;
 	underline = underline_;
-    visible = visible_;
 	if (aliasOfDefaultFont)
 		font.SetID(0);
 	else 
--- a/contrib/src/stc/scintilla/src/Style.h
+++ b/contrib/src/stc/scintilla/src/Style.h
@@ -18,7 +18,6 @@ public:
 	int characterSet;
 	bool eolFilled;
 	bool underline;
-	bool visible;

 	Font font;
 	unsigned int lineHeight;
@@ -35,7 +34,7 @@ public:
 	void Clear(Colour fore_, Colour back_,
           	int size_, 
 		const char *fontName_, int characterSet_,
-		bool bold_, bool italic_, bool eolFilled_, bool underline_, bool visible_);
+		bool bold_, bool italic_, bool eolFilled_, bool underline_);
 	bool EquivalentFontTo(const Style *other) const;
 	void Realise(Surface &surface, int zoomLevel, Style *defaultStyle=0);
 };
--- a/contrib/src/stc/scintilla/src/ViewStyle.cxx
+++ b/contrib/src/stc/scintilla/src/ViewStyle.cxx
@@ -69,12 +69,10 @@ ViewStyle::ViewStyle(const ViewStyle &source) {
 	selforeground.desired = source.selforeground.desired;
 	selbackset = source.selbackset;
 	selbackground.desired = source.selbackground.desired;
-	selbackground2.desired = source.selbackground2.desired;
 	selbar.desired = source.selbar.desired;
 	selbarlight.desired = source.selbarlight.desired;
 	caretcolour.desired = source.caretcolour.desired;
 	edgecolour.desired = source.edgecolour.desired;
-	edgeState = source.edgeState;
 	leftMarginWidth = source.leftMarginWidth;
 	rightMarginWidth = source.rightMarginWidth;
 	for (int i=0;i < margins; i++) {
@@ -85,7 +83,6 @@ ViewStyle::ViewStyle(const ViewStyle &source) {
 	fixedColumnWidth = source.fixedColumnWidth;
 	zoomLevel = source.zoomLevel;
 	viewWhitespace = source.viewWhitespace;
-	viewIndentationGuides = source.viewIndentationGuides;
 	viewEOL = source.viewEOL;
 	showMarkedLines = source.showMarkedLines;		
 }
@@ -114,7 +111,6 @@ void ViewStyle::Init() {
 	selforeground.desired = Colour(0xff, 0, 0);
 	selbackset = true;
 	selbackground.desired = Colour(0xc0, 0xc0, 0xc0);
-	selbackground2.desired = Colour(0xb0, 0xb0, 0xb0);
 	selbar.desired = Platform::Chrome();
 	selbarlight.desired = Platform::ChromeHighlight();
 	styles[STYLE_LINENUMBER].fore.desired = Colour(0, 0, 0);
@@ -122,7 +118,6 @@ void ViewStyle::Init() {
 	//caretcolour.desired = Colour(0xff, 0, 0);
 	caretcolour.desired = Colour(0, 0, 0);
 	edgecolour.desired = Colour(0xc0, 0xc0, 0xc0);
-	edgeState = EDGE_NONE;
 	
 	leftMarginWidth = 1;
 	rightMarginWidth = 1;
@@ -147,8 +142,7 @@ void ViewStyle::Init() {
 			maskInLine &= ~ms[margin].mask;
 	}
 	zoomLevel = 0;
-	viewWhitespace = wsInvisible;
-	viewIndentationGuides = false;
+	viewWhitespace = false;
 	viewEOL = false;
 	showMarkedLines = true;
 }
@@ -168,7 +162,6 @@ void ViewStyle::RefreshColourPalette(Palette &pal, bool want) {
 	}
 	pal.WantFind(selforeground, want);
 	pal.WantFind(selbackground, want);
-	pal.WantFind(selbackground2, want);
 	pal.WantFind(selbar, want);
 	pal.WantFind(selbarlight, want);
 	pal.WantFind(caretcolour, want);
@@ -210,7 +203,7 @@ void ViewStyle::ResetDefaultStyle() {
 	styles[STYLE_DEFAULT].Clear(Colour(0,0,0), Colour(0xff,0xff,0xff),
 	        Platform::DefaultFontSize(), fontNames.Save(Platform::DefaultFont()), 
 		SC_CHARSET_DEFAULT,
-		false, false, false, false, true);
+		false, false, false, false);
 }

 void ViewStyle::ClearStyles() {
@@ -226,8 +219,7 @@ void ViewStyle::ClearStyles() {
 				styles[STYLE_DEFAULT].bold, 
 				styles[STYLE_DEFAULT].italic,
 				styles[STYLE_DEFAULT].eolFilled,
-				styles[STYLE_DEFAULT].underline,
-				styles[STYLE_DEFAULT].visible);
+				styles[STYLE_DEFAULT].underline);
 		}
 	}
 	styles[STYLE_LINENUMBER].back.desired = Platform::Chrome();
--- a/contrib/src/stc/scintilla/src/ViewStyle.h
+++ b/contrib/src/stc/scintilla/src/ViewStyle.h
@@ -26,7 +26,6 @@ public:
 	const char *Save(const char *name);
 };

-enum WhiteSpaceVisibility {wsInvisible=0, wsVisibleAlways=1, wsVisibleAfterIndent=2};
 class ViewStyle {
 public:
 	FontNames fontNames;
@@ -42,7 +41,6 @@ public:
 	ColourPair selforeground;
 	bool selbackset;
 	ColourPair selbackground;
-	ColourPair selbackground2;
 	ColourPair selbar;
 	ColourPair selbarlight;
 	// Margins are ordered: Line Numbers, Selection Margin, Spacing Margin
@@ -54,13 +52,11 @@ public:
 	MarginStyle ms[margins];
 	int fixedColumnWidth;
 	int zoomLevel;
-	WhiteSpaceVisibility viewWhitespace;
-	bool viewIndentationGuides;
+	bool viewWhitespace;
 	bool viewEOL;
 	bool showMarkedLines;
 	ColourPair caretcolour;
 	ColourPair edgecolour;
-	int edgeState;
 	
 	ViewStyle();
 	ViewStyle(const ViewStyle &source);
--- a/contrib/src/stc/scintilla/src/WindowAccessor.cxx
+++ b/contrib/src/stc/scintilla/src/WindowAccessor.cxx
@@ -4,7 +4,6 @@
 // The License.txt file describes the conditions under which this software may be distributed.

 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h> 
 #include <stdio.h>

@@ -18,26 +17,25 @@
 WindowAccessor::~WindowAccessor() {
 }

-#if PLAT_WIN 
 bool WindowAccessor::InternalIsLeadByte(char ch) {
+#if PLAT_GTK
+	// TODO: support DBCS under GTK+
+	return false;
+#elif PLAT_WIN 
 	if (SC_CP_UTF8 == codePage)
 		// For lexing, all characters >= 0x80 are treated the
 		// same so none is considered a lead byte.
 		return false;	
 	else
 		return IsDBCSLeadByteEx(codePage, ch);
-}
-#else
-// PLAT_GTK or PLAT_WX
-// TODO: support DBCS under GTK+ and WX
-bool WindowAccessor::InternalIsLeadByte(char) {
+#elif PLAT_WX 
 	return false;
-}
 #endif 
+}

 void WindowAccessor::Fill(int position) {
 	if (lenDoc == -1)
-		lenDoc = Platform::SendScintilla(id, SCI_GETTEXTLENGTH, 0, 0);
+		lenDoc = Platform::SendScintilla(id, WM_GETTEXTLENGTH, 0, 0);
 	startPos = position - slopSize;
 	if (startPos + bufferSize > lenDoc)
 		startPos = lenDoc - bufferSize;
@@ -47,8 +45,8 @@ void WindowAccessor::Fill(int position) {
 	if (endPos > lenDoc)
 		endPos = lenDoc;

-	TextRange tr = {{startPos, endPos}, buf};
-	Platform::SendScintilla(id, SCI_GETTEXTRANGE, 0, reinterpret_cast<long>(&tr));
+	TEXTRANGE tr = {{startPos, endPos}, buf};
+	Platform::SendScintilla(id, EM_GETTEXTRANGE, 0, reinterpret_cast<LPARAM>(&tr));
 }

 char WindowAccessor::StyleAt(int position) {
@@ -57,11 +55,11 @@ char WindowAccessor::StyleAt(int position) {
 }

 int WindowAccessor::GetLine(int position) {
-	return Platform::SendScintilla(id, SCI_LINEFROMPOSITION, position, 0);
+	return Platform::SendScintilla(id, EM_LINEFROMCHAR, position, 0);
 }

 int WindowAccessor::LineStart(int line) {
-	return Platform::SendScintilla(id, SCI_POSITIONFROMLINE, line, 0);
+	return Platform::SendScintilla(id, EM_LINEINDEX, line, 0);
 }

 int WindowAccessor::LevelAt(int line) {
@@ -70,7 +68,7 @@ int WindowAccessor::LevelAt(int line) {

 int WindowAccessor::Length() { 
 	if (lenDoc == -1) 
-		lenDoc = Platform::SendScintilla(id, SCI_GETTEXTLENGTH, 0, 0);
+		lenDoc = Platform::SendScintilla(id, WM_GETTEXTLENGTH, 0, 0);
 	return lenDoc; 
 }

@@ -123,7 +121,7 @@ void WindowAccessor::Flush() {
 	lenDoc = -1;
 	if (validLen > 0) {
 		Platform::SendScintilla(id, SCI_SETSTYLINGEX, validLen, 
-			reinterpret_cast<long>(styleBuf));
+			reinterpret_cast<LPARAM>(styleBuf));
 		validLen = 0;
 	}
 }
--- a/contrib/src/stc/stc.cpp
+++ b/contrib/src/stc/stc.cpp
--- a/contrib/src/stc/stc.cpp.in
+++ b/contrib/src/stc/stc.cpp.in
@@ -1,523 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Name:        stc.cpp
-// Purpose:     A wxWindows implementation of Scintilla.  This class is the
-//              one meant to be used directly by wx applications.  It does not
-//              derive directly from the Scintilla classes, but instead
-//              delegates most things to the real Scintilla class.
-//              This allows the use of Scintilla without polluting the
-//              namespace with all the classes and identifiers from Scintilla.
-//
-// Author:      Robin Dunn
-//
-// Created:     13-Jan-2000
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#include <ctype.h>
-
-#include "wx/stc/stc.h"
-#include "ScintillaWX.h"
-
-#include <wx/tokenzr.h>
-
-// The following code forces a reference to all of the Scintilla lexers.
-// If we don't do something like this, then the linker tends to "optimize"
-// them away. (eric@sourcegear.com)
-
-int wxForceScintillaLexers(void)
-{
-  extern LexerModule lmCPP;
-  extern LexerModule lmHTML;
-  extern LexerModule lmXML;
-  extern LexerModule lmProps;
-  extern LexerModule lmErrorList;
-  extern LexerModule lmMake;
-  extern LexerModule lmBatch;
-  extern LexerModule lmPerl;
-  extern LexerModule lmPython;
-  extern LexerModule lmSQL;
-  extern LexerModule lmVB;
-
-  if (
-      &lmCPP
-      && &lmHTML
-      && &lmXML
-      && &lmProps
-      && &lmErrorList
-      && &lmMake
-      && &lmBatch
-      && &lmPerl
-      && &lmPython
-      && &lmSQL
-      && &lmVB
-      )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-//----------------------------------------------------------------------
-
-const wxChar* wxSTCNameStr = "stcwindow";
-
-BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
-    EVT_PAINT                   (wxStyledTextCtrl::OnPaint)
-    EVT_SCROLLWIN               (wxStyledTextCtrl::OnScrollWin)
-    EVT_SIZE                    (wxStyledTextCtrl::OnSize)
-    EVT_LEFT_DOWN               (wxStyledTextCtrl::OnMouseLeftDown)
-    EVT_MOTION                  (wxStyledTextCtrl::OnMouseMove)
-    EVT_LEFT_UP                 (wxStyledTextCtrl::OnMouseLeftUp)
-    EVT_RIGHT_UP                (wxStyledTextCtrl::OnMouseRightUp)
-    EVT_CHAR                    (wxStyledTextCtrl::OnChar)
-    EVT_KEY_DOWN                (wxStyledTextCtrl::OnKeyDown)
-    EVT_KILL_FOCUS              (wxStyledTextCtrl::OnLoseFocus)
-    EVT_SET_FOCUS               (wxStyledTextCtrl::OnGainFocus)
-    EVT_SYS_COLOUR_CHANGED      (wxStyledTextCtrl::OnSysColourChanged)
-    EVT_ERASE_BACKGROUND        (wxStyledTextCtrl::OnEraseBackground)
-    EVT_MENU_RANGE              (-1, -1, wxStyledTextCtrl::OnMenu)
-    EVT_LISTBOX_DCLICK          (-1, wxStyledTextCtrl::OnListBox)
-END_EVENT_TABLE()
-
-
-IMPLEMENT_CLASS(wxStyledTextCtrl, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxStyledTextEvent, wxCommandEvent)
-
-//----------------------------------------------------------------------
-// Constructor and Destructor
-
-wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
-                                   wxWindowID id,
-                                   const wxPoint& pos,
-                                   const wxSize& size,
-                                   long style,
-                                   const wxString& name) :
-    wxControl(parent, id, pos, size,
-              style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN,
-              wxDefaultValidator, name)
-{
-    m_swx = new ScintillaWX(this);
-    m_stopWatch.Start();
-}
-
-
-wxStyledTextCtrl::~wxStyledTextCtrl() {
-    delete m_swx;
-}
-
-
-//----------------------------------------------------------------------
-
-long wxStyledTextCtrl::SendMsg(int msg, long wp, long lp) {
-
-    return m_swx->WndProc(msg, wp, lp);
-}
-
-
-#ifdef MAKELONG
-#undef MAKELONG
-#endif
-
-#define MAKELONG(a, b) ((a) | ((b) << 16))
-
-
-static long wxColourAsLong(const wxColour& co) {
-    return (((long)co.Blue()  << 16) |
-            ((long)co.Green() <<  8) |
-            ((long)co.Red()));
-}
-
-static wxColour wxColourFromLong(long c) {
-    wxColour clr;
-    clr.Set(c & 0xff, (c >> 8) & 0xff, (c >> 16) & 0xff);
-    return clr;
-}
-
-
-static wxColour wxColourFromSpec(const wxString& spec) {
-    // spec should be #RRGGBB
-    char* junk;
-    int red   = strtol(spec.Mid(1,2), &junk, 16);
-    int green = strtol(spec.Mid(3,2), &junk, 16);
-    int blue  = strtol(spec.Mid(5,2), &junk, 16);
-    return wxColour(red, green, blue);
-}
-
-
-//----------------------------------------------------------------------
-// BEGIN generated section.  The following code is automatically generated
-//       by gen_iface.py from the contents of Scintilla.iface.  Do not edit
-//       this file.  Edit stc.cpp.in or gen_iface.py instead and regenerate.
-
-%(METHOD_IMPS)s
-
-// END of generated section
-//----------------------------------------------------------------------
-
-
-// Returns the line number of the line with the caret.
-int wxStyledTextCtrl::GetCurrentLine() {
-    int line = LineFromPosition(GetCurrentPos());
-    return line;
-}
-
-
-// Extract style settings from a spec-string which is composed of one or
-// more of the following comma separated elements:
-//
-//      bold                    turns on bold
-//      italic                  turns on italics
-//      fore:#RRGGBB            sets the foreground colour
-//      back:#RRGGBB            sets the background colour
-//      face:[facename]         sets the font face name to use
-//      size:[num]              sets the font size in points
-//      eol                     turns on eol filling
-//      underline               turns on underlining
-//
-void wxStyledTextCtrl::StyleSetSpec(int styleNum, const wxString& spec) {
-
-    wxStringTokenizer tkz(spec, ",");
-    while (tkz.HasMoreTokens()) {
-        wxString token = tkz.GetNextToken();
-
-        wxString option = token.BeforeFirst(':');
-        wxString val = token.AfterFirst(':');
-
-        if (option == "bold")
-            StyleSetBold(styleNum, true);
-
-        else if (option == "italic")
-            StyleSetItalic(styleNum, true);
-
-        else if (option == "underline")
-            StyleSetUnderline(styleNum, true);
-
-        else if (option == "eol")
-            StyleSetEOLFilled(styleNum, true);
-
-        else if (option == "size") {
-            long points;
-            if (val.ToLong(&points))
-                StyleSetSize(styleNum, points);
-        }
-
-        else if (option == "face")
-            StyleSetFaceName(styleNum, val);
-
-        else if (option == "fore")
-            StyleSetForeground(styleNum, wxColourFromSpec(val));
-
-        else if (option == "back")
-            StyleSetBackground(styleNum, wxColourFromSpec(val));
-    }
-}
-
-
-// Set style size, face, bold, italic, and underline attributes from
-// a wxFont's attributes.
-void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) {
-    int      size     = font.GetPointSize();
-    wxString faceName = font.GetFaceName();
-    bool     bold     = font.GetWeight() == wxBOLD;
-    bool     italic   = font.GetStyle() != wxNORMAL;
-    bool     under    = font.GetUnderlined();
-
-    // TODO: add encoding/charset mapping
-    StyleSetFontAttr(styleNum, size, faceName, bold, italic, under);
-}
-
-// Set all font style attributes at once.
-void wxStyledTextCtrl::StyleSetFontAttr(int styleNum, int size,
-                                        const wxString& faceName,
-                                        bool bold, bool italic,
-                                        bool underline) {
-    StyleSetSize(styleNum, size);
-    StyleSetFaceName(styleNum, faceName);
-    StyleSetBold(styleNum, bold);
-    StyleSetItalic(styleNum, italic);
-    StyleSetUnderline(styleNum, underline);
-
-    // TODO: add encoding/charset mapping
-}
-
-
-// Perform one of the operations defined by the wxSTC_CMD_* constants.
-void wxStyledTextCtrl::CmdKeyExecute(int cmd) {
-    SendMsg(cmd);
-}
-
-
-// Set the left and right margin in the edit area, measured in pixels.
-void wxStyledTextCtrl::SetMargins(int left, int right) {
-    SetMarginLeft(left);
-    SetMarginRight(right);
-}
-
-
-// Retrieve the start and end positions of the current selection.
-void wxStyledTextCtrl::GetSelection(int* startPos, int* endPos) {
-    if (startPos != NULL)
-        *startPos = SendMsg(SCI_GETSELECTIONSTART);
-    if (endPos != NULL)
-        *endPos = SendMsg(SCI_GETSELECTIONEND);
-}
-
-
-// Retrieve the point in the window where a position is displayed.
-wxPoint wxStyledTextCtrl::PointFromPosition(int pos) {
-    int x = SendMsg(SCI_POINTXFROMPOSITION, 0, pos);
-    int y = SendMsg(SCI_POINTYFROMPOSITION, 0, pos);
-    return wxPoint(x, y);
-}
-
-// Scroll enough to make the given line visible
-void wxStyledTextCtrl::ScrollToLine(int line) {
-    m_swx->DoScrollToLine(line);
-}
-
-
-// Scroll enough to make the given column visible
-void wxStyledTextCtrl::ScrollToColumn(int column) {
-    m_swx->DoScrollToColumn(column);
-}
-
-
-
-//----------------------------------------------------------------------
-// Event handlers
-
-void wxStyledTextCtrl::OnPaint(wxPaintEvent& evt) {
-    wxPaintDC dc(this);
-    wxRegion  region = GetUpdateRegion();
-
-    m_swx->DoPaint(&dc, region.GetBox());
-}
-
-void wxStyledTextCtrl::OnScrollWin(wxScrollWinEvent& evt) {
-    if (evt.GetOrientation() == wxHORIZONTAL)
-        m_swx->DoHScroll(evt.GetEventType(), evt.GetPosition());
-    else
-        m_swx->DoVScroll(evt.GetEventType(), evt.GetPosition());
-}
-
-void wxStyledTextCtrl::OnSize(wxSizeEvent& evt) {
-    wxSize sz = GetClientSize();
-    m_swx->DoSize(sz.x, sz.y);
-}
-
-void wxStyledTextCtrl::OnMouseLeftDown(wxMouseEvent& evt) {
-    wxPoint pt = evt.GetPosition();
-    m_swx->DoButtonDown(Point(pt.x, pt.y), m_stopWatch.Time(),
-                      evt.ShiftDown(), evt.ControlDown(), evt.AltDown());
-}
-
-void wxStyledTextCtrl::OnMouseMove(wxMouseEvent& evt) {
-    wxPoint pt = evt.GetPosition();
-    m_swx->DoButtonMove(Point(pt.x, pt.y));
-}
-
-void wxStyledTextCtrl::OnMouseLeftUp(wxMouseEvent& evt) {
-    wxPoint pt = evt.GetPosition();
-    m_swx->DoButtonUp(Point(pt.x, pt.y), m_stopWatch.Time(),
-                      evt.ControlDown());
-}
-
-
-void wxStyledTextCtrl::OnMouseRightUp(wxMouseEvent& evt) {
-    wxPoint pt = evt.GetPosition();
-    m_swx->DoContextMenu(Point(pt.x, pt.y));
-}
-
-void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
-    long key = evt.KeyCode();
-    if ((key > WXK_ESCAPE) &&
-        (key != WXK_DELETE) && (key < 255) &&
-        !evt.ControlDown() && !evt.AltDown()) {
-
-        m_swx->DoAddChar(key);
-    }
-    else {
-        evt.Skip();
-    }
-}
-
-void wxStyledTextCtrl::OnKeyDown(wxKeyEvent& evt) {
-    long key = evt.KeyCode();
-    key = toupper(key);
-    int processed = m_swx->DoKeyDown(key, evt.ShiftDown(),
-                                     evt.ControlDown(), evt.AltDown());
-    if (! processed)
-        evt.Skip();
-}
-
-void wxStyledTextCtrl::OnLoseFocus(wxFocusEvent& evt) {
-    m_swx->DoLoseFocus();
-}
-
-void wxStyledTextCtrl::OnGainFocus(wxFocusEvent& evt) {
-    m_swx->DoGainFocus();
-}
-
-void wxStyledTextCtrl::OnSysColourChanged(wxSysColourChangedEvent& evt) {
-    m_swx->DoSysColourChange();
-}
-
-void wxStyledTextCtrl::OnEraseBackground(wxEraseEvent& evt) {
-    // do nothing to help avoid flashing
-}
-
-
-
-void wxStyledTextCtrl::OnMenu(wxCommandEvent& evt) {
-    m_swx->DoCommand(evt.GetId());
-}
-
-
-void wxStyledTextCtrl::OnListBox(wxCommandEvent& evt) {
-    m_swx->DoOnListBox();
-}
-
-
-//----------------------------------------------------------------------
-// Turn notifications from Scintilla into events
-
-
-void wxStyledTextCtrl::NotifyChange() {
-    wxStyledTextEvent evt(wxEVT_STC_CHANGE, GetId());
-    GetEventHandler()->ProcessEvent(evt);
-}
-
-void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
-    SCNotification& scn = *_scn;
-    int eventType = 0;
-    switch (scn.nmhdr.code) {
-    case SCN_STYLENEEDED:
-        eventType = wxEVT_STC_STYLENEEDED;
-        break;
-    case SCN_CHARADDED:
-        eventType = wxEVT_STC_CHARADDED;
-        break;
-    case SCN_UPDATEUI:
-        eventType = wxEVT_STC_UPDATEUI;
-        break;
-    case SCN_SAVEPOINTREACHED:
-        eventType = wxEVT_STC_SAVEPOINTREACHED;
-        break;
-    case SCN_SAVEPOINTLEFT:
-        eventType = wxEVT_STC_SAVEPOINTLEFT;
-        break;
-    case SCN_MODIFYATTEMPTRO:
-        eventType = wxEVT_STC_ROMODIFYATTEMPT;
-        break;
-    case SCN_DOUBLECLICK:
-        eventType = wxEVT_STC_DOUBLECLICK;
-        break;
-    case SCN_MODIFIED:
-        eventType = wxEVT_STC_MODIFIED;
-        break;
-    case SCN_KEY:
-        eventType = wxEVT_STC_KEY;
-        break;
-    case SCN_MACRORECORD:
-        eventType = wxEVT_STC_MACRORECORD;
-        break;
-    case SCN_MARGINCLICK:
-        eventType = wxEVT_STC_MARGINCLICK;
-        break;
-    case SCN_NEEDSHOWN:
-        eventType = wxEVT_STC_NEEDSHOWN;
-        break;
-    case SCN_POSCHANGED:
-        eventType = wxEVT_STC_POSCHANGED;
-        break;
-    }
-    if (eventType) {
-        wxStyledTextEvent evt(eventType, GetId());
-        evt.SetPosition(scn.position);
-        evt.SetKey(scn.ch);
-        evt.SetModifiers(scn.modifiers);
-        if (eventType == wxEVT_STC_MODIFIED) {
-            evt.SetModificationType(scn.modificationType);
-            if (scn.text)
-                evt.SetText(wxString(scn.text, scn.length));
-            evt.SetLength(scn.length);
-            evt.SetLinesAdded(scn.linesAdded);
-            evt.SetLine(scn.line);
-            evt.SetFoldLevelNow(scn.foldLevelNow);
-            evt.SetFoldLevelPrev(scn.foldLevelPrev);
-        }
-        if (eventType == wxEVT_STC_MARGINCLICK)
-            evt.SetMargin(scn.margin);
-        if (eventType == wxEVT_STC_MACRORECORD) {
-            evt.SetMessage(scn.message);
-            evt.SetWParam(scn.wParam);
-            evt.SetLParam(scn.lParam);
-        }
-
-        GetEventHandler()->ProcessEvent(evt);
-    }
-}
-
-
-
-//----------------------------------------------------------------------
-//----------------------------------------------------------------------
-//----------------------------------------------------------------------
-
-wxStyledTextEvent::wxStyledTextEvent(wxEventType commandType, int id)
-    : wxCommandEvent(commandType, id)
-{
-    m_position = 0;
-    m_key = 0;
-    m_modifiers = 0;
-    m_modificationType = 0;
-    m_length = 0;
-    m_linesAdded = 0;
-    m_line = 0;
-    m_foldLevelNow = 0;
-    m_foldLevelPrev = 0;
-    m_margin = 0;
-    m_message = 0;
-    m_wParam = 0;
-    m_lParam = 0;
-
-
-}
-
-bool wxStyledTextEvent::GetShift() const { return (m_modifiers & SCI_SHIFT) != 0; }
-bool wxStyledTextEvent::GetControl() const { return (m_modifiers & SCI_CTRL) != 0; }
-bool wxStyledTextEvent::GetAlt() const { return (m_modifiers & SCI_ALT) != 0; }
-
-void wxStyledTextEvent::CopyObject(wxObject& obj) const {
-    wxCommandEvent::CopyObject(obj);
-
-    wxStyledTextEvent* o = (wxStyledTextEvent*)&obj;
-    o->m_position =      m_position;
-    o->m_key =           m_key;
-    o->m_modifiers =     m_modifiers;
-    o->m_modificationType = m_modificationType;
-    o->m_text =          m_text;
-    o->m_length =        m_length;
-    o->m_linesAdded =    m_linesAdded;
-    o->m_line =          m_line;
-    o->m_foldLevelNow =  m_foldLevelNow;
-    o->m_foldLevelPrev = m_foldLevelPrev;
-
-    o->m_margin =        m_margin;
-
-    o->m_message =       m_message;
-    o->m_wParam =        m_wParam;
-    o->m_lParam =        m_lParam;
-
-
-
-}
-
-//----------------------------------------------------------------------
-//----------------------------------------------------------------------
-
--- a/contrib/src/stc/stc.h.in
+++ b/contrib/src/stc/stc.h.in
@@ -1,297 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Name:        stc.h
-// Purpose:     A wxWindows implementation of Scintilla.  This class is the
-//              one meant to be used directly by wx applications.  It does not
-//              derive directly from the Scintilla classes, and in fact there
-//              is no mention of Scintilla classes at all in this header.
-//              This class delegates all method calls and events to the
-//              Scintilla objects and so forth.  This allows the use of
-//              Scintilla without polluting the namespace with all the
-//              classes and itentifiers from Scintilla.
-//
-// Author:      Robin Dunn
-//
-// Created:     13-Jan-2000
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __stc_h__
-#define __stc_h__
-
-
-#include <wx/wx.h>
-
-//----------------------------------------------------------------------
-// BEGIN generated section.  The following code is automatically generated
-//       by gen_iface.py.  Do not edit this file.  Edit stc.h.in instead
-//       and regenerate
-
-%(VALUES)s
-
-// END of generated section
-//----------------------------------------------------------------------
-// Others
-
-#define wxSTC_MASK_FOLDERS ((1 << wxSTC_MARKNUM_FOLDER) | (1 << wxSTC_MARKNUM_FOLDEROPEN))
-
-
-
-//----------------------------------------------------------------------
-
-class  ScintillaWX;                      // forward declare
-class  WordList;
-struct SCNotification;
-
-
-extern const wxChar* wxSTCNameStr;
-
-//----------------------------------------------------------------------
-
-class wxStyledTextCtrl : public wxControl {
-public:
-
-#ifdef SWIG
-    wxStyledTextCtrl(wxWindow *parent, wxWindowID id,
-                     const wxPoint& pos = wxDefaultPosition,
-                     const wxSize& size = wxDefaultSize, long style = 0,
-                     const char* name = "styledtext");
-#else
-    wxStyledTextCtrl(wxWindow *parent, wxWindowID id,
-                     const wxPoint& pos = wxDefaultPosition,
-                     const wxSize& size = wxDefaultSize, long style = 0,
-                     const wxString& name = wxSTCNameStr);
-#endif
-
-
-#ifndef SWIG
-    ~wxStyledTextCtrl();
-#endif
-
-//----------------------------------------------------------------------
-// BEGIN generated section.  The following code is automatically generated
-//       by gen_iface.py.  Do not edit this file.  Edit stc.h.in instead
-//       and regenerate
-
-%(METHOD_DEFS)s
-
-// END of generated section
-//----------------------------------------------------------------------
-// Others...
-
-
-    // Returns the line number of the line with the caret.
-    int GetCurrentLine();
-
-    // Extract style settings from a spec-string which is composed of one or
-    // more of the following comma separated elements:
-    //
-    //      bold                    turns on bold
-    //      italic                  turns on italics
-    //      fore:#RRGGBB            sets the foreground colour
-    //      back:#RRGGBB            sets the background colour
-    //      face:[facename]         sets the font face name to use
-    //      size:[num]              sets the font size in points
-    //      eol                     turns on eol filling
-    //      underline               turns on underlining
-    //
-    void StyleSetSpec(int styleNum, const wxString& spec);
-
-
-
-    // Set style size, face, bold, italic, and underline attributes from
-    // a wxFont's attributes.
-    void StyleSetFont(int styleNum, wxFont& font);
-
-
-
-    // Set all font style attributes at once.
-    void StyleSetFontAttr(int styleNum, int size,
-                          const wxString& faceName,
-                          bool bold, bool italic,
-                          bool underline);
-
-
-
-    // Perform one of the operations defined by the wxSTC_CMD_* constants.
-    void CmdKeyExecute(int cmd);
-
-
-
-    // Set the left and right margin in the edit area, measured in pixels.
-    void SetMargins(int left, int right);
-
-
-    // Retrieve the start and end positions of the current selection.
-#ifdef SWIG
-    void GetSelection(int* OUTPUT, int* OUTPUT);
-#else
-    void GetSelection(int* startPos, int* endPos);
-#endif
-
-    // Retrieve the point in the window where a position is displayed.
-    wxPoint PointFromPosition(int pos);
-
-
-    // Scroll enough to make the given line visible
-    void ScrollToLine(int line);
-
-
-    // Scroll enough to make the given column visible
-    void ScrollToColumn(int column);
-
-//----------------------------------------------------------------------
-
-
-#ifndef SWIG
-private:
-    // Event handlers
-    void OnPaint(wxPaintEvent& evt);
-    void OnScrollWin(wxScrollWinEvent& evt);
-    void OnSize(wxSizeEvent& evt);
-    void OnMouseLeftDown(wxMouseEvent& evt);
-    void OnMouseMove(wxMouseEvent& evt);
-    void OnMouseLeftUp(wxMouseEvent& evt);
-    void OnMouseRightUp(wxMouseEvent& evt);
-    void OnChar(wxKeyEvent& evt);
-    void OnKeyDown(wxKeyEvent& evt);
-    void OnLoseFocus(wxFocusEvent& evt);
-    void OnGainFocus(wxFocusEvent& evt);
-    void OnSysColourChanged(wxSysColourChangedEvent& evt);
-    void OnEraseBackground(wxEraseEvent& evt);
-    void OnMenu(wxCommandEvent& evt);
-    void OnListBox(wxCommandEvent& evt);
-
-
-    // Turn notifications from Scintilla into events
-    void NotifyChange();
-    void NotifyParent(SCNotification* scn);
-
-    long SendMsg(int msg, long wp=0, long lp=0);
-
-private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxStyledTextCtrl)
-
-    ScintillaWX*        m_swx;
-    wxStopWatch         m_stopWatch;
-
-
-    friend class ScintillaWX;
-    friend class Platform;
-#endif
-};
-
-//----------------------------------------------------------------------
-
-class wxStyledTextEvent : public wxCommandEvent {
-public:
-    wxStyledTextEvent(wxEventType commandType=0, int id=0);
-    ~wxStyledTextEvent() {}
-
-    void SetPosition(int pos)        { m_position = pos; }
-    void SetKey(int k)               { m_key = k; }
-    void SetModifiers(int m)         { m_modifiers = m; }
-    void SetModificationType(int t)  { m_modificationType = t; }
-    void SetText(const char* t)      { m_text = t; }
-    void SetLength(int len)          { m_length = len; }
-    void SetLinesAdded(int num)      { m_linesAdded = num; }
-    void SetLine(int val)            { m_line = val; }
-    void SetFoldLevelNow(int val)    { m_foldLevelNow = val; }
-    void SetFoldLevelPrev(int val)   { m_foldLevelPrev = val; }
-    void SetMargin(int val)          { m_margin = val; }
-    void SetMessage(int val)         { m_message = val; }
-    void SetWParam(int val)          { m_wParam = val; }
-    void SetLParam(int val)          { m_lParam = val; }
-
-    int  GetPosition() const         { return m_position; }
-    int  GetKey()  const             { return m_key; }
-    int  GetModifiers() const        { return m_modifiers; }
-    int  GetModificationType() const { return m_modificationType; }
-    wxString GetText() const         { return m_text; }
-    int  GetLength() const           { return m_length; }
-    int  GetLinesAdded() const       { return m_linesAdded; }
-    int  GetLine() const             { return m_line; }
-    int  GetFoldLevelNow() const     { return m_foldLevelNow; }
-    int  GetFoldLevelPrev() const    { return m_foldLevelPrev; }
-    int  GetMargin() const           { return m_margin; }
-    int  GetMessage() const          { return m_message; }
-    int  GetWParam() const           { return m_wParam; }
-    int  GetLParam() const           { return m_lParam; }
-
-    bool GetShift() const;
-    bool GetControl() const;
-    bool GetAlt() const;
-
-    void CopyObject(wxObject& obj) const;
-
-#ifndef SWIG
-private:
-    DECLARE_DYNAMIC_CLASS(wxStyledTextEvent)
-
-    int  m_position;
-    int  m_key;
-    int  m_modifiers;
-
-    int  m_modificationType;    // wxEVT_STC_MODIFIED
-    wxString m_text;
-    int  m_length;
-    int  m_linesAdded;
-    int  m_line;
-    int  m_foldLevelNow;
-    int  m_foldLevelPrev;
-
-    int  m_margin;              // wxEVT_STC_MARGINCLICK
-
-    int  m_message;             // wxEVT_STC_MACRORECORD
-    int  m_wParam;
-    int  m_lParam;
-#endif
-};
-
-
-// Event types
-enum {
-    wxEVT_STC_CHANGE = 1650,
-    wxEVT_STC_STYLENEEDED,
-    wxEVT_STC_CHARADDED,
-    wxEVT_STC_UPDATEUI,
-    wxEVT_STC_SAVEPOINTREACHED,
-    wxEVT_STC_SAVEPOINTLEFT,
-    wxEVT_STC_ROMODIFYATTEMPT,
-    wxEVT_STC_DOUBLECLICK,
-    wxEVT_STC_MODIFIED,
-    wxEVT_STC_KEY,
-    wxEVT_STC_MACRORECORD,
-    wxEVT_STC_MARGINCLICK,
-    wxEVT_STC_NEEDSHOWN,
-    wxEVT_STC_POSCHANGED
-};
-
-
-#ifndef SWIG
-typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
-
-#define EVT_STC_CHANGE(id, fn) { wxEVT_STC_CHANGE, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_STYLENEEDED(id, fn) { wxEVT_STC_STYLENEEDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_CHARADDED(id, fn) { wxEVT_STC_CHARADDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_UPDATEUI(id, fn) { wxEVT_STC_UPDATEUI, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_SAVEPOINTREACHED(id, fn) { wxEVT_STC_SAVEPOINTREACHED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_SAVEPOINTLEFT(id, fn) { wxEVT_STC_SAVEPOINTLEFT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_ROMODIFYATTEMPT(id, fn) { wxEVT_STC_ROMODIFYATTEMPT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_DOUBLECLICK(id, fn) { wxEVT_STC_DOUBLECLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_MODIFIED(id, fn) { wxEVT_STC_MODIFIED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_KEY(id, fn) { wxEVT_STC_KEY, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_MACRORECORD(id, fn) { wxEVT_STC_MACRORECORD, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_MARGINCLICK(id, fn) { wxEVT_STC_MARGINCLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_NEEDSHOWN(id, fn) { wxEVT_STC_NEEDSHOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-#define EVT_STC_POSCHANGED(id, fn) { wxEVT_STC_POSCHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL },
-
-#endif
-
-//----------------------------------------------------------------------
-//----------------------------------------------------------------------
-#endif
-
-
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -5,43 +5,14 @@ The following packages are built from the wxWindows CVS source.

 libwxbase		wxBase runtime shared libraries
 libwxbase-dev		extra files and static libs for building wxBase apps
-libwxbase-dbg		wxBase libraries built with -g and __WXDEBUG__
-
 libwxgtk		wxGTK runtime shared libraries
 libwxgtk-dev		extra files and static libs for building wxGTK apps
-libwxgtk-dbg		wxGTK libraries built with -g and __WXDEBUG__
-
-libwxgtk-python		Python binding to wxGTK  (from 2.2.3 onward, this
-			obsoletes the libwxgtk-python-contrib package as
-			all python modules are build into a single monolith)
-
+libwxgtk-python		Python binding to wxGTK
 wxwin-contrib		wxWin contrib runtime shared libs (built with wxGTK)
 wxwin-contrib-dev	extra files and static contrib libs for building apps
-
 wxwin-headers		common header files for building wxWindows apps
 wxwin-doc		HTML version of the wxWindows manual
 wxwin-examples		wxWindows and wxPython demos and samples (source)
-wxwin-i18n		message catalogs for native language support
-
-
-	The following three can be built from the source package
-	with the mingw32 cross compiler, but are not currently
-	distributed by Debian.  If you feel that should change,
-	please file a bug against the wxwindows2.2 package, or
-	append your views to a report already there if you're not
-	the first to do so.
-
-	[ you can check the current state of affairs at:
-	  http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=wxwindows2.2 ]
-
-	Oh and, please do *not* file bug reports for these three
-	to the Debian bts.  But do feel free to email be personally
-	if you find problems and/or have patches to fix them.
-
-libwxmsw2.2-dev_2.2.8_i386.deb		mingw32-cross wxMSW libs.
-libwxbase-msw2.2-dev_2.2.8_i386.deb	mingw32-cross wxBase libs.
-wxwin2.2-headers-msw_2.2.8_i386.deb	extra headers needed for wxMSW.


 -- Ron Lee <ron@debian.org>, Sun, 13 Feb 2000 18:40:00 +1030
-
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,145 +1,6 @@
-wxwindows2.2 (2.2.9) unstable; urgency=high
+wxwindows2.1 (2.1.16) unstable; urgency=low

-  * fix for arches with unsigned char as default.
-  * high urgency because this fix really should get
-    into woody.
-    Closes: #127014
-
- -- Ron Lee <ron@debian.org>  Mon, 31 Dec 2001 06:53:27 -0800
-
-wxwindows2.2 (2.2.8.5) unstable; urgency=low
-
-  * Add wxSIZE_T_IS defines to setup.h
-    Add automate that to my TODO list.
-
- -- Ron Lee <ron@debian.org>  Tue, 27 Nov 2001 05:55:47 -0800
-
-wxwindows2.2 (2.2.8.4) unstable; urgency=low
-
-  * Put the (modified) size_t == ulong kludge back into sndwav.cpp
-    it's still needed until wxDataOutputStream is made 64 bit
-    friendly, which may not happen for 2.2 since it will probably
-    not be binary compatible.
-  * caps a memory leak in the jpeg handler.
-
- -- Ron Lee <ron@debian.org>  Sun, 25 Nov 2001 11:53:59 -0800
-
-wxwindows2.2 (2.2.8.3) unstable; urgency=low
-
-  * Backported size_t test from 2.3 tree, removes the need for
-    specific tests for various 64 bit platforms including now
-    S/390 (thanks to Gerhard Tonn for the report).
-    Closes: #120768
-
- -- Ron Lee <ron@debian.org>  Fri, 23 Nov 2001 20:53:49 -0800
-
-wxwindows2.2 (2.2.8.2) unstable; urgency=low
-
-  * python-dev doesn't get me python?  More bytes in Build-Dep then
-    I guess ...  Closes: #119954
-
- -- Ron Lee <ron@debian.org>  Sun, 18 Nov 2001 04:28:41 -0800
-
-wxwindows2.2 (2.2.8.1) unstable; urgency=low
-
-  * Rebuild for python2.1  Closes: #119226, #118835
-
- -- Ron Lee <ron@debian.org>  Mon, 12 Nov 2001 21:47:38 -0800
-
-wxwindows2.2 (2.2.8) unstable; urgency=medium
-
-  * Fixed bogus samples makefile. Closes: #110061
-  * Added ability to build wxMSW-cross packages, but they
-    are not built and distributed by default.
-
-      If you think such creatures belong in the archive,
-      see README.Debian
-
-  * Pruned more inapplicable files from the raw cvs source,
-    cleaned configure.in and removed the need for a common setup.h,
-    removed superfluous library links and generally tweaked things
-    so as to make adding new ports easier.
-  * added --gl-libs flag to wx-config.
-  * added wx2.4 forward compatible event macros.
-  * added build fixes for IA64 from Jeff Licquia, and fixed clean
-    rules to pick up unnoticed strays that effected NMU builds.
-    Thanks Jeff.  Closes: #101734, #104679  (fixed in NMU)
-  * Medium urgency since several other packages are waiting
-    for this to get into testing.
-
- -- Ron Lee <ron@debian.org>  Thu, 30 Aug 2001 15:41:49 -0700
-
-wxwindows2.2 (2.2.7) unstable; urgency=medium
-
-  * The "Testing Tarantella" release.
-  * various small control (mis)behaviours corrected.
-  * added missing build-dep for gettext.
-  * updated wxPython description, Closes: #102689
-  * Never publicly released, oh well.
-
- -- Ron Lee <ron@debian.org>  Sun, 10 Jun 2001 19:32:46 -0700
-
-wxwindows2.2 (2.2.6.1) unstable; urgency=low
-
-  * fix rules so it really doesn't build -indep for ports
-    and fixed ambiguous overload bug in mmedia contrib.
-    This time it will build on alpha for sure.  Really. :)
-    Closes: #92288
-  * added extra -dev package deps.  Closes: #91364
-
- -- Ron Lee <ron@debian.org>  Sat,  7 Apr 2001 06:49:58 -0700
-
-wxwindows2.2 (2.2.6) unstable; urgency=low
-
-  * changed i18n package back to building during arch phase
-    so we can reap the .mo files as they are created. Closes: #86174
-  * OBCBLR Closes: #84692
-  * fix wxPython build gremlin.  Closes: #89209, #85129
-  * tweaked wx-config alternatives priority to favour the most
-    likely default use.
-  * general buglet count reduced.
-
- -- Ron Lee <ron@debian.org>  Thu,  8 Mar 2001 21:10:07 -0800
-
-wxwindows2.2 (2.2.5.1) unstable; urgency=low
-
-  * "This One's for Dirk"  Closes: #84696
-  * 2.2.5 has known issues and will not be released for Debian.
-  * Fixed parser.y for Alpha builds (#82949)
-  * changed mesa dependency to the virtual libgl package and
-    added Conflicts for the old 2.1 packages (which are now
-    gone from woody anyway)  Closes: #80120, #70778, #70779, #70780
-  * wxPython now builds as a single unit (including contrib)
-    so removed the libwxgtk-python-contrib package
-  * updated translations
-  * new event table macro to enable code being written with 2.2
-    to be forward compatible with the changes in 2.4
-  * numerous sundry bugfixes
-
- -- Ron Lee <ron@debian.org>  Wed, 24 Jan 2001 18:51:24 -0800
-
-wxwindows2.2 (2.2.2) unstable; urgency=low
-
-  * added missing dependancy for contrib-dev package.  Closes: #70880
-  * by popular demand, added a package with the python-contrib libs.
-  * more tweaks to deb/rules.  autodetect the python install location,
-    and cache the results of configure tests for all packages.
-  * and of course a whole stack of minor fixes in the main codebase too.
-
- -- Ron Lee <ron@debian.org>  Tue,  5 Sep 2000 18:51:24 +0930
-
-wxwindows2.2 (2.2.1) unstable; urgency=low
-
-  * wxWin 2.2.1 stable release.
-  * First upload to deb.org after repackaging to build directly from
-    upstream cvs.
-  * still not quite lintian clean yet:
-    - wxPython lib can't be built with a proper soname yet.
-    - the -dbg packages need an override for the shlib symlink.
-    - and a couple of packages have the lib symlink 'before the
-      lib', but that's ugly to fix right now, they aren't critical
-      libs, and allegedly this will be handled by dpkg sometime soon.
-  * moved full licence text into copyright file.
+  * Repackaged to build from cvs.

 -- Ron Lee <ron@debian.org>  Sun, 13 Feb 2000 18:40:00 +1030

--- a/debian/control.in
+++ b/debian/control.in
@@ -1,9 +1,9 @@
 Source: wxwindows=V
 Section: libs
 Priority: optional
-Build-Depends: debhelper (>=2.0), flex, bison, gettext, libgtk1.2-dev, python (>=2.1), python (<<2.2), python2.1-dev, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libgl-dev, libesd0-dev
+Build-Depends: debhelper, flex, bison, libgtk1.2-dev, python-dev (>=1.5), zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, mesag-dev
 Maintainer: Ron Lee <ron@debian.org>
-Standards-Version: 3.5.6.0
+Standards-Version: 3.1.1

 Package: libwxbase=V
 Architecture: any
@@ -15,8 +15,8 @@ Description: wxBase library (runtime) - non-GUI support classes of wxWindows too
 portable wrappers around many OS-specific functions allowing to build the
 same program under all supported folders, wxThread class for writing
 multithreaded programs using either Win32 or POSIX threads and much more.
- wxBase currently supports the following platforms: Generic Unix (Linux, FreeBSD,
- Solaris, HP-UX, ...), win32, and BeOS.
+ wxBase currently supports the following platforms: Win32, generic Unix
+ (Linux, FreeBSD, Solaris, HP-UX, ...) and BeOS.
 .
 This package is only useful for non-gui apps.  It offers a subset of the
 classes in libwx_gtk=V for use in console apps and daemons.  It is currently
@@ -25,7 +25,7 @@ Description: wxBase library (runtime) - non-GUI support classes of wxWindows too
 Package: libwxbase=V-dev
 Architecture: any
 Section: devel
-Depends: wxwin=V-headers (= ${Source-Version}), libwxbase=V (= ${Source-Version}), zlib1g-dev, libc6-dev
+Depends: wxwin=V-headers (= ${Source-Version}), libwxbase=V (= ${Source-Version}), libc6-dev
 Suggests: wxwin=V-doc, gettext
 Conflicts: libwxbase-dev
 Replaces: libwxbase-dev
@@ -36,27 +36,23 @@ Description: wxBase library (development) - non-GUI support classes of wxWindows
 portable wrappers around many OS-specific functions allowing to build the
 same program under all supported folders, wxThread class for writing
 multithreaded programs using either Win32 or POSIX threads and much more.
- wxBase currently supports the following platforms: Generic Unix (Linux, FreeBSD,
- Solaris, HP-UX, ...), win32, and BeOS.
+ wxBase currently supports the following platforms: Win32, generic Unix
+ (Linux, FreeBSD, Solaris, HP-UX, ...) and BeOS.
 .
 This package provides the files needed to compile apps using the wxBase library.

 Package: libwxbase=V-dbg
 Architecture: any
 Section: devel
-Priority: extra
 Depends: wxwin=V-headers (= ${Source-Version}), libc6-dev
-Conflicts: libwxbase-dbg
-Replaces: libwxbase-dbg
-Provides: libwxbase-dbg
 Description: wxBase library (debug) - non-GUI support classes of wxWindows toolkit
 wxBase is a collection of C++ classes providing basic data structures
 (strings, lists, arrays), powerful wxDateTime class for date manipulations,
 portable wrappers around many OS-specific functions allowing to build the
 same program under all supported folders, wxThread class for writing
 multithreaded programs using either Win32 or POSIX threads and much more.
- wxBase currently supports the following platforms: Generic Unix (Linux, FreeBSD,
- Solaris, HP-UX, ...) win32, and BeOS.
+ wxBase currently supports the following platforms: Win32, generic Unix
+ (Linux, FreeBSD, Solaris, HP-UX, ...) and BeOS.
 .
 This package provides a debug version of the wxBase library.  It is compiled
 both with -g for normal debugger tracing and with the __WXDEBUG__ flag which
@@ -67,8 +63,7 @@ Package: libwxgtk=V
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Suggests: libgl1
-Replaces: wxgtk2.1
+Suggests: mesag3
 Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ runtime)
 wxWindows is a class library for C++ providing GUI (Graphical User
 Interface) and other facilities on more than one platform.  Version =V
@@ -81,10 +76,10 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ runtime)
 Package: libwxgtk=V-dev
 Architecture: any
 Section: devel
-Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libgtk1.2-dev, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libc6-dev
-Suggests: wxwin=V-doc, libstdc++-dev, gettext, libgl-dev
+Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libc6-dev
+Suggests: wxwin=V-doc, libstdc++-dev, gettext, mesag-dev
 Conflicts: libwxgtk-dev
-Replaces: libwxgtk-dev, wxgtk2.1-dev
+Replaces: libwxgtk-dev
 Provides: libwxgtk-dev
 Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
 wxWindows is a class library for C++ providing GUI (Graphical User
@@ -98,11 +93,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
 Package: libwxgtk=V-dbg
 Architecture: any
 Section: devel
-Priority: extra
 Depends: wxwin=V-headers (= ${Source-Version}), libc6-dev
-Conflicts: libwxgtk-dbg
-Replaces: libwxgtk-dbg
-Provides: libwxgtk-dbg
 Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
 wxWindows is a class library for C++ providing GUI (Graphical User
 Interface) and other facilities on more than one platform.  Version =V
@@ -116,17 +107,14 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
 Package: libwxgtk=V-python
 Architecture: any
 Section: interpreters
-Depends: python (>=2.1), python (<<2.2), ${shlibs:Depends}
-Suggests: wxwin=V-doc, wxwin=V-examples
-Conflicts: libwxgtk=V-python-contrib, python-wxwin
-Replaces: libwxgtk=V-python-contrib, python-wxwin
-Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding)
+Depends: libwxgtk=V (= ${Source-Version}), python-base (>=1.5), ${shlibs:Depends}
+Suggests: wxwin=V-doc
+Description: wxWindows Cross-platform C++ GUI toolkit (Python binding)
 wxWindows is a class library for C++ providing GUI (Graphical User
 Interface) and other facilities on more than one platform.  Version =V
 currently supports subsets of GTK+, Motif, and MS Windows.
 .
- This package provides a Python binding to the wxGTK library and it's
- contrib libs.
+ This package provides a Python binding to the wxGTK library.

 Package: libwxgtk=V-contrib
 Architecture: any
@@ -143,7 +131,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (runtime contrib libs)
 Package: libwxgtk=V-contrib-dev
 Architecture: any
 Section: devel
-Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V-dev (= ${Source-Version}), libwxgtk=V-contrib (= ${Source-Version}), libc6-dev
+Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V-dev (= ${Source-Version}), libc6-dev
 Conflicts: libwxgtk-contrib-dev
 Replaces: libwxgtk-contrib-dev
 Provides: libwxgtk-contrib-dev
@@ -159,7 +147,7 @@ Package: wxwin=V-headers
 Architecture: any
 Section: devel
 Conflicts: wxwin-headers
-Replaces: wxwin-headers, wxgtk2.1-dev
+Replaces: wxwin-headers
 Provides: wxwin-headers
 Description: wxWindows Cross-platform C++ GUI toolkit (header files)
 wxWindows is a class library for C++ providing GUI (Graphical User
@@ -169,19 +157,6 @@ Description: wxWindows Cross-platform C++ GUI toolkit (header files)
 This package provides the common header files required to build applications
 using the wxWindows toolkit.

-Package: wxwin=V-i18n
-Architecture: all
-Section: libs
-Conflicts: wxwin-i18n
-Replaces: wxwin-i18n
-Provides: wxwin-i18n
-Description: wxWindows Cross-platform C++ GUI toolkit (i18n support)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
- .
- This package provides the i18n message catalogs for wxWindows.
-
 Package: wxwin=V-doc
 Architecture: all
 Section: doc
@@ -204,33 +179,3 @@ Description: wxWindows Cross-platform C++ GUI toolkit (examples)
 .
 This package contains examples of using the wxWindows toolkit.

-Package: libwxbase-msw=V-dev
-Architecture: i386
-Section: otherosfs
-Depends: wxwin=V-headers-msw (= ${Source-Version})
-Conflicts: libwxbase-msw-dev
-Replaces: libwxbase-msw-dev
-Provides: libwxbase-msw-dev
-Description: wxBase mingw32msvc-cross
- mingw32msvc-cross wxBase libs.
-
-Package: libwxmsw=V-dev
-Architecture: i386
-Section: otherosfs
-Depends: wxwin=V-headers-msw (= ${Source-Version})
-Conflicts: libwxmsw-dev
-Replaces: libwxmsw-dev
-Provides: libwxmsw-dev
-Description: wxMSW mingw32msvc-cross
- mingw32msvc-cross wxMSW libs.
-
-Package: wxwin=V-headers-msw
-Architecture: i386
-Section: otherosfs
-Depends: wxwin=V-headers (= ${Source-Version})
-Conflicts: wxwin-headers-msw
-Replaces: wxwin-headers-msw
-Provides: wxwin-headers-msw
-Description: Extra wxWindows headers for mingw32msvc-cross
- Headers required by the wxWindows mingw32msvc-cross libraries.
-
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,193 +1,18 @@
 This package was debianized by Ron Lee <ron@debian.org> on
 Sun, 13 Feb 2000 18:40:00 +1030.

-more information about wxWindows, as well as the source these debs
-are produced from can be found at www.wxwindows.org
+wxWindows main upstream site is www.wxwindows.org

-Note for Debian users:
-======================
-
-Most of the core wxWindows library is licenced under the wxWindows Library
-Licence (included below), however some additional features of the library
-may include source licenced under terms which do not include the exception
-permitting you to licence binary object code versions of works based on the
-Library under terms of your own choice.  At any time and without warning,
-newer versions of the Debian binary packages may include such code.
-
-In short, if you plan to licence apps built against these debs under terms
-compatible with the GPL or LGPL, then you have nothing to worry about.  If
-you wish to release your code under a licence which does not grant all of
-the same rights as the LGPL would assert but would be permitted under the
-terms of the exception, then you are strongly advised to either check the
-licencing terms of all components that these debs (and all future versions
-that you use) are built with, or build your own binaries of wxWindows which
-include only such code as is definitely covered by the exception.
-
-You should presume that these debs will fall under the provisions of the
-unmodified LGPL unless you can prove otherwise, however this note in no way
-alters the actual terms of the authorative licence detailed below, it is
-intended to be purely informative of the fact that the Debian binary packages
-will be built primarily with features useful to Free Software developers and
-may not be suitable "as is" for compiling software for distribution that is
-licenced incompatibly with the LGPL.
-
-Modifications and additions to the Library itself are encouraged to be
-placed under the wxWindows Library Licence.  We hope you find it useful.
-
-  -- Ron
-
-----------------------------------------------------------------------------
-
-Preamble
-========
-
-The licensing of the wxWindows library is intended to protect the wxWindows
-library, its developers, and its users, so that the considerable investment
-it represents is not abused.
-
-Under the terms of the wxWindows Licence, you as a user are not
-obliged to distribute wxWindows source code with your products, if you
-distribute these products in binary form. However, you are prevented from
-restricting use of the library in source code form, or denying others the
-rights to use or distribute wxWindows library source code in the way
-intended.
-
-The wxWindows Licence establishes the copyright for the code and related
-material, and it gives you legal permission to copy, distribute and/or
-modify the library. It also asserts that no warranty is given by the authors
-for this or derived code.
-
-The core distribution of the wxWindows library contains files
-under two different licences:
-
- Most files are distributed under the GNU Library General Public
-  Licence, version 2, with the special exception that you may create and
-  distribute object code versions built from the source code or modified
-  versions of it (even if these modified versions include code under a
-  different licence), and distribute such binaries under your own
-  terms.
-
- Most core wxWindows manuals are made available under the "wxWindows
-  Free Documentation Licence", which allows you to distribute modified
-  versions of the manuals, such as versions documenting any modifications
-  made by you in your version of the library. However, you may not restrict
-  any third party from reincorporating your changes into the original
-  manuals.
+wxWindows is licenced under the LGPL with a special exception for
+binary only apps produced with it.  Some parts of the library (as
+compiled for Debian) might *not* include this extra exception in
+their licence.  If you wish to distribute binary object code under
+terms other than those allowed by the (L)GPL (but allowed by the
+wxWindows Licence), you must first ensure all linked in code is
+subject to this exception.  This package is almost certainly built
+with code licenced under terms which do not include that exception.


-
-                wxWindows Library Licence, Version 3
-                ====================================
-
-  Copyright (c) 1998 Julian Smart, Robert Roebling et al
-
-  Everyone is permitted to copy and distribute verbatim copies
-  of this licence document, but changing it is not allowed.
-
-                       WXWINDOWS LIBRARY LICENCE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-  
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public Licence as published by
-  the Free Software Foundation; either version 2 of the Licence, or (at
-  your option) any later version.
-  
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library
-  General Public Licence for more details.
-
-  You should have received a copy of the GNU Library General Public Licence
-  along with this software, usually in a file named COPYING.LIB.  If not,
-  write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA 02111-1307 USA.
-
-  EXCEPTION NOTICE
-
-  1. As a special exception, the copyright holders of this library give
-  permission for additional uses of the text contained in this release of
-  the library as licenced under the wxWindows Library Licence, applying
-  either version 3 of the Licence, or (at your option) any later version of
-  the Licence as published by the copyright holders of version 3 of the
-  Licence document.
-
-  2. The exception is that you may use, copy, link, modify and distribute
-  under the user's own terms, binary object code versions of works based
-  on the Library.
-
-  3. If you copy code from files distributed under the terms of the GNU
-  General Public Licence or the GNU Library General Public Licence into a
-  copy of this library, as this licence permits, the exception does not
-  apply to the code that you add in this way.  To avoid misleading anyone as
-  to the status of such modified files, you must delete this exception
-  notice from such code and/or adjust the licensing conditions notice
-  accordingly.
-
-  4. If you write modifications of your own for this library, it is your
-  choice whether to permit this exception to apply to your modifications. 
-  If you do not wish that, you must delete the exception notice from such
-  code and/or adjust the licensing conditions notice accordingly.
-
-
-
-                wxWindows Free Documentation Licence, Version 3
-                ===============================================
-
-  Copyright (c) 1998 Julian Smart, Robert Roebling et al
-
-  Everyone is permitted to copy and distribute verbatim copies
-  of this licence document, but changing it is not allowed.
-   
-                   WXWINDOWS FREE DOCUMENTATION LICENCE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  1. Permission is granted to make and distribute verbatim copies of this
-  manual or piece of documentation provided any copyright notice and this
-  permission notice are preserved on all copies.
-
-  2. Permission is granted to process this file or document through a
-  document processing system and, at your option and the option of any third
-  party, print the results, provided a printed document carries a copying
-  permission notice identical to this one.
-
-  3. Permission is granted to copy and distribute modified versions of this
-  manual or piece of documentation under the conditions for verbatim
-  copying, provided also that any sections describing licensing conditions
-  for this manual, such as, in particular, the GNU General Public Licence,
-  the GNU Library General Public Licence, and any wxWindows Licence are
-  included exactly as in the original, and provided that the entire
-  resulting derived work is distributed under the terms of a permission
-  notice identical to this one.
-
-  4. Permission is granted to copy and distribute translations of this
-  manual or piece of documentation into another language, under the above
-  conditions for modified versions, except that sections related to
-  licensing, including this paragraph, may also be included in translations
-  approved by the copyright holders of the respective licence documents in
-  addition to the original English.
-
-                            WARRANTY DISCLAIMER
-
-  5. BECAUSE THIS MANUAL OR PIECE OF DOCUMENTATION IS LICENSED FREE OF CHARGE,
-  THERE IS NO WARRANTY FOR IT, TO THE EXTENT PERMITTED BY APPLICABLE LAW. 
-  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER
-  PARTIES PROVIDE THIS MANUAL OR PIECE OF DOCUMENTATION "AS IS" WITHOUT
-  WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
-  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-  PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF
-  THE MANUAL OR PIECE OF DOCUMENTATION IS WITH YOU.  SHOULD THE MANUAL OR
-  PIECE OF DOCUMENTATION PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
-  NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  6. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
-  ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-  REDISTRIBUTE THE MANUAL OR PIECE OF DOCUMENTATION AS PERMITTED ABOVE, BE
-  LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-  CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-  MANUAL OR PIECE OF DOCUMENTATION (INCLUDING BUT NOT LIMITED TO LOSS OF
-  DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-  PARTIES OR A FAILURE OF A PROGRAM BASED ON THE MANUAL OR PIECE OF
-  DOCUMENTATION TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR
-  OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
+   See the file licence.txt for authorative details of
+                  the wxWindows licence.

--- a/debian/libwxbase-dbg.dirs
+++ b/debian/libwxbase-dbg.dirs
@@ -1,5 +1,4 @@
 usr/bin
-usr/lib/wx/include/based-=V/wx
+usr/lib/wx/include/wx
 usr/share/man/man1
-usr/share/lintian/overrides

--- a/debian/libwxbase-dbg.docs
+++ b/debian/libwxbase-dbg.docs
@@ -0,0 +1,2 @@
+docs/licence.txt
+
--- a/debian/libwxbase-dbg.links
+++ b/debian/libwxbase-dbg.links
@@ -1,2 +1,2 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbased-=V-config.1.gz
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbased-config.1.gz

--- a/debian/libwxbase-dbg.postinst
+++ b/debian/libwxbase-dbg.postinst
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e

-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbased-=V-config 50
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbased-config 50

 if [ "$1" = "configure" ]; then
 	ldconfig
--- a/debian/libwxbase-dbg.prerm
+++ b/debian/libwxbase-dbg.prerm
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e

-update-alternatives --remove wx-config /usr/bin/wxbased-=V-config
+update-alternatives --remove wx-config /usr/bin/wxbased-config

 #DEBHELPER#

--- a/debian/libwxbase-dev.dirs
+++ b/debian/libwxbase-dev.dirs
@@ -1,3 +1,3 @@
 usr/bin
-usr/lib/wx/include/base-=V/wx
+usr/lib/wx/include/wx
 usr/share/man/man1
--- a/debian/libwxbase-dev.docs
+++ b/debian/libwxbase-dev.docs
@@ -0,0 +1,3 @@
+docs/preamble.txt
+docs/licence.txt
+docs/licendoc.txt
--- a/debian/libwxbase-dev.files
+++ b/debian/libwxbase-dev.files
@@ -1,4 +1,4 @@
-usr/bin/wxbase-=V-config
-usr/lib/wx/include/base-=V/wx/setup.h
+usr/bin/wxbase-config
+usr/lib/wx/include/wx/base/setup.h
 usr/lib/libwx_base*.so

--- a/debian/libwxbase-dev.links
+++ b/debian/libwxbase-dev.links
@@ -1 +1 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-config.1.gz
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-config.1.gz
--- a/debian/libwxbase-dev.postinst
+++ b/debian/libwxbase-dev.postinst
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e

-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-=V-config 60
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-config 50

 #DEBHELPER#

--- a/debian/libwxbase-dev.prerm
+++ b/debian/libwxbase-dev.prerm
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e

-update-alternatives --remove wx-config /usr/bin/wxbase-=V-config
+update-alternatives --remove wx-config /usr/bin/wxbase-config

 #DEBHELPER#

--- a/debian/libwxbase-msw-dev.dirs
+++ b/debian/libwxbase-msw-dev.dirs
@@ -1,4 +0,0 @@
-usr/bin
-usr/=H/lib/wx/include/base-=V-=H/wx
-usr/share/man/man1
-
--- a/debian/libwxbase-msw-dev.links
+++ b/debian/libwxbase-msw-dev.links
@@ -1,2 +0,0 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-=H-config.1.gz
-
--- a/debian/libwxbase-msw-dev.postinst
+++ b/debian/libwxbase-msw-dev.postinst
@@ -1,7 +0,0 @@
-#! /bin/sh
-set -e
-
-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-=V-=H-config 40
-
-#DEBHELPER#
-
--- a/debian/libwxbase-msw-dev.prerm
+++ b/debian/libwxbase-msw-dev.prerm
@@ -1,7 +0,0 @@
-#! /bin/sh
-set -e
-
-update-alternatives --remove wx-config /usr/bin/wxbase-=V-=H-config
-
-#DEBHELPER#
-
--- a/debian/libwxbase.docs
+++ b/debian/libwxbase.docs
@@ -0,0 +1 @@
+docs/licence.txt
--- a/debian/libwxgtk-contrib-dev.docs
+++ b/debian/libwxgtk-contrib-dev.docs
@@ -0,0 +1,2 @@
+docs/licence.txt
+
--- a/debian/libwxgtk-contrib.docs
+++ b/debian/libwxgtk-contrib.docs
@@ -0,0 +1,2 @@
+docs/licence.txt
+
--- a/debian/libwxgtk-dbg.dirs
+++ b/debian/libwxgtk-dbg.dirs
@@ -1,5 +1,4 @@
 usr/bin
-usr/lib/wx/include/gtkd-=V/wx
+usr/lib/wx/include/wx/gtkd/
 usr/share/man/man1
-usr/share/lintian/overrides

--- a/debian/libwxgtk-dbg.docs
+++ b/debian/libwxgtk-dbg.docs
@@ -0,0 +1,2 @@
+docs/licence.txt
+
--- a/debian/libwxgtk-dbg.links
+++ b/debian/libwxgtk-dbg.links
@@ -1,2 +1,2 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtkd-=V-config.1.gz
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtkd-config.1.gz

--- a/Show More
+++ b/Show More
				`@@ -1,2 +0,0 @@`
				`usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-=H-config.1.gz`