diff --git a/Makefile.in b/Makefile.in
index 5855a1943d..b529928dba 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -70,7 +70,7 @@ wx_top_builddir = @wx_top_builddir@
 DESTDIR = 
 WX_RELEASE = 2.8
 WX_RELEASE_NODOT = 28
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).3
 LIBDIRNAME = $(wx_top_builddir)/lib
 WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \
 	$(CPPFLAGS) $(CFLAGS)
@@ -1511,7 +1511,7 @@ LOCALE_MSW_LINGUAS =  it
 @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
 @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
 @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
-@COND_PLATFORM_MACOSX_1@	-compatibility_version 1.0 -current_version 1.0
+@COND_PLATFORM_MACOSX_1@	-compatibility_version 2.0 -current_version 2.1
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -1984,6 +1984,7 @@ COND_TOOLKIT_COCOA_GUI_HDR =  \
 	wx/cocoa/textctrl.h \
 	wx/cocoa/timer.h \
 	wx/cocoa/toolbar.h \
+	wx/cocoa/tooltip.h \
 	wx/cocoa/toplevel.h \
 	wx/cocoa/window.h \
 	wx/generic/caret.h \
@@ -11241,9 +11242,9 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
 @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX)
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@dll___targetsuf3 \
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	= \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.1.1
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.1.1.$(SO_SUFFIX)
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
diff --git a/acinclude.m4 b/acinclude.m4
index 6a27a120d7..4c86f58ec7 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -132,7 +132,7 @@ AC_DEFUN([WX_CPP_NEW_HEADERS],
     AC_LANG_SAVE
     AC_LANG_CPLUSPLUS
 
-    AC_CHECK_HEADERS(iostream)
+    AC_CHECK_HEADER(iostream,,, [ ])
 
     if test "$ac_cv_header_iostream" = "yes" ; then
       ifelse([$1], , :, [$1])
diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index b12641c859..942756c03e 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -362,7 +362,7 @@
     <set var="msvc_copy_setup_h_script">
         <if cond="IS_MSVC_PRJ">
 Creating $(SETUPHDIR)\wx\setup.h
-InputPath=..\include\wx\%s
+InputPath=..\..\include\wx\%s
 
 "$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
 $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
@@ -421,6 +421,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
             </set>
             <set var="_custom_build_include_wx_msw_genrcdefs_h">
 Creating $(SETUPHDIR)\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
 "$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(SETUPHDIR)\wx\msw"
 $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index d1994b5498..4e8f21ea01 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -2518,6 +2518,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/textctrl.h
     wx/cocoa/timer.h
     wx/cocoa/toolbar.h
+    wx/cocoa/tooltip.h
     wx/cocoa/toplevel.h
     wx/cocoa/window.h
     <!-- Generic implementations used by wxCocoa: -->
diff --git a/build/bakefiles/version.bkl b/build/bakefiles/version.bkl
index 0dab6e49bf..e9ead0d616 100644
--- a/build/bakefiles/version.bkl
+++ b/build/bakefiles/version.bkl
@@ -23,9 +23,9 @@
        3. Else, i.e. if there were no changes at all to API but only internal
           changes, change C:R:A to C:R+1:A
     -->
-    <set var="WX_CURRENT">0</set>
-    <set var="WX_REVISION">0</set>
-    <set var="WX_AGE">0</set>
+    <set var="WX_CURRENT">1</set>
+    <set var="WX_REVISION">1</set>
+    <set var="WX_AGE">1</set>
 
 
     <!-- ================================================================== -->
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 62573010e7..954ad63cd1 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -4141,7 +4141,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
 build_cfg_file: $(SETUPHDIR)
 	@echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
 	@echo WXVER_MINOR=8 >>$(BUILD_CFG_FILE)
-	@echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE)
+	@echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE)
 	@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
 	@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
 	@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 7f7e27ccdd..810210f91f 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -3934,7 +3934,7 @@ $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a: $(WXEXPAT_OBJECTS)
 ifeq ($(MONOLITHIC),1)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(OBJS)\monodll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
-	$(CXX) -shared -fPIC -o $@ $(MONODLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
+	$(CXX) -shared -fPIC -o $@ $(MONODLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
 endif
 endif
 
@@ -3950,7 +3950,7 @@ endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(OBJS)\basedll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
-	$(CXX) -shared -fPIC -o $@ $(BASEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
+	$(CXX) -shared -fPIC -o $@ $(BASEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
 endif
 endif
 
@@ -3966,7 +3966,7 @@ endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(OBJS)\netdll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname)
-	$(CXX) -shared -fPIC -o $@ $(NETDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) -shared -fPIC -o $@ $(NETDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 
@@ -3983,7 +3983,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(OBJS)\coredll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname)
-	$(CXX) -shared -fPIC -o $@ $(COREDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) -shared -fPIC -o $@ $(COREDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -4003,7 +4003,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(OBJS)\advdll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname)
-	$(CXX) -shared -fPIC -o $@ $(ADVDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) -shared -fPIC -o $@ $(ADVDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -4024,7 +4024,7 @@ ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_MEDIA),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG).dll: $(MEDIADLL_OBJECTS) $(OBJS)\mediadll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname)
-	$(CXX) -shared -fPIC -o $@ $(MEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) -shared -fPIC -o $@ $(MEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -4047,7 +4047,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_ODBC),1)
 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_gcc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(OBJS)\odbcdll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname)
-	$(CXX) -shared -fPIC -o $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) -shared -fPIC -o $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -4068,7 +4068,7 @@ ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_ODBC),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_gcc$(VENDORTAG).dll: $(DBGRIDDLL_OBJECTS) $(OBJS)\dbgriddll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
-	$(CXX) -shared -fPIC -o $@ $(DBGRIDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) -shared -fPIC -o $@ $(DBGRIDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -4092,7 +4092,7 @@ ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_HTML),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname)
-	$(CXX) -shared -fPIC -o $@ $(HTMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) -shared -fPIC -o $@ $(HTMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -4116,7 +4116,7 @@ ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_QA),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_gcc$(VENDORTAG).dll: $(QADLL_OBJECTS) $(OBJS)\qadll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
-	$(CXX) -shared -fPIC -o $@ $(QADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a
+	$(CXX) -shared -fPIC -o $@ $(QADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a
 endif
 endif
 endif
@@ -4138,7 +4138,7 @@ endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(OBJS)\xmldll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname)
-	$(CXX) -shared -fPIC -o $@ $(XMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) -shared -fPIC -o $@ $(XMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 
@@ -4155,7 +4155,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_XRC),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG).dll: $(XRCDLL_OBJECTS) $(OBJS)\xrcdll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__htmldll___depname) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
-	$(CXX) -shared -fPIC -o $@ $(XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) -shared -fPIC -o $@ $(XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -4175,7 +4175,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_AUI),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_gcc$(VENDORTAG).dll: $(AUIDLL_OBJECTS) $(OBJS)\auidll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
-	$(CXX) -shared -fPIC -o $@ $(AUIDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) -shared -fPIC -o $@ $(AUIDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -4195,7 +4195,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_RICHTEXT),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_gcc$(VENDORTAG).dll: $(RICHTEXTDLL_OBJECTS) $(OBJS)\richtextdll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__advdll___depname) $(__htmldll___depname) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
-	$(CXX) -shared -fPIC -o $@ $(RICHTEXTDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) -shared -fPIC -o $@ $(RICHTEXTDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -4215,7 +4215,7 @@ ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_OPENGL),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(OBJS)\gldll_version_rc.o $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__basedll___depname) $(__coredll___depname)
-	$(CXX) -shared -fPIC -o $@ $(GLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32
+	$(CXX) -shared -fPIC -o $@ $(GLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32
 endif
 endif
 endif
@@ -4258,7 +4258,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
 build_cfg_file: $(SETUPHDIR)
 	@echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
 	@echo WXVER_MINOR=8 >>$(BUILD_CFG_FILE)
-	@echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE)
+	@echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE)
 	@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
 	@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
 	@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 8a9cfe54c2..9854ce5029 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -4474,7 +4474,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
 build_cfg_file: $(SETUPHDIR)
 	@echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
 	@echo WXVER_MINOR=8 >>$(BUILD_CFG_FILE)
-	@echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE)
+	@echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE)
 	@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
 	@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
 	@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 779b9a25be..4af2396bb5 100644
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -4486,7 +4486,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h :  $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcde
 build_cfg_file : .SYMBOLIC $(SETUPHDIR)
 	@echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
 	@echo WXVER_MINOR=8 >>$(BUILD_CFG_FILE)
-	@echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE)
+	@echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE)
 	@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
 	@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
 	@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp
index 0d8fcd096b..a6d5144e4f 100644
--- a/build/msw/wx_adv.dsp
+++ b/build/msw/wx_adv.dsp
@@ -701,7 +701,7 @@ SOURCE=..\..\include\wx\univ\setup.h
 !IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
@@ -711,7 +711,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
@@ -721,7 +721,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
@@ -731,7 +731,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
@@ -765,7 +765,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
@@ -775,7 +775,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
@@ -785,7 +785,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
@@ -795,7 +795,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
@@ -860,7 +860,7 @@ SOURCE=..\..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
@@ -870,7 +870,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
@@ -880,7 +880,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
@@ -890,7 +890,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
@@ -924,7 +924,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
@@ -934,7 +934,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
@@ -944,7 +944,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "adv - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
@@ -954,7 +954,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "adv - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
@@ -979,8 +979,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !IF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -988,8 +989,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -997,8 +999,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1006,8 +1009,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1015,8 +1019,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1024,8 +1029,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1033,8 +1039,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1042,8 +1049,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1051,8 +1059,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1060,8 +1069,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1069,8 +1079,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1078,8 +1089,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1087,8 +1099,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "adv - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1096,8 +1109,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "adv - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1105,8 +1119,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "adv - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1114,8 +1129,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "adv - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
diff --git a/build/msw/wx_aui.dsp b/build/msw/wx_aui.dsp
index 5696a34abf..aa820cedc8 100644
--- a/build/msw/wx_aui.dsp
+++ b/build/msw/wx_aui.dsp
@@ -534,7 +534,7 @@ SOURCE=..\..\include\wx\univ\setup.h
 !IF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
@@ -544,7 +544,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
@@ -554,7 +554,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
@@ -564,7 +564,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
@@ -598,7 +598,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
@@ -608,7 +608,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
@@ -618,7 +618,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "aui - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
@@ -628,7 +628,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "aui - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
@@ -693,7 +693,7 @@ SOURCE=..\..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
@@ -703,7 +703,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
@@ -713,7 +713,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
@@ -723,7 +723,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
@@ -757,7 +757,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "aui - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
@@ -767,7 +767,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "aui - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
@@ -777,7 +777,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "aui - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
@@ -787,7 +787,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "aui - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
@@ -808,8 +808,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !IF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -817,8 +818,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -826,8 +828,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -835,8 +838,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -844,8 +848,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -853,8 +858,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -862,8 +868,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -871,8 +878,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -880,8 +888,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -889,8 +898,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -898,8 +908,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "aui - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -907,8 +918,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "aui - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -916,8 +928,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "aui - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -925,8 +938,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "aui - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -934,8 +948,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "aui - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -943,8 +958,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "aui - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp
index e9abfa1a62..bc2e5ff96e 100644
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -911,7 +911,7 @@ SOURCE=..\..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
@@ -921,7 +921,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
@@ -931,7 +931,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
@@ -941,7 +941,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
@@ -975,7 +975,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "base - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
@@ -985,7 +985,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "base - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
@@ -995,7 +995,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "base - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
@@ -1005,7 +1005,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "base - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
@@ -1022,7 +1022,7 @@ SOURCE=..\..\include\wx\univ\setup.h
 !IF  "$(CFG)" == "base - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
@@ -1032,7 +1032,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
@@ -1042,7 +1042,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
@@ -1052,7 +1052,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
@@ -1086,7 +1086,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
@@ -1096,7 +1096,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
@@ -1106,7 +1106,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "base - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
@@ -1116,7 +1116,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "base - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
@@ -1189,8 +1189,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !IF  "$(CFG)" == "base - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1198,8 +1199,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1207,8 +1209,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1216,8 +1219,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1225,8 +1229,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1234,8 +1239,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1243,8 +1249,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1252,8 +1259,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1261,8 +1269,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1270,8 +1279,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1279,8 +1289,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "base - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1288,8 +1299,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "base - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1297,8 +1309,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "base - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1306,8 +1319,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "base - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1315,8 +1329,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "base - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1324,8 +1339,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "base - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 1971af9707..cc49298d6b 100644
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -7393,7 +7393,7 @@ SOURCE=..\..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
@@ -7403,7 +7403,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
@@ -7413,7 +7413,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
@@ -7423,7 +7423,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
@@ -7457,7 +7457,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
@@ -7467,7 +7467,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
@@ -7477,7 +7477,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
@@ -7487,7 +7487,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
@@ -7504,7 +7504,7 @@ SOURCE=..\..\include\wx\univ\setup.h
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
@@ -7514,7 +7514,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
@@ -7524,7 +7524,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
@@ -7534,7 +7534,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
@@ -7568,7 +7568,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
@@ -7578,7 +7578,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
@@ -7588,7 +7588,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
@@ -7598,7 +7598,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
@@ -7819,8 +7819,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -7828,8 +7829,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -7837,8 +7839,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -7846,8 +7849,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -7855,8 +7859,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -7864,8 +7869,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -7873,8 +7879,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -7882,8 +7889,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -7891,8 +7899,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -7900,8 +7909,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -7909,8 +7919,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -7918,8 +7929,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -7927,8 +7939,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -7936,8 +7949,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -7945,8 +7959,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -7954,8 +7969,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
diff --git a/build/msw/wx_dbgrid.dsp b/build/msw/wx_dbgrid.dsp
index afb36ee145..9f43a14988 100644
--- a/build/msw/wx_dbgrid.dsp
+++ b/build/msw/wx_dbgrid.dsp
@@ -538,7 +538,7 @@ SOURCE=..\..\include\wx\univ\setup.h
 !IF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
@@ -548,7 +548,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
@@ -558,7 +558,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
@@ -568,7 +568,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
@@ -602,7 +602,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
@@ -612,7 +612,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
@@ -622,7 +622,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
@@ -632,7 +632,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
@@ -697,7 +697,7 @@ SOURCE=..\..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
@@ -707,7 +707,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
@@ -717,7 +717,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
@@ -727,7 +727,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
@@ -761,7 +761,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
@@ -771,7 +771,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
@@ -781,7 +781,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
@@ -791,7 +791,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
@@ -812,8 +812,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !IF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -821,8 +822,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -830,8 +832,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -839,8 +842,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -848,8 +852,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -857,8 +862,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -866,8 +872,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -875,8 +882,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -884,8 +892,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -893,8 +902,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -902,8 +912,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -911,8 +922,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -920,8 +932,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -929,8 +942,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -938,8 +952,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -947,8 +962,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "dbgrid - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
diff --git a/build/msw/wx_gl.dsp b/build/msw/wx_gl.dsp
index 479a1cf858..6155b4dadc 100644
--- a/build/msw/wx_gl.dsp
+++ b/build/msw/wx_gl.dsp
@@ -538,7 +538,7 @@ SOURCE=..\..\include\wx\univ\setup.h
 !IF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
@@ -548,7 +548,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
@@ -558,7 +558,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
@@ -568,7 +568,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
@@ -602,7 +602,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
@@ -612,7 +612,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
@@ -622,7 +622,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "gl - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
@@ -632,7 +632,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "gl - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
@@ -697,7 +697,7 @@ SOURCE=..\..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
@@ -707,7 +707,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
@@ -717,7 +717,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
@@ -727,7 +727,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
@@ -761,7 +761,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "gl - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
@@ -771,7 +771,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "gl - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
@@ -781,7 +781,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "gl - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
@@ -791,7 +791,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "gl - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
@@ -812,8 +812,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !IF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -821,8 +822,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -830,8 +832,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -839,8 +842,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -848,8 +852,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -857,8 +862,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -866,8 +872,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -875,8 +882,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -884,8 +892,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -893,8 +902,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -902,8 +912,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "gl - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -911,8 +922,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "gl - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -920,8 +932,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "gl - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -929,8 +942,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "gl - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -938,8 +952,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "gl - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -947,8 +962,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "gl - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
diff --git a/build/msw/wx_html.dsp b/build/msw/wx_html.dsp
index 7bcbf57468..98bbb9b381 100644
--- a/build/msw/wx_html.dsp
+++ b/build/msw/wx_html.dsp
@@ -662,7 +662,7 @@ SOURCE=..\..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
@@ -672,7 +672,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
@@ -682,7 +682,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
@@ -692,7 +692,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
@@ -726,7 +726,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "html - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
@@ -736,7 +736,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "html - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
@@ -746,7 +746,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "html - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
@@ -756,7 +756,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "html - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
@@ -773,7 +773,7 @@ SOURCE=..\..\include\wx\univ\setup.h
 !IF  "$(CFG)" == "html - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
@@ -783,7 +783,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
@@ -793,7 +793,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
@@ -803,7 +803,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
@@ -837,7 +837,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
@@ -847,7 +847,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
@@ -857,7 +857,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "html - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
@@ -867,7 +867,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "html - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
@@ -912,8 +912,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !IF  "$(CFG)" == "html - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -921,8 +922,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -930,8 +932,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -939,8 +942,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -948,8 +952,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -957,8 +962,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -966,8 +972,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -975,8 +982,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -984,8 +992,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -993,8 +1002,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1002,8 +1012,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "html - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1011,8 +1022,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "html - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1020,8 +1032,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "html - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1029,8 +1042,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "html - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1038,8 +1052,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "html - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -1047,8 +1062,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "html - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
diff --git a/build/msw/wx_media.dsp b/build/msw/wx_media.dsp
index 6a18d68d6c..9dbb4045fa 100644
--- a/build/msw/wx_media.dsp
+++ b/build/msw/wx_media.dsp
@@ -554,7 +554,7 @@ SOURCE=..\..\include\wx\univ\setup.h
 !IF  "$(CFG)" == "media - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
@@ -564,7 +564,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
@@ -574,7 +574,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
@@ -584,7 +584,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
@@ -618,7 +618,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
@@ -628,7 +628,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
@@ -638,7 +638,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "media - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
@@ -648,7 +648,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "media - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
@@ -713,7 +713,7 @@ SOURCE=..\..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
@@ -723,7 +723,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
@@ -733,7 +733,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
@@ -743,7 +743,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
@@ -777,7 +777,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "media - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
@@ -787,7 +787,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "media - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
@@ -797,7 +797,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "media - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
@@ -807,7 +807,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "media - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
@@ -832,8 +832,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !IF  "$(CFG)" == "media - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -841,8 +842,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -850,8 +852,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -859,8 +862,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -868,8 +872,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -877,8 +882,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -886,8 +892,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -895,8 +902,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -904,8 +912,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -913,8 +922,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -922,8 +932,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "media - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -931,8 +942,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "media - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -940,8 +952,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "media - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -949,8 +962,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "media - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -958,8 +972,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "media - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -967,8 +982,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "media - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
diff --git a/build/msw/wx_net.dsp b/build/msw/wx_net.dsp
index 43872ba34d..ef78023942 100644
--- a/build/msw/wx_net.dsp
+++ b/build/msw/wx_net.dsp
@@ -582,7 +582,7 @@ SOURCE=..\..\include\wx\univ\setup.h
 !IF  "$(CFG)" == "net - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
@@ -592,7 +592,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
@@ -602,7 +602,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
@@ -612,7 +612,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
@@ -646,7 +646,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
@@ -656,7 +656,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
@@ -666,7 +666,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "net - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
@@ -676,7 +676,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "net - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
@@ -741,7 +741,7 @@ SOURCE=..\..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
@@ -751,7 +751,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
@@ -761,7 +761,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
@@ -771,7 +771,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
@@ -805,7 +805,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "net - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
@@ -815,7 +815,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "net - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
@@ -825,7 +825,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "net - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
@@ -835,7 +835,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "net - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
@@ -856,8 +856,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !IF  "$(CFG)" == "net - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -865,8 +866,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -874,8 +876,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -883,8 +886,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -892,8 +896,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -901,8 +906,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -910,8 +916,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -919,8 +926,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -928,8 +936,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -937,8 +946,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -946,8 +956,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "net - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -955,8 +966,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "net - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -964,8 +976,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "net - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -973,8 +986,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "net - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -982,8 +996,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "net - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -991,8 +1006,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "net - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
diff --git a/build/msw/wx_odbc.dsp b/build/msw/wx_odbc.dsp
index 879a358957..feac36f98f 100644
--- a/build/msw/wx_odbc.dsp
+++ b/build/msw/wx_odbc.dsp
@@ -542,7 +542,7 @@ SOURCE=..\..\include\wx\univ\setup.h
 !IF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
@@ -552,7 +552,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
@@ -562,7 +562,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
@@ -572,7 +572,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
@@ -606,7 +606,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
@@ -616,7 +616,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
@@ -626,7 +626,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
@@ -636,7 +636,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
@@ -701,7 +701,7 @@ SOURCE=..\..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
@@ -711,7 +711,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
@@ -721,7 +721,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
@@ -731,7 +731,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
@@ -765,7 +765,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
@@ -775,7 +775,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
@@ -785,7 +785,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
@@ -795,7 +795,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
@@ -816,8 +816,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !IF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -825,8 +826,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -834,8 +836,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -843,8 +846,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -852,8 +856,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -861,8 +866,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -870,8 +876,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -879,8 +886,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -888,8 +896,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -897,8 +906,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -906,8 +916,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -915,8 +926,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -924,8 +936,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -933,8 +946,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -942,8 +956,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -951,8 +966,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "odbc - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
diff --git a/build/msw/wx_qa.dsp b/build/msw/wx_qa.dsp
index 917f63264e..a3cc9a2beb 100644
--- a/build/msw/wx_qa.dsp
+++ b/build/msw/wx_qa.dsp
@@ -546,7 +546,7 @@ SOURCE=..\..\include\wx\univ\setup.h
 !IF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
@@ -556,7 +556,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
@@ -566,7 +566,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
@@ -576,7 +576,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
@@ -610,7 +610,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
@@ -620,7 +620,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
@@ -630,7 +630,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "qa - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
@@ -640,7 +640,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "qa - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
@@ -705,7 +705,7 @@ SOURCE=..\..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
@@ -715,7 +715,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
@@ -725,7 +725,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
@@ -735,7 +735,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
@@ -769,7 +769,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "qa - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
@@ -779,7 +779,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "qa - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
@@ -789,7 +789,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "qa - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
@@ -799,7 +799,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "qa - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
@@ -820,8 +820,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !IF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -829,8 +830,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -838,8 +840,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -847,8 +850,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -856,8 +860,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -865,8 +870,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -874,8 +880,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -883,8 +890,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -892,8 +900,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -901,8 +910,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -910,8 +920,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "qa - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -919,8 +930,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "qa - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -928,8 +940,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "qa - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -937,8 +950,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "qa - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -946,8 +960,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "qa - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -955,8 +970,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "qa - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
diff --git a/build/msw/wx_richtext.dsp b/build/msw/wx_richtext.dsp
index 0a23cc51db..fd29165ea9 100644
--- a/build/msw/wx_richtext.dsp
+++ b/build/msw/wx_richtext.dsp
@@ -534,7 +534,7 @@ SOURCE=..\..\include\wx\univ\setup.h
 !IF  "$(CFG)" == "richtext - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
@@ -544,7 +544,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
@@ -554,7 +554,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
@@ -564,7 +564,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
@@ -598,7 +598,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
@@ -608,7 +608,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
@@ -618,7 +618,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
@@ -628,7 +628,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
@@ -693,7 +693,7 @@ SOURCE=..\..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
@@ -703,7 +703,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
@@ -713,7 +713,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
@@ -723,7 +723,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
@@ -757,7 +757,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
@@ -767,7 +767,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
@@ -777,7 +777,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
@@ -787,7 +787,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
@@ -808,8 +808,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !IF  "$(CFG)" == "richtext - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -817,8 +818,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -826,8 +828,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -835,8 +838,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -844,8 +848,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -853,8 +858,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -862,8 +868,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -871,8 +878,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -880,8 +888,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -889,8 +898,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -898,8 +908,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -907,8 +918,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -916,8 +928,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -925,8 +938,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -934,8 +948,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -943,8 +958,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "richtext - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
diff --git a/build/msw/wx_wxregex.dsp b/build/msw/wx_wxregex.dsp
index e9a58b19be..142e32e003 100644
--- a/build/msw/wx_wxregex.dsp
+++ b/build/msw/wx_wxregex.dsp
@@ -460,8 +460,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !IF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -469,8 +470,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -478,8 +480,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -487,8 +490,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -496,8 +500,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -505,8 +510,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -514,8 +520,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -523,8 +530,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -532,8 +540,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -541,8 +550,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -550,8 +560,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -559,8 +570,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -568,8 +580,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -577,8 +590,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -586,8 +600,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -595,8 +610,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -611,7 +627,7 @@ SOURCE=..\..\include\wx\univ\setup.h
 !IF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
@@ -621,7 +637,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
@@ -631,7 +647,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
@@ -641,7 +657,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
@@ -675,7 +691,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
@@ -685,7 +701,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
@@ -695,7 +711,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
@@ -705,7 +721,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
@@ -770,7 +786,7 @@ SOURCE=..\..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
@@ -780,7 +796,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
@@ -790,7 +806,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
@@ -800,7 +816,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
@@ -834,7 +850,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
@@ -844,7 +860,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
@@ -854,7 +870,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
@@ -864,7 +880,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "wxregex - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
diff --git a/build/msw/wx_xml.dsp b/build/msw/wx_xml.dsp
index be922af690..d50a11a72d 100644
--- a/build/msw/wx_xml.dsp
+++ b/build/msw/wx_xml.dsp
@@ -538,7 +538,7 @@ SOURCE=..\..\include\wx\univ\setup.h
 !IF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
@@ -548,7 +548,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
@@ -558,7 +558,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
@@ -568,7 +568,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
@@ -602,7 +602,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
@@ -612,7 +612,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
@@ -622,7 +622,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "xml - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
@@ -632,7 +632,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "xml - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
@@ -697,7 +697,7 @@ SOURCE=..\..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
@@ -707,7 +707,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
@@ -717,7 +717,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
@@ -727,7 +727,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
@@ -761,7 +761,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "xml - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
@@ -771,7 +771,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "xml - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
@@ -781,7 +781,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "xml - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
@@ -791,7 +791,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "xml - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
@@ -812,8 +812,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !IF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -821,8 +822,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -830,8 +832,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -839,8 +842,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -848,8 +852,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -857,8 +862,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -866,8 +872,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -875,8 +882,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -884,8 +892,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -893,8 +902,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -902,8 +912,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xml - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -911,8 +922,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xml - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -920,8 +932,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xml - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -929,8 +942,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xml - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -938,8 +952,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xml - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -947,8 +962,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xml - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
diff --git a/build/msw/wx_xrc.dsp b/build/msw/wx_xrc.dsp
index 7c7364500f..6a1329819b 100644
--- a/build/msw/wx_xrc.dsp
+++ b/build/msw/wx_xrc.dsp
@@ -558,7 +558,7 @@ SOURCE=..\..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
@@ -568,7 +568,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
@@ -578,7 +578,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
@@ -588,7 +588,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
@@ -622,7 +622,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
@@ -632,7 +632,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
@@ -642,7 +642,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
@@ -652,7 +652,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
@@ -669,7 +669,7 @@ SOURCE=..\..\include\wx\univ\setup.h
 !IF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
@@ -679,7 +679,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
@@ -689,7 +689,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
@@ -699,7 +699,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
@@ -733,7 +733,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
@@ -743,7 +743,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
@@ -753,7 +753,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
@@ -763,7 +763,7 @@ InputPath=..\include\wx\univ\setup.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
-InputPath=..\include\wx\univ\setup.h
+InputPath=..\..\include\wx\univ\setup.h
 
 "..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
@@ -808,8 +808,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !IF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -817,8 +818,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -826,8 +828,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -835,8 +838,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -844,8 +848,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -853,8 +858,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -862,8 +868,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -871,8 +878,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -880,8 +888,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -889,8 +898,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -898,8 +908,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -907,8 +918,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -916,8 +928,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -925,8 +938,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -934,8 +948,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
 
 # End Custom Build
@@ -943,8 +958,9 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 !ELSEIF  "$(CFG)" == "xrc - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
 
 # End Custom Build
diff --git a/build/script/makedocs.vc b/build/script/makedocs.vc
index 31146cc127..33200ee9e2 100644
--- a/build/script/makedocs.vc
+++ b/build/script/makedocs.vc
@@ -49,6 +49,24 @@ allhlp: wxhlp
 allpdfrtf: pdfrtf
 
 allhtb: htb
+#        cd $(WXDIR)\utils\dialoged\src
+#        nmake -f makefile.vc htb
+        cd $(WXDIR)\utils\tex2rtf\docs
+        nmake -f makefile.vc htb
+        cd $(WXDIR)\contrib\src\fl
+        cd $(THISDIR)
+        cd $(WXDIR)\contrib\src\ogl
+        nmake -f makedocs.vc htb
+        cd $(THISDIR)
+        cd $(WXDIR)\contrib\src\svg
+        nmake -f makedocs.vc htb
+        cd $(THISDIR)
+        cd $(WXDIR)\contrib\src\gizmos
+        nmake -f makedocs.vc htb
+        cd $(THISDIR)
+        cd $(WXDIR)\contrib\src\mmedia
+        nmake -f makedocs.vc htb
+        cd $(THISDIR)
 
 allhtml: wxhtml
 #        cd $(WXDIR)\utils\dialoged\src
diff --git a/build/script/win_docs.bat b/build/script/win_docs.bat
index 14a426faf5..a6da1c1307 100644
--- a/build/script/win_docs.bat
+++ b/build/script/win_docs.bat
@@ -1,5 +1,7 @@
 rem Uncomment the next line to set the version; used also in wxWidgets.iss
-SET WXW_VER=2.8.1
+SET WXW_VER=2.8.4-rc2
+
+
 if (%WXW_VER%)==() SET WXW_VER=CVS
 
 echo docs building for %WXW_VER%
diff --git a/configure b/configure
index bb5b7d8fa0..c9fff9e855 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in Id: configure.in.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.1.
+# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.4.
 #
 # Report bugs to <wx-dev@lists.wxwidgets.org>.
 #
@@ -270,8 +270,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='wxWidgets'
 PACKAGE_TARNAME='wxwidgets'
-PACKAGE_VERSION='2.8.1'
-PACKAGE_STRING='wxWidgets 2.8.1'
+PACKAGE_VERSION='2.8.4'
+PACKAGE_STRING='wxWidgets 2.8.4'
 PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'
 
 ac_unique_file="wx-config.in"
@@ -870,7 +870,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures wxWidgets 2.8.1 to adapt to many kinds of systems.
+\`configure' configures wxWidgets 2.8.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -936,7 +936,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of wxWidgets 2.8.1:";;
+     short | recursive ) echo "Configuration of wxWidgets 2.8.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1339,7 +1339,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-wxWidgets configure 2.8.1
+wxWidgets configure 2.8.4
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1353,7 +1353,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by wxWidgets $as_me 2.8.1, which was
+It was created by wxWidgets $as_me 2.8.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1804,8 +1804,8 @@ test -n "$target_alias" &&
 
 wx_major_version_number=2
 wx_minor_version_number=8
-wx_release_number=1
-wx_subrelease_number=1
+wx_release_number=4
+wx_subrelease_number=0
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
@@ -46010,7 +46010,7 @@ _ACEOF
 _ACEOF
 
                 cat >>confdefs.h <<\_ACEOF
-#define wxUSE_OLE_ACTIVEX 1
+#define wxUSE_ACTIVEX 1
 _ACEOF
 
                 SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto"
@@ -51442,7 +51442,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by wxWidgets $as_me 2.8.1, which was
+This file was extended by wxWidgets $as_me 2.8.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -51505,7 +51505,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-wxWidgets config.status 2.8.1
+wxWidgets config.status 2.8.4
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.in b/configure.in
index 5d85214bc6..89416f77ad 100644
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ dnl ---------------------------------------------------------------------------
 dnl initialization
 dnl ---------------------------------------------------------------------------
 
-AC_INIT([wxWidgets], [2.8.1], [wx-dev@lists.wxwidgets.org])
+AC_INIT([wxWidgets], [2.8.4], [wx-dev@lists.wxwidgets.org])
 
 dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
 AC_CONFIG_SRCDIR([wx-config.in])
@@ -34,8 +34,8 @@ dnl wx_release_number += 1
 
 wx_major_version_number=2
 wx_minor_version_number=8
-wx_release_number=1
-wx_subrelease_number=1
+wx_release_number=4
+wx_subrelease_number=0
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
@@ -1831,11 +1831,13 @@ dnl ------------------------------------------------------------------------
 dnl Check for headers
 dnl ------------------------------------------------------------------------
 
-AC_CHECK_HEADERS(stdlib.h fnmatch.h langinfo.h malloc.h unistd.h wchar.h)
+dnl Note: non-empty last parameter makes check compile-only,
+dnl   skipping worthless preprocessing check
+AC_CHECK_HEADERS(stdlib.h fnmatch.h langinfo.h malloc.h unistd.h wchar.h,,, [AC_INCLUDES_DEFAULT()])
 
 dnl maybe wchar_t is in wcstr.h if we don't have wchar.h?
 if test "$ac_cv_header_wchar_h" != "yes"; then
-    AC_CHECK_HEADERS(wcstr.h)
+    AC_CHECK_HEADER(wcstr.h,,, [AC_INCLUDES_DEFAULT()])
 fi
 
 case "${host}" in
@@ -1853,7 +1855,7 @@ esac
 
 dnl POSIX needs this for select(), but old systems don't have it
 if test "$USE_UNIX" = 1 ; then
-    AC_CHECK_HEADERS([sys/select.h])
+    AC_CHECK_HEADER([sys/select.h],,, [AC_INCLUDES_DEFAULT()])
 fi
 
 dnl ---------------------------------------------------------------------------
@@ -2278,7 +2280,9 @@ if test "$wxUSE_STL" = "yes"; then
                 wx_cv_class_stdhashmapset=yes,
                 wx_cv_class_stdhashmapset=no)
             ]
-        )]
+        )],
+        [],
+        [ ]
     )
 
     if test "$wx_cv_class_stdhashmapset" = yes; then
@@ -2296,7 +2300,9 @@ if test "$wxUSE_STL" = "yes"; then
                 wx_cv_class_gnuhashmapset=yes,
                 wx_cv_class_gnuhashmapset=no)
             ]
-        )]
+        )],
+        [],
+        [ ]
     )
 
     if test "$wx_cv_class_gnuhashmapset" = yes; then
@@ -2591,7 +2597,7 @@ if test "$wxUSE_REGEX" != "no"; then
     if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
         dnl according to Unix 98 specs, regcomp() is in libc but I believe that
         dnl on some old systems it may be in libregex - check for it too?
-        AC_CHECK_HEADER(regex.h, [AC_CHECK_FUNCS(regcomp re_search)])
+        AC_CHECK_HEADER(regex.h, [AC_CHECK_FUNCS(regcomp re_search)],, [ ])
 
         if test "x$ac_cv_func_regcomp" != "xyes"; then
             if test "$wxUSE_REGEX" = "sys" ; then
@@ -2659,7 +2665,7 @@ if test "$wxUSE_ZLIB" != "no" ; then
             )
             dnl If the test above did not come up with a value (e.g. cross
             dnl compiling) then this should give a definitive answer
-            AC_CHECK_HEADER(zlib.h)
+            AC_CHECK_HEADER(zlib.h,,, [ ])
 
             system_zlib_h_ok=$ac_cv_header_zlib_h
         fi
@@ -2730,7 +2736,7 @@ if test "$wxUSE_LIBPNG" != "no" ; then
                     unset ac_cv_header_png_h
                 )]
             )
-            AC_CHECK_HEADER(png.h)
+            AC_CHECK_HEADER(png.h,,, [ ])
 
             if test "$ac_cv_header_png_h" = "yes"; then
                 AC_CHECK_LIB(png, png_check_sig, PNG_LINK=" -lpng -lz", , [-lz -lm])
@@ -2855,7 +2861,9 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
                                          TIFF_LINK=" -ltiff",
                                          ,
                                          $TIFF_PREREQ_LINKS)
-                        ]
+                        ],
+                        [],
+                        [ ]
                        )
 
         if test "x$TIFF_LINK" = "x" ; then
@@ -2893,7 +2901,7 @@ if test "$wxUSE_EXPAT" != "no"; then
     AC_DEFINE(wxUSE_XML)
 
     if test "$wxUSE_EXPAT" = "sys" -o "$wxUSE_EXPAT" = "yes" ; then
-        AC_CHECK_HEADER([expat.h], [found_expat_h=1])
+        AC_CHECK_HEADER([expat.h], [found_expat_h=1],, [ ])
         if test "x$found_expat_h" = "x1"; then
             dnl Expat 1.95.6 comes with broken expat.h:
             AC_CACHE_CHECK([if expat.h is valid C++ header],
@@ -2935,7 +2943,7 @@ dnl Check for libmspack
 dnl ------------------------------------------------------------------------
 
 if test "$wxUSE_LIBMSPACK" != "no"; then
-    AC_CHECK_HEADER([mspack.h], [found_mspack_h=1])
+    AC_CHECK_HEADER([mspack.h], [found_mspack_h=1],, [ ])
     if test "x$found_mspack_h" = "x1"; then
         AC_CHECK_LIB(mspack, mspack_create_chm_decompressor,
                      MSPACK_LINK=" -lmspack")
@@ -2964,11 +2972,12 @@ WIDGET_SET=
 dnl are we building for a win32 target environment?
 dnl If so, setup common stuff needed for both GUI and Base libs.
 if test "$USE_WIN32" = 1 ; then
-    AC_CHECK_HEADERS(w32api.h)
-    AC_CHECK_HEADER(windows.h, [],
+    AC_CHECK_HEADER(w32api.h,,, [ ])
+    AC_CHECK_HEADER(windows.h,,
     [
         AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
-    ])
+    ],
+    [ ])
 
     dnl --- FIXME: This is still a somewhat random list of libs,
     dnl ---        some of them should probably be included conditionally.
@@ -3007,7 +3016,7 @@ if test "$USE_WIN32" = 1 ; then
     WIN32INSTALL=win32install
 
     dnl pbt.h is missing on Wine at least
-    AC_CHECK_HEADERS(pbt.h, [], [AC_DEFINE(NEED_PBT_H)])
+    AC_CHECK_HEADER(pbt.h,, [AC_DEFINE(NEED_PBT_H)], [ ])
 fi
 
 if test "$wxUSE_GUI" = "yes"; then
@@ -3800,8 +3809,8 @@ dnl do this after test for X11 above so that we have a chance of finding Xlib.h
 if test "$wxUSE_GUI" = "yes"; then
     if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
         dnl defines HAVE_X11_XKBLIB_H
-        AC_CHECK_HEADERS(X11/Xlib.h)
-        AC_CHECK_HEADERS([X11/XKBlib.h], [], [],
+        AC_CHECK_HEADER(X11/Xlib.h,,, [ ])
+        AC_CHECK_HEADER([X11/XKBlib.h],,,
                          [
                           #if HAVE_X11_XLIB_H
                             #include <X11/Xlib.h>
@@ -3825,7 +3834,7 @@ if test "$TOOLKIT" != "MSW" ; then
         dnl This is not ideal we really ough to use the unixodbc-config
         dnl  or iodbc-config if they exist.
 
-        AC_CHECK_HEADER([sql.h], [found_sql_h=1])
+        AC_CHECK_HEADER([sql.h], [found_sql_h=1],, [ ])
         if test "x$found_sql_h" = "x1" ; then
             AC_CHECK_LIB(iodbc, SQLAllocEnv, ODBC_LINK=" -liodbc",
             [
@@ -3884,7 +3893,7 @@ dnl ---------------------------------------------------------------------------
             WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xxf86vm)
             if test "$ac_find_libraries" != "" ; then
                 AC_MSG_RESULT([yes])
-                AC_CHECK_HEADERS([X11/extensions/xf86vmode.h],
+                AC_CHECK_HEADER([X11/extensions/xf86vmode.h],
                                  [
                                   GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
                                  ],
@@ -3907,7 +3916,7 @@ dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
 dnl DirectDraw for MSW - optionally used by WxDisplay.
 dnl ---------------------------------------------------------------------------
-        AC_CHECK_HEADERS([ddraw.h], [], [], [#include <windows.h>])
+        AC_CHECK_HEADER([ddraw.h], [], [], [#include <windows.h>])
     fi
 fi
 
@@ -4011,7 +4020,9 @@ if test "$wxUSE_OPENGL" = "yes"; then
                     fi
                 fi
             ])
-        ])
+        ],
+        [],
+        [ ])
 
         if test "x$OPENGL_LIBS" = "x"; then
             dnl it should be an error and not a warning because OpenGL is not on
@@ -4626,7 +4637,7 @@ if test "$wxUSE_UNICODE" = yes; then
 #include <wchar.h>"
     case "${host}" in
         *-*-solaris2* )
-            AC_CHECK_HEADERS(widec.h)
+            AC_CHECK_HEADER(widec.h,,, [AC_INCLUDES_DEFAULT()])
             if test "$ac_cv_header_widec_h" = "yes"; then
                 wchar_headers="$wchar_headers
 #include <widec.h>"
@@ -4989,9 +5000,11 @@ dnl ------------------------------------------
 dnl Check for ESD:
 EXTRALIBS_ESD=
 AC_CHECK_LIB(esd, esd_close, [
-    AC_CHECK_HEADERS([esd.h], [
+    AC_CHECK_HEADER([esd.h], [
     EXTRALIBS_ESD="-lesd"
-  ])
+  ],
+  [],
+  [ ])
 ])
 AC_SUBST(EXTRALIBS_ESD)
 
@@ -5226,7 +5239,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
         AC_DEFINE(wxHAVE_PTHREAD_CLEANUP)
       fi
 
-      AC_CHECK_HEADERS(sched.h)
+      AC_CHECK_HEADER(sched.h,,, [AC_INCLUDES_DEFAULT()])
       if test "$ac_cv_header_sched_h" = "yes"; then
           AC_CHECK_FUNC(sched_yield,
             AC_DEFINE(HAVE_SCHED_YIELD),
@@ -6433,7 +6446,7 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
             dnl can't be compiled because of an error and with the default
             dnl AC_CHECK_HEADER semantics we'd still detect it in this case and
             dnl build would fail later
-            AC_CHECK_HEADER(linux/joystick.h, wxUSE_JOYSTICK=yes,,[#include <stdio.h>])
+            AC_CHECK_HEADER(linux/joystick.h, [wxUSE_JOYSTICK=yes],, [AC_INCLUDES_DEFAULT()])
         fi
     fi
 
@@ -6570,7 +6583,7 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
                           -o "$wxUSE_CLIPBOARD"     = "yes" \
                           -o "$wxUSE_OLE"     = "yes" \
                           -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then
-    AC_CHECK_HEADERS(ole2.h)
+    AC_CHECK_HEADER(ole2.h,,, [ ])
 
     if test "$ac_cv_header_ole2_h" = "yes" ; then
         if test "$GCC" = yes ; then
@@ -6585,7 +6598,7 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
             if test "$wxUSE_OLE" = "yes" ; then
                 AC_DEFINE(wxUSE_OLE)
                 AC_DEFINE(wxUSE_OLE_AUTOMATION)
-                AC_DEFINE(wxUSE_OLE_ACTIVEX)
+                AC_DEFINE(wxUSE_ACTIVEX)
                 SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto"
             fi
         fi
diff --git a/contrib/build/animate/animate_animatedll.dsp b/contrib/build/animate/animate_animatedll.dsp
deleted file mode 100644
index f57686ce8e..0000000000
--- a/contrib/build/animate/animate_animatedll.dsp
+++ /dev/null
@@ -1,266 +0,0 @@
-# Microsoft Developer Studio Project File - Name="animatedll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=animatedll - Win32 DLL 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 "animate_animatedll.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 "animate_animatedll.mak" CFG="animatedll - Win32 DLL Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "animatedll - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "animatedll - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "animatedll - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "animatedll - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "animatedll - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "animatedll - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "animatedll - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "animatedll - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "animatedll - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\animatedll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\animatedll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswddll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswddll\wxmsw250d_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswddll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswddll\wxmsw250d_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswddll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswddll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswddll\wxmsw250d_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswddll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswddll\wxmsw25d_animate.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswddll\wxmsw250d_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswddll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswddll\wxmsw25d_animate.lib" /debug
-
-!ELSEIF  "$(CFG)" == "animatedll - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\animatedll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\animatedll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswdll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_mswdll\wxmsw250_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswdll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_mswdll\wxmsw250_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswdll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswdll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswdll\wxmsw250_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswdll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswdll\wxmsw25_animate.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswdll\wxmsw250_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswdll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswdll\wxmsw25_animate.lib"
-
-!ELSEIF  "$(CFG)" == "animatedll - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\animatedll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\animatedll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswuddll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswuddll\wxmsw250ud_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswuddll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswuddll\wxmsw250ud_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswuddll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswuddll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswuddll\wxmsw250ud_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswuddll\wxmsw25ud_animate.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswuddll\wxmsw250ud_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswuddll\wxmsw25ud_animate.lib" /debug
-
-!ELSEIF  "$(CFG)" == "animatedll - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\animatedll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\animatedll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswudll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_mswudll\wxmsw250u_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswudll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_mswudll\wxmsw250u_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswudll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswudll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswudll\wxmsw250u_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswudll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswudll\wxmsw25u_animate.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswudll\wxmsw250u_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswudll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswudll\wxmsw25u_animate.lib"
-
-!ELSEIF  "$(CFG)" == "animatedll - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\animatedll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\animatedll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivddll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivddll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswunivddll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswunivddll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_animate.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_animate.lib" /debug
-
-!ELSEIF  "$(CFG)" == "animatedll - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\animatedll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\animatedll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivdll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_mswunivdll\wxmswuniv250_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivdll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_mswunivdll\wxmswuniv250_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswunivdll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswunivdll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswunivdll\wxmswuniv250_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswunivdll\wxmswuniv25_animate.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswunivdll\wxmswuniv250_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswunivdll\wxmswuniv25_animate.lib"
-
-!ELSEIF  "$(CFG)" == "animatedll - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\animatedll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\animatedll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_animatedll.pch" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_animate.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_animate.lib" /debug
-
-!ELSEIF  "$(CFG)" == "animatedll - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\animatedll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\animatedll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivudll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivudll" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_animatedll.pch" /Fd..\..\src\animate\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_animate_vc_custom.pdb /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ANIMATE" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswunivudll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\animate\..\..\..\include" /i "..\..\src\animate\..\..\..\lib\vc_mswunivudll" /i "..\..\src\animate\..\..\..\src\tiff" /i "..\..\src\animate\..\..\..\src\jpeg" /i "..\..\src\animate\..\..\..\src\png" /i "..\..\src\animate\..\..\..\src\zlib" /i "..\..\src\animate\..\..\..\src\regex" /i "..\..\src\animate\..\..\..\src\expat\lib" /i "..\..\src\animate\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_ANIMATE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_animate.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\animate\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_animate_vc_custom.dll" /libpath:"..\..\src\animate\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\animate\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_animate.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "animatedll - Win32 DLL Debug"
-# Name "animatedll - Win32 DLL Release"
-# Name "animatedll - Win32 DLL Unicode Debug"
-# Name "animatedll - Win32 DLL Unicode Release"
-# Name "animatedll - Win32 DLL Universal Debug"
-# Name "animatedll - Win32 DLL Universal Release"
-# Name "animatedll - Win32 DLL Universal Unicode Debug"
-# Name "animatedll - Win32 DLL Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/animate\animate.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/animate\..\..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/animate/animate_animatelib.dsp b/contrib/build/animate/animate_animatelib.dsp
deleted file mode 100644
index 29c5d673d9..0000000000
--- a/contrib/build/animate/animate_animatelib.dsp
+++ /dev/null
@@ -1,249 +0,0 @@
-# Microsoft Developer Studio Project File - Name="animatelib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=animatelib - Win32 Unicode 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 "animate_animatelib.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 "animate_animatelib.mak" CFG="animatelib - Win32 Unicode Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "animatelib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "animatelib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "animatelib - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "animatelib - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "animatelib - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "animatelib - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "animatelib - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "animatelib - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "animatelib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\animatelib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\animatelib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswd" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswd\wxmsw25d_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswd" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswd\wxmsw25d_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswd\wxmsw25d_animate.lib"
-# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswd\wxmsw25d_animate.lib"
-
-!ELSEIF  "$(CFG)" == "animatelib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\animatelib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_msw"
-# PROP Intermediate_Dir "vc_msw\animatelib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_msw" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Fd..\..\src\animate\..\..\..\lib\vc_msw\wxmsw25_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_msw" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Fd..\..\src\animate\..\..\..\lib\vc_msw\wxmsw25_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_msw\wxmsw25_animate.lib"
-# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_msw\wxmsw25_animate.lib"
-
-!ELSEIF  "$(CFG)" == "animatelib - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\animatelib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\animatelib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswud" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswud\wxmsw25ud_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswud" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswud\wxmsw25ud_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswud\wxmsw25ud_animate.lib"
-# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswud\wxmsw25ud_animate.lib"
-
-!ELSEIF  "$(CFG)" == "animatelib - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\animatelib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\animatelib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswu" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Fd..\..\src\animate\..\..\..\lib\vc_mswu\wxmsw25u_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswu" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Fd..\..\src\animate\..\..\..\lib\vc_mswu\wxmsw25u_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswu\wxmsw25u_animate.lib"
-# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswu\wxmsw25u_animate.lib"
-
-!ELSEIF  "$(CFG)" == "animatelib - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\animatelib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\animatelib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivd" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswunivd\wxmswuniv25d_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivd" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswunivd\wxmswuniv25d_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswunivd\wxmswuniv25d_animate.lib"
-# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswunivd\wxmswuniv25d_animate.lib"
-
-!ELSEIF  "$(CFG)" == "animatelib - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\animatelib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\animatelib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswuniv" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Fd..\..\src\animate\..\..\..\lib\vc_mswuniv\wxmswuniv25_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswuniv" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Fd..\..\src\animate\..\..\..\lib\vc_mswuniv\wxmswuniv25_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswuniv\wxmswuniv25_animate.lib"
-# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswuniv\wxmswuniv25_animate.lib"
-
-!ELSEIF  "$(CFG)" == "animatelib - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\animatelib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\animatelib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivud" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivud" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\animate\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_animate.lib"
-# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_animate.lib"
-
-!ELSEIF  "$(CFG)" == "animatelib - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\animatelib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\animate\..\..\..\lib\vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\animatelib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivu" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Fd..\..\src\animate\..\..\..\lib\vc_mswunivu\wxmswuniv25u_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\animate\..\..\..\include" /I "..\..\src\animate\..\..\..\lib\vc_mswunivu" /I "..\..\src\animate\..\..\..\src\tiff" /I "..\..\src\animate\..\..\..\src\jpeg" /I "..\..\src\animate\..\..\..\src\png" /I "..\..\src\animate\..\..\..\src\zlib" /I "..\..\src\animate\..\..\..\src\regex" /I "..\..\src\animate\..\..\..\src\expat\lib" /Fd..\..\src\animate\..\..\..\lib\vc_mswunivu\wxmswuniv25u_animate.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_animatelib.pch" /I "..\..\src\animate\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswunivu\wxmswuniv25u_animate.lib"
-# ADD LIB32 /nologo /out:"..\..\src\animate\..\..\..\lib\vc_mswunivu\wxmswuniv25u_animate.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "animatelib - Win32 Debug"
-# Name "animatelib - Win32 Release"
-# Name "animatelib - Win32 Unicode Debug"
-# Name "animatelib - Win32 Unicode Release"
-# Name "animatelib - Win32 Universal Debug"
-# Name "animatelib - Win32 Universal Release"
-# Name "animatelib - Win32 Universal Unicode Debug"
-# Name "animatelib - Win32 Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/animate\animate.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/animate\..\..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/deprecated/makefile.gcc b/contrib/build/deprecated/makefile.gcc
index c2ce73724a..466f34ae08 100644
--- a/contrib/build/deprecated/makefile.gcc
+++ b/contrib/build/deprecated/makefile.gcc
@@ -272,7 +272,7 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_gcc$(VENDORTAG).dll: $(DEPRECATEDDLL_OBJECTS) $(OBJS)\deprecateddll_version_rc.o
-	$(CXX) -shared -fPIC -o $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+	$(CXX) -shared -fPIC -o $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
 endif
 
 ifeq ($(SHARED),0)
diff --git a/contrib/build/fl/fl_fldll.dsp b/contrib/build/fl/fl_fldll.dsp
deleted file mode 100644
index 899e49dfe6..0000000000
--- a/contrib/build/fl/fl_fldll.dsp
+++ /dev/null
@@ -1,330 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fldll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=fldll - Win32 DLL 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 "fl_fldll.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 "fl_fldll.mak" CFG="fldll - Win32 DLL Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "fldll - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fldll - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fldll - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fldll - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fldll - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fldll - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fldll - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fldll - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "fldll - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\fldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\fldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswddll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswddll\wxmsw250d_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswddll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswddll\wxmsw250d_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswddll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswddll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswddll\wxmsw250d_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswddll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswddll\wxmsw25d_fl.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswddll\wxmsw250d_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswddll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswddll\wxmsw25d_fl.lib" /debug
-
-!ELSEIF  "$(CFG)" == "fldll - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\fldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\fldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswdll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_mswdll\wxmsw250_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswdll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_mswdll\wxmsw250_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswdll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswdll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswdll\wxmsw250_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswdll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswdll\wxmsw25_fl.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswdll\wxmsw250_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswdll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswdll\wxmsw25_fl.lib"
-
-!ELSEIF  "$(CFG)" == "fldll - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\fldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\fldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswuddll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswuddll\wxmsw250ud_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswuddll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswuddll\wxmsw250ud_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswuddll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswuddll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswuddll\wxmsw250ud_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswuddll\wxmsw25ud_fl.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswuddll\wxmsw250ud_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswuddll\wxmsw25ud_fl.lib" /debug
-
-!ELSEIF  "$(CFG)" == "fldll - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\fldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\fldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswudll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_mswudll\wxmsw250u_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswudll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_mswudll\wxmsw250u_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswudll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswudll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswudll\wxmsw250u_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswudll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswudll\wxmsw25u_fl.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswudll\wxmsw250u_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswudll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswudll\wxmsw25u_fl.lib"
-
-!ELSEIF  "$(CFG)" == "fldll - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\fldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\fldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivddll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivddll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswunivddll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswunivddll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_fl.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_fl.lib" /debug
-
-!ELSEIF  "$(CFG)" == "fldll - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\fldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\fldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivdll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_mswunivdll\wxmswuniv250_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivdll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_mswunivdll\wxmswuniv250_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswunivdll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswunivdll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswunivdll\wxmswuniv250_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswunivdll\wxmswuniv25_fl.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswunivdll\wxmswuniv250_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswunivdll\wxmswuniv25_fl.lib"
-
-!ELSEIF  "$(CFG)" == "fldll - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\fldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\fldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_fldll.pch" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_fl.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_fl.lib" /debug
-
-!ELSEIF  "$(CFG)" == "fldll - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\fldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\fldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivudll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivudll" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_fldll.pch" /Fd..\..\src\fl\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_fl_vc_custom.pdb /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_FL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswunivudll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\fl\..\..\..\include" /i "..\..\src\fl\..\..\..\lib\vc_mswunivudll" /i "..\..\src\fl\..\..\..\src\tiff" /i "..\..\src\fl\..\..\..\src\jpeg" /i "..\..\src\fl\..\..\..\src\png" /i "..\..\src\fl\..\..\..\src\zlib" /i "..\..\src\fl\..\..\..\src\regex" /i "..\..\src\fl\..\..\..\src\expat\lib" /i "..\..\src\fl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_FL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_fl.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\fl\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_fl_vc_custom.dll" /libpath:"..\..\src\fl\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\fl\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_fl.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "fldll - Win32 DLL Debug"
-# Name "fldll - Win32 DLL Release"
-# Name "fldll - Win32 DLL Unicode Debug"
-# Name "fldll - Win32 DLL Unicode Release"
-# Name "fldll - Win32 DLL Universal Debug"
-# Name "fldll - Win32 DLL Universal Release"
-# Name "fldll - Win32 DLL Universal Unicode Debug"
-# Name "fldll - Win32 DLL Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/fl\antiflickpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\bardragpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\barhintspl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\cbcustom.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\controlbar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\..\..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\dyntbar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\dyntbarhnd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\frmview.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\garbagec.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\gcupdatesmgr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\hintanimpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\newbmpbtn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\panedrawpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\rowdragpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\rowlayoutpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\toolwnd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\updatesmgr.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/fl/fl_fllib.dsp b/contrib/build/fl/fl_fllib.dsp
deleted file mode 100644
index cb52972bba..0000000000
--- a/contrib/build/fl/fl_fllib.dsp
+++ /dev/null
@@ -1,313 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fllib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=fllib - Win32 Unicode 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 "fl_fllib.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 "fl_fllib.mak" CFG="fllib - Win32 Unicode Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "fllib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "fllib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "fllib - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "fllib - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "fllib - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "fllib - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "fllib - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "fllib - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "fllib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\fllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\fllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswd" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswd\wxmsw25d_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswd" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswd\wxmsw25d_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswd\wxmsw25d_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswd\wxmsw25d_fl.lib"
-
-!ELSEIF  "$(CFG)" == "fllib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\fllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_msw"
-# PROP Intermediate_Dir "vc_msw\fllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_msw" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Fd..\..\src\fl\..\..\..\lib\vc_msw\wxmsw25_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_msw" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Fd..\..\src\fl\..\..\..\lib\vc_msw\wxmsw25_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_msw\wxmsw25_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_msw\wxmsw25_fl.lib"
-
-!ELSEIF  "$(CFG)" == "fllib - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\fllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\fllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswud" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswud\wxmsw25ud_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswud" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswud\wxmsw25ud_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswud\wxmsw25ud_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswud\wxmsw25ud_fl.lib"
-
-!ELSEIF  "$(CFG)" == "fllib - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\fllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\fllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswu" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Fd..\..\src\fl\..\..\..\lib\vc_mswu\wxmsw25u_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswu" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Fd..\..\src\fl\..\..\..\lib\vc_mswu\wxmsw25u_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswu\wxmsw25u_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswu\wxmsw25u_fl.lib"
-
-!ELSEIF  "$(CFG)" == "fllib - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\fllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\fllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivd" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswunivd\wxmswuniv25d_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivd" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswunivd\wxmswuniv25d_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswunivd\wxmswuniv25d_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswunivd\wxmswuniv25d_fl.lib"
-
-!ELSEIF  "$(CFG)" == "fllib - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\fllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\fllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswuniv" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Fd..\..\src\fl\..\..\..\lib\vc_mswuniv\wxmswuniv25_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswuniv" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Fd..\..\src\fl\..\..\..\lib\vc_mswuniv\wxmswuniv25_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswuniv\wxmswuniv25_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswuniv\wxmswuniv25_fl.lib"
-
-!ELSEIF  "$(CFG)" == "fllib - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\fllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\fllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivud" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivud" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\fl\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_fl.lib"
-
-!ELSEIF  "$(CFG)" == "fllib - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\fllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\fl\..\..\..\lib\vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\fllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivu" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Fd..\..\src\fl\..\..\..\lib\vc_mswunivu\wxmswuniv25u_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\fl\..\..\..\include" /I "..\..\src\fl\..\..\..\lib\vc_mswunivu" /I "..\..\src\fl\..\..\..\src\tiff" /I "..\..\src\fl\..\..\..\src\jpeg" /I "..\..\src\fl\..\..\..\src\png" /I "..\..\src\fl\..\..\..\src\zlib" /I "..\..\src\fl\..\..\..\src\regex" /I "..\..\src\fl\..\..\..\src\expat\lib" /Fd..\..\src\fl\..\..\..\lib\vc_mswunivu\wxmswuniv25u_fl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_fllib.pch" /I "..\..\src\fl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswunivu\wxmswuniv25u_fl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\fl\..\..\..\lib\vc_mswunivu\wxmswuniv25u_fl.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "fllib - Win32 Debug"
-# Name "fllib - Win32 Release"
-# Name "fllib - Win32 Unicode Debug"
-# Name "fllib - Win32 Unicode Release"
-# Name "fllib - Win32 Universal Debug"
-# Name "fllib - Win32 Universal Release"
-# Name "fllib - Win32 Universal Unicode Debug"
-# Name "fllib - Win32 Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/fl\antiflickpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\bardragpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\barhintspl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\cbcustom.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\controlbar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\..\..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\dyntbar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\dyntbarhnd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\frmview.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\garbagec.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\gcupdatesmgr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\hintanimpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\newbmpbtn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\panedrawpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\rowdragpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\rowlayoutpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\toolwnd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/fl\updatesmgr.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/fl/makefile.gcc b/contrib/build/fl/makefile.gcc
index d882063421..a32834237f 100644
--- a/contrib/build/fl/makefile.gcc
+++ b/contrib/build/fl/makefile.gcc
@@ -271,7 +271,7 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_gcc$(VENDORTAG).dll: $(FLDLL_OBJECTS) $(OBJS)\fldll_version_rc.o
-	$(CXX) -shared -fPIC -o $@ $(FLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+	$(CXX) -shared -fPIC -o $@ $(FLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
 endif
 
 ifeq ($(SHARED),0)
diff --git a/contrib/build/foldbar/makefile.gcc b/contrib/build/foldbar/makefile.gcc
index 1948917f73..b1df507f9b 100644
--- a/contrib/build/foldbar/makefile.gcc
+++ b/contrib/build/foldbar/makefile.gcc
@@ -244,7 +244,7 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_gcc$(VENDORTAG).dll: $(FOLDBARDLL_OBJECTS) $(OBJS)\foldbardll_version_rc.o
-	$(CXX) -shared -fPIC -o $@ $(FOLDBARDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+	$(CXX) -shared -fPIC -o $@ $(FOLDBARDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
 endif
 
 ifeq ($(SHARED),0)
diff --git a/contrib/build/gizmos/makefile.gcc b/contrib/build/gizmos/makefile.gcc
index 888fb97bcb..fccc368256 100644
--- a/contrib/build/gizmos/makefile.gcc
+++ b/contrib/build/gizmos/makefile.gcc
@@ -295,13 +295,13 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG).dll: $(GIZMOSDLL_OBJECTS) $(OBJS)\gizmosdll_version_rc.o
-	$(CXX) -shared -fPIC -o $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+	$(CXX) -shared -fPIC -o $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
 endif
 
 ifeq ($(SHARED),1)
 ifeq ($(USE_XRC),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_gcc$(VENDORTAG).dll: $(GIZMOS_XRCDLL_OBJECTS) $(OBJS)\gizmos_xrcdll_version_rc.o $(__gizmosdll___depname)
-	$(CXX) -shared -fPIC -o $@ $(GIZMOS_XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+	$(CXX) -shared -fPIC -o $@ $(GIZMOS_XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
 endif
 endif
 
diff --git a/contrib/build/mmedia/makefile.gcc b/contrib/build/mmedia/makefile.gcc
index fe1d5992f7..de5f2a591d 100644
--- a/contrib/build/mmedia/makefile.gcc
+++ b/contrib/build/mmedia/makefile.gcc
@@ -278,7 +278,7 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_gcc$(VENDORTAG).dll: $(MMEDIADLL_OBJECTS) $(OBJS)\mmediadll_version_rc.o
-	$(CXX) -shared -fPIC -o $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+	$(CXX) -shared -fPIC -o $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
 endif
 
 ifeq ($(SHARED),0)
diff --git a/contrib/build/net/makefile.gcc b/contrib/build/net/makefile.gcc
index a084de6363..eddc2d0864 100644
--- a/contrib/build/net/makefile.gcc
+++ b/contrib/build/net/makefile.gcc
@@ -244,7 +244,7 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_gcc$(VENDORTAG).dll: $(NETUTILSDLL_OBJECTS) $(OBJS)\netutilsdll_version_rc.o
-	$(CXX) -shared -fPIC -o $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+	$(CXX) -shared -fPIC -o $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
 endif
 
 ifeq ($(SHARED),0)
diff --git a/contrib/build/net/netutils.dsp b/contrib/build/net/netutils.dsp
deleted file mode 100644
index 14e8e27738..0000000000
--- a/contrib/build/net/netutils.dsp
+++ /dev/null
@@ -1,474 +0,0 @@
-# Microsoft Developer Studio Project File - Name="netutils" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=netutils - Win32 DLL Release
-!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 "netutils.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 "netutils.mak" CFG="netutils - Win32 DLL Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "netutils - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "netutils - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "netutils - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "netutils - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "netutils - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "netutils - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "netutils - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "netutils - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "netutils - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "netutils - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw25d_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw25d_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw25d_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw25d_netutils.lib"
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\msw" /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw25_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\msw" /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw25_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw25_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw25_netutils.lib"
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw25ud_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw25ud_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw25ud_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw25ud_netutils.lib"
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswu" /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw25u_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswu" /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmsw25u_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw25u_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmsw25u_netutils.lib"
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25d_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25d_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25d_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25d_netutils.lib"
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswuniv" /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswuniv" /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25_netutils.lib"
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivud\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25ud_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25ud_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25ud_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25ud_netutils.lib"
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswunivu" /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25u_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_lib\mswunivu" /Fd..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25u_netutils.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netutilslib.pch" /I "..\..\src\net\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25u_netutils.lib"
-# ADD LIB32 /nologo /out:"..\..\src\net\..\..\..\lib\vc_lib\wxmswuniv25u_netutils.lib"
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw250d_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw250d_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswd" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswd" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw250d_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw25d_netutils.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw250d_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw25d_netutils.lib" /debug
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw250_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw250_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\msw" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\msw" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw250_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw25_netutils.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw250_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw25_netutils.lib"
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw250ud_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw250ud_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswud" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswud" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw250ud_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw25ud_netutils.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw250ud_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw25ud_netutils.lib" /debug
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw250u_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmsw250u_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswu" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswu" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw250u_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw25u_netutils.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw250u_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmsw25u_netutils.lib"
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250d_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250d_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250d_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv25d_netutils.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250d_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv25d_netutils.lib" /debug
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv25_netutils.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv25_netutils.lib"
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250ud_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MDd /Od /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netutilsdll.pch" /Zi /Gm /GZ /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250ud_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250ud_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv25ud_netutils.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250ud_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv25ud_netutils.lib" /debug
-
-!ELSEIF  "$(CFG)" == "netutils - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\netutils"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\net\..\..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\netutils"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250u_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD CPP /nologo /FD /W4 /GR /GX /MD /O1 /I "..\..\src\net\..\..\..\include" /I "..\..\src\net\..\..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netutilsdll.pch" /Fd..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250u_netutils_vc_custom.pdb /I "..\..\src\net\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_NETUTILS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\src\net\..\..\..\include" /i "..\..\src\net\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\net\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_NETUTILS
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250u_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv25u_netutils.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv250u_netutils_vc_custom.dll" /libpath:"..\..\src\net\..\..\..\lib\vc_dll" /implib:"..\..\src\net\..\..\..\lib\vc_dll\wxmswuniv25u_netutils.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "netutils - Win32 Debug"
-# Name "netutils - Win32 Release"
-# Name "netutils - Win32 Unicode Debug"
-# Name "netutils - Win32 Unicode Release"
-# Name "netutils - Win32 Universal Debug"
-# Name "netutils - Win32 Universal Release"
-# Name "netutils - Win32 Universal Unicode Debug"
-# Name "netutils - Win32 Universal Unicode Release"
-# Name "netutils - Win32 DLL Debug"
-# Name "netutils - Win32 DLL Release"
-# Name "netutils - Win32 DLL Unicode Debug"
-# Name "netutils - Win32 DLL Unicode Release"
-# Name "netutils - Win32 DLL Universal Debug"
-# Name "netutils - Win32 DLL Universal Release"
-# Name "netutils - Win32 DLL Universal Unicode Debug"
-# Name "netutils - Win32 DLL Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/net\..\..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/net\email.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/net\smapi.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/net\web.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/ogl/makefile.gcc b/contrib/build/ogl/makefile.gcc
index 8e683167d7..7273443562 100644
--- a/contrib/build/ogl/makefile.gcc
+++ b/contrib/build/ogl/makefile.gcc
@@ -261,7 +261,7 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_gcc$(VENDORTAG).dll: $(OGLDLL_OBJECTS) $(OBJS)\ogldll_version_rc.o
-	$(CXX) -shared -fPIC -o $@ $(OGLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+	$(CXX) -shared -fPIC -o $@ $(OGLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
 endif
 
 ifeq ($(SHARED),0)
diff --git a/contrib/build/ogl/ogl_ogldll.dsp b/contrib/build/ogl/ogl_ogldll.dsp
deleted file mode 100644
index 5dfa984e7d..0000000000
--- a/contrib/build/ogl/ogl_ogldll.dsp
+++ /dev/null
@@ -1,310 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ogldll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=ogldll - Win32 DLL 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 "ogl_ogldll.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 "ogl_ogldll.mak" CFG="ogldll - Win32 DLL Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ogldll - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ogldll - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ogldll - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ogldll - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ogldll - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ogldll - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ogldll - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ogldll - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ogldll - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\ogldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\ogldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswddll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswddll\wxmsw250d_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswddll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswddll\wxmsw250d_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswddll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswddll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswddll\wxmsw250d_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswddll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswddll\wxmsw25d_ogl.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswddll\wxmsw250d_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswddll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswddll\wxmsw25d_ogl.lib" /debug
-
-!ELSEIF  "$(CFG)" == "ogldll - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\ogldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\ogldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswdll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_mswdll\wxmsw250_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswdll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_mswdll\wxmsw250_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswdll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswdll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswdll\wxmsw250_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswdll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswdll\wxmsw25_ogl.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswdll\wxmsw250_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswdll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswdll\wxmsw25_ogl.lib"
-
-!ELSEIF  "$(CFG)" == "ogldll - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\ogldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\ogldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswuddll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswuddll\wxmsw250ud_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswuddll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswuddll\wxmsw250ud_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswuddll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswuddll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswuddll\wxmsw250ud_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswuddll\wxmsw25ud_ogl.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswuddll\wxmsw250ud_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswuddll\wxmsw25ud_ogl.lib" /debug
-
-!ELSEIF  "$(CFG)" == "ogldll - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\ogldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\ogldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswudll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_mswudll\wxmsw250u_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswudll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_mswudll\wxmsw250u_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswudll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswudll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswudll\wxmsw250u_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswudll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswudll\wxmsw25u_ogl.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswudll\wxmsw250u_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswudll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswudll\wxmsw25u_ogl.lib"
-
-!ELSEIF  "$(CFG)" == "ogldll - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\ogldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\ogldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivddll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivddll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswunivddll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswunivddll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_ogl.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_ogl.lib" /debug
-
-!ELSEIF  "$(CFG)" == "ogldll - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\ogldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\ogldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivdll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivdll\wxmswuniv250_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivdll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivdll\wxmswuniv250_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswunivdll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswunivdll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivdll\wxmswuniv250_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswunivdll\wxmswuniv25_ogl.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivdll\wxmswuniv250_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswunivdll\wxmswuniv25_ogl.lib"
-
-!ELSEIF  "$(CFG)" == "ogldll - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\ogldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\ogldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_ogldll.pch" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_ogl.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_ogl.lib" /debug
-
-!ELSEIF  "$(CFG)" == "ogldll - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\ogldll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\ogldll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivudll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivudll" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ogldll.pch" /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_ogl_vc_custom.pdb /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_OGL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswunivudll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\ogl\..\..\..\include" /i "..\..\src\ogl\..\..\..\lib\vc_mswunivudll" /i "..\..\src\ogl\..\..\..\src\tiff" /i "..\..\src\ogl\..\..\..\src\jpeg" /i "..\..\src\ogl\..\..\..\src\png" /i "..\..\src\ogl\..\..\..\src\zlib" /i "..\..\src\ogl\..\..\..\src\regex" /i "..\..\src\ogl\..\..\..\src\expat\lib" /i "..\..\src\ogl\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_OGL
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_ogl.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_ogl_vc_custom.dll" /libpath:"..\..\src\ogl\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\ogl\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_ogl.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "ogldll - Win32 DLL Debug"
-# Name "ogldll - Win32 DLL Release"
-# Name "ogldll - Win32 DLL Unicode Debug"
-# Name "ogldll - Win32 DLL Unicode Release"
-# Name "ogldll - Win32 DLL Universal Debug"
-# Name "ogldll - Win32 DLL Universal Release"
-# Name "ogldll - Win32 DLL Universal Unicode Debug"
-# Name "ogldll - Win32 DLL Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/ogl\basic.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\basic2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\bmpshape.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\canvas.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\composit.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\constrnt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\divided.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\drawn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\..\..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\lines.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\mfutils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\ogldiag.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\oglmisc.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/ogl/ogl_ogllib.dsp b/contrib/build/ogl/ogl_ogllib.dsp
deleted file mode 100644
index f15f18d6f9..0000000000
--- a/contrib/build/ogl/ogl_ogllib.dsp
+++ /dev/null
@@ -1,293 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ogllib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=ogllib - Win32 Unicode 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 "ogl_ogllib.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 "ogl_ogllib.mak" CFG="ogllib - Win32 Unicode Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ogllib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "ogllib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "ogllib - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "ogllib - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "ogllib - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "ogllib - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "ogllib - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "ogllib - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ogllib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\ogllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\ogllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswd" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswd\wxmsw25d_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswd" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswd\wxmsw25d_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswd\wxmsw25d_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswd\wxmsw25d_ogl.lib"
-
-!ELSEIF  "$(CFG)" == "ogllib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\ogllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_msw"
-# PROP Intermediate_Dir "vc_msw\ogllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_msw" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Fd..\..\src\ogl\..\..\..\lib\vc_msw\wxmsw25_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_msw" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Fd..\..\src\ogl\..\..\..\lib\vc_msw\wxmsw25_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_msw\wxmsw25_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_msw\wxmsw25_ogl.lib"
-
-!ELSEIF  "$(CFG)" == "ogllib - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\ogllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\ogllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswud" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswud\wxmsw25ud_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswud" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswud\wxmsw25ud_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswud\wxmsw25ud_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswud\wxmsw25ud_ogl.lib"
-
-!ELSEIF  "$(CFG)" == "ogllib - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\ogllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\ogllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswu" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Fd..\..\src\ogl\..\..\..\lib\vc_mswu\wxmsw25u_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswu" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Fd..\..\src\ogl\..\..\..\lib\vc_mswu\wxmsw25u_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswu\wxmsw25u_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswu\wxmsw25u_ogl.lib"
-
-!ELSEIF  "$(CFG)" == "ogllib - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\ogllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\ogllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivd" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivd\wxmswuniv25d_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivd" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivd\wxmswuniv25d_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivd\wxmswuniv25d_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivd\wxmswuniv25d_ogl.lib"
-
-!ELSEIF  "$(CFG)" == "ogllib - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\ogllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\ogllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswuniv" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Fd..\..\src\ogl\..\..\..\lib\vc_mswuniv\wxmswuniv25_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswuniv" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Fd..\..\src\ogl\..\..\..\lib\vc_mswuniv\wxmswuniv25_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswuniv\wxmswuniv25_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswuniv\wxmswuniv25_ogl.lib"
-
-!ELSEIF  "$(CFG)" == "ogllib - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\ogllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\ogllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivud" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivud" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_ogl.lib"
-
-!ELSEIF  "$(CFG)" == "ogllib - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\ogllib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\ogl\..\..\..\lib\vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\ogllib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivu" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivu\wxmswuniv25u_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\ogl\..\..\..\include" /I "..\..\src\ogl\..\..\..\lib\vc_mswunivu" /I "..\..\src\ogl\..\..\..\src\tiff" /I "..\..\src\ogl\..\..\..\src\jpeg" /I "..\..\src\ogl\..\..\..\src\png" /I "..\..\src\ogl\..\..\..\src\zlib" /I "..\..\src\ogl\..\..\..\src\regex" /I "..\..\src\ogl\..\..\..\src\expat\lib" /Fd..\..\src\ogl\..\..\..\lib\vc_mswunivu\wxmswuniv25u_ogl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_ogllib.pch" /I "..\..\src\ogl\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivu\wxmswuniv25u_ogl.lib"
-# ADD LIB32 /nologo /out:"..\..\src\ogl\..\..\..\lib\vc_mswunivu\wxmswuniv25u_ogl.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "ogllib - Win32 Debug"
-# Name "ogllib - Win32 Release"
-# Name "ogllib - Win32 Unicode Debug"
-# Name "ogllib - Win32 Unicode Release"
-# Name "ogllib - Win32 Universal Debug"
-# Name "ogllib - Win32 Universal Release"
-# Name "ogllib - Win32 Universal Unicode Debug"
-# Name "ogllib - Win32 Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/ogl\basic.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\basic2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\bmpshape.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\canvas.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\composit.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\constrnt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\divided.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\drawn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\..\..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\lines.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\mfutils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\ogldiag.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/ogl\oglmisc.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/plot/makefile.gcc b/contrib/build/plot/makefile.gcc
index 22b23321a5..3f830bb112 100644
--- a/contrib/build/plot/makefile.gcc
+++ b/contrib/build/plot/makefile.gcc
@@ -240,7 +240,7 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_gcc$(VENDORTAG).dll: $(PLOTDLL_OBJECTS) $(OBJS)\plotdll_version_rc.o
-	$(CXX) -shared -fPIC -o $@ $(PLOTDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+	$(CXX) -shared -fPIC -o $@ $(PLOTDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
 endif
 
 ifeq ($(SHARED),0)
diff --git a/contrib/build/stc/makefile.gcc b/contrib/build/stc/makefile.gcc
index fd8482697b..6336f7638d 100644
--- a/contrib/build/stc/makefile.gcc
+++ b/contrib/build/stc/makefile.gcc
@@ -407,7 +407,7 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_gcc$(VENDORTAG).dll: $(STCDLL_OBJECTS) $(OBJS)\stcdll_version_rc.o
-	$(CXX) -shared -fPIC -o $@ $(STCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+	$(CXX) -shared -fPIC -o $@ $(STCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
 endif
 
 ifeq ($(SHARED),0)
diff --git a/contrib/build/stc/stc_stcdll.dsp b/contrib/build/stc/stc_stcdll.dsp
deleted file mode 100644
index 6c609728c8..0000000000
--- a/contrib/build/stc/stc_stcdll.dsp
+++ /dev/null
@@ -1,452 +0,0 @@
-# Microsoft Developer Studio Project File - Name="stcdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=stcdll - Win32 DLL 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 "stc_stcdll.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 "stc_stcdll.mak" CFG="stcdll - Win32 DLL Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "stcdll - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "stcdll - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "stcdll - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "stcdll - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "stcdll - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "stcdll - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "stcdll - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "stcdll - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "stcdll - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\stcdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\stcdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswddll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswddll\wxmsw250d_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswddll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswddll\wxmsw250d_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswddll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswddll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswddll\wxmsw250d_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswddll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswddll\wxmsw25d_stc.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswddll\wxmsw250d_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswddll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswddll\wxmsw25d_stc.lib" /debug
-
-!ELSEIF  "$(CFG)" == "stcdll - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\stcdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\stcdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswdll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswdll\wxmsw250_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswdll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswdll\wxmsw250_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswdll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswdll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswdll\wxmsw250_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswdll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswdll\wxmsw25_stc.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswdll\wxmsw250_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswdll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswdll\wxmsw25_stc.lib"
-
-!ELSEIF  "$(CFG)" == "stcdll - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\stcdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\stcdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswuddll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswuddll\wxmsw250ud_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswuddll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswuddll\wxmsw250ud_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswuddll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswuddll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswuddll\wxmsw250ud_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswuddll\wxmsw25ud_stc.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswuddll\wxmsw250ud_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswuddll\wxmsw25ud_stc.lib" /debug
-
-!ELSEIF  "$(CFG)" == "stcdll - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\stcdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\stcdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswudll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswudll\wxmsw250u_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswudll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswudll\wxmsw250u_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswudll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswudll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswudll\wxmsw250u_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswudll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswudll\wxmsw25u_stc.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswudll\wxmsw250u_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswudll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswudll\wxmsw25u_stc.lib"
-
-!ELSEIF  "$(CFG)" == "stcdll - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\stcdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\stcdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivddll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivddll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswunivddll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswunivddll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_stc.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_stc.lib" /debug
-
-!ELSEIF  "$(CFG)" == "stcdll - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\stcdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\stcdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivdll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswunivdll\wxmswuniv250_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivdll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswunivdll\wxmswuniv250_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswunivdll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswunivdll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswunivdll\wxmswuniv250_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswunivdll\wxmswuniv25_stc.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswunivdll\wxmswuniv250_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswunivdll\wxmswuniv25_stc.lib"
-
-!ELSEIF  "$(CFG)" == "stcdll - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\stcdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\stcdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_stc.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_stc.lib" /debug
-
-!ELSEIF  "$(CFG)" == "stcdll - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\stcdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\stcdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivudll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivudll" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_stc_vc_custom.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /D "WXUSINGDLL" /D "WXMAKINGDLL_STC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswunivudll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\stc\..\..\..\include" /i "..\..\src\stc\..\..\..\lib\vc_mswunivudll" /i "..\..\src\stc\..\..\..\src\tiff" /i "..\..\src\stc\..\..\..\src\jpeg" /i "..\..\src\stc\..\..\..\src\png" /i "..\..\src\stc\..\..\..\src\zlib" /i "..\..\src\stc\..\..\..\src\regex" /i "..\..\src\stc\..\..\..\src\expat\lib" /i "..\..\src\stc\..\..\include" /i "..\..\src\stc\scintilla\include" /i "..\..\src\stc\scintilla\src" /d "__WX__" /d "SCI_LEXER" /d "LINK_LEXERS" /d "WXUSINGDLL" /d WXMAKINGDLL_STC
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_stc.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\stc\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_stc_vc_custom.dll" /libpath:"..\..\src\stc\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\stc\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_stc.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "stcdll - Win32 DLL Debug"
-# Name "stcdll - Win32 DLL Release"
-# Name "stcdll - Win32 DLL Unicode Debug"
-# Name "stcdll - Win32 DLL Unicode Release"
-# Name "stcdll - Win32 DLL Universal Debug"
-# Name "stcdll - Win32 DLL Universal Release"
-# Name "stcdll - Win32 DLL Universal Unicode Debug"
-# Name "stcdll - Win32 DLL Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\AutoComplete.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\CallTip.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\CellBuffer.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\ContractionState.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\Document.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\DocumentAccessor.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\Editor.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\ExternalLexer.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\Indicator.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\KeyMap.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\KeyWords.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexAVE.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexAda.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexAsm.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexBaan.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexBullant.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexCPP.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexCSS.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexConf.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexCrontab.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexEScript.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexEiffel.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexFortran.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexHTML.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexLisp.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexLout.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexLua.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexMatlab.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexOthers.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexPOV.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexPascal.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexPerl.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexPython.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexRuby.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexSQL.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexVB.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LineMarker.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\PlatWX.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\PropSet.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\RESearch.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\ScintillaBase.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\ScintillaWX.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\Style.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\StyleContext.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\UniConversion.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\ViewStyle.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\WindowAccessor.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\XPM.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\stc.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/stc/stc_stclib.dsp b/contrib/build/stc/stc_stclib.dsp
deleted file mode 100644
index 5e90a35aa0..0000000000
--- a/contrib/build/stc/stc_stclib.dsp
+++ /dev/null
@@ -1,435 +0,0 @@
-# Microsoft Developer Studio Project File - Name="stclib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=stclib - Win32 Unicode 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 "stc_stclib.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 "stc_stclib.mak" CFG="stclib - Win32 Unicode Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "stclib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "stclib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "stclib - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "stclib - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "stclib - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "stclib - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "stclib - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "stclib - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "stclib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\stclib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\stclib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswd" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswd\wxmsw25d_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswd" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswd\wxmsw25d_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswd\wxmsw25d_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswd\wxmsw25d_stc.lib"
-
-!ELSEIF  "$(CFG)" == "stclib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\stclib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_msw"
-# PROP Intermediate_Dir "vc_msw\stclib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_msw" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_msw\wxmsw25_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_msw" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_msw\wxmsw25_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_msw\wxmsw25_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_msw\wxmsw25_stc.lib"
-
-!ELSEIF  "$(CFG)" == "stclib - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\stclib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\stclib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswud" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswud\wxmsw25ud_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswud" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswud\wxmsw25ud_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswud\wxmsw25ud_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswud\wxmsw25ud_stc.lib"
-
-!ELSEIF  "$(CFG)" == "stclib - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\stclib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\stclib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswu" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswu\wxmsw25u_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswu" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswu\wxmsw25u_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswu\wxmsw25u_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswu\wxmsw25u_stc.lib"
-
-!ELSEIF  "$(CFG)" == "stclib - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\stclib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\stclib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivd" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswunivd\wxmswuniv25d_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivd" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswunivd\wxmswuniv25d_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswunivd\wxmswuniv25d_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswunivd\wxmswuniv25d_stc.lib"
-
-!ELSEIF  "$(CFG)" == "stclib - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\stclib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\stclib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswuniv" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswuniv\wxmswuniv25_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswuniv" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswuniv\wxmswuniv25_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswuniv\wxmswuniv25_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswuniv\wxmswuniv25_stc.lib"
-
-!ELSEIF  "$(CFG)" == "stclib - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\stclib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\stclib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivud" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivud" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\stc\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_stc.lib"
-
-!ELSEIF  "$(CFG)" == "stclib - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\stclib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\stc\..\..\..\lib\vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\stclib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivu" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswunivu\wxmswuniv25u_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\stc\..\..\..\include" /I "..\..\src\stc\..\..\..\lib\vc_mswunivu" /I "..\..\src\stc\..\..\..\src\tiff" /I "..\..\src\stc\..\..\..\src\jpeg" /I "..\..\src\stc\..\..\..\src\png" /I "..\..\src\stc\..\..\..\src\zlib" /I "..\..\src\stc\..\..\..\src\regex" /I "..\..\src\stc\..\..\..\src\expat\lib" /Fd..\..\src\stc\..\..\..\lib\vc_mswunivu\wxmswuniv25u_stc.pdb /I "..\..\src\stc\..\..\include" /I "..\..\src\stc\scintilla\include" /I "..\..\src\stc\scintilla\src" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswunivu\wxmswuniv25u_stc.lib"
-# ADD LIB32 /nologo /out:"..\..\src\stc\..\..\..\lib\vc_mswunivu\wxmswuniv25u_stc.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "stclib - Win32 Debug"
-# Name "stclib - Win32 Release"
-# Name "stclib - Win32 Unicode Debug"
-# Name "stclib - Win32 Unicode Release"
-# Name "stclib - Win32 Universal Debug"
-# Name "stclib - Win32 Universal Release"
-# Name "stclib - Win32 Universal Unicode Debug"
-# Name "stclib - Win32 Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\AutoComplete.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\CallTip.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\CellBuffer.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\ContractionState.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\Document.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\DocumentAccessor.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\Editor.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\ExternalLexer.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\Indicator.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\KeyMap.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\KeyWords.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexAVE.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexAda.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexAsm.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexBaan.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexBullant.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexCPP.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexCSS.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexConf.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexCrontab.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexEScript.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexEiffel.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexFortran.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexHTML.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexLisp.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexLout.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexLua.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexMatlab.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexOthers.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexPOV.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexPascal.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexPerl.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexPython.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexRuby.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexSQL.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LexVB.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\LineMarker.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\PlatWX.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\PropSet.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\RESearch.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\ScintillaBase.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\ScintillaWX.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\Style.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\StyleContext.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\UniConversion.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\ViewStyle.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\WindowAccessor.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\scintilla\src\XPM.cxx
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/stc\stc.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/svg/makefile.gcc b/contrib/build/svg/makefile.gcc
index 157449126f..6c2ea72563 100644
--- a/contrib/build/svg/makefile.gcc
+++ b/contrib/build/svg/makefile.gcc
@@ -239,7 +239,7 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_gcc$(VENDORTAG).dll: $(SVGDLL_OBJECTS) $(OBJS)\svgdll_version_rc.o
-	$(CXX) -shared -fPIC -o $@ $(SVGDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+	$(CXX) -shared -fPIC -o $@ $(SVGDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
 endif
 
 ifeq ($(SHARED),0)
diff --git a/contrib/build/svg/svg_svgdll.dsp b/contrib/build/svg/svg_svgdll.dsp
deleted file mode 100644
index 867f3db1b8..0000000000
--- a/contrib/build/svg/svg_svgdll.dsp
+++ /dev/null
@@ -1,266 +0,0 @@
-# Microsoft Developer Studio Project File - Name="svgdll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=svgdll - Win32 DLL 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 "svg_svgdll.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 "svg_svgdll.mak" CFG="svgdll - Win32 DLL Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "svgdll - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "svgdll - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "svgdll - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "svgdll - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "svgdll - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "svgdll - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "svgdll - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "svgdll - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "svgdll - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\svgdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\svgdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswddll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_svgdll.pch" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswddll\wxmsw250d_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswddll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_svgdll.pch" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswddll\wxmsw250d_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswddll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswddll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswddll\wxmsw250d_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswddll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswddll\wxmsw25d_svg.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswddll\wxmsw250d_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswddll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswddll\wxmsw25d_svg.lib" /debug
-
-!ELSEIF  "$(CFG)" == "svgdll - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\svgdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\svgdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswdll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_svgdll.pch" /Fd..\..\src\svg\..\..\..\lib\vc_mswdll\wxmsw250_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswdll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_svgdll.pch" /Fd..\..\src\svg\..\..\..\lib\vc_mswdll\wxmsw250_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswdll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswdll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswdll\wxmsw250_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswdll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswdll\wxmsw25_svg.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswdll\wxmsw250_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswdll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswdll\wxmsw25_svg.lib"
-
-!ELSEIF  "$(CFG)" == "svgdll - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\svgdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\svgdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswuddll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_svgdll.pch" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswuddll\wxmsw250ud_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswuddll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_svgdll.pch" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswuddll\wxmsw250ud_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswuddll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswuddll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswuddll\wxmsw250ud_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswuddll\wxmsw25ud_svg.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswuddll\wxmsw250ud_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswuddll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswuddll\wxmsw25ud_svg.lib" /debug
-
-!ELSEIF  "$(CFG)" == "svgdll - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\svgdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\svgdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswudll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_svgdll.pch" /Fd..\..\src\svg\..\..\..\lib\vc_mswudll\wxmsw250u_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswudll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_svgdll.pch" /Fd..\..\src\svg\..\..\..\lib\vc_mswudll\wxmsw250u_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswudll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswudll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswudll\wxmsw250u_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswudll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswudll\wxmsw25u_svg.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmsw25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswudll\wxmsw250u_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswudll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswudll\wxmsw25u_svg.lib"
-
-!ELSEIF  "$(CFG)" == "svgdll - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\svgdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\svgdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivddll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_svgdll.pch" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivddll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_svgdll.pch" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswunivddll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswunivddll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_svg.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25d_core.lib wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswunivddll\wxmswuniv250d_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswunivddll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswunivddll\wxmswuniv25d_svg.lib" /debug
-
-!ELSEIF  "$(CFG)" == "svgdll - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\svgdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\svgdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivdll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_svgdll.pch" /Fd..\..\src\svg\..\..\..\lib\vc_mswunivdll\wxmswuniv250_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivdll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_svgdll.pch" /Fd..\..\src\svg\..\..\..\lib\vc_mswunivdll\wxmswuniv250_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswunivdll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswunivdll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswunivdll\wxmswuniv250_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswunivdll\wxmswuniv25_svg.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25_core.lib wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswunivdll\wxmswuniv250_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswunivdll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswunivdll\wxmswuniv25_svg.lib"
-
-!ELSEIF  "$(CFG)" == "svgdll - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\svgdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\svgdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_svgdll.pch" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivuddll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_svgdll.pch" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswunivuddll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_svg.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25ud_core.lib wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswunivuddll\wxmswuniv250ud_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswunivuddll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswunivuddll\wxmswuniv25ud_svg.lib" /debug
-
-!ELSEIF  "$(CFG)" == "svgdll - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\svgdll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\svgdll"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivudll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_svgdll.pch" /Fd..\..\src\svg\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivudll" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_svgdll.pch" /Fd..\..\src\svg\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_svg_vc_custom.pdb /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_SVG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswunivudll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\svg\..\..\..\include" /i "..\..\src\svg\..\..\..\lib\vc_mswunivudll" /i "..\..\src\svg\..\..\..\src\tiff" /i "..\..\src\svg\..\..\..\src\jpeg" /i "..\..\src\svg\..\..\..\src\png" /i "..\..\src\svg\..\..\..\src\zlib" /i "..\..\src\svg\..\..\..\src\regex" /i "..\..\src\svg\..\..\..\src\expat\lib" /i "..\..\src\svg\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_SVG
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_svg.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wxmswuniv25u_core.lib wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\src\svg\..\..\..\lib\vc_mswunivudll\wxmswuniv250u_svg_vc_custom.dll" /libpath:"..\..\src\svg\..\..\..\lib\vc_mswunivudll" /implib:"..\..\src\svg\..\..\..\lib\vc_mswunivudll\wxmswuniv25u_svg.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "svgdll - Win32 DLL Debug"
-# Name "svgdll - Win32 DLL Release"
-# Name "svgdll - Win32 DLL Unicode Debug"
-# Name "svgdll - Win32 DLL Unicode Release"
-# Name "svgdll - Win32 DLL Universal Debug"
-# Name "svgdll - Win32 DLL Universal Release"
-# Name "svgdll - Win32 DLL Universal Unicode Debug"
-# Name "svgdll - Win32 DLL Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/svg\dcsvg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/svg\..\..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/build/svg/svg_svglib.dsp b/contrib/build/svg/svg_svglib.dsp
deleted file mode 100644
index 135662f173..0000000000
--- a/contrib/build/svg/svg_svglib.dsp
+++ /dev/null
@@ -1,249 +0,0 @@
-# Microsoft Developer Studio Project File - Name="svglib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=svglib - Win32 Unicode 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 "svg_svglib.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 "svg_svglib.mak" CFG="svglib - Win32 Unicode Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "svglib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "svglib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "svglib - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "svglib - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "svglib - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "svglib - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "svglib - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "svglib - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "svglib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\svglib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\svglib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswd" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswd\wxmsw25d_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswd" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswd\wxmsw25d_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswd\wxmsw25d_svg.lib"
-# ADD LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswd\wxmsw25d_svg.lib"
-
-!ELSEIF  "$(CFG)" == "svglib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\svglib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_msw"
-# PROP Intermediate_Dir "vc_msw\svglib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_msw" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Fd..\..\src\svg\..\..\..\lib\vc_msw\wxmsw25_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_msw" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Fd..\..\src\svg\..\..\..\lib\vc_msw\wxmsw25_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_msw\wxmsw25_svg.lib"
-# ADD LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_msw\wxmsw25_svg.lib"
-
-!ELSEIF  "$(CFG)" == "svglib - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\svglib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\svglib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswud" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswud\wxmsw25ud_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswud" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswud\wxmsw25ud_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswud\wxmsw25ud_svg.lib"
-# ADD LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswud\wxmsw25ud_svg.lib"
-
-!ELSEIF  "$(CFG)" == "svglib - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\svglib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\svglib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswu" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Fd..\..\src\svg\..\..\..\lib\vc_mswu\wxmsw25u_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswu" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Fd..\..\src\svg\..\..\..\lib\vc_mswu\wxmsw25u_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswu\wxmsw25u_svg.lib"
-# ADD LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswu\wxmsw25u_svg.lib"
-
-!ELSEIF  "$(CFG)" == "svglib - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\svglib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\svglib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivd" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswunivd\wxmswuniv25d_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivd" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswunivd\wxmswuniv25d_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswunivd\wxmswuniv25d_svg.lib"
-# ADD LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswunivd\wxmswuniv25d_svg.lib"
-
-!ELSEIF  "$(CFG)" == "svglib - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\svglib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\svglib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswuniv" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Fd..\..\src\svg\..\..\..\lib\vc_mswuniv\wxmswuniv25_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswuniv" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Fd..\..\src\svg\..\..\..\lib\vc_mswuniv\wxmswuniv25_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswuniv\wxmswuniv25_svg.lib"
-# ADD LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswuniv\wxmswuniv25_svg.lib"
-
-!ELSEIF  "$(CFG)" == "svglib - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\svglib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\svglib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivud" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivud" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\src\svg\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_svg.lib"
-# ADD LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswunivud\wxmswuniv25ud_svg.lib"
-
-!ELSEIF  "$(CFG)" == "svglib - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\svglib"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\src\svg\..\..\..\lib\vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\svglib"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivu" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Fd..\..\src\svg\..\..\..\lib\vc_mswunivu\wxmswuniv25u_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\svg\..\..\..\include" /I "..\..\src\svg\..\..\..\lib\vc_mswunivu" /I "..\..\src\svg\..\..\..\src\tiff" /I "..\..\src\svg\..\..\..\src\jpeg" /I "..\..\src\svg\..\..\..\src\png" /I "..\..\src\svg\..\..\..\src\zlib" /I "..\..\src\svg\..\..\..\src\regex" /I "..\..\src\svg\..\..\..\src\expat\lib" /Fd..\..\src\svg\..\..\..\lib\vc_mswunivu\wxmswuniv25u_svg.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_svglib.pch" /I "..\..\src\svg\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswunivu\wxmswuniv25u_svg.lib"
-# ADD LIB32 /nologo /out:"..\..\src\svg\..\..\..\lib\vc_mswunivu\wxmswuniv25u_svg.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "svglib - Win32 Debug"
-# Name "svglib - Win32 Release"
-# Name "svglib - Win32 Unicode Debug"
-# Name "svglib - Win32 Unicode Release"
-# Name "svglib - Win32 Universal Debug"
-# Name "svglib - Win32 Universal Release"
-# Name "svglib - Win32 Universal Unicode Debug"
-# Name "svglib - Win32 Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=../../src/svg\dcsvg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=../../src/svg\..\..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/contrib/samples/deprecated/proplist/Makefile.in b/contrib/samples/deprecated/proplist/Makefile.in
index 730450cfe8..5da90d1c11 100644
--- a/contrib/samples/deprecated/proplist/Makefile.in
+++ b/contrib/samples/deprecated/proplist/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 PROPLIST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/contrib/samples/deprecated/resource/Makefile.in b/contrib/samples/deprecated/resource/Makefile.in
index ec6ac463ee..06403b4857 100644
--- a/contrib/samples/deprecated/resource/Makefile.in
+++ b/contrib/samples/deprecated/resource/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 RESOURCE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/contrib/samples/deprecated/treelay/Makefile.in b/contrib/samples/deprecated/treelay/Makefile.in
index 7c270a1110..930b5161a0 100644
--- a/contrib/samples/deprecated/treelay/Makefile.in
+++ b/contrib/samples/deprecated/treelay/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 TREELAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/contrib/samples/fl/Makefile.in b/contrib/samples/fl/Makefile.in
index ffe2c21a26..a8cf22b57e 100644
--- a/contrib/samples/fl/Makefile.in
+++ b/contrib/samples/fl/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 FL_DEMO1_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/contrib/samples/foldbar/extended/Makefile.in b/contrib/samples/foldbar/extended/Makefile.in
index c7608618cc..5dfbad1d11 100644
--- a/contrib/samples/foldbar/extended/Makefile.in
+++ b/contrib/samples/foldbar/extended/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 EXTENDED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/contrib/samples/foldbar/foldpanelbar/Makefile.in b/contrib/samples/foldbar/foldpanelbar/Makefile.in
index b265d8ac5d..a041190056 100644
--- a/contrib/samples/foldbar/foldpanelbar/Makefile.in
+++ b/contrib/samples/foldbar/foldpanelbar/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 FOLDTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/contrib/samples/gizmos/dynsash/Makefile.in b/contrib/samples/gizmos/dynsash/Makefile.in
index 0e02ee5dc6..9071582aee 100644
--- a/contrib/samples/gizmos/dynsash/Makefile.in
+++ b/contrib/samples/gizmos/dynsash/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 DYNSASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/contrib/samples/gizmos/dynsash_switch/Makefile.in b/contrib/samples/gizmos/dynsash_switch/Makefile.in
index eb9911f444..87368ef95a 100644
--- a/contrib/samples/gizmos/dynsash_switch/Makefile.in
+++ b/contrib/samples/gizmos/dynsash_switch/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 DYNSASH_SWITCH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/contrib/samples/gizmos/editlbox/Makefile.in b/contrib/samples/gizmos/editlbox/Makefile.in
index 0d3605e336..c4bcf6e356 100644
--- a/contrib/samples/gizmos/editlbox/Makefile.in
+++ b/contrib/samples/gizmos/editlbox/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/contrib/samples/gizmos/led/Makefile.in b/contrib/samples/gizmos/led/Makefile.in
index d5a9dc060b..299f59892f 100644
--- a/contrib/samples/gizmos/led/Makefile.in
+++ b/contrib/samples/gizmos/led/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 LED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/contrib/samples/gizmos/multicell/Makefile.in b/contrib/samples/gizmos/multicell/Makefile.in
index 7cbd2e952d..28e9f07460 100644
--- a/contrib/samples/gizmos/multicell/Makefile.in
+++ b/contrib/samples/gizmos/multicell/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 MTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/contrib/samples/gizmos/splittree/Makefile.in b/contrib/samples/gizmos/splittree/Makefile.in
index ea2e53fffa..908b0e3fa0 100644
--- a/contrib/samples/gizmos/splittree/Makefile.in
+++ b/contrib/samples/gizmos/splittree/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 SPLITTREE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/contrib/samples/mmedia/Makefile.in b/contrib/samples/mmedia/Makefile.in
index 2c9fe39711..6b5aa72d22 100644
--- a/contrib/samples/mmedia/Makefile.in
+++ b/contrib/samples/mmedia/Makefile.in
@@ -41,7 +41,7 @@ EXTRALIBS_ESD = @EXTRALIBS_ESD@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 MMBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/contrib/samples/ogl/ogledit/Makefile.in b/contrib/samples/ogl/ogledit/Makefile.in
index c1f305628a..f0e8bf8dd4 100644
--- a/contrib/samples/ogl/ogledit/Makefile.in
+++ b/contrib/samples/ogl/ogledit/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 OGLEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/contrib/samples/ogl/studio/Makefile.in b/contrib/samples/ogl/studio/Makefile.in
index 55ac43dd83..9e814df8a3 100644
--- a/contrib/samples/ogl/studio/Makefile.in
+++ b/contrib/samples/ogl/studio/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 STUDIO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/contrib/samples/plot/Makefile.in b/contrib/samples/plot/Makefile.in
index 0194709c36..ded973593c 100644
--- a/contrib/samples/plot/Makefile.in
+++ b/contrib/samples/plot/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 PLOT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/contrib/samples/stc/Makefile.in b/contrib/samples/stc/Makefile.in
index 8ef158fc6e..f2f18745e1 100644
--- a/contrib/samples/stc/Makefile.in
+++ b/contrib/samples/stc/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 STCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/contrib/samples/svg/Makefile.in b/contrib/samples/svg/Makefile.in
index 7be3a64654..616018dad3 100644
--- a/contrib/samples/svg/Makefile.in
+++ b/contrib/samples/svg/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 SVGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/contrib/src/deprecated/Makefile.in b/contrib/src/deprecated/Makefile.in
index 4ff86b7ad4..841386ef64 100644
--- a/contrib/src/deprecated/Makefile.in
+++ b/contrib/src/deprecated/Makefile.in
@@ -105,7 +105,7 @@ DEPRECATEDLIB_ODEP = \
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
 @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
-@COND_PLATFORM_MACOSX_1@	-compatibility_version 1.0 -current_version 1.0
+@COND_PLATFORM_MACOSX_1@	-compatibility_version 2.0 -current_version 2.0
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -156,9 +156,9 @@ COND_WINDOWS_IMPLIB_1___deprecateddll___importlib = \
 @COND_USE_SOVERSION_0@__deprecateddll___targetsuf2 = .$(SO_SUFFIX)
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__deprecateddll___targetsuf3 \
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	= \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.1.0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__deprecateddll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.1.0.$(SO_SUFFIX)
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__deprecateddll___targetsuf3 \
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@	= -0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__deprecateddll___targetsuf3 = .$(SO_SUFFIX)
diff --git a/contrib/src/fl/Makefile.in b/contrib/src/fl/Makefile.in
index d0b3ea043b..8bb0048d88 100644
--- a/contrib/src/fl/Makefile.in
+++ b/contrib/src/fl/Makefile.in
@@ -108,7 +108,7 @@ FLLIB_ODEP =  $(___pch_wxprec_fllib_wx_wxprec_h_gch___depname)
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
 @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
-@COND_PLATFORM_MACOSX_1@	-compatibility_version 1.0 -current_version 1.0
+@COND_PLATFORM_MACOSX_1@	-compatibility_version 2.0 -current_version 2.0
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -158,9 +158,9 @@ COND_WINDOWS_IMPLIB_1___fldll___importlib = \
 @COND_USE_SOVERSION_0@__fldll___targetsuf2 = .$(SO_SUFFIX)
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__fldll___targetsuf3 \
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	= \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.1.0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__fldll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.1.0.$(SO_SUFFIX)
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__fldll___targetsuf3 \
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@	= -0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__fldll___targetsuf3 = .$(SO_SUFFIX)
diff --git a/contrib/src/foldbar/Makefile.in b/contrib/src/foldbar/Makefile.in
index dad082374c..8425bfaef2 100644
--- a/contrib/src/foldbar/Makefile.in
+++ b/contrib/src/foldbar/Makefile.in
@@ -80,7 +80,7 @@ FOLDBARLIB_ODEP =  $(___pch_wxprec_foldbarlib_wx_wxprec_h_gch___depname)
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
 @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
-@COND_PLATFORM_MACOSX_1@	-compatibility_version 1.0 -current_version 1.0
+@COND_PLATFORM_MACOSX_1@	-compatibility_version 2.0 -current_version 2.0
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -130,9 +130,9 @@ COND_WINDOWS_IMPLIB_1___foldbardll___importlib = \
 @COND_USE_SOVERSION_0@__foldbardll___targetsuf2 = .$(SO_SUFFIX)
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__foldbardll___targetsuf3 \
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	= \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.1.0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__foldbardll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.1.0.$(SO_SUFFIX)
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__foldbardll___targetsuf3 \
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@	= -0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__foldbardll___targetsuf3 = .$(SO_SUFFIX)
diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in
index b3c6ca16ab..48bb058b9e 100644
--- a/contrib/src/gizmos/Makefile.in
+++ b/contrib/src/gizmos/Makefile.in
@@ -103,7 +103,7 @@ GIZMOS_XRCLIB_ODEP = \
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
 @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
-@COND_PLATFORM_MACOSX_1@	-compatibility_version 1.0 -current_version 1.0
+@COND_PLATFORM_MACOSX_1@	-compatibility_version 2.0 -current_version 2.0
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -264,8 +264,8 @@ COND_SHARED_0_USE_XRC_1___gizmos_xrclib___depname = \
 @COND_USE_SOVERSION_0@__gizmos = .$(SO_SUFFIX)
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__gizmos_0 \
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	= \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.0.0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmos_0 = .0.0.0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.1.0
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmos_0 = .0.1.0.$(SO_SUFFIX)
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__gizmos_0 = -0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__gizmos_0 = .$(SO_SUFFIX)
 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
diff --git a/contrib/src/mmedia/Makefile.in b/contrib/src/mmedia/Makefile.in
index 107274e982..546c71e322 100644
--- a/contrib/src/mmedia/Makefile.in
+++ b/contrib/src/mmedia/Makefile.in
@@ -111,7 +111,7 @@ MMEDIALIB_ODEP =  $(___pch_wxprec_mmedialib_wx_wxprec_h_gch___depname)
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
 @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
-@COND_PLATFORM_MACOSX_1@	-compatibility_version 1.0 -current_version 1.0
+@COND_PLATFORM_MACOSX_1@	-compatibility_version 2.0 -current_version 2.0
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -161,9 +161,9 @@ COND_WINDOWS_IMPLIB_1___mmediadll___importlib = \
 @COND_USE_SOVERSION_0@__mmediadll___targetsuf2 = .$(SO_SUFFIX)
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__mmediadll___targetsuf3 \
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	= \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.1.0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__mmediadll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.1.0.$(SO_SUFFIX)
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__mmediadll___targetsuf3 \
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@	= -0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__mmediadll___targetsuf3 = .$(SO_SUFFIX)
diff --git a/contrib/src/net/Makefile.in b/contrib/src/net/Makefile.in
index 6c6a98b1f1..e4819f9f74 100644
--- a/contrib/src/net/Makefile.in
+++ b/contrib/src/net/Makefile.in
@@ -80,7 +80,7 @@ NETUTILSLIB_ODEP =  $(___pch_wxprec_netutilslib_wx_wxprec_h_gch___depname)
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
 @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
-@COND_PLATFORM_MACOSX_1@	-compatibility_version 1.0 -current_version 1.0
+@COND_PLATFORM_MACOSX_1@	-compatibility_version 2.0 -current_version 2.0
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -130,9 +130,9 @@ COND_WINDOWS_IMPLIB_1___netutilsdll___importlib = \
 @COND_USE_SOVERSION_0@__netutilsdll___targetsuf2 = .$(SO_SUFFIX)
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__netutilsdll___targetsuf3 \
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	= \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.1.0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__netutilsdll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.1.0.$(SO_SUFFIX)
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__netutilsdll___targetsuf3 \
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@	= -0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__netutilsdll___targetsuf3 = .$(SO_SUFFIX)
diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in
index f4963c4f0b..7c7471ab77 100644
--- a/contrib/src/ogl/Makefile.in
+++ b/contrib/src/ogl/Makefile.in
@@ -98,7 +98,7 @@ OGLLIB_ODEP =  $(___pch_wxprec_ogllib_wx_wxprec_h_gch___depname)
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
 @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
-@COND_PLATFORM_MACOSX_1@	-compatibility_version 1.0 -current_version 1.0
+@COND_PLATFORM_MACOSX_1@	-compatibility_version 2.0 -current_version 2.0
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -148,9 +148,9 @@ COND_WINDOWS_IMPLIB_1___ogldll___importlib = \
 @COND_USE_SOVERSION_0@__ogldll___targetsuf2 = .$(SO_SUFFIX)
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__ogldll___targetsuf3 \
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	= \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.1.0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.1.0.$(SO_SUFFIX)
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__ogldll___targetsuf3 \
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@	= -0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__ogldll___targetsuf3 = .$(SO_SUFFIX)
diff --git a/contrib/src/plot/Makefile.in b/contrib/src/plot/Makefile.in
index 1ab0d3383d..ba55f914ef 100644
--- a/contrib/src/plot/Makefile.in
+++ b/contrib/src/plot/Makefile.in
@@ -76,7 +76,7 @@ PLOTLIB_ODEP =  $(___pch_wxprec_plotlib_wx_wxprec_h_gch___depname)
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
 @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
-@COND_PLATFORM_MACOSX_1@	-compatibility_version 1.0 -current_version 1.0
+@COND_PLATFORM_MACOSX_1@	-compatibility_version 2.0 -current_version 2.0
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -126,9 +126,9 @@ COND_WINDOWS_IMPLIB_1___plotdll___importlib = \
 @COND_USE_SOVERSION_0@__plotdll___targetsuf2 = .$(SO_SUFFIX)
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__plotdll___targetsuf3 \
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	= \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.1.0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__plotdll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.1.0.$(SO_SUFFIX)
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__plotdll___targetsuf3 \
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@	= -0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__plotdll___targetsuf3 = .$(SO_SUFFIX)
diff --git a/contrib/src/stc/Makefile.in b/contrib/src/stc/Makefile.in
index 2daee2cd00..02437e2f96 100644
--- a/contrib/src/stc/Makefile.in
+++ b/contrib/src/stc/Makefile.in
@@ -242,7 +242,7 @@ STCLIB_OBJECTS =  \
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
 @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
-@COND_PLATFORM_MACOSX_1@	-compatibility_version 1.0 -current_version 1.0
+@COND_PLATFORM_MACOSX_1@	-compatibility_version 2.0 -current_version 2.0
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -287,9 +287,9 @@ COND_WINDOWS_IMPLIB_1___stcdll___importlib = \
 @COND_USE_SOVERSION_0@__stcdll___targetsuf2 = .$(SO_SUFFIX)
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__stcdll___targetsuf3 \
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	= \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.1.0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__stcdll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.1.0.$(SO_SUFFIX)
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__stcdll___targetsuf3 \
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@	= -0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__stcdll___targetsuf3 = .$(SO_SUFFIX)
diff --git a/contrib/src/stc/stc.cpp b/contrib/src/stc/stc.cpp
index 0bf46f60b4..3b7d9bfc8f 100644
--- a/contrib/src/stc/stc.cpp
+++ b/contrib/src/stc/stc.cpp
@@ -3294,10 +3294,18 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
         evt.SetEventType(wxEVT_STC_PAINTED);
         break;
 
+    case SCN_AUTOCSELECTION:
+        evt.SetEventType(wxEVT_STC_AUTOCOMP_SELECTION);
+        evt.SetListType(scn.listType);
+        SetEventText(evt, scn.text, strlen(scn.text));
+        evt.SetPosition(scn.lParam);
+        break;
+        
     case SCN_USERLISTSELECTION:
         evt.SetEventType(wxEVT_STC_USERLISTSELECTION);
         evt.SetListType(scn.listType);
         SetEventText(evt, scn.text, strlen(scn.text));
+        evt.SetPosition(scn.lParam);
         break;
 
     case SCN_URIDROPPED:
@@ -3332,11 +3340,7 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
     case SCN_CALLTIPCLICK:
         evt.SetEventType(wxEVT_STC_CALLTIP_CLICK);
         break;
-
-    case SCN_AUTOCSELECTION:
-        evt.SetEventType(wxEVT_STC_AUTOCOMP_SELECTION);
-        break;
-        
+       
     default:
         return;
     }
diff --git a/contrib/src/stc/stc.cpp.in b/contrib/src/stc/stc.cpp.in
index d1a1701a53..072d1c1cc2 100644
--- a/contrib/src/stc/stc.cpp.in
+++ b/contrib/src/stc/stc.cpp.in
@@ -932,10 +932,18 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
         evt.SetEventType(wxEVT_STC_PAINTED);
         break;
 
+    case SCN_AUTOCSELECTION:
+        evt.SetEventType(wxEVT_STC_AUTOCOMP_SELECTION);
+        evt.SetListType(scn.listType);
+        SetEventText(evt, scn.text, strlen(scn.text));
+        evt.SetPosition(scn.lParam);
+        break;
+        
     case SCN_USERLISTSELECTION:
         evt.SetEventType(wxEVT_STC_USERLISTSELECTION);
         evt.SetListType(scn.listType);
         SetEventText(evt, scn.text, strlen(scn.text));
+        evt.SetPosition(scn.lParam);
         break;
 
     case SCN_URIDROPPED:
@@ -970,11 +978,7 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
     case SCN_CALLTIPCLICK:
         evt.SetEventType(wxEVT_STC_CALLTIP_CLICK);
         break;
-
-    case SCN_AUTOCSELECTION:
-        evt.SetEventType(wxEVT_STC_AUTOCOMP_SELECTION);
-        break;
-        
+       
     default:
         return;
     }
diff --git a/contrib/src/svg/Makefile.in b/contrib/src/svg/Makefile.in
index 4687a3bd8f..51e90d444a 100644
--- a/contrib/src/svg/Makefile.in
+++ b/contrib/src/svg/Makefile.in
@@ -76,7 +76,7 @@ SVGLIB_ODEP =  $(___pch_wxprec_svglib_wx_wxprec_h_gch___depname)
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
 @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
-@COND_PLATFORM_MACOSX_1@	-compatibility_version 1.0 -current_version 1.0
+@COND_PLATFORM_MACOSX_1@	-compatibility_version 2.0 -current_version 2.0
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -126,9 +126,9 @@ COND_WINDOWS_IMPLIB_1___svgdll___importlib = \
 @COND_USE_SOVERSION_0@__svgdll___targetsuf2 = .$(SO_SUFFIX)
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__svgdll___targetsuf3 \
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	= \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.1.0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__svgdll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.1.0.$(SO_SUFFIX)
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__svgdll___targetsuf3 \
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@	= -0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__svgdll___targetsuf3 = .$(SO_SUFFIX)
diff --git a/debian/changelog b/debian/changelog
index 2455a5550f..032880b797 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,50 @@
+wxwidgets2.8 (2.8.3.0-0) unstable; urgency=low
+
+  * Added wxSizerFlags::Shaped(), FixedMinSize(), Top() and Bottom() methods.
+  * Added wxCSConv::IsOk() (Manuel Martin).
+  * Added wxDateTime::GetDateOnly().
+  * Made wxTextFile work with unseekable files again (David Hart).
+  * Added wxCONFIG_USE_SUBDIR flag to wxFileConfig (Giuseppe Bilotta).
+  * Added wxSearchCtrl::[Get|Set]DescriptiveText.
+  * Added wxToolBar::SetTool[Normal|Disabled]Bitmap for wxMSW, wxGTK and wxMac.
+  * Added wxRICHTEXT_SETSTYLE_REMOVE flag for removing styles, and
+    wxRICHTEXT_HITTEST_OUTSIDE for more accurate hit-testing.
+  * Fixed a crash when writing wxRichTextCtrl styles.
+  * wxPython: enhanced the widget inspection tool
+  * wxPython: Added wrappers for wx.SizerFlags and wx.Sizer methods using it
+  * Some missing methods of wxCairoGraphicsContext now implemented
+  * Fixed tab-related drawing and hit-testing bugs in wxRichTextCtrl.
+  * Implemented background colour in wxRichTextCtrl.
+  * Fixed crashes in helpview when opening a file.
+  * Fixed detection of number of processors under Linux 2.6
+  * Fixed Base64 computation in wxHTTP (p_michalczyk)
+  * Fix handling of wxSOCKET_REUSEADDR in wxDatagramSocket (troelsk)
+  * Fixed crash in wxGetUserName() in Unicode build
+  * Fix hang on startup when using GTK+ options in Unicode build
+  * Shut down the sockets gracefully (Sergio Aguayo)
+  * Fix extra indentation in wxHTML_ALIGN_JUSTIFY display (Chacal)
+  * Fixed handling of accelerators using PageUp/Down keys
+
+ -- Robin Dunn <robin@alldunn.com>  Tue, 20 Mar 2007 14:00:50 -0800
+
+wxwidgets2.8 (2.8.1.1-0) unstable; urgency=low
+
+  * Fix compilation with wxUSE_STL=1
+  * wxGrid::GetBestSize() returns same size the grid would have after AutoSize()
+  * Added wxTreeCtrl::CollapseAll[Children]() and IsEmpty() (Francesco Montorsi)
+  * Several RTL-related positioning fixes (Diaa Sami)
+  * Fix wxConfig::DeleteGroup() for arguments with trailing slash (David Hart)
+  * Fix memory leak in wxGrid::ShowCellEditControl() (Christian Sturmlechner)
+  * Don't crash if command line is not valid UTF-8 (Unicode build only)
+  * Added wxSizerFlags::Shaped() and FixedMinSize() methods
+  * Added wxCSConv::IsOk() (Manuel Martin)
+  * Added wxDateTime::GetDateOnly()
+  * Made wxTextFile work with unseekable files again (David Hart)
+  * Added wxCONFIG_USE_SUBDIR flag to wxFileConfig (Giuseppe Bilotta)
+  * Added wxSearchCtrl::[Get|Set]DescriptiveText
+
+ -- Robin Dunn <robin@alldunn.com>  Fri, 19 Jan 2007 12:02:52 -0800
+
 wxwidgets2.8 (2.8.0.1-1) unstable; urgency=low
 
   * No changes, just a different packager
diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in
index 41f92b325c..d223142f01 100644
--- a/demos/bombs/Makefile.in
+++ b/demos/bombs/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 BOMBS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/demos/dbbrowse/Makefile.in b/demos/dbbrowse/Makefile.in
index 2668ab5da6..7e8dbb1f8a 100644
--- a/demos/dbbrowse/Makefile.in
+++ b/demos/dbbrowse/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 DBBROWSE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/demos/dbbrowse/dbbrowse.pro b/demos/dbbrowse/dbbrowse.pro
deleted file mode 100644
index 38bb948c4a..0000000000
--- a/demos/dbbrowse/dbbrowse.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# this is the project file for the dbbrowse wxWindows sample
-
-# we generate the VC++ IDE project file, comment this line
-# to generate a makefile for (n)make
-TEMPLATE = vc6app
-
-# wx is mandatory for wxWindows projects
-CONFIG  = wx
-
-# the configurations of wxWindows we want to use: the value below is the
-# default one; possible other values are {Debug|Release}Unicode[Dll]
-#WXCONFIGS = Debug Release DebugDll ReleaseDll
-
-# we need to explicitly specify the wxWindows root dir location because it is
-# not the default "../.." for this sample
-WXDIR=../../..
-
-# project files
-SOURCES = dbbrowse.cpp
-RC_FILE = dbbrowse.rc
-TARGET  = dbbrowse
diff --git a/demos/dbbrowse/dbtree.cpp b/demos/dbbrowse/dbtree.cpp
index bd2193a9ee..751e730d0d 100644
--- a/demos/dbbrowse/dbtree.cpp
+++ b/demos/dbbrowse/dbtree.cpp
@@ -275,7 +275,7 @@ void DBTree::OnSelChanged(wxTreeEvent& WXUNUSED(event))
         //-------------------------------------------------------------------------------------
         if (Temp1.Contains(_T("ODBC-")))
         {
-            Temp1 = Temp1.Mid(5,wxSTRING_MAXLEN);
+            Temp1 = Temp1.Mid(5);
             for (i=0;i<pDoc->i_DSN;i++)
             {
                 if (Temp1 == (pDoc->p_DSN+i)->Dsn)
diff --git a/demos/dbbrowse/dlguser.cpp b/demos/dbbrowse/dlguser.cpp
index 76fd8d5105..f7511a352f 100644
--- a/demos/dbbrowse/dlguser.cpp
+++ b/demos/dbbrowse/dlguser.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------------------
-// Name:        DlgUser.h,cpp
+// Name:        DlgUser.cpp
 // Purpose:     Dialog mit Variable Gestaltung durch DlgUser.wxr
 // Author:      Mark Johnson
 // Modified by: 19991105.mj10777
@@ -124,23 +124,13 @@ void DlgUser::OnInit()
 //----------------------------------------------------------------------------------------
 BEGIN_EVENT_TABLE(DlgUser, wxDialog)
     EVT_BUTTON(wxID_OK, DlgUser::OnOk)
-    EVT_BUTTON(wxID_CANCEL, DlgUser::OnCancel)
 END_EVENT_TABLE()
 
 //----------------------------------------------------------------------------------------
 void DlgUser::OnOk(wxCommandEvent& WXUNUSED(event) )
 {
-    //canceled = false;
     s_User    = m_UserName->GetValue();
     s_Password = m_Password->GetValue();
     EndModal(wxID_OK);
 }
 
-//----------------------------------------------------------------------------------------
-//void DlgUser::OnCancel(wxCommandEvent& WXUNUSED(event) )
-// {
-//   canceled = true;
-//   EndModal(wxID_CANCEL);
-// }
-//----------------------------------------------------------------------------------------
-
diff --git a/demos/dbbrowse/makefile.gtk b/demos/dbbrowse/makefile.gtk
deleted file mode 100644
index cd8a960812..0000000000
--- a/demos/dbbrowse/makefile.gtk
+++ /dev/null
@@ -1,15 +0,0 @@
-
-# Top dir of wxWindows
-top_builddir = /gtm/bart/wxGTK
-
-PROGRAM=dbbrowser_gtk
-
-
-OBJECTS= dbbrowse.o doc.o pgmctrl.o tabpgwin.o\
-         browsedb.o dbtree.o dbgrid.o  dlguser.o
-	
-
-
-
-include $(top_builddir)/src/makeprog.env
-
diff --git a/demos/dbbrowse/pgmctrl.cpp b/demos/dbbrowse/pgmctrl.cpp
index d146c0de9f..e64db76399 100644
--- a/demos/dbbrowse/pgmctrl.cpp
+++ b/demos/dbbrowse/pgmctrl.cpp
@@ -169,7 +169,7 @@ void PgmCtrl::OnSelChanged(wxMouseEvent& WXUNUSED(event))
         //--------------------------------------------------------------------------------------
         if (Temp1.Contains(_T("ODBC-")))
         {
-            Temp1 = Temp1.Mid(5,wxSTRING_MAXLEN);
+            Temp1 = Temp1.Mid(5);
             for (i=0;i<pDoc->i_DSN;i++)
             {
                 if (Temp1 == (pDoc->p_DSN+i)->Dsn)
@@ -213,7 +213,7 @@ void PgmCtrl::OnRightSelect(wxTreeEvent& WXUNUSED(event))
         //--------------------------------------------------------------------------------------
         if (Temp1.Contains(_T("ODBC-")))
         {
-            Temp1 = Temp1.Mid(5,wxSTRING_MAXLEN);
+            Temp1 = Temp1.Mid(5);
             for (i=0;i<pDoc->i_DSN;i++)
             {
                 if (Temp1 == (pDoc->p_DSN+i)->Dsn)
diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in
index 7d769f8e97..718f82bd93 100644
--- a/demos/forty/Makefile.in
+++ b/demos/forty/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 FORTY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/demos/forty/game.cpp b/demos/forty/game.cpp
index 088193e839..e95954131e 100644
--- a/demos/forty/game.cpp
+++ b/demos/forty/game.cpp
@@ -824,7 +824,7 @@ Pack::~Pack()
     {
         delete m_cards[m_topCard];
     }
-};
+}
 
 
 //------------------------------------------------------//
diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in
index 9a65149872..83764c3900 100644
--- a/demos/fractal/Makefile.in
+++ b/demos/fractal/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 FRACTAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in
index 2217658402..3fc7639189 100644
--- a/demos/life/Makefile.in
+++ b/demos/life/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 LIFE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in
index ae165fb77d..adac75c87e 100644
--- a/demos/poem/Makefile.in
+++ b/demos/poem/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 WXPOEM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/distrib/scripts/build-environ.cfg b/distrib/scripts/build-environ.cfg
index 0c7eab44ac..6389238e68 100644
--- a/distrib/scripts/build-environ.cfg
+++ b/distrib/scripts/build-environ.cfg
@@ -17,7 +17,7 @@ DOCDIR=${WX_TEMP_DIR}/wxWidgets/docs/
 CURDATE=`date -I`
 
 # build info
-BUILD_VERSION=2.8.2
+BUILD_VERSION=2.8.4
 BUILD_TAG=HEAD
 
 
diff --git a/distrib/scripts/create_archives.sh b/distrib/scripts/create_archives.sh
index 56e9d63f57..83857ca49d 100755
--- a/distrib/scripts/create_archives.sh
+++ b/distrib/scripts/create_archives.sh
@@ -64,11 +64,11 @@ getfilelist(){
   fi
   
   if [ $port = "dfb" ] || [ $port = "all" ]; then
-    filelist="$filelist dfb.rsp" 
+    filelist="$filelist univ.rsp dfb.rsp" 
   fi
   
   if [ $port = "gtk" ] || [ $port = "all" ]; then
-    filelist="$filelist gtk.rsp"
+    filelist="$filelist gtk.rsp gtk1.rsp"
   fi
 
   if [ $port = "motif" ] || [ $port = "all" ]; then
diff --git a/distrib/scripts/manifests/generic.rsp b/distrib/scripts/manifests/generic.rsp
index 318e40cc95..0b14aae5f1 100644
--- a/distrib/scripts/manifests/generic.rsp
+++ b/distrib/scripts/manifests/generic.rsp
@@ -879,6 +879,7 @@ samples/minimal/*.rc
 samples/minimal/*.pro
 samples/minimal/*.bkl
 samples/minimal/*.r
+samples/minimal/Info.plist
 
 samples/minifram/*.h
 samples/minifram/*.cpp
diff --git a/distrib/scripts/manifests/tex2rtf.rsp b/distrib/scripts/manifests/tex2rtf.rsp
index b8efd051e8..5bf038740d 100644
--- a/distrib/scripts/manifests/tex2rtf.rsp
+++ b/distrib/scripts/manifests/tex2rtf.rsp
@@ -4,6 +4,7 @@ utils/tex2rtf/src/*.h
 utils/tex2rtf/src/makefile.bcc
 utils/tex2rtf/src/makefile.b32
 utils/tex2rtf/src/makefile.wat
+utils/tex2rtf/src/makefile.vc
 utils/tex2rtf/src/makefile.unx
 utils/tex2rtf/src/makefile.vms
 utils/tex2rtf/src/makefile.g95
diff --git a/docs/changes.txt b/docs/changes.txt
index 3ccc2e61a8..740b6fa096 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -88,30 +88,127 @@ Major new features in 2.8 release
   wxSearchCtrl, wxAboutBox, wxTreebook, tar streams.
 
 
+2.8.4
+-----
+
+All:
+
+- Fix bug in wxFileConfig when recreating a group (Steven Van Ingelgem)
+- Fix wxStringOutputStream::Write() in Unicode build when the argument
+  overlaps UTF-8 characters boundary
+- Account for lines without newline at the end in wxExecute()
+- Added wxString::char_str() and wchar_str() methods for forward
+  compatiblity with wxWidgets 3
+
+All (Unix):
+
+- Handle socket shutdown by the peer correctly in wxSocket (Tim Kosse)
+
+All (GUI):
+
+- Allow status bar children in XRC (Edmunt Pienkowski)
+- Fix memory leak in wxWizard when not using sizers for the page layout
+
+wxMSW:
+
+- Corrected wxStaticBox label appearance when its foreground colour was set:
+  it didn't respect font size nor background colour then (Juan Antonio Ortega)
+- Don't lose combobox text when it's opened and closed (Kolya Kosenko)
+- Corrected GetChecked() for events from checkable menu items (smanders)
+- Fixed popup menus under Windows NT 4
+- Fixed bug in wxThread::Wait() in console applications introduced in 2.8.3
+- Support right-aligned/centered owner drawn items in wxListCtrl (troelsk)
+- Compilation fixed with WXWIN_COMPATIBILITY_2_6==0
+
+wxGTK:
+
+- Fix infinite loop when adding a wxStaticText control to a toolbar
+- Fix wxNO_BORDER style for wxRadioBox (David Hart)
+- wxComboBox::SetValue() doesn't emit EVT_TEXT anymore
+- Fix wxTextCtrl::GetLineText() for empty lines (Marcin Wojdyr)
+
+wxMac:
+
+- Fix wxComboBox::SetSelection(wxNOT_FOUND) (Adrian Secord)
+
+wxUniv:
+
+- Fix wxTextCtrl::SetSelection(-1, -1) to behave as documented (Anders Larsen)
+- Fix wxComboBox::SetSelection(wxNOT_FOUND)
+- Fix setting background colour for controls with transparent background
+
+2.8.3
+-----
+
+All:
+
+- Shut down the sockets gracefully (Sergio Aguayo)
+- Fix extra indentation in wxHTML_ALIGN_JUSTIFY display (Chacal)
+
+wxMac
+
+- Corrected top border size for wxStaticBox with empty label (nusi).
+- Fixed wxFont, wxPen and wxBrush accessor bugs introduced in 2.8.2.
+
+wxMSW:
+
+- Fixed wxFileName::GetSize() for large files.
+- Fixed wxFont and wxPen accessor bugs introduced in 2.8.2.
+
+wxGTK:
+
+- Fixed handling of accelerators using PageUp/Down keys
+
+
 2.8.2
 -----
 
 All:
 
-- Added wxSizerFlags::Shaped() and FixedMinSize() methods
-- Added wxCSConv::IsOk() (Manuel Martin)
-- Added wxDateTime::GetDateOnly()
-- Made wxTextFile work with unseekable files again (David Hart)
-- Added wxCONFIG_USE_SUBDIR flag to wxFileConfig (Giuseppe Bilotta)
-- Added wxSearchCtrl::[Get|Set]DescriptiveText
+- Added wxSizerFlags::Shaped(), FixedMinSize(), Top() and Bottom() methods.
+- Added wxCSConv::IsOk() (Manuel Martin).
+- Added wxDateTime::GetDateOnly().
+- Made wxTextFile work with unseekable files again (David Hart).
+- Added wxCONFIG_USE_SUBDIR flag to wxFileConfig (Giuseppe Bilotta).
+- Added wxSearchCtrl::[Get|Set]DescriptiveText.
+- Added wxToolBar::SetTool[Normal|Disabled]Bitmap for wxMSW, wxGTK and wxMac.
+- Added wxRICHTEXT_SETSTYLE_REMOVE flag for removing styles, and
+  wxRICHTEXT_HITTEST_OUTSIDE for more accurate hit-testing.
+- Fixed a crash when writing wxRichTextCtrl styles.
+- Fixed tab-related drawing and hit-testing bugs in wxRichTextCtrl.
+- Implemented background colour in wxRichTextCtrl.
+- Fixed crashes in helpview when opening a file.
+- Fixed detection of number of processors under Linux 2.6
+- Fixed Base64 computation in wxHTTP (p_michalczyk)
+- Fix handling of wxSOCKET_REUSEADDR in wxDatagramSocket (troelsk)
+
+Unix Ports:
+
+- Fixed crash in wxGetUserName() in Unicode build
 
 wxMSW
 
-- Fix lack of spin control update event when control lost focus
-- Corrected drawing of bitmaps for disabled menu items
+- Fix lack of spin control update event when control lost focus.
+- Corrected drawing of bitmaps for disabled menu items.
+
+wxGTK
+
+- Fix hang on startup when using GTK+ options in Unicode build
 
 wxMac
 
-- Added support for the wxFRAME_FLOAT_ON_PARENT style
+- Added support for the wxFRAME_FLOAT_ON_PARENT style.
+- Now takes window variants into account when rendering buttons.
+- Fix position of the centered windows (didn't take menu bar size into account)
 
 wxX11:
 
-- Don't crash in wxWindow dtor if the window hadn't been really Create()d
+- Don't crash in wxWindow dtor if the window hadn't been really Create()d.
+- Update wxChoice value when SetSelection() is called.
+
+wxUniv:
+
+- Fixed wxComboBox always sorted.
 
 
 2.8.1
@@ -119,25 +216,25 @@ wxX11:
 
 All:
 
-- Fix compilation with wxUSE_STL=1
-- wxGrid::GetBestSize() returns same size the grid would have after AutoSize()
-- Added wxTreeCtrl::CollapseAll[Children]() and IsEmpty() (Francesco Montorsi)
-- Several RTL-related positioning fixes (Diaa Sami)
-- Fix wxConfig::DeleteGroup() for arguments with trailing slash (David Hart)
-- Fix memory leak in wxGrid::ShowCellEditControl() (Christian Sturmlechner)
+- Fix compilation with wxUSE_STL=1.
+- wxGrid::GetBestSize() returns same size the grid would have after AutoSize().
+- Added wxTreeCtrl::CollapseAll[Children]() and IsEmpty() (Francesco Montorsi).
+- Several RTL-related positioning fixes (Diaa Sami).
+- Fix wxConfig::DeleteGroup() for arguments with trailing slash (David Hart).
+- Fix memory leak in wxGrid::ShowCellEditControl() (Christian Sturmlechner).
 
 wxMSW:
 
-- Fixed compilation with Borland C++ in Unicode mode but without MSLU
-- Show taskbar icon menu on right button release, not press
+- Fixed compilation with Borland C++ in Unicode mode but without MSLU.
+- Show taskbar icon menu on right button release, not press.
 
 wxGTK:
 
-- Don't crash if command line is not valid UTF-8 (Unicode build only)
+- Don't crash if command line is not valid UTF-8 (Unicode build only).
 
 wxUniv:
 
-- It is now possible to set background colour of wxStaticText
+- It is now possible to set background colour of wxStaticText.
 
 
 2.8.0
@@ -145,27 +242,27 @@ wxUniv:
 
 All:
 
-- Added wxSearchCtrl (Vince Harron)
-- wxCSConv("UTF-16/32") now behaves correctly, i.e. same as wxMBConvUTF16/32
+- Added wxSearchCtrl (Vince Harron).
+- wxCSConv("UTF-16/32") now behaves correctly, i.e. same as wxMBConvUTF16/32.
 - wxArrayString::Alloc() now works as reserve() and doesn't clear array contents
 - Fixed long standing bug in wxFileConfig groups renaming (Antti Koivisto).
 - New option wxFS_READ | wxFS_SEEKABLE for wxFileSystem::OpenFile() to return
   a stream that is seekable.
-- Fixed bug in wxCalendarCtrl::HitTest() when clicking on month change arrows
+- Fixed bug in wxCalendarCtrl::HitTest() when clicking on month change arrows.
 - Added wxWindow::GetWindowBorderSize() and corrected wxTreeCtrl::GetBestSize()
-  for a control with borders (Tim Kosse)
+  for a control with borders (Tim Kosse).
 
 wxMSW:
 
 - Fixed version script problems when using configure with cygwin/mingw32.
 - Use system default paper size for printing instead of A4.
-- Fix (harmless) assert in virtual list control under Vista
+- Fix (harmless) assert in virtual list control under Vista.
 - Fix colours when converting wxBitmap with alpha to wxImage (nusi).
 
 wxGTK:
 
-- Allow dynamically changing most of text control styles
-- Enable use of libgnomeprintui by default in configure
+- Allow dynamically changing most of text control styles.
+- Enable use of libgnomeprintui by default in configure.
 
 
 2.7.2
diff --git a/docs/latex/wx/collpane.tex b/docs/latex/wx/collpane.tex
index 8e0702d941..8b8d412c79 100644
--- a/docs/latex/wx/collpane.tex
+++ b/docs/latex/wx/collpane.tex
@@ -107,7 +107,7 @@ all the parameters.
 \param{const wxSize\& }{size = wxDefaultSize},\rtfsp
 \param{long}{ style = wxCP\_DEFAULT\_STYLE},\rtfsp
 \param{const wxValidator\& }{validator = wxDefaultValidator},
-\param{const wxString\& }{name = ``colourpickerctrl"}}
+\param{const wxString\& }{name = ``collapsiblePane"}}
 
 \wxheading{Parameters}
 
diff --git a/docs/latex/wx/dcsvg.tex b/docs/latex/wx/dcsvg.tex
deleted file mode 100644
index fb4ee445e8..0000000000
--- a/docs/latex/wx/dcsvg.tex
+++ /dev/null
@@ -1,736 +0,0 @@
-\documentstyle[a4,makeidx,verbatim,texhelp,fancyhea,mysober,mytitle]{report}%
-%\input{psbox.tex}
-\newcommand{\commandref}[2]{\helpref{{\tt $\backslash$#1}}{#2}}%
-\newcommand{\commandrefn}[2]{\helprefn{{\tt $\backslash$#1}}{#2}\index{#1}}%
-\newcommand{\commandpageref}[2]{\latexignore{\helprefn{{\tt $\backslash$#1}}{#2}}\latexonly{{\tt $\backslash$#1} {\it page \pageref{#2}}}\index{#1}}%
-\newcommand{\indexit}[1]{#1\index{#1}}%
-\newcommand{\inioption}[1]{{\bf {\tt #1}}\index{#1}}%
-\parskip=10pt%
-\parindent=0pt%
-%\backgroundcolour{255;255;255}\textcolour{0;0;0}% Has an effect in HTML only
-\winhelpignore{\title{Manual for wxSVGFileDC}%
-\author{Chris Elliott}%
-\date{June 2002}%
-}%
-\winhelponly{\title{Manual for wxSVGFileDC}%
-\author{by Chris Elliott}%
-}%
-\makeindex%
-\begin{document}%
-\maketitle%
-\pagestyle{fancyplain}%
-\bibliographystyle{plain}%
-\pagenumbering{roman}%
-\setheader{{\it CONTENTS}}{}{}{}{}{{\it CONTENTS}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-\tableofcontents%
-
-\chapter*{Copyright notice}%
-\setheader{{\it COPYRIGHT}}{}{}{}{}{{\it COPYRIGHT}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-\chapter*{wxSVGFileDC}%
-\setheader{{\it wxSVGFileDC}}{}{}{}{}{{\it wxSVGFileDC}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-\section{\class{wxSVGFileDC}}\label{wxSVGFileDC}
-
-A wxSVGFileDC is a {\it device context} onto which graphics and text can be drawn, and the output
-produced as a vector file, in the SVG format (see http://www.w3.org/TR/2001/REC-SVG-20010904/ ).
-This format can be read by a range of programs, including a Netscape plugin (Adobe), full details at 
-http://www.w3.org/Graphics/SVG/SVG-Implementations.htm8 Vector formats may often be smaller 
-than raster formats.
-
-The intention behind wxSVGFileDC is that it can be used to produce a file corresponding 
-to the screen display context, wxSVGFileDC, by passing the wxSVGFileDC as a parameter instead of a wxSVGFileDC. Thus
-the wxSVGFileDC is a write-only class.
-
-As the wxSVGFileDC is a vector format, raster operations like GetPixel are unlikely to be supported.
-However, the SVG specification allows for PNG format raster files to be embedded in the SVG, and so 
-bitmaps, icons and blit operations into the wxSVGFileDC are supported.
-
-A more substantial SVG library (for reading and writing) is available at 
-http://www.xs4all.nl/~kholwerd/wxstuff/canvas/htmldocbook/aap.html
-
-\wxheading{Derived from}
-
-\helpref{wxDCBase}{wxDCBase}
-
-\wxheading{Include files}
-
-<wx/dcsvg.h>
-
-\wxheading{See also}
-
-%\helpref{Overview}{dcoverview}
-
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxSVGFileDC::wxSVGFileDC}
-
-\func{}{wxSVGFileDC}{\param{wxString}{ f}}  \rtfsp
-\func{}{wxSVGFileDC}{\param{wxString}{ f}, \param{int}{ Width},\param{int}{ Height}}  \rtfsp
-\func{}{wxSVGFileDC}{\param{wxString}{ f}, \param{int}{ Width},\param{int}{ Height},\param{float}{ dpi}} \rtfsp
-
-Constructors: 
-a filename {\it f} with default size 340x240 at 72.0 dots per inch (a frequent screen resolution).
-a filename {\it f} with size {\it Width} by {\it Height} at 72.0 dots per inch 
-a filename {\it f} with size {\it Width} by {\it Height} at {\it dpi} resolution.
-
-\membersection{wxSVGFileDC::\destruct{wxSVGFileDC}}
-
-\func{}{\destruct{wxSVGFileDC}}{\void}
-
-Destructor.
-
-\membersection{wxSVGFileDC::BeginDrawing}\label{wxdcbegindrawing}
-
-Does nothing
-
-\membersection{wxSVGFileDC::Blit}\label{wxdcblit}
-
-\func{bool}{Blit}{\param{wxCoord}{ xdest}, \param{wxCoord}{ ydest}, \param{wxCoord}{ width}, \param{wxCoord}{ height},
-  \param{wxSVGFileDC* }{source}, \param{wxCoord}{ xsrc}, \param{wxCoord}{ ysrc}, \param{int}{ logicalFunc = wxCOPY},
-  \param{bool }{useMask = FALSE}, \param{wxCoord}{ xsrcMask = -1}, \param{wxCoord}{ ysrcMask = -1}}
-
-As wxDC: Copy from a source DC to this DC, specifying the destination
-coordinates, size of area to copy, source DC, source coordinates,
-logical function, whether to use a bitmap mask, and mask source position.
-
-\membersection{wxSVGFileDC::CalcBoundingBox}\label{wxdccalcboundingbox}
-
-\func{void}{CalcBoundingBox}{\param{wxCoord }{x}, \param{wxCoord }{y}}
-
-Adds the specified point to the bounding box which can be retrieved with 
-\helpref{MinX}{wxdcminx}, \helpref{MaxX}{wxdcmaxx} and 
-\helpref{MinY}{wxdcminy}, \helpref{MaxY}{wxdcmaxy} functions.
-
-
-\membersection{wxSVGFileDC::Clear}\label{wxdcclear}
-
-\func{void}{Clear}{\void}
-
-This makes no sense in wxSVGFileDC and does nothing
-
-
-\membersection{wxSVGFileDC::CrossHair}\label{wxdccrosshair}
-
-\func{void}{CrossHair}{\param{wxCoord}{ x}, \param{wxCoord}{ y}}
-
-Not Implemented
-
-\membersection{wxSVGFileDC::DestroyClippingRegion}\label{wxdcdestroyclippingregion}
-
-\func{void}{DestroyClippingRegion}{\void}
-
-Not Implemented
-
-\membersection{wxSVGFileDC::DeviceToLogicalX}\label{wxdcdevicetologicalx}
-
-\func{wxCoord}{DeviceToLogicalX}{\param{wxCoord}{ x}}
-
-Convert device X coordinate to logical coordinate, using the current
-mapping mode.
-
-\membersection{wxSVGFileDC::DeviceToLogicalXRel}\label{wxdcdevicetologicalxrel}
-
-\func{wxCoord}{DeviceToLogicalXRel}{\param{wxCoord}{ x}}
-
-Convert device X coordinate to relative logical coordinate, using the current
-mapping mode but ignoring the x axis orientation.
-Use this function for converting a width, for example.
-
-\membersection{wxSVGFileDC::DeviceToLogicalY}\label{wxdcdevicetologicaly}
-
-\func{wxCoord}{DeviceToLogicalY}{\param{wxCoord}{ y}}
-
-Converts device Y coordinate to logical coordinate, using the current
-mapping mode.
-
-\membersection{wxSVGFileDC::DeviceToLogicalYRel}\label{wxdcdevicetologicalyrel}
-
-\func{wxCoord}{DeviceToLogicalYRel}{\param{wxCoord}{ y}}
-
-Convert device Y coordinate to relative logical coordinate, using the current
-mapping mode but ignoring the y axis orientation.
-Use this function for converting a height, for example.
-
-\membersection{wxSVGFileDC::DrawArc}\label{wxdcdrawarc}
-
-\func{void}{DrawArc}{\param{wxCoord}{ x1}, \param{wxCoord}{ y1}, \param{wxCoord}{ x2}, \param{wxCoord}{ y2}, \param{wxCoord}{ xc}, \param{wxCoord}{ yc}}
-
-Draws an arc of a circle, centred on ({\it xc, yc}), with starting point ({\it x1, y1})
-and ending at ({\it x2, y2}).   The current pen is used for the outline
-and the current brush for filling the shape.
-
-The arc is drawn in an anticlockwise direction from the start point to the end point.
-
-\membersection{wxSVGFileDC::DrawBitmap}\label{wxdcdrawbitmap}
-
-\func{void}{DrawBitmap}{\param{const wxBitmap\&}{ bitmap}, \param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{bool}{ transparent}}
-
-Draw a bitmap on the device context at the specified point. If {\it transparent} is true and the bitmap has
-a transparency mask, the bitmap will be drawn transparently.
-
-When drawing a mono-bitmap, the current text foreground colour will be used to draw the foreground
-of the bitmap (all bits set to 1), and the current text background colour to draw the background
-(all bits set to 0). See also \helpref{SetTextForeground}{wxdcsettextforeground}, 
-\helpref{SetTextBackground}{wxdcsettextbackground} and \helpref{wxMemoryDC}{wxmemorydc}.
-
-\membersection{wxSVGFileDC::DrawCheckMark}\label{wxdcdrawcheckmark}
-
-\func{void}{DrawCheckMark}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{wxCoord}{ width}, \param{wxCoord}{ height}}
-
-\func{void}{DrawCheckMark}{\param{const wxRect \&}{rect}}
-
-Draws a check mark inside the given rectangle.
-
-\membersection{wxSVGFileDC::DrawCircle}\label{wxdcdrawcircle}
-
-\func{void}{DrawCircle}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{wxCoord}{ radius}}
-
-\func{void}{DrawCircle}{\param{const wxPoint\&}{ pt}, \param{wxCoord}{ radius}}
-
-Draws a circle with the given centre and radius.
-
-\wxheading{See also}
-
-\helpref{DrawEllipse}{wxdcdrawellipse}
-
-\membersection{wxSVGFileDC::DrawEllipse}\label{wxdcdrawellipse}
-
-\func{void}{DrawEllipse}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{wxCoord}{ width}, \param{wxCoord}{ height}}
-
-\func{void}{DrawEllipse}{\param{const wxPoint\&}{ pt}, \param{const wxSize\&}{ size}}
-
-\func{void}{DrawEllipse}{\param{const wxRect\&}{ rect}}
-
-Draws an ellipse contained in the rectangle specified either with the given top
-left corner and the given size or directly. The current pen is used for the
-outline and the current brush for filling the shape.
-
-\wxheading{See also}
-
-\helpref{DrawCircle}{wxdcdrawcircle}
-
-\membersection{wxSVGFileDC::DrawEllipticArc}\label{wxdcdrawellipticarc}
-
-\func{void}{DrawEllipticArc}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{wxCoord}{ width}, \param{wxCoord}{ height},
- \param{double}{ start}, \param{double}{ end}}
-
-Draws an arc of an ellipse. The current pen is used for drawing the arc and
-the current brush is used for drawing the pie.
-
-{\it x} and {\it y} specify the x and y coordinates of the upper-left corner of the rectangle that contains
-the ellipse.
-
-{\it width} and {\it height} specify the width and height of the rectangle that contains
-the ellipse.
-
-{\it start} and {\it end} specify the start and end of the arc relative to the three-o'clock
-position from the center of the rectangle. Angles are specified
-in degrees (360 is a complete circle). Positive values mean
-counter-clockwise motion. If {\it start} is equal to {\it end}, a
-complete ellipse will be drawn.
-
-\membersection{wxSVGFileDC::DrawIcon}\label{wxdcdrawicon}
-
-\func{void}{DrawIcon}{\param{const wxIcon\&}{ icon}, \param{wxCoord}{ x}, \param{wxCoord}{ y}}
-
-Draw an icon on the display (does nothing if the device context is PostScript).
-This can be the simplest way of drawing bitmaps on a window.
-
-\membersection{wxSVGFileDC::DrawLine}\label{wxdcdrawline}
-
-\func{void}{DrawLine}{\param{wxCoord}{ x1}, \param{wxCoord}{ y1}, \param{wxCoord}{ x2}, \param{wxCoord}{ y2}}
-
-Draws a line from the first point to the second. The current pen is used
-for drawing the line.
-
-\membersection{wxSVGFileDC::DrawLines}\label{wxdcdrawlines}
-
-\func{void}{DrawLines}{\param{int}{ n}, \param{wxPoint}{ points[]}, \param{wxCoord}{ xoffset = 0}, \param{wxCoord}{ yoffset = 0}}
-
-\func{void}{DrawLines}{\param{wxList *}{points}, \param{wxCoord}{ xoffset = 0}, \param{wxCoord}{ yoffset = 0}}
-
-Draws lines using an array of {\it points} of size {\it n}, or list of
-pointers to points, adding the optional offset coordinate. The current
-pen is used for drawing the lines.  The programmer is responsible for
-deleting the list of points.
-
-\membersection{wxSVGFileDC::DrawPolygon}\label{wxdcdrawpolygon}
-
-\func{void}{DrawPolygon}{\param{int}{ n}, \param{wxPoint}{ points[]}, \param{wxCoord}{ xoffset = 0}, \param{wxCoord}{ yoffset = 0},\\
-  \param{int }{fill\_style = wxODDEVEN\_RULE}}
-
-\func{void}{DrawPolygon}{\param{wxList *}{points}, \param{wxCoord}{ xoffset = 0}, \param{wxCoord}{ yoffset = 0},\\
-  \param{int }{fill\_style = wxODDEVEN\_RULE}}
-
-Draws a filled polygon using an array of {\it points} of size {\it n},
-or list of pointers to points, adding the optional offset coordinate.
-
-The last argument specifies the fill rule: {\bf wxODDEVEN\_RULE} (the
-default) or {\bf wxWINDING\_RULE}.
-
-The current pen is used for drawing the outline, and the current brush
-for filling the shape.  Using a transparent brush suppresses filling.
-The programmer is responsible for deleting the list of points.
-
-Note that wxWindows automatically closes the first and last points.
-
-
-\membersection{wxSVGFileDC::DrawPoint}\label{wxdcdrawpoint}
-
-\func{void}{DrawPoint}{\param{wxCoord}{ x}, \param{wxCoord}{ y}}
-
-Draws a point using the current pen.
-
-\membersection{wxSVGFileDC::DrawRectangle}\label{wxdcdrawrectangle}
-
-\func{void}{DrawRectangle}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{wxCoord}{ width}, \param{wxCoord}{ height}}
-
-Draws a rectangle with the given top left corner, and with the given
-size.  The current pen is used for the outline and the current brush
-for filling the shape.
-
-\membersection{wxSVGFileDC::DrawRotatedText}\label{wxdcdrawrotatedtext}
-
-\func{void}{DrawRotatedText}{\param{const wxString\& }{text}, \param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{double}{ angle}}
-
-Draws the text rotated by {\it angle} degrees.
-
-The wxMSW wxDC and wxSVGFileDC rotate the text around slightly different points, depending on the size of the font
-
-\membersection{wxSVGFileDC::DrawRoundedRectangle}\label{wxdcdrawroundedrectangle}
-
-\func{void}{DrawRoundedRectangle}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{wxCoord}{ width}, \param{wxCoord}{ height}, \param{double}{ radius = 20}}
-
-Draws a rectangle with the given top left corner, and with the given
-size.  The corners are quarter-circles using the given radius. The
-current pen is used for the outline and the current brush for filling
-the shape.
-
-If {\it radius} is positive, the value is assumed to be the
-radius of the rounded corner. If {\it radius} is negative,
-the absolute value is assumed to be the {\it proportion} of the smallest
-dimension of the rectangle. This means that the corner can be
-a sensible size relative to the size of the rectangle, and also avoids
-the strange effects X produces when the corners are too big for
-the rectangle.
-
-\membersection{wxSVGFileDC::DrawSpline}\label{wxdcdrawspline}
-
-\func{void}{DrawSpline}{\param{wxList *}{points}}
-
-Draws a spline between all given control points, using the current
-pen.  Doesn't delete the wxList and contents. The spline is drawn
-using a series of lines, using an algorithm taken from the X drawing
-program `XFIG'.
-
-\func{void}{DrawSpline}{\param{wxCoord}{ x1}, \param{wxCoord}{ y1}, \param{wxCoord}{ x2}, \param{wxCoord}{ y2}, \param{wxCoord}{ x3}, \param{wxCoord}{ y3}}
-
-Draws a three-point spline using the current pen.
-
-\membersection{wxSVGFileDC::DrawText}\label{wxdcdrawtext}
-
-\func{void}{DrawText}{\param{const wxString\& }{text}, \param{wxCoord}{ x}, \param{wxCoord}{ y}}
-
-Draws a text string at the specified point, using the current text font,
-and the current text foreground and background colours.
-
-The coordinates refer to the top-left corner of the rectangle bounding
-the string. See \helpref{wxSVGFileDC::GetTextExtent}{wxdcgettextextent} for how
-to get the dimensions of a text string, which can be used to position the
-text more precisely.
-
-
-
-\membersection{wxSVGFileDC::EndDoc}\label{wxdcenddoc}
-
-\func{void}{EndDoc}{\void}
-
-Does nothing
-
-\membersection{wxSVGFileDC::EndDrawing}\label{wxdcenddrawing}
-
-\func{void}{EndDrawing}{\void}
-
-Does nothing
-
-\membersection{wxSVGFileDC::EndPage}\label{wxdcendpage}
-
-\func{void}{EndPage}{\void}
-
-Does nothing
-
-\membersection{wxSVGFileDC::FloodFill}\label{wxdcfloodfill}
-
-\func{void}{FloodFill}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{const wxColour\&}{ colour}, \param{int}{ style=wxFLOOD\_SURFACE}}
-
-Not implemented
-
-\membersection{wxSVGFileDC::GetBackground}\label{wxdcgetbackground}
-
-\func{wxBrush\&}{GetBackground}{\void}
-
-\constfunc{const wxBrush\&}{GetBackground}{\void}
-
-Gets the brush used for painting the background (see \helpref{wxSVGFileDC::SetBackground}{wxdcsetbackground}).
-
-\membersection{wxSVGFileDC::GetBackgroundMode}\label{wxdcgetbackgroundmode}
-
-\constfunc{int}{GetBackgroundMode}{\void}
-
-Returns the current background mode: {\tt wxSOLID} or {\tt wxTRANSPARENT}.
-
-\wxheading{See also}
-
-\helpref{SetBackgroundMode}{wxdcsetbackgroundmode}
-
-\membersection{wxSVGFileDC::GetBrush}\label{wxdcgetbrush}
-
-\func{wxBrush\&}{GetBrush}{\void}
-
-\constfunc{const wxBrush\&}{GetBrush}{\void}
-
-Gets the current brush (see \helpref{wxSVGFileDC::SetBrush}{wxdcsetbrush}).
-
-\membersection{wxSVGFileDC::GetCharHeight}\label{wxdcgetcharheight}
-
-\func{wxCoord}{GetCharHeight}{\void}
-
-Gets the character height of the currently set font.
-
-\membersection{wxSVGFileDC::GetCharWidth}\label{wxdcgetcharwidth}
-
-\func{wxCoord}{GetCharWidth}{\void}
-
-Gets the average character width of the currently set font.
-
-\membersection{wxSVGFileDC::GetClippingBox}\label{wxdcgetclippingbox}
-
-\func{void}{GetClippingBox}{\param{wxCoord}{ *x}, \param{wxCoord}{ *y}, \param{wxCoord}{ *width}, \param{wxCoord}{ *height}}
-
-Not implemented
-
-\membersection{wxSVGFileDC::GetFont}\label{wxdcgetfont}
-
-\func{wxFont\&}{GetFont}{\void}
-
-\constfunc{const wxFont\&}{GetFont}{\void}
-
-Gets the current font (see \helpref{wxSVGFileDC::SetFont}{wxdcsetfont}).
-
-\membersection{wxSVGFileDC::GetLogicalFunction}\label{wxdcgetlogicalfunction}
-
-\func{int}{GetLogicalFunction}{\void}
-
-Gets the current logical function (see \helpref{wxSVGFileDC::SetLogicalFunction}{wxdcsetlogicalfunction}).
-
-\membersection{wxSVGFileDC::GetMapMode}\label{wxdcgetmapmode}
-
-\func{int}{GetMapMode}{\void}
-
-Gets the {\it mapping mode} for the device context (see \helpref{wxSVGFileDC::SetMapMode}{wxdcsetmapmode}).
-
-\membersection{wxSVGFileDC::GetPen}\label{wxdcgetpen}
-
-\func{wxPen\&}{GetPen}{\void}
-
-\constfunc{const wxPen\&}{GetPen}{\void}
-
-Gets the current pen (see \helpref{wxSVGFileDC::SetPen}{wxdcsetpen}).
-
-\membersection{wxSVGFileDC::GetPixel}\label{wxdcgetpixel}
-
-\func{bool}{GetPixel}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{wxColour *}{colour}}
-
-Not implemented
-
-\membersection{wxSVGFileDC::GetSize}\label{wxdcgetsize}
-
-\func{void}{GetSize}{\param{wxCoord *}{width}, \param{wxCoord *}{height}}
-
-
-For a Windows printer device context, this gets the horizontal and vertical
-resolution. 
-
-\membersection{wxSVGFileDC::GetTextBackground}\label{wxdcgettextbackground}
-
-\func{wxColour\&}{GetTextBackground}{\void}
-
-\constfunc{const wxColour\&}{GetTextBackground}{\void}
-
-Gets the current text background colour (see \helpref{wxSVGFileDC::SetTextBackground}{wxdcsettextbackground}).
-
-\membersection{wxSVGFileDC::GetTextExtent}\label{wxdcgettextextent}
-
-\func{void}{GetTextExtent}{\param{const wxString\& }{string}, \param{wxCoord *}{w}, \param{wxCoord *}{h},\\
-  \param{wxCoord *}{descent = NULL}, \param{wxCoord *}{externalLeading = NULL}, \param{wxFont *}{font = NULL}}
-
-Gets the dimensions of the string using the currently selected font.
-\rtfsp{\it string} is the text string to measure, {\it w} and {\it h} are
-the total width and height respectively, {\it descent} is the
-dimension from the baseline of the font to the bottom of the
-descender, and {\it externalLeading} is any extra vertical space added
-to the font by the font designer (usually is zero).
-
-The optional parameter {\it font} specifies an alternative
-to the currently selected font: but note that this does not
-yet work under Windows, so you need to set a font for
-the device context first.
-
-See also \helpref{wxFont}{wxfont}, \helpref{wxSVGFileDC::SetFont}{wxdcsetfont}.
-
-\membersection{wxSVGFileDC::GetTextForeground}\label{wxdcgettextforeground}
-
-\func{wxColour\&}{GetTextForeground}{\void}
-
-\constfunc{const wxColour\&}{GetTextForeground}{\void}
-
-Gets the current text foreground colour (see \helpref{wxSVGFileDC::SetTextForeground}{wxdcsettextforeground}).
-
-
-\membersection{wxSVGFileDC::GetUserScale}\label{wxdcgetuserscale}
-
-\func{void}{GetUserScale}{\param{double}{ *x}, \param{double}{ *y}}
-
-Gets the current user scale factor (set by \helpref{SetUserScale}{wxdcsetuserscale}).
-
-\membersection{wxSVGFileDC::LogicalToDeviceX}\label{wxdclogicaltodevicex}
-
-\func{wxCoord}{LogicalToDeviceX}{\param{wxCoord}{ x}}
-
-Converts logical X coordinate to device coordinate, using the current
-mapping mode.
-
-\membersection{wxSVGFileDC::LogicalToDeviceXRel}\label{wxdclogicaltodevicexrel}
-
-\func{wxCoord}{LogicalToDeviceXRel}{\param{wxCoord}{ x}}
-
-Converts logical X coordinate to relative device coordinate, using the current
-mapping mode but ignoring the x axis orientation.
-Use this for converting a width, for example.
-
-\membersection{wxSVGFileDC::LogicalToDeviceY}\label{wxdclogicaltodevicey}
-
-\func{wxCoord}{LogicalToDeviceY}{\param{wxCoord}{ y}}
-
-Converts logical Y coordinate to device coordinate, using the current
-mapping mode.
-
-\membersection{wxSVGFileDC::LogicalToDeviceYRel}\label{wxdclogicaltodeviceyrel}
-
-\func{wxCoord}{LogicalToDeviceYRel}{\param{wxCoord}{ y}}
-
-Converts logical Y coordinate to relative device coordinate, using the current
-mapping mode but ignoring the y axis orientation.
-Use this for converting a height, for example.
-
-\membersection{wxSVGFileDC::MaxX}\label{wxdcmaxx}
-
-\func{wxCoord}{MaxX}{\void}
-
-Gets the maximum horizontal extent used in drawing commands so far.
-
-\membersection{wxSVGFileDC::MaxY}\label{wxdcmaxy}
-
-\func{wxCoord}{MaxY}{\void}
-
-Gets the maximum vertical extent used in drawing commands so far.
-
-\membersection{wxSVGFileDC::MinX}\label{wxdcminx}
-
-\func{wxCoord}{MinX}{\void}
-
-Gets the minimum horizontal extent used in drawing commands so far.
-
-\membersection{wxSVGFileDC::MinY}\label{wxdcminy}
-
-\func{wxCoord}{MinY}{\void}
-
-Gets the minimum vertical extent used in drawing commands so far.
-
-\membersection{wxSVGFileDC::Ok}\label{wxdcok}
-
-\func{bool}{Ok}{\void}
-
-Returns true if the DC is ok to use; False values arise from being unable to 
-write the file
-
-\membersection{wxSVGFileDC::ResetBoundingBox}\label{wxdcresetboundingbox}
-
-\func{void}{ResetBoundingBox}{\void}
-
-Resets the bounding box: after a call to this function, the bounding box
-doesn't contain anything.
-
-\wxheading{See also}
-
-\helpref{CalcBoundingBox}{wxdccalcboundingbox}
-
-\membersection{wxSVGFileDC::SetAxisOrientation}\label{wxdcsetaxisorientation}
-
-\func{void}{SetAxisOrientation}{\param{bool}{ xLeftRight},
-                                \param{bool}{ yBottomUp}}
-
-Sets the x and y axis orientation (i.e., the direction from lowest to
-highest values on the axis). The default orientation is the natural
-orientation, e.g. x axis from left to right and y axis from bottom up.
-
-\wxheading{Parameters}
-
-\docparam{xLeftRight}{True to set the x axis orientation to the natural
-left to right orientation, false to invert it.}
-
-\docparam{yBottomUp}{True to set the y axis orientation to the natural
-bottom up orientation, false to invert it.}
-
-\membersection{wxSVGFileDC::SetDeviceOrigin}\label{wxdcsetdeviceorigin}
-
-\func{void}{SetDeviceOrigin}{\param{wxCoord}{ x}, \param{wxCoord}{ y}}
-
-Sets the device origin (i.e., the origin in pixels after scaling has been
-applied).
-
-This function may be useful in Windows printing
-operations for placing a graphic on a page.
-
-\membersection{wxSVGFileDC::SetBackground}\label{wxdcsetbackground}
-
-\func{void}{SetBackground}{\param{const wxBrush\& }{brush}}
-
-Sets the current background brush for the DC.
-
-\membersection{wxSVGFileDC::SetBackgroundMode}\label{wxdcsetbackgroundmode}
-
-\func{void}{SetBackgroundMode}{\param{int}{ mode}}
-
-{\it mode} may be one of wxSOLID and wxTRANSPARENT. This setting determines
-whether text will be drawn with a background colour or not.
-
-\membersection{wxSVGFileDC::SetClippingRegion}\label{wxdcsetclippingregion}
-
-\func{void}{SetClippingRegion}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{wxCoord}{ width}, \param{wxCoord}{ height}}
-
-\func{void}{SetClippingRegion}{\param{const wxPoint\& }{pt}, \param{const wxSize\& }{sz}}
-
-\func{void}{SetClippingRegion}{\param{const wxRect\&}{ rect}}
-
-\func{void}{SetClippingRegion}{\param{const wxRegion\&}{ region}}
-
-Not implemented 
-
-
-\membersection{wxSVGFileDC::SetPalette}\label{wxdcsetpalette}
-
-\func{void}{SetPalette}{\param{const wxPalette\& }{palette}}
-
-Not implemented 
-
-\membersection{wxSVGFileDC::SetBrush}\label{wxdcsetbrush}
-
-\func{void}{SetBrush}{\param{const wxBrush\& }{brush}}
-
-Sets the current brush for the DC.
-
-If the argument is wxNullBrush, the current brush is selected out of the device
-context, and the original brush restored, allowing the current brush to
-be destroyed safely.
-
-See also \helpref{wxBrush}{wxbrush}.
-
-See also \helpref{wxMemoryDC}{wxmemorydc} for the interpretation of colours
-when drawing into a monochrome bitmap.
-
-\membersection{wxSVGFileDC::SetFont}\label{wxdcsetfont}
-
-\func{void}{SetFont}{\param{const wxFont\& }{font}}
-
-Sets the current font for the DC. It must be a valid font, in particular you
-should not pass {\tt wxNullFont} to this method.
-
-See also \helpref{wxFont}{wxfont}.
-
-\membersection{wxSVGFileDC::SetLogicalFunction}\label{wxdcsetlogicalfunction}
-
-\func{void}{SetLogicalFunction}{\param{int}{ function}}
-
-
-Only wxCOPY is avalaible; trying to set one of the othe values will fail
-
-\membersection{wxSVGFileDC::SetMapMode}\label{wxdcsetmapmode}
-
-\func{void}{SetMapMode}{\param{int}{ int}}
-
-The {\it mapping mode} of the device context defines the unit of
-measurement used to convert logical units to device units. Note that
-in X, text drawing isn't handled consistently with the mapping mode; a
-font is always specified in point size. However, setting the {\it
-user scale} (see \helpref{wxSVGFileDC::SetUserScale}{wxdcsetuserscale}) scales the text appropriately. In
-Windows, scaleable TrueType fonts are always used; in X, results depend
-on availability of fonts, but usually a reasonable match is found.
-
-Note that the coordinate origin should ideally be selectable, but for
-now is always at the top left of the screen/printer.
-
-Drawing to a Windows printer device context under UNIX
-uses the current mapping mode, but mapping mode is currently ignored for
-PostScript output.
-
-The mapping mode can be one of the following:
-
-\begin{twocollist}\itemsep=0pt
-\twocolitem{wxMM\_TWIPS}{Each logical unit is 1/20 of a point, or 1/1440 of
-  an inch.}
-\twocolitem{wxMM\_POINTS}{Each logical unit is a point, or 1/72 of an inch.}
-\twocolitem{wxMM\_METRIC}{Each logical unit is 1 mm.}
-\twocolitem{wxMM\_LOMETRIC}{Each logical unit is 1/10 of a mm.}
-\twocolitem{wxMM\_TEXT}{Each logical unit is 1 pixel.}
-\end{twocollist}
-
-\membersection{wxSVGFileDC::SetPen}\label{wxdcsetpen}
-
-\func{void}{SetPen}{\param{const wxPen\& }{pen}}
-
-Sets the current pen for the DC.
-
-If the argument is wxNullPen, the current pen is selected out of the device
-context, and the original pen restored.
-
-See also \helpref{wxMemoryDC}{wxmemorydc} for the interpretation of colours
-when drawing into a monochrome bitmap.
-
-\membersection{wxSVGFileDC::SetTextBackground}\label{wxdcsettextbackground}
-
-\func{void}{SetTextBackground}{\param{const wxColour\& }{colour}}
-
-Sets the current text background colour for the DC.
-
-\membersection{wxSVGFileDC::SetTextForeground}\label{wxdcsettextforeground}
-
-\func{void}{SetTextForeground}{\param{const wxColour\& }{colour}}
-
-Sets the current text foreground colour for the DC.
-
-See also \helpref{wxMemoryDC}{wxmemorydc} for the interpretation of colours
-when drawing into a monochrome bitmap.
-
-\membersection{wxSVGFileDC::SetUserScale}\label{wxdcsetuserscale}
-
-\func{void}{SetUserScale}{\param{double}{ xScale}, \param{double}{ yScale}}
-
-Sets the user scaling factor, useful for applications which require
-`zooming'.
-
-\membersection{wxSVGFileDC::StartDoc}\label{wxdcstartdoc}
-
-\func{bool}{StartDoc}{\param{const wxString\& }{message}}
-
-Does nothing
-
-\membersection{wxSVGFileDC::StartPage}\label{wxdcstartpage}
-
-\func{bool}{StartPage}{\void}
-
-Does nothing
diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex
index 3f35029b21..6f4054c80d 100644
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -352,7 +352,7 @@ Same as \helpref{wxCHECK\_VERSION}{wxcheckversion} but also checks that
 
 \membersection{wxCHECK\_W32API\_VERSION}\label{wxcheckw32apiversion}
 
-\func{bool}{wxCHECK\_GCC\_VERSION}{\param{}{major, minor, release}}
+\func{bool}{wxCHECK\_W32API\_VERSION}{\param{}{major, minor, release}}
 
 Returns $1$ if the version of w32api headers used is major.minor.release or
 greater. Otherwise, and also if we are not compiling with mingw32/cygwin under
diff --git a/docs/latex/wx/grid.tex b/docs/latex/wx/grid.tex
index 0fdfd59eb6..22d35e8019 100644
--- a/docs/latex/wx/grid.tex
+++ b/docs/latex/wx/grid.tex
@@ -183,14 +183,6 @@ The memory requirements for this could become prohibitive if your grid is very l
 
 
 
-\membersection{wxGrid::AutoSizeColOrRow}\label{wxgridautosizecolorrow}
-
-\func{void}{AutoSizeColOrRow}{\param{int }{n}, \param{bool }{setAsMin}, \param{bool }{column}}
-
-Common part of AutoSizeColumn/Row() or row?
-
-
-
 \membersection{wxGrid::AutoSizeColumn}\label{wxgridautosizecolumn}
 
 \func{void}{AutoSizeColumn}{\param{int }{col}, \param{bool }{setAsMin = true}}
diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex
index 231b656cf0..ba67e168a6 100644
--- a/docs/latex/wx/manual.tex
+++ b/docs/latex/wx/manual.tex
@@ -26,13 +26,13 @@
 %\special{!/@scaleunit 1 def}
 \parskip=10pt
 \parindent=0pt
-\title{wxWidgets 2.8.1: A portable C++ and Python GUI toolkit}
+\title{wxWidgets 2.8.4: A portable C++ and Python GUI toolkit}
 \winhelponly{\author{by Julian Smart et al
 %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
 }}
 \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin,
 Robin Dunn, et al}
-\date{January, 2007}
+\date{March, 2007}
 }
 \makeindex
 \begin{document}
diff --git a/docs/latex/wx/mediactrl.tex b/docs/latex/wx/mediactrl.tex
index ada105aba2..2d903ddf16 100644
--- a/docs/latex/wx/mediactrl.tex
+++ b/docs/latex/wx/mediactrl.tex
@@ -11,7 +11,7 @@
 
 \section{\class{wxMediaCtrl}}\label{wxmediactrl}
 
-wxMediaCtrl is a class that allows a way to convieniently display types of 
+wxMediaCtrl is a class for displaying types of 
 media, such as videos, audio files, natively through native codecs.
 
 wxMediaCtrl uses native backends to render media, for example on Windows
diff --git a/docs/latex/wx/mediaevt.tex b/docs/latex/wx/mediaevt.tex
index 0e0712c7e4..b3b9fe9fe4 100644
--- a/docs/latex/wx/mediaevt.tex
+++ b/docs/latex/wx/mediaevt.tex
@@ -25,24 +25,24 @@ Event \helpref{wxMediaCtrl}{wxmediactrl} uses.
 
 \twocolwidtha{7cm}
 \begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf EVT\_MEDIA\_LOADED(func)}}{
+\twocolitem{{\bf EVT\_MEDIA\_LOADED(id, func)}}{
 Sent when a media has loaded enough data that it can start playing.}
-\twocolitem{{\bf EVT\_MEDIA\_STOP(func)}}{
+\twocolitem{{\bf EVT\_MEDIA\_STOP(id, func)}}{
 Send when a media has switched to the wxMEDIASTATE\_STOPPED state.
 You may be able to Veto this event to prevent it from stopping,
 causing it to continue playing - even if it has reached that end of the media
 (note that this may not have the desired effect - if you want to loop the
 media, for example, catch the EVT\_MEDIA\_FINISHED and play there instead). }
-\twocolitem{{\bf EVT\_MEDIA\_FINISHED(func)}}{
+\twocolitem{{\bf EVT\_MEDIA\_FINISHED(id, func)}}{
 Sent when a media has finished playing in a \helpref{wxMediaCtrl}{wxmediactrl}.
 }
-\twocolitem{{\bf EVT\_MEDIA\_STATECHANGED(func)}}{
+\twocolitem{{\bf EVT\_MEDIA\_STATECHANGED(id, func)}}{
 Send when a media has switched its state (from any media state).
 }
-\twocolitem{{\bf EVT\_MEDIA\_PLAY(func)}}{
+\twocolitem{{\bf EVT\_MEDIA\_PLAY(id, func)}}{
 Send when a media has switched to the wxMEDIASTATE\_PLAYING state.
 }
-\twocolitem{{\bf EVT\_MEDIA\_PAUSE(func)}}{
+\twocolitem{{\bf EVT\_MEDIA\_PAUSE(id, func)}}{
 Send when a media has switched to the wxMEDIASTATE\_PAUSED state.
 }
 \end{twocollist}
diff --git a/docs/latex/wx/regkey.tex b/docs/latex/wx/regkey.tex
index ac862814c8..f5853a10a3 100644
--- a/docs/latex/wx/regkey.tex
+++ b/docs/latex/wx/regkey.tex
@@ -144,7 +144,7 @@ Gets the name of the registry key.
 
 \membersection{wxRegKey::GetFirstKey}\label{wxregkeygetfirstkey}
 
-\func{bool}{GetKeyValue}{\param{wxString\&}{ strKeyName}, \param{long\&}{ lIndex}}
+\func{bool}{GetFirstKey}{\param{wxString\&}{ strKeyName}, \param{long\&}{ lIndex}}
 
 Gets the first key.
 
diff --git a/docs/latex/wx/richtextbuffer.tex b/docs/latex/wx/richtextbuffer.tex
index 7fae2b6e3a..fac7924d32 100644
--- a/docs/latex/wx/richtextbuffer.tex
+++ b/docs/latex/wx/richtextbuffer.tex
@@ -606,6 +606,8 @@ The function returns one of the following values:
 #define wxRICHTEXT_HITTEST_AFTER    0x04
 // The point was on the position returned from HitTest
 #define wxRICHTEXT_HITTEST_ON       0x08
+// The point was on space outside content
+#define wxRICHTEXT_HITTEST_OUTSIDE  0x10
 \end{verbatim}
 }
 
@@ -812,6 +814,7 @@ and not the content. This allows content styling to be preserved independently f
 \item wxRICHTEXT\_SETSTYLE\_CHARACTERS\_ONLY: specifies that the style should only be applied to characters,
 and not the paragraph. This allows content styling to be preserved independently from that of e.g. a named paragraph style.
 \item wxRICHTEXT\_SETSTYLE\_RESET: resets (clears) the existing style before applying the new style.
+\item wxRICHTEXT\_SETSTYLE\_REMOVE: removes the specified style. Only the style flags are used in this operation.
 \end{itemize}
 
 \membersection{wxRichTextBuffer::SetStyleSheet}\label{wxrichtextbuffersetstylesheet}
diff --git a/docs/latex/wx/richtextctrl.tex b/docs/latex/wx/richtextctrl.tex
index deb1f91fba..58ebfb411c 100644
--- a/docs/latex/wx/richtextctrl.tex
+++ b/docs/latex/wx/richtextctrl.tex
@@ -1407,6 +1407,7 @@ and not the content. This allows content styling to be preserved independently f
 \item wxRICHTEXT\_SETSTYLE\_CHARACTERS\_ONLY: specifies that the style should only be applied to characters,
 and not the paragraph. This allows content styling to be preserved independently from that of e.g. a named paragraph style.
 \item wxRICHTEXT\_SETSTYLE\_RESET: resets (clears) the existing style before applying the new style.
+\item wxRICHTEXT\_SETSTYLE\_REMOVE: removes the specified style. Only the style flags are used in this operation.
 \end{itemize}
 
 \membersection{wxRichTextCtrl::SetStyleSheet}\label{wxrichtextctrlsetstylesheet}
diff --git a/docs/latex/wx/thread.tex b/docs/latex/wx/thread.tex
index 7a8c8ee32c..ad1cb401fd 100644
--- a/docs/latex/wx/thread.tex
+++ b/docs/latex/wx/thread.tex
@@ -461,10 +461,11 @@ See also \helpref{Sleep()}{wxthreadsleep}.
 
 \constfunc{ExitCode}{Wait}{\void}
 
-Gracefully terminates a joinable thread, either when the thread calls 
-\helpref{TestDestroy}{wxthreadtestdestroy} or finished processing, and 
-returns the value the thread returned from 
-\helpref{wxThread::Entry}{wxthreadentry} or {\tt (ExitCode)-1} on error. 
+Waits for a joinable thread to terminate and returns the value the thread
+returned from \helpref{wxThread::Entry}{wxthreadentry} or {\tt (ExitCode)-1} on
+error. Notice that, unlike \helpref{Delete}{wxthreaddelete} doesn't cancel the
+thread in any way so the caller waits for as long as it takes to the thread to
+exit.
 
 You can only Wait() for joinable (not detached) threads.
 
diff --git a/docs/latex/wx/toolbar.tex b/docs/latex/wx/toolbar.tex
index 122767fb79..400dd86252 100644
--- a/docs/latex/wx/toolbar.tex
+++ b/docs/latex/wx/toolbar.tex
@@ -761,6 +761,17 @@ and not the eventual size of the tool button.
 Sets the client data associated with the tool.
 
 
+\membersection{wxToolBar::SetToolDisabledBitmap}\label{wxtoolbarsettooldisabledbitmap}
+
+\func{void}{SetToolDisabledBitmap}{\param{int }{id}, \param{const wxBitmap\& }{bitmap}}
+
+Sets the bitmap to be used by the tool with the given ID when the tool
+is in a disabled state.  This can only be used on Button tools, not
+controls.  NOTE: The native toolbar classes on the main platforms all
+synthesize the disabled bitmap from the normal bitmap, so this
+function will have no effect on those platforms.
+
+
 \membersection{wxToolBar::SetToolLongHelp}\label{wxtoolbarsettoollonghelp}
 
 \func{void}{SetToolLongHelp}{\param{int }{toolId}, \param{const wxString\& }{helpString}}
@@ -824,6 +835,15 @@ An application might use short help for identifying the tool purpose in a toolti
 \helpref{wxToolBar::GetToolShortHelp}{wxtoolbargettoolshorthelp}, \helpref{wxToolBar::SetToolLongHelp}{wxtoolbarsettoollonghelp}
 
 
+\membersection{wxToolBar::SetToolNormalBitmap}\label{wxtoolbarsettoolnormalbitmap}
+
+\func{void}{SetToolNormalBitmap}{\param{int }{id}, \param{const wxBitmap\& }{bitmap}}
+
+Sets the bitmap to be used by the tool with the given ID.  This can
+only be used on Button tools, not controls.
+
+
+
 \membersection{wxToolBar::SetToolSeparation}\label{wxtoolbarsettoolseparation}
 
 \func{void}{SetToolSeparation}{\param{int}{ separation}}
diff --git a/docs/latex/wx/toolbook.tex b/docs/latex/wx/toolbook.tex
index 4621496d18..4a54470c06 100644
--- a/docs/latex/wx/toolbook.tex
+++ b/docs/latex/wx/toolbook.tex
@@ -38,7 +38,7 @@ wxBookCtrlBase\\
 \twocolwidtha{5cm}
 \begin{twocollist}\itemsep=0pt
 
-\twocolitem{\windowstyle{wxLB\_DEFAULT}}{Choose the default location for the
+\twocolitem{\windowstyle{wxBK\_DEFAULT}}{Choose the default location for the
 labels depending on the current platform (currently always the top).}
 \end{twocollist}
 
diff --git a/docs/latex/wx/wxstring.tex b/docs/latex/wx/wxstring.tex
index ff14f5ff40..b8c3091f56 100644
--- a/docs/latex/wx/wxstring.tex
+++ b/docs/latex/wx/wxstring.tex
@@ -573,11 +573,35 @@ Returns the empty string if {\it ch} is not found.
 Returns a pointer to the string data ({\tt const char*} in ANSI build,
 {\tt const wchar\_t*} in Unicode build).
 
+Note that the returned value will not be convertible to {\tt char*} or
+{\tt wchar\_t*} in wxWidgets 3, consider using
+\helpref{char\_str}{wxstringcharstr} or
+\helpref{wchar\_string}{wxstringwcharstr} if you need to pass string value
+to a function expecting non-const pointer.
+
 \wxheading{See also}
 
 \helpref{mb\_str}{wxstringmbstr}, \helpref{wc\_str}{wxstringwcstr},
-\helpref{fn\_str}{wxstringfnstr}
+\helpref{fn\_str}{wxstringfnstr}, \helpref{char\_str}{wxstringcharstr},
+\helpref{wchar\_string}{wxstringwcharstr}
 
+\membersection{wxString::char\_str}\label{wxstringcharstr}
+
+\constfunc{wxWritableCharBuffer}{char\_str}{\param{wxMBConv\&}{ conv = wxConvLibc}}
+
+Returns an object with string data that is implicitly convertible to
+{\tt char*} pointer. Note that any change to the returned buffer is lost and so
+this function is only usable for passing strings to legacy libraries that
+don't have const-correct API. Use \helpref{wxStringBuffer}{wxstringbuffer} if
+you want to modify the string.
+
+\newsince{2.8.4}
+
+\wxheading{See also}
+
+\helpref{mb\_str}{wxstringmbstr}, \helpref{wc\_str}{wxstringwcstr},
+\helpref{fn\_str}{wxstringfnstr}, \helpref{c\_str}{wxstringcstr},
+\helpref{wchar\_str}{wxstringwcharstr}
 
 \membersection{wxString::Clear}\label{wxstringclear}
 
@@ -937,7 +961,7 @@ The macro wxWX2MBbuf is defined as the correct return type (without const).
 
 \helpref{wxMBConv}{wxmbconv},
 \helpref{c\_str}{wxstringcstr}, \helpref{wc\_str}{wxstringwcstr},
-\helpref{fn\_str}{wxstringfnstr}
+\helpref{fn\_str}{wxstringfnstr}, \helpref{char\_str}{wxstringcharstr}
 
 
 \membersection{wxString::Mid}\label{wxstringmid}
@@ -1264,7 +1288,25 @@ The macro wxWX2WCbuf is defined as the correct return type (without const).
 
 \helpref{wxMBConv}{wxmbconv},
 \helpref{c\_str}{wxstringcstr}, \helpref{mb\_str}{wxstringwcstr},
-\helpref{fn\_str}{wxstringfnstr}
+\helpref{fn\_str}{wxstringfnstr}, \helpref{wchar\_str}{wxstringwcharstr}
+
+\membersection{wxString::wchar\_str}\label{wxstringwcharstr}
+
+\constfunc{wxWritableWCharBuffer}{wchar\_str}{\void}
+
+Returns an object with string data that is implicitly convertible to
+{\tt char*} pointer. Note that any change to the returned buffer is lost and so
+this function is only usable for passing strings to legacy libraries that
+don't have const-correct API. Use \helpref{wxStringBuffer}{wxstringbuffer} if
+you want to modify the string.
+
+\newsince{2.8.4}
+
+\wxheading{See also}
+
+\helpref{mb\_str}{wxstringmbstr}, \helpref{wc\_str}{wxstringwcstr},
+\helpref{fn\_str}{wxstringfnstr}, \helpref{c\_str}{wxstringcstr},
+\helpref{char\_str}{wxstringcharstr}
 
 
 \membersection{wxString::operator!}\label{wxstringoperatornot}
diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index 8f44b8f0d9..fd90d6af41 100644
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -766,9 +766,9 @@ VENDOR=<your company name>
   distribute wxWidgets DLLs with your application. Default value is 'custom'.
   This string is included as part of DLL name. wxWidgets DLLs contain compiler
   name, version information and vendor name in them. For example
-  wxmsw280_core_bcc_custom.dll is one of DLLs build using Borland C++ with
+  wxmsw283_core_bcc_custom.dll is one of DLLs build using Borland C++ with
   default settings. If you set VENDOR=mycorp, the name will change to
-  wxmsw280_core_bcc_mycorp.dll.
+  wxmsw283_core_bcc_mycorp.dll.
 
 CFG=<configuration name>
   Sets configuration name so that you can have multiple wxWidgets builds with
diff --git a/docs/readme.txt b/docs/readme.txt
index 873ae53805..8b098c3bed 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,4 +1,4 @@
-wxWidgets 2.8.1
+wxWidgets 2.8.4 
 ---------------------------------------------------------
 
 Welcome to wxWidgets, a sophisticated cross-platform C++
@@ -153,5 +153,5 @@ web site.
 
 Have fun!
 
-The wxWidgets Team, January 2007
+The wxWidgets Team, March 2007
 
diff --git a/docs/tech/tn0011.txt b/docs/tech/tn0011.txt
index e22b2b80c7..14c1331c8c 100644
--- a/docs/tech/tn0011.txt
+++ b/docs/tech/tn0011.txt
@@ -10,12 +10,13 @@
        {wx}/configure.in
        {wx}/*.spec
        {wx}/include/wx/version.h
-       {wx}/include/msvc/wx/setup.h
-       {wx}/src/wxvc_dll.dsp
+       {wx}/include/msvc/wx/setup.h  {major release only}
        {wx}/docs/latex/wx/manual.tex
-       {wx}/docs/changes.txt
-       {wx}/docs/gtk/changes.txt
-       {wx}/build/bakefiles/wxpresets/presets/wx_win32.bkl
+       {wx}/docs/msw/install.txt
+       {wx}/docs/changes.txt    
+       {wx}/docs/readme.txt       
+       {wx}/build/bakefiles/wxpresets/presets/wx_win32.bkl {major release only}
+       {wx}/build/bakefiles/version.bkl {C:R:A}
        {wx}/build/script/win_docs.bat {windows doc and setup file}
        {wx}/distrib/scripts/build-environ.cfg {cvs tar and zip files}
 
@@ -34,6 +35,15 @@
 Version: $Id$
 
 $Log$
+Revision 1.10.2.3  2007/03/15 14:55:02  CE
+add readme.txt to files to change
+
+Revision 1.10.2.2  2007/03/15 09:54:04  CE
+update to 2.8.3 (configure and version.bkl to follow)
+
+Revision 1.10.2.1  2007/02/12 10:54:52  CE
+add docs/msw/install.txt
+
 Revision 1.10  2007/01/07 22:28:07  VZ
 also update manual.tex
 
diff --git a/include/wx/anidecod.h b/include/wx/anidecod.h
index bc048d3c85..ee5e719c2d 100644
--- a/include/wx/anidecod.h
+++ b/include/wx/anidecod.h
@@ -17,6 +17,7 @@
 #include "wx/stream.h"
 #include "wx/image.h"
 #include "wx/animdecod.h"
+#include "wx/dynarray.h"
 
 
 class /*WXDLLEXPORT*/ wxANIFrameInfo;
diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h
index ac4af06e70..5e94dffd64 100644
--- a/include/wx/aui/tabmdi.h
+++ b/include/wx/aui/tabmdi.h
@@ -63,7 +63,7 @@ public:
     wxAuiNotebook* GetNotebook() const;
     
 #if wxUSE_MENUS
-    wxMenu* GetWindowMenu() const { return m_pWindowMenu; };
+    wxMenu* GetWindowMenu() const { return m_pWindowMenu; }
     void SetWindowMenu(wxMenu* pMenu);
 
     virtual void SetMenuBar(wxMenuBar *pMenuBar);
diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 2c4d1d7767..66fa0c6d93 100644
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -39,11 +39,11 @@ public:
     void SetBitmapLabel(const wxBitmap& bitmap)
         { m_bmpNormal = bitmap; OnSetBitmap(); }
     void SetBitmapSelected(const wxBitmap& sel)
-        { m_bmpSelected = sel; OnSetBitmap(); };
+        { m_bmpSelected = sel; OnSetBitmap(); }
     void SetBitmapFocus(const wxBitmap& focus)
-        { m_bmpFocus = focus; OnSetBitmap(); };
+        { m_bmpFocus = focus; OnSetBitmap(); }
     void SetBitmapDisabled(const wxBitmap& disabled)
-        { m_bmpDisabled = disabled; OnSetBitmap(); };
+        { m_bmpDisabled = disabled; OnSetBitmap(); }
     void SetBitmapHover(const wxBitmap& hover)
         { m_bmpHover = hover; OnSetBitmap(); }
 
diff --git a/include/wx/buffer.h b/include/wx/buffer.h
index f17aa0c1ab..51c837336f 100644
--- a/include/wx/buffer.h
+++ b/include/wx/buffer.h
@@ -111,15 +111,29 @@ private:                                                                    \
     chartype *m_str;                                                        \
 }
 
+// needed for wxString::char_str() and wchar_str()
+#define DEFINE_WRITABLE_BUFFER(classname, baseclass, chartype)              \
+class WXDLLIMPEXP_BASE classname : public baseclass                         \
+{                                                                           \
+public:                                                                     \
+    classname(const baseclass& src) : baseclass(src) {}                     \
+    classname(const chartype *str = NULL) : baseclass(str) {}               \
+                                                                            \
+    operator chartype*() { return this->data(); }                           \
+}
+
 DEFINE_BUFFER(wxCharBuffer, char, wxStrdupA);
+DEFINE_WRITABLE_BUFFER(wxWritableCharBuffer, wxCharBuffer, char);
 
 #if wxUSE_WCHAR_T
 
 DEFINE_BUFFER(wxWCharBuffer, wchar_t, wxStrdupW);
+DEFINE_WRITABLE_BUFFER(wxWritableWCharBuffer, wxWCharBuffer, wchar_t);
 
 #endif // wxUSE_WCHAR_T
 
 #undef DEFINE_BUFFER
+#undef DEFINE_WRITABLE_BUFFER
 
 #if wxUSE_UNICODE
     typedef wxWCharBuffer wxWxCharBuffer;
diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 8127d23d07..46cc92d5a7 100644
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -292,39 +292,39 @@ public:
     wxPrintDialogData(const wxPrintData& printData);
     virtual ~wxPrintDialogData();
 
-    int GetFromPage() const { return m_printFromPage; };
-    int GetToPage() const { return m_printToPage; };
-    int GetMinPage() const { return m_printMinPage; };
-    int GetMaxPage() const { return m_printMaxPage; };
-    int GetNoCopies() const { return m_printNoCopies; };
-    bool GetAllPages() const { return m_printAllPages; };
-    bool GetSelection() const { return m_printSelection; };
-    bool GetCollate() const { return m_printCollate; };
-    bool GetPrintToFile() const { return m_printToFile; };
+    int GetFromPage() const { return m_printFromPage; }
+    int GetToPage() const { return m_printToPage; }
+    int GetMinPage() const { return m_printMinPage; }
+    int GetMaxPage() const { return m_printMaxPage; }
+    int GetNoCopies() const { return m_printNoCopies; }
+    bool GetAllPages() const { return m_printAllPages; }
+    bool GetSelection() const { return m_printSelection; }
+    bool GetCollate() const { return m_printCollate; }
+    bool GetPrintToFile() const { return m_printToFile; }
 #if WXWIN_COMPATIBILITY_2_4
-    bool GetSetupDialog() const { return m_printSetupDialog; };
+    bool GetSetupDialog() const { return m_printSetupDialog; }
 #endif
-    void SetFromPage(int v) { m_printFromPage = v; };
-    void SetToPage(int v) { m_printToPage = v; };
-    void SetMinPage(int v) { m_printMinPage = v; };
-    void SetMaxPage(int v) { m_printMaxPage = v; };
-    void SetNoCopies(int v) { m_printNoCopies = v; };
-    void SetAllPages(bool flag) { m_printAllPages = flag; };
-    void SetSelection(bool flag) { m_printSelection = flag; };
-    void SetCollate(bool flag) { m_printCollate = flag; };
-    void SetPrintToFile(bool flag) { m_printToFile = flag; };
+    void SetFromPage(int v) { m_printFromPage = v; }
+    void SetToPage(int v) { m_printToPage = v; }
+    void SetMinPage(int v) { m_printMinPage = v; }
+    void SetMaxPage(int v) { m_printMaxPage = v; }
+    void SetNoCopies(int v) { m_printNoCopies = v; }
+    void SetAllPages(bool flag) { m_printAllPages = flag; }
+    void SetSelection(bool flag) { m_printSelection = flag; }
+    void SetCollate(bool flag) { m_printCollate = flag; }
+    void SetPrintToFile(bool flag) { m_printToFile = flag; }
 #if WXWIN_COMPATIBILITY_2_4
-    void SetSetupDialog(bool flag) { m_printSetupDialog = flag; };
+    void SetSetupDialog(bool flag) { m_printSetupDialog = flag; }
 #endif
-    void EnablePrintToFile(bool flag) { m_printEnablePrintToFile = flag; };
-    void EnableSelection(bool flag) { m_printEnableSelection = flag; };
-    void EnablePageNumbers(bool flag) { m_printEnablePageNumbers = flag; };
-    void EnableHelp(bool flag) { m_printEnableHelp = flag; };
+    void EnablePrintToFile(bool flag) { m_printEnablePrintToFile = flag; }
+    void EnableSelection(bool flag) { m_printEnableSelection = flag; }
+    void EnablePageNumbers(bool flag) { m_printEnablePageNumbers = flag; }
+    void EnableHelp(bool flag) { m_printEnableHelp = flag; }
 
-    bool GetEnablePrintToFile() const { return m_printEnablePrintToFile; };
-    bool GetEnableSelection() const { return m_printEnableSelection; };
-    bool GetEnablePageNumbers() const { return m_printEnablePageNumbers; };
-    bool GetEnableHelp() const { return m_printEnableHelp; };
+    bool GetEnablePrintToFile() const { return m_printEnablePrintToFile; }
+    bool GetEnableSelection() const { return m_printEnableSelection; }
+    bool GetEnablePageNumbers() const { return m_printEnablePageNumbers; }
+    bool GetEnableHelp() const { return m_printEnableHelp; }
 
     // Is this data OK for showing the print dialog?
     bool Ok() const { return IsOk(); }
@@ -374,20 +374,20 @@ public:
     wxPageSetupDialogData(const wxPrintData& printData);
     virtual ~wxPageSetupDialogData();
 
-    wxSize GetPaperSize() const { return m_paperSize; };
-    wxPaperSize GetPaperId() const { return m_printData.GetPaperId(); };
-    wxPoint GetMinMarginTopLeft() const { return m_minMarginTopLeft; };
-    wxPoint GetMinMarginBottomRight() const { return m_minMarginBottomRight; };
-    wxPoint GetMarginTopLeft() const { return m_marginTopLeft; };
-    wxPoint GetMarginBottomRight() const { return m_marginBottomRight; };
+    wxSize GetPaperSize() const { return m_paperSize; }
+    wxPaperSize GetPaperId() const { return m_printData.GetPaperId(); }
+    wxPoint GetMinMarginTopLeft() const { return m_minMarginTopLeft; }
+    wxPoint GetMinMarginBottomRight() const { return m_minMarginBottomRight; }
+    wxPoint GetMarginTopLeft() const { return m_marginTopLeft; }
+    wxPoint GetMarginBottomRight() const { return m_marginBottomRight; }
 
-    bool GetDefaultMinMargins() const { return m_defaultMinMargins; };
-    bool GetEnableMargins() const { return m_enableMargins; };
-    bool GetEnableOrientation() const { return m_enableOrientation; };
-    bool GetEnablePaper() const { return m_enablePaper; };
-    bool GetEnablePrinter() const { return m_enablePrinter; };
-    bool GetDefaultInfo() const { return m_getDefaultInfo; };
-    bool GetEnableHelp() const { return m_enableHelp; };
+    bool GetDefaultMinMargins() const { return m_defaultMinMargins; }
+    bool GetEnableMargins() const { return m_enableMargins; }
+    bool GetEnableOrientation() const { return m_enableOrientation; }
+    bool GetEnablePaper() const { return m_enablePaper; }
+    bool GetEnablePrinter() const { return m_enablePrinter; }
+    bool GetDefaultInfo() const { return m_getDefaultInfo; }
+    bool GetEnableHelp() const { return m_enableHelp; }
 
     // Is this data OK for showing the page setup dialog?
     bool Ok() const { return IsOk(); }
@@ -397,23 +397,23 @@ public:
     // paper size id member as well.
     void SetPaperSize(const wxSize& sz);
 
-    void SetPaperId(wxPaperSize id) { m_printData.SetPaperId(id); };
+    void SetPaperId(wxPaperSize id) { m_printData.SetPaperId(id); }
 
     // Sets the wxPrintData id, plus the paper width/height if found in the paper database.
     void SetPaperSize(wxPaperSize id);
 
-    void SetMinMarginTopLeft(const wxPoint& pt) { m_minMarginTopLeft = pt; };
-    void SetMinMarginBottomRight(const wxPoint& pt) { m_minMarginBottomRight = pt; };
-    void SetMarginTopLeft(const wxPoint& pt) { m_marginTopLeft = pt; };
-    void SetMarginBottomRight(const wxPoint& pt) { m_marginBottomRight = pt; };
-    void SetDefaultMinMargins(bool flag) { m_defaultMinMargins = flag; };
-    void SetDefaultInfo(bool flag) { m_getDefaultInfo = flag; };
+    void SetMinMarginTopLeft(const wxPoint& pt) { m_minMarginTopLeft = pt; }
+    void SetMinMarginBottomRight(const wxPoint& pt) { m_minMarginBottomRight = pt; }
+    void SetMarginTopLeft(const wxPoint& pt) { m_marginTopLeft = pt; }
+    void SetMarginBottomRight(const wxPoint& pt) { m_marginBottomRight = pt; }
+    void SetDefaultMinMargins(bool flag) { m_defaultMinMargins = flag; }
+    void SetDefaultInfo(bool flag) { m_getDefaultInfo = flag; }
 
-    void EnableMargins(bool flag) { m_enableMargins = flag; };
-    void EnableOrientation(bool flag) { m_enableOrientation = flag; };
-    void EnablePaper(bool flag) { m_enablePaper = flag; };
-    void EnablePrinter(bool flag) { m_enablePrinter = flag; };
-    void EnableHelp(bool flag) { m_enableHelp = flag; };
+    void EnableMargins(bool flag) { m_enableMargins = flag; }
+    void EnableOrientation(bool flag) { m_enableOrientation = flag; }
+    void EnablePaper(bool flag) { m_enablePaper = flag; }
+    void EnablePrinter(bool flag) { m_enablePrinter = flag; }
+    void EnableHelp(bool flag) { m_enableHelp = flag; }
 
     // Use paper size defined in this object to set the wxPrintData
     // paper id
diff --git a/include/wx/combo.h b/include/wx/combo.h
index 05ee2d9c3e..1fc9fbe4a4 100644
--- a/include/wx/combo.h
+++ b/include/wx/combo.h
@@ -647,7 +647,7 @@ public:
     // variable has been initialized before the call.
     // NOTE: It is not in constructor so the derived class doesn't need to redefine
     //       a default constructor of its own.
-    virtual void Init() { };
+    virtual void Init() { }
 
     virtual ~wxComboPopup();
 
diff --git a/include/wx/db.h b/include/wx/db.h
index 7c3924b57d..d8bc4acf84 100644
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -326,38 +326,38 @@ class WXDLLIMPEXP_ODBC wxDbConnectInf
         void             FreeHenv();
 
         // Accessors
-        const HENV       &GetHenv()          { return Henv; };
+        const HENV       &GetHenv()          { return Henv; }
 
-        const wxChar    *GetDsn()           { return Dsn; };
+        const wxChar    *GetDsn()           { return Dsn; }
 
-        const wxChar    *GetUid()           { return Uid; };
-        const wxChar    *GetUserID()        { return Uid; };
+        const wxChar    *GetUid()           { return Uid; }
+        const wxChar    *GetUserID()        { return Uid; }
 
-        const wxChar    *GetAuthStr()       { return AuthStr; };
-        const wxChar    *GetPassword()      { return AuthStr; };
+        const wxChar    *GetAuthStr()       { return AuthStr; }
+        const wxChar    *GetPassword()      { return AuthStr; }
 
-        const wxChar    *GetConnectionStr() { return ConnectionStr; };
-        bool             UseConnectionStr() { return useConnectionStr; };
+        const wxChar    *GetConnectionStr() { return ConnectionStr; }
+        bool             UseConnectionStr() { return useConnectionStr; }
 
-        const wxChar    *GetDescription()   { return Description; };
-        const wxChar    *GetFileType()      { return FileType; };
-        const wxChar    *GetDefaultDir()    { return DefaultDir; };
+        const wxChar    *GetDescription()   { return Description; }
+        const wxChar    *GetFileType()      { return FileType; }
+        const wxChar    *GetDefaultDir()    { return DefaultDir; }
 
-        void             SetHenv(const HENV henv)               { Henv = henv; };
+        void             SetHenv(const HENV henv)               { Henv = henv; }
 
         void             SetDsn(const wxString &dsn);
 
         void             SetUserID(const wxString &userID);
-        void             SetUid(const wxString &uid)            { SetUserID(uid); };
+        void             SetUid(const wxString &uid)            { SetUserID(uid); }
 
         void             SetPassword(const wxString &password);
-        void             SetAuthStr(const wxString &authstr)    { SetPassword(authstr); };
+        void             SetAuthStr(const wxString &authstr)    { SetPassword(authstr); }
 
         void             SetConnectionStr(const wxString &connectStr);
 
-        void             SetDescription(const wxString &desc)   { Description   = desc;     };
-        void             SetFileType(const wxString &fileType)  { FileType      = fileType; };
-        void             SetDefaultDir(const wxString &defDir)  { DefaultDir    = defDir;   };
+        void             SetDescription(const wxString &desc)   { Description   = desc;     }
+        void             SetFileType(const wxString &fileType)  { FileType      = fileType; }
+        void             SetDefaultDir(const wxString &defDir)  { DefaultDir    = defDir;   }
 };  // class wxDbConnectInf
 
 
@@ -558,8 +558,8 @@ private:
 
 public:
 
-    void             setCached(bool cached)  { dbIsCached = cached; };  // This function must only be called by wxDbGetConnection() and wxDbCloseConnections!!!
-    bool             IsCached() { return dbIsCached; };
+    void             setCached(bool cached)  { dbIsCached = cached; }  // This function must only be called by wxDbGetConnection() and wxDbCloseConnections!!!
+    bool             IsCached() { return dbIsCached; }
 
     bool             GetDataTypeInfo(SWORD fSqlType, wxDbSqlTypeInfo &structSQLTypeInfo)
                             { return getDataTypeInfo(fSqlType, structSQLTypeInfo); }
diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h
index ef5383bbdf..0f4e896d9f 100644
--- a/include/wx/dcbuffer.h
+++ b/include/wx/dcbuffer.h
@@ -173,7 +173,7 @@ public:
         if( buffer.IsOk() )
             Init(&m_paintdc, buffer, style);
         else
-            Init(&m_paintdc, window->GetClientSize(), style);
+            Init(&m_paintdc, GetBufferedSize(window, style), style);
     }
 
     // If no bitmap is supplied by the user, a temporary one will be created.
@@ -184,7 +184,7 @@ public:
         if (style & wxBUFFER_VIRTUAL_AREA)
             window->PrepareDC( m_paintdc );
 
-        Init(&m_paintdc, window->GetClientSize(), style);
+        Init(&m_paintdc, GetBufferedSize(window, style), style);
     }
 
     // default copy ctor ok.
@@ -196,6 +196,15 @@ public:
         UnMask();
     }
 
+protected:
+    // return the size needed by the buffer: this depends on whether we're
+    // buffering just the currently shown part or the total (scrolled) window
+    static wxSize GetBufferedSize(wxWindow *window, int style)
+    {
+        return style & wxBUFFER_VIRTUAL_AREA ? window->GetVirtualSize()
+                                             : window->GetClientSize();
+    }
+
 private:
     wxPaintDC m_paintdc;
 
diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
deleted file mode 100644
index 9e9b8c7b0f..0000000000
--- a/include/wx/dcsvg.h
+++ /dev/null
@@ -1,315 +0,0 @@
-#ifndef __DCSVG_H
-#define __DCSVG_H
-#include "wx/wfstream.h"
-#include "wx/string.h"
-
-#ifdef WXMAKINGDLL_SVG
-    #define WXDLLIMPEXP_SVG WXEXPORT
-#elif defined(WXUSINGDLL)
-    #define WXDLLIMPEXP_SVG WXIMPORT
-#else // not making nor using DLL
-    #define WXDLLIMPEXP_SVG
-#endif
-
-#define wxSVGVersion wxT("v0100")
-#ifdef __BORLANDC__
-#pragma warn -rch
-#pragma warn -ccc
-#endif
-
-class WXDLLIMPEXP_SVG wxSVGFileDC : public wxDC
-{
-
-    private:
-        wxFileOutputStream * m_outfile ;
-        wxString m_filename ;
-        //holds number of png format images we have
-        int m_sub_images ;
-        bool m_OK, m_graphics_changed ;
-        int m_width, m_height ;
-
-        double
-            m_logicalScaleX,
-            m_logicalScaleY,
-            m_userScaleX,
-            m_userScaleY,
-            m_scaleX,
-            m_scaleY,
-            m_OriginX,
-            m_OriginY,
-            m_mm_to_pix_x,
-            m_mm_to_pix_y;
-
-        bool
-            m_needComputeScaleX,
-            m_needComputeScaleY; // not yet used
-
-
-        bool DoGetPixel(wxCoord, wxCoord, class wxColour *) const
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoGetPixel Call not implemented")); return true; };
-
-        virtual bool DoBlit(wxCoord, wxCoord, wxCoord, wxCoord, class wxDC *,
-            wxCoord, wxCoord, int = wxCOPY, bool = 0, int = -1, int = -1) ;
-
-        void DoCrossHair(wxCoord, wxCoord)
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::CrossHair Call not implemented")); return  ; };
-
-        void DoDrawArc(wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord);
-
-        void DoDrawBitmap(const class wxBitmap &, wxCoord, wxCoord, bool = 0) ;
-
-        void DoDrawCheckMark(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ;
-
-        void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ;
-
-        void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) ;
-
-        void DoDrawIcon(const class wxIcon &, wxCoord, wxCoord) ;
-
-        void DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) ;
-
-        void DoDrawPoint(wxCoord, wxCoord) ;
-
-        void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle) ;
-
-        void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ;
-
-        void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle) ;
-
-        void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20)  ;
-
-        void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
-
-        bool DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour& WXUNUSED(col),
-                             int WXUNUSED(style) = wxFLOOD_SURFACE)
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoFloodFill Call not implemented")); return false ; };
-
-        void DoGetSize(int * x, int *y) const { *x = m_width; *y = m_height ; return ; } ;
-
-        void DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, wxFont *font = NULL) const ;
-
-        void DoSetClippingRegionAsRegion(const class wxRegion &)
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoSetClippingRegionAsRegion Call not yet implemented")); return  ; };
-
-       void Init (wxString f, int Width, int Height, float dpi);
-
-       void NewGraphics () ;
-
-#ifdef XDEV2LOG
-#undef XDEV2LOG
-#endif
-        wxCoord XDEV2LOG(wxCoord x) const
-        {
-            wxCoord new_x = x - m_deviceOriginX;
-            if (new_x > 0)
-                return (wxCoord)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX;
-            else
-                return (wxCoord)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX;
-        }
-#ifdef XDEV2LOGREL
-#undef XDEV2LOGREL
-#endif
-        wxCoord XDEV2LOGREL(wxCoord x) const
-        {
-            if (x > 0)
-                return (wxCoord)((double)(x) / m_scaleX + 0.5);
-            else
-                return (wxCoord)((double)(x) / m_scaleX - 0.5);
-        }
-#ifdef YDEV2LOG
-#undef YDEV2LOG
-#endif
-        wxCoord YDEV2LOG(wxCoord y) const
-        {
-            wxCoord new_y = y - m_deviceOriginY;
-            if (new_y > 0)
-                return (wxCoord)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY;
-            else
-                return (wxCoord)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY;
-        }
-#ifdef YDEV2LOGREL
-#undef YDEV2LOGREL
-#endif
-        wxCoord YDEV2LOGREL(wxCoord y) const
-        {
-            if (y > 0)
-                return (wxCoord)((double)(y) / m_scaleY + 0.5);
-            else
-                return (wxCoord)((double)(y) / m_scaleY - 0.5);
-        }
-#ifdef XLOG2DEV
-#undef XLOG2DEV
-#endif
-        wxCoord XLOG2DEV(wxCoord x) const
-        {
-            wxCoord new_x = x - m_logicalOriginX;
-            if (new_x > 0)
-                return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX;
-            else
-                return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX;
-        }
-#ifdef XLOG2DEVREL
-#undef XLOG2DEVREL
-#endif
-        wxCoord XLOG2DEVREL(wxCoord x) const
-        {
-            if (x > 0)
-                return (wxCoord)((double)(x) * m_scaleX + 0.5);
-            else
-                return (wxCoord)((double)(x) * m_scaleX - 0.5);
-        }
-#ifdef YLOG2DEV
-#undef YLOG2DEV
-#endif
-        wxCoord YLOG2DEV(wxCoord y) const
-        {
-            wxCoord new_y = y - m_logicalOriginY;
-            if (new_y > 0)
-                return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY;
-            else
-                return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY;
-        }
-#ifdef YLOG2DEVREL
-#undef YLOG2DEVREL
-#endif
-        wxCoord YLOG2DEVREL(wxCoord y) const
-        {
-            if (y > 0)
-                return (wxCoord)((double)(y) * m_scaleY + 0.5);
-            else
-                return (wxCoord)((double)(y) * m_scaleY - 0.5);
-        }
-
-        void write(const wxString &s);
-
-    public:
-
-        wxSVGFileDC (wxString f);
-        wxSVGFileDC (wxString f, int Width, int Height);
-        wxSVGFileDC (wxString f, int Width, int Height, float dpi);
-        ~wxSVGFileDC();
-
-
-        bool CanDrawBitmap() const { return true; };
-
-        bool CanGetTextExtent() const { return true; };
-
-        int GetDepth() const
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetDepth Call not implemented")); return -1 ; };
-
-        void BeginDrawing() { return;};
-
-        bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC* source, wxCoord xsrc, wxCoord ysrc, int logicalFunc = wxCOPY, bool useMask = false)
-            { return DoBlit(xdest, ydest, width, height, source, xsrc, ysrc, logicalFunc, useMask); };
-
-        void Clear()
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?")); return ; };
-
-        void CrossHair(wxCoord x, wxCoord y)
-            { DoCrossHair (x,y); return; };
-
-        virtual void ComputeScaleAndOrigin();
-
-        void DestroyClippingRegion()
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::void Call not yet implemented")); return ; };
-
-        wxCoord DeviceToLogicalX(wxCoord x) const ;
-
-        wxCoord DeviceToLogicalXRel(wxCoord x)  const ;
-
-        wxCoord DeviceToLogicalY(wxCoord y)  const ;
-
-        wxCoord DeviceToLogicalYRel(wxCoord y)  const ;
-
-        void DrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool transparent)
-            {  DoDrawBitmap ( bitmap, x, y, transparent ) ; return ;};
-
-        void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
-            {DoDrawIcon(icon, x, y) ; return ; };
-
-        void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0) ;
-
-        void EndDoc()
-            { return ; };
-
-        void EndDrawing()
-            { return ; };
-
-        void EndPage()
-            {  return ; };
-
-        void FloodFill(wxCoord x, wxCoord y, wxColour *colour, int style=wxFLOOD_SURFACE)
-            { DoFloodFill (x, y, *colour, style); return ;} ;
-
-        wxCoord GetCharHeight() const;
-
-        wxCoord GetCharWidth() const;
-
-        void GetClippingBox(wxCoord *WXUNUSED(x), wxCoord *WXUNUSED(y), wxCoord * WXUNUSED(width), wxCoord * WXUNUSED(height))
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetClippingBox Call not yet implemented")); return ; };
-
-        int GetLogicalFunction()
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetLogicalFunction()  Call not implemented")); return wxCOPY ; };
-
-        int GetMapMode() ;
-
-        bool GetPixel(wxCoord x, wxCoord y, wxColour *colour)
-            { return DoGetPixel (x, y, colour) ; } ;
-
-        void GetUserScale(double *x, double *y) const ;
-
-        wxCoord LogicalToDeviceX(wxCoord x)  const ;
-
-        wxCoord LogicalToDeviceXRel(wxCoord x)  const ;
-
-        wxCoord LogicalToDeviceY(wxCoord y)  const ;
-
-        wxCoord LogicalToDeviceYRel(wxCoord y)  const ;
-
-        bool Ok() const {return m_OK;};
-
-        void SetAxisOrientation( bool xLeftRight, bool yBottomUp ) ;
-
-        void SetClippingRegion(wxCoord  WXUNUSED(x), wxCoord  WXUNUSED(y), wxCoord  WXUNUSED(width), wxCoord  WXUNUSED(height))
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetClippingRegion Call not yet implemented")); return ; };
-
-        void SetPalette(const wxPalette&  WXUNUSED(palette))
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetPalette Call not yet implemented")); return ; };
-
-        void SetBackground( const wxBrush &brush ) ;
-
-        void SetBackgroundMode( int mode ) ;
-
-        void SetBrush(const wxBrush& brush) ;
-
-        void SetFont(const wxFont& font) ;
-
-        void SetLogicalFunction(int  WXUNUSED(function))
-            { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetLogicalFunction Call implemented")); return ; };
-
-        void SetLogicalScale( double x, double y ) ;
-
-        void SetLogicalOrigin( wxCoord x, wxCoord y ) ;
-
-        void SetDeviceOrigin( wxCoord x, wxCoord y ) ;
-
-        void SetMapMode(int anint) ;
-
-        void SetPen(const wxPen& pen)  ;
-
-        void SetUserScale(double xScale, double yScale) ;
-
-        bool StartDoc(const wxString&  WXUNUSED(message))
-            {  return false; };
-
-        void StartPage()
-            {  return ; };
-
-
-};
-
-#ifdef __BORLANDC__
-#pragma warn .rch
-#pragma warn .ccc
-#endif
-#endif
diff --git a/include/wx/defs.h b/include/wx/defs.h
index 6bf190c292..b3c051f344 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -494,25 +494,19 @@ typedef int wxWindowID;
 /*  ---------------------------------------------------------------------------- */
 
 /*  Printf-like attribute definitions to obtain warnings with GNU C/C++ */
-#if defined(__GNUC__) && !wxUSE_UNICODE
-#  ifndef ATTRIBUTE_PRINTF
-#    define ATTRIBUTE_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n)))
-#    define ATTRIBUTE_PRINTF_1 ATTRIBUTE_PRINTF(1, 2)
-#    define ATTRIBUTE_PRINTF_2 ATTRIBUTE_PRINTF(2, 3)
-#    define ATTRIBUTE_PRINTF_3 ATTRIBUTE_PRINTF(3, 4)
-#    define ATTRIBUTE_PRINTF_4 ATTRIBUTE_PRINTF(4, 5)
-#    define ATTRIBUTE_PRINTF_5 ATTRIBUTE_PRINTF(5, 6)
-#  endif /* ATTRIBUTE_PRINTF */
-#else
-#  ifndef ATTRIBUTE_PRINTF
-#    define ATTRIBUTE_PRINTF
-#    define ATTRIBUTE_PRINTF_1
-#    define ATTRIBUTE_PRINTF_2
-#    define ATTRIBUTE_PRINTF_3
-#    define ATTRIBUTE_PRINTF_4
-#    define ATTRIBUTE_PRINTF_5
-#  endif /* ATTRIBUTE_PRINTF */
-#endif
+#ifndef ATTRIBUTE_PRINTF
+#   if defined(__GNUC__) && !wxUSE_UNICODE
+#       define ATTRIBUTE_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n)))
+#   else
+#       define ATTRIBUTE_PRINTF(m, n)
+#   endif
+
+#   define ATTRIBUTE_PRINTF_1 ATTRIBUTE_PRINTF(1, 2)
+#   define ATTRIBUTE_PRINTF_2 ATTRIBUTE_PRINTF(2, 3)
+#   define ATTRIBUTE_PRINTF_3 ATTRIBUTE_PRINTF(3, 4)
+#   define ATTRIBUTE_PRINTF_4 ATTRIBUTE_PRINTF(4, 5)
+#   define ATTRIBUTE_PRINTF_5 ATTRIBUTE_PRINTF(5, 6)
+#endif /* !defined(ATTRIBUTE_PRINTF) */
 
 /*  Macro to issue warning when using deprecated functions with gcc3 or MSVC7: */
 #if wxCHECK_GCC_VERSION(3, 1)
diff --git a/include/wx/docview.h b/include/wx/docview.h
index 46cc57c211..f69745552d 100644
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -70,10 +70,10 @@ public:
     void SetFilename(const wxString& filename, bool notifyViews = false);
     wxString GetFilename() const { return m_documentFile; }
 
-    void SetTitle(const wxString& title) { m_documentTitle = title; };
+    void SetTitle(const wxString& title) { m_documentTitle = title; }
     wxString GetTitle() const { return m_documentTitle; }
 
-    void SetDocumentName(const wxString& name) { m_documentTypeName = name; };
+    void SetDocumentName(const wxString& name) { m_documentTypeName = name; }
     wxString GetDocumentName() const { return m_documentTypeName; }
 
     bool GetDocumentSaved() const { return m_savedYet; }
@@ -180,7 +180,7 @@ public:
     virtual void SetDocument(wxDocument *doc);
 
     wxString GetViewName() const { return m_viewTypeName; }
-    void SetViewName(const wxString& name) { m_viewTypeName = name; };
+    void SetViewName(const wxString& name) { m_viewTypeName = name; }
 
     wxWindow *GetFrame() const { return m_viewFrame ; }
     void SetFrame(wxWindow *frame) { m_viewFrame = frame; }
@@ -194,7 +194,7 @@ public:
 
     // Called by framework if created automatically by the default document
     // manager class: gives view a chance to initialise
-    virtual bool OnCreate(wxDocument *WXUNUSED(doc), long WXUNUSED(flags)) { return true; };
+    virtual bool OnCreate(wxDocument *WXUNUSED(doc), long WXUNUSED(flags)) { return true; }
 
     // Checks if the view is the last one for the document; if so, asks user
     // to confirm save data (if modified). If ok, deletes itself and returns
@@ -260,21 +260,21 @@ public:
     // creation
     virtual bool InitDocument(wxDocument* doc, const wxString& path, long flags = 0);
 
-    wxString GetDefaultExtension() const { return m_defaultExt; };
+    wxString GetDefaultExtension() const { return m_defaultExt; }
     wxString GetDescription() const { return m_description; }
-    wxString GetDirectory() const { return m_directory; };
+    wxString GetDirectory() const { return m_directory; }
     wxDocManager *GetDocumentManager() const { return m_documentManager; }
     void SetDocumentManager(wxDocManager *manager) { m_documentManager = manager; }
-    wxString GetFileFilter() const { return m_fileFilter; };
-    long GetFlags() const { return m_flags; };
+    wxString GetFileFilter() const { return m_fileFilter; }
+    long GetFlags() const { return m_flags; }
     virtual wxString GetViewName() const { return m_viewTypeName; }
     virtual wxString GetDocumentName() const { return m_docTypeName; }
 
-    void SetFileFilter(const wxString& filter) { m_fileFilter = filter; };
-    void SetDirectory(const wxString& dir) { m_directory = dir; };
-    void SetDescription(const wxString& descr) { m_description = descr; };
-    void SetDefaultExtension(const wxString& ext) { m_defaultExt = ext; };
-    void SetFlags(long flags) { m_flags = flags; };
+    void SetFileFilter(const wxString& filter) { m_fileFilter = filter; }
+    void SetDirectory(const wxString& dir) { m_directory = dir; }
+    void SetDescription(const wxString& descr) { m_description = descr; }
+    void SetDefaultExtension(const wxString& ext) { m_defaultExt = ext; }
+    void SetFlags(long flags) { m_flags = flags; }
 
     bool IsVisible() const { return ((m_flags & wxTEMPLATE_VISIBLE) == wxTEMPLATE_VISIBLE); }
 
diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index be59192bc2..66b39f3e93 100644
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -472,7 +472,7 @@ public:                                                               \
   const_reverse_iterator rbegin() const;                              \
   reverse_iterator rend() { return reverse_iterator(begin() - 1); }   \
   const_reverse_iterator rend() const;                                \
-  void reserve(size_type n) { base::reserve(n); };                    \
+  void reserve(size_type n) { base::reserve(n); }                     \
   void resize(size_type n, value_type v = value_type())               \
     { base::resize(n, v); }                                           \
 }
diff --git a/include/wx/event.h b/include/wx/event.h
index 538c1be5d4..ffe6121079 100644
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -351,7 +351,7 @@ public:
     // to allow the event processing by the base classes (calling event.Skip()
     // is the analog of calling the base class version of a virtual function)
     void Skip(bool skip = true) { m_skipped = skip; }
-    bool GetSkipped() const { return m_skipped; };
+    bool GetSkipped() const { return m_skipped; }
 
     // this function is used to create a copy of the event polymorphically and
     // all derived classes must implement it because otherwise wxPostEvent()
@@ -1788,7 +1788,7 @@ public:
 
     virtual wxEvent *Clone() const { return new wxMouseCaptureChangedEvent(*this); }
 
-    wxWindow* GetCapturedWindow() const { return m_gainedCapture; };
+    wxWindow* GetCapturedWindow() const { return m_gainedCapture; }
 
 private:
     wxWindow* m_gainedCapture;
diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h
index b2ffb7e536..5b355df4d1 100644
--- a/include/wx/generic/laywin.h
+++ b/include/wx/generic/laywin.h
@@ -165,11 +165,11 @@ public:
         const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = wxT("layoutWindow"));
 
 // Accessors
-    inline wxLayoutAlignment GetAlignment() const { return m_alignment; };
-    inline wxLayoutOrientation GetOrientation() const { return m_orientation; };
+    inline wxLayoutAlignment GetAlignment() const { return m_alignment; }
+    inline wxLayoutOrientation GetOrientation() const { return m_orientation; }
 
-    inline void SetAlignment(wxLayoutAlignment align) { m_alignment = align; };
-    inline void SetOrientation(wxLayoutOrientation orient) { m_orientation = orient; };
+    inline void SetAlignment(wxLayoutAlignment align) { m_alignment = align; }
+    inline void SetOrientation(wxLayoutOrientation orient) { m_orientation = orient; }
 
     // Give the window default dimensions
     inline void SetDefaultSize(const wxSize& size) { m_defaultSize = size; }
diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h
index db76b8e309..81b683af75 100644
--- a/include/wx/generic/splitter.h
+++ b/include/wx/generic/splitter.h
@@ -97,7 +97,7 @@ public:
     }
 
     // Gets the split mode
-    wxSplitMode GetSplitMode() const { return m_splitMode; };
+    wxSplitMode GetSplitMode() const { return m_splitMode; }
 
     // Initialize with one window
     void Initialize(wxWindow *window);
diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index 52940b2a82..02309299ad 100644
--- a/include/wx/generic/wizard.h
+++ b/include/wx/generic/wizard.h
@@ -45,6 +45,10 @@ public:
              long style = wxDEFAULT_DIALOG_STYLE);
     void Init();
 
+#if wxABI_VERSION >= 20804
+    virtual ~wxWizard();
+#endif
+
     // implement base class pure virtuals
     virtual bool RunWizard(wxWizardPage *firstPage);
     virtual wxWizardPage *GetCurrentPage() const;
diff --git a/include/wx/gifdecod.h b/include/wx/gifdecod.h
index 0a1961d2f0..f1a754a227 100644
--- a/include/wx/gifdecod.h
+++ b/include/wx/gifdecod.h
@@ -18,6 +18,7 @@
 #include "wx/stream.h"
 #include "wx/image.h"
 #include "wx/animdecod.h"
+#include "wx/dynarray.h"
 
 // internal utility used to store a frame in 8bit-per-pixel format
 class GIFImage;
diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h
index 28fc7ee00b..ea4c9e223b 100644
--- a/include/wx/gtk/tbargtk.h
+++ b/include/wx/gtk/tbargtk.h
@@ -52,6 +52,12 @@ public:
 
     virtual void SetWindowStyleFlag( long style );
 
+#if wxABI_VERSION >= 20802
+    // TODO: In 2.9 these should probably be virtual, and declared in the base class...
+    void SetToolNormalBitmap(int id, const wxBitmap& bitmap);
+    void SetToolDisabledBitmap(int id, const wxBitmap& bitmap);
+#endif
+    
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
     
diff --git a/include/wx/hash.h b/include/wx/hash.h
index a85d83c83b..bf044c01da 100644
--- a/include/wx/hash.h
+++ b/include/wx/hash.h
@@ -159,7 +159,7 @@ public:
     typedef wxHashTableBase_Node Node;
 
     wxHashTableBase();
-    virtual ~wxHashTableBase() { };
+    virtual ~wxHashTableBase() { }
 
     void Create( wxKeyType keyType = wxKEY_INTEGER,
                  size_t size = wxHASH_SIZE_DEFAULT );
diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h
index 41aaccb230..7932913588 100644
--- a/include/wx/hashmap.h
+++ b/include/wx/hashmap.h
@@ -271,9 +271,9 @@ public: \
     const_iterator end() const { return const_iterator( 0, this ); } \
     iterator end() { return iterator( 0, this ); } \
     const_iterator begin() const \
-        { return const_iterator( (Node*)GetFirstNode( m_tableBuckets, (_wxHashTable_NodeBase**)m_table ), this ); }; \
+        { return const_iterator( (Node*)GetFirstNode( m_tableBuckets, (_wxHashTable_NodeBase**)m_table ), this ); } \
     iterator begin() \
-        { return iterator( (Node*)GetFirstNode( m_tableBuckets, (_wxHashTable_NodeBase**)m_table ), this ); }; \
+        { return iterator( (Node*)GetFirstNode( m_tableBuckets, (_wxHashTable_NodeBase**)m_table ), this ); } \
  \
     size_type erase( const const_key_type& key ) \
     { \
diff --git a/include/wx/helpbase.h b/include/wx/helpbase.h
index 613a87477c..614ccae69d 100644
--- a/include/wx/helpbase.h
+++ b/include/wx/helpbase.h
@@ -57,7 +57,7 @@ public:
     virtual bool DisplaySection(int sectionNo) = 0;
 
     // Display the section using a context id
-    virtual bool DisplayContextPopup(int WXUNUSED(contextId)) { return false; };
+    virtual bool DisplayContextPopup(int WXUNUSED(contextId)) { return false; }
 
     // Display the text in a popup, if possible
     virtual bool DisplayTextPopup(const wxString& WXUNUSED(text), const wxPoint& WXUNUSED(pos)) { return false; }
diff --git a/include/wx/html/helpdlg.h b/include/wx/html/helpdlg.h
index 832224824c..b696182d30 100644
--- a/include/wx/html/helpdlg.h
+++ b/include/wx/html/helpdlg.h
@@ -66,7 +66,7 @@ public:
     void SetTitleFormat(const wxString& format);
 
     // Override to add custom buttons to the toolbar
-    virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {};
+    virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {}
 
 protected:
     void Init(wxHtmlHelpData* data = NULL);
diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index cc50b5fc57..f3ff630171 100644
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -105,7 +105,7 @@ public:
     void AddGrabIfNeeded();
 
     // Override to add custom buttons to the toolbar
-    virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {};
+    virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {}
 
     // we don't want to prevent the app from closing just because a help window
     // remains opened
diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h
index 125183e0b0..c5d6f337dd 100644
--- a/include/wx/html/winpars.h
+++ b/include/wx/html/winpars.h
@@ -230,7 +230,7 @@ class WXDLLIMPEXP_HTML wxHtmlWinTagHandler : public wxHtmlTagHandler
 public:
     wxHtmlWinTagHandler() : wxHtmlTagHandler() {}
 
-    virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;};
+    virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;}
 
 protected:
     wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted
diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h
index 4a19f800fa..c70dd6cb87 100644
--- a/include/wx/imagbmp.h
+++ b/include/wx/imagbmp.h
@@ -56,7 +56,7 @@ public:
         m_extension = _T("bmp");
         m_type = wxBITMAP_TYPE_BMP;
         m_mime = _T("image/x-bmp");
-    };
+    }
 
 #if wxUSE_STREAMS
     virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );
@@ -90,7 +90,7 @@ public:
         m_extension = _T("ico");
         m_type = wxBITMAP_TYPE_ICO;
         m_mime = _T("image/x-ico");
-    };
+    }
 
 #if wxUSE_STREAMS
     virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );
@@ -119,7 +119,7 @@ public:
         m_extension = _T("cur");
         m_type = wxBITMAP_TYPE_CUR;
         m_mime = _T("image/x-cur");
-    };
+    }
 
     // VS: This handler's meat is implemented inside wxICOHandler (the two
     //     formats are almost identical), but we hide this fact at
@@ -146,11 +146,11 @@ public:
         m_extension = _T("ani");
         m_type = wxBITMAP_TYPE_ANI;
         m_mime = _T("image/x-ani");
-    };
+    }
 
 
 #if wxUSE_STREAMS
-    virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose=true) ){return false ;};
+    virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose=true) ){return false ;}
     virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
     virtual int GetImageCount( wxInputStream& stream );
 protected:
diff --git a/include/wx/intl.h b/include/wx/intl.h
index 471d9ad9ba..8b3aa2530e 100644
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -562,7 +562,8 @@ private:
 extern WXDLLIMPEXP_BASE wxLocale* wxGetLocale();
 
 // get the translation of the string in the current locale
-inline const wxChar *wxGetTranslation(const wxChar *sz, const wxChar* domain=NULL)
+inline const wxChar *
+wxGetTranslation(const wxChar *sz, const wxChar* domain = NULL)
 {
     wxLocale *pLoc = wxGetLocale();
     if (pLoc)
@@ -570,8 +571,11 @@ inline const wxChar *wxGetTranslation(const wxChar *sz, const wxChar* domain=NUL
     else
         return sz;
 }
-inline const wxChar *wxGetTranslation(const wxChar *sz1, const wxChar *sz2,
-                                      size_t n, const wxChar* domain=NULL)
+
+inline const wxChar *
+wxGetTranslation(const wxChar *sz1, const wxChar *sz2,
+                 size_t n,
+                 const wxChar *domain = NULL)
 {
     wxLocale *pLoc = wxGetLocale();
     if (pLoc)
@@ -588,13 +592,16 @@ inline const wxChar *wxGetTranslation(const wxChar *sz1, const wxChar *sz2,
     #if !defined(_)
         #define _(s)                 (_T(s))
     #endif
+    #define wxPLURAL(sing, plur, n)  ((n) == 1 ? _T(sing) : _T(plur))
 #endif
 
 #define wxTRANSLATE(str) _T(str)
 
-// Note: use of 'inline' here can cause this symbol not to be found when compiled with gcc
-//const wxChar *wxGetTranslation(const wxChar *sz);
-#define wxGetTranslation(sz) (sz)
+inline const wxChar *
+wxGetTranslation(const wxChar *sz, const wxChar * WXUNUSED(domain) = NULL)
+{
+    return sz;
+}
 
 #endif // wxUSE_INTL/!wxUSE_INTL
 
diff --git a/include/wx/ipcbase.h b/include/wx/ipcbase.h
index 45f61b66f4..d5c41a52b8 100644
--- a/include/wx/ipcbase.h
+++ b/include/wx/ipcbase.h
@@ -73,28 +73,28 @@ public:
                                wxChar *WXUNUSED(data),
                                int WXUNUSED(size),
                                wxIPCFormat WXUNUSED(format) )
-                             { return false; };
+                             { return false; }
 
   virtual wxChar *OnRequest    ( const wxString& WXUNUSED(topic),
                                const wxString& WXUNUSED(item),
                                int *WXUNUSED(size),
                                wxIPCFormat WXUNUSED(format) )
-                             { return (wxChar *) NULL; };
+                             { return (wxChar *) NULL; }
 
   virtual bool OnPoke        ( const wxString& WXUNUSED(topic),
                                const wxString& WXUNUSED(item),
                                wxChar *WXUNUSED(data),
                                int WXUNUSED(size),
                                wxIPCFormat WXUNUSED(format) )
-                             { return false; };
+                             { return false; }
 
   virtual bool OnStartAdvise ( const wxString& WXUNUSED(topic),
                                const wxString& WXUNUSED(item) )
-                             { return false; };
+                             { return false; }
 
   virtual bool OnStopAdvise  ( const wxString& WXUNUSED(topic),
                                const wxString& WXUNUSED(item) )
-                             { return false; };
+                             { return false; }
 
   // Callbacks to CLIENT - override at will
   virtual bool OnAdvise      ( const wxString& WXUNUSED(topic),
@@ -102,7 +102,7 @@ public:
                                wxChar *WXUNUSED(data),
                                int WXUNUSED(size),
                                wxIPCFormat WXUNUSED(format) )
-                             { return false; };
+                             { return false; }
 
   // Callbacks to BOTH - override at will
   // Default behaviour is to delete connection and return true
diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index d61560bdb4..fb219e1ba5 100644
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -45,11 +45,11 @@ public:
     // all generic methods are in wxControlWithItems, except for the following
     // ones which are not yet implemented by wxChoice/wxComboBox
     void Insert(const wxString& item, unsigned int pos)
-        { DoInsert(item, pos); }
+        { /* return*/ wxControlWithItems::Insert(item,pos); }
     void Insert(const wxString& item, unsigned int pos, void *clientData)
-        { DoInsert(item, pos); SetClientData(pos, clientData); }
+        { /* return*/ wxControlWithItems::Insert(item,pos,clientData); }
     void Insert(const wxString& item, unsigned int pos, wxClientData *clientData)
-        { DoInsert(item, pos); SetClientObject(pos, clientData); }
+        { /* return*/ wxControlWithItems::Insert(item,pos,clientData); }
 
     void InsertItems(unsigned int nItems, const wxString *items, unsigned int pos);
     void InsertItems(const wxArrayString& items, unsigned int pos)
diff --git a/include/wx/mac/carbon/config_xcode.h b/include/wx/mac/carbon/config_xcode.h
index 0dc2440fbf..4204f53786 100644
--- a/include/wx/mac/carbon/config_xcode.h
+++ b/include/wx/mac/carbon/config_xcode.h
@@ -116,9 +116,9 @@
 #define WXWIN_OS_DESCRIPTION "Darwin 7.9.0 Power Macintosh"
 #define PACKAGE_BUGREPORT "wx-dev@lists.wxwidgets.org"
 #define PACKAGE_NAME "wxWidgets"
-#define PACKAGE_STRING "wxWidgets 2.7.1"
+#define PACKAGE_STRING "wxWidgets 2.8.3"
 #define PACKAGE_TARNAME "wxwidgets"
-#define PACKAGE_VERSION "2.7.1"
+#define PACKAGE_VERSION "2.8.3"
 
 // for regex
 #define WX_NO_REGEX_ADVANCED 1
diff --git a/include/wx/mac/carbon/dataform.h b/include/wx/mac/carbon/dataform.h
index 6de68218ad..ffc4f87a42 100644
--- a/include/wx/mac/carbon/dataform.h
+++ b/include/wx/mac/carbon/dataform.h
@@ -29,7 +29,7 @@ public:
     // comparison (must have both versions)
     bool operator==(const wxDataFormat& format) const ;
     bool operator!=(const wxDataFormat& format) const
-        { return ! ( *this != format ); }
+        { return ! ( *this == format ); }
     bool operator==(wxDataFormatId format) const
         { return m_type == (wxDataFormatId)format; }
     bool operator!=(wxDataFormatId format) const
@@ -54,7 +54,7 @@ public:
 
     // returns true if the format is one of those defined in wxDataFormatId
     bool IsStandard() const { return m_type > 0 && m_type < wxDF_PRIVATE; }
-    
+
 private:
     wxDataFormatId   m_type;
     NativeFormat     m_format;
diff --git a/include/wx/mac/carbon/toolbar.h b/include/wx/mac/carbon/toolbar.h
index 62c91785e1..cc17b485d9 100644
--- a/include/wx/mac/carbon/toolbar.h
+++ b/include/wx/mac/carbon/toolbar.h
@@ -57,7 +57,13 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase
 
     virtual void SetRows(int nRows);
 
-  // Add all the buttons
+#if wxABI_VERSION >= 20802
+    // TODO: In 2.9 these should probably be virtual, and declared in the base class...
+    void SetToolNormalBitmap(int id, const wxBitmap& bitmap);
+    void SetToolDisabledBitmap(int id, const wxBitmap& bitmap);
+#endif
+
+    // Add all the buttons
 
     virtual wxString MacGetToolTipString( wxPoint &where ) ;
     void OnPaint(wxPaintEvent& event) ;
diff --git a/include/wx/math.h b/include/wx/math.h
index de561737dd..f1f4d889f7 100644
--- a/include/wx/math.h
+++ b/include/wx/math.h
@@ -105,9 +105,6 @@
 
     inline bool wxIsNullDouble(double x) { return wxIsSameDouble(x, 0.); }
 
-    #if defined(HAVE_ROUND) && !defined(HAVE_DECL_ROUND)
-        extern "C" double round(double);
-    #endif
     inline int wxRound(double x)
     {
         #if defined(HAVE_ROUND)
diff --git a/include/wx/matrix.h b/include/wx/matrix.h
index fbdfae5308..465846e8d9 100644
--- a/include/wx/matrix.h
+++ b/include/wx/matrix.h
@@ -94,7 +94,7 @@ public:
     // Is the matrix the identity matrix?
     // Only returns a flag, which is set whenever an operation
     // is done.
-    inline bool IsIdentity(void) const { return m_isIdentity; };
+    inline bool IsIdentity(void) const { return m_isIdentity; }
 
     // This does an actual check.
     inline bool IsIdentity1(void) const ;
diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index b00c977038..c0e6e446ef 100644
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -375,4 +375,13 @@
 #   endif
 #endif /* !wxUSE_ACTIVEX */
 
+#if defined(_MSC_VER) && _MSC_VER <= 1200 && wxUSE_GRAPHICS_CONTEXT
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxGraphicsContext needs MSVC 7 or newer"
+#       else
+#           undef wxUSE_GRAPHICS_CONTEXT
+#           define wxUSE_GRAPHICS_CONTEXT 0
+#       endif
+#endif
+
 #endif /* _WX_MSW_CHKCONF_H_ */
diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h
index 0faf3d086e..c3854f50b8 100644
--- a/include/wx/msw/colour.h
+++ b/include/wx/msw/colour.h
@@ -56,7 +56,7 @@ public:
 
     bool operator != (const wxColour& colour) const { return !(*this == colour); }
 
-    WXCOLORREF GetPixel() const { return m_pixel; };
+    WXCOLORREF GetPixel() const { return m_pixel; }
 
 
 public:
diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index e5b8dc9b9f..a2e56f7159 100644
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -59,8 +59,8 @@ public:
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
 
     // For ownerdraw items
-    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return false; };
-    virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return false; };
+    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return false; }
+    virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return false; }
 
     const wxArrayLong& GetSubcontrols() const { return m_subControls; }
 
diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index caff90d67d..7b2e01632b 100644
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -70,9 +70,9 @@ public:
 
     // TODO: should this go into a wxFrameworkSettings class perhaps?
     static void UseNativeStatusBar(bool useNative)
-        { m_useNativeStatusBar = useNative; };
+        { m_useNativeStatusBar = useNative; }
     static bool UsesNativeStatusBar()
-        { return m_useNativeStatusBar; };
+        { return m_useNativeStatusBar; }
 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_MENUS
diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index 3a45a535aa..cd0b21b28d 100644
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -62,7 +62,7 @@ public:
     virtual wxMDIClientWindow *OnCreateClient(void);
 
     // MDI windows menu
-    wxMenu* GetWindowMenu() const { return m_windowMenu; };
+    wxMenu* GetWindowMenu() const { return m_windowMenu; }
     void SetWindowMenu(wxMenu* menu) ;
     virtual void DoMenuUpdates(wxMenu* menu = NULL);
 
diff --git a/include/wx/msw/ole/automtn.h b/include/wx/msw/ole/automtn.h
index e81b0e9096..dea726397b 100644
--- a/include/wx/msw/ole/automtn.h
+++ b/include/wx/msw/ole/automtn.h
@@ -38,7 +38,7 @@ public:
     virtual ~wxAutomationObject();
 
     // Set/get dispatch pointer
-    inline void SetDispatchPtr(WXIDISPATCH* dispatchPtr) { m_dispatchPtr = dispatchPtr; };
+    inline void SetDispatchPtr(WXIDISPATCH* dispatchPtr) { m_dispatchPtr = dispatchPtr; }
     inline WXIDISPATCH* GetDispatchPtr() const { return m_dispatchPtr; }
 
     // Get a dispatch pointer from the current object associated
diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h
index 470d92c6dc..ec987fc14e 100644
--- a/include/wx/msw/pen.h
+++ b/include/wx/msw/pen.h
@@ -103,20 +103,20 @@ public:
     void SetJoin(int join);
     void SetCap(int cap);
 
-    wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); };
-    int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); };
-    int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
-    int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
-    int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
+    wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); }
+    int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); }
+    int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); }
+    int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); }
+    int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); }
     int GetDashes(wxDash **ptr) const
     {
         *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
         return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
     }
-    wxDash* GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*)NULL); };
-    inline int GetDashCount() const { return (M_PENDATA ? M_PENDATA->m_nbDash : 0); };
+    wxDash* GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*)NULL); }
+    inline int GetDashCount() const { return (M_PENDATA ? M_PENDATA->m_nbDash : 0); }
 
-    inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };
+    inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); }
 
     // Internal
     bool RealizeResource();
diff --git a/include/wx/msw/seh.h b/include/wx/msw/seh.h
index caab1a4370..edcefb8fd3 100644
--- a/include/wx/msw/seh.h
+++ b/include/wx/msw/seh.h
@@ -47,7 +47,7 @@
     #define wxSEH_HANDLE(rc)
 #endif // wxUSE_ON_FATAL_EXCEPTION
 
-#if defined(__VISUALC__) && !defined(__WXWINCE__)
+#if wxUSE_ON_FATAL_EXCEPTION && defined(__VISUALC__) && !defined(__WXWINCE__)
     #include <eh.h>
 
     // C++ exception to structured exceptions translator: we need it in order
diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index daa168e3d6..44f52610e9 100644
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -54,6 +54,12 @@ public:
 
     virtual void SetRows(int nRows);
 
+#if wxABI_VERSION >= 20802
+    // TODO: In 2.9 these should probably be virtual, and declared in the base class...
+    void SetToolNormalBitmap(int id, const wxBitmap& bitmap);
+    void SetToolDisabledBitmap(int id, const wxBitmap& bitmap);
+#endif
+    
     // implementation only from now on
     // -------------------------------
 
diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 281e88278d..18591104a0 100644
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -193,7 +193,7 @@ public:
     wxWindow *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
 
     // MSW only: true if this control is part of the main control
-    virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; };
+    virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; }
 
 #if wxUSE_TOOLTIPS
     // MSW only: true if this window or any of its children have a tooltip
diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h
index 03a1a6ba69..01336376e0 100644
--- a/include/wx/protocol/ftp.h
+++ b/include/wx/protocol/ftp.h
@@ -47,7 +47,7 @@ public:
     // Parameters set up
 
     // set transfer mode now
-    void SetPassive(bool pasv) { m_bPassive = pasv; };
+    void SetPassive(bool pasv) { m_bPassive = pasv; }
     void SetDefaultTimeout(wxUint32 Value);
     bool SetBinary() { return SetTransferMode(BINARY); }
     bool SetAscii() { return SetTransferMode(ASCII); }
diff --git a/include/wx/richtext/richtextbuffer.h b/include/wx/richtext/richtextbuffer.h
index c414e1394f..2889221481 100644
--- a/include/wx/richtext/richtextbuffer.h
+++ b/include/wx/richtext/richtextbuffer.h
@@ -139,6 +139,8 @@ class WXDLLIMPEXP_RICHTEXT wxRichTextBuffer;
 #define wxRICHTEXT_HITTEST_AFTER    0x04
 // The point was on the position returned from HitTest
 #define wxRICHTEXT_HITTEST_ON       0x08
+// The point was on space outside content
+#define wxRICHTEXT_HITTEST_OUTSIDE  0x10
 
 /*!
  * Flags for GetRangeSize
@@ -181,6 +183,9 @@ class WXDLLIMPEXP_RICHTEXT wxRichTextBuffer;
 // Resets the existing style before applying the new style
 #define wxRICHTEXT_SETSTYLE_RESET           0x40
 
+// Removes the given style instead of applying it
+#define wxRICHTEXT_SETSTYLE_REMOVE          0x80
+
 /*!
  * Flags for text insertion
  */
@@ -2317,6 +2322,9 @@ WXDLLIMPEXP_RICHTEXT bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const
 WXDLLIMPEXP_RICHTEXT bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith = NULL);
 WXDLLIMPEXP_RICHTEXT bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith = NULL);
 
+// Remove attributes
+WXDLLIMPEXP_RICHTEXT bool wxRichTextRemoveStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style);
+
 /// Combine two bitlists
 WXDLLIMPEXP_RICHTEXT bool wxRichTextCombineBitlists(int& valueA, int valueB, int& flagsA, int flagsB);
 
diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index d477a2e0f4..aaa4b09461 100644
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -78,6 +78,11 @@ public:
     wxSizerFlags& Left() { return Align(wxALIGN_LEFT); }
     wxSizerFlags& Right() { return Align(wxALIGN_RIGHT); }
 
+#if wxABI_VERSION >= 20802
+    wxSizerFlags& Top() { return Align(wxALIGN_TOP); }
+    wxSizerFlags& Bottom() { return Align(wxALIGN_BOTTOM); }
+#endif // wxABI 2.8.2+
+
     // default border size used by Border() below
     static int GetDefaultBorder()
     {
diff --git a/include/wx/socket.h b/include/wx/socket.h
index ee2578f3c2..3c61361a56 100644
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -109,11 +109,11 @@ public:
 
   // state
   inline bool Ok() const { return IsOk(); }
-  inline bool IsOk() const { return (m_socket != NULL); };
-  inline bool Error() const { return m_error; };
-  inline bool IsConnected() const { return m_connected; };
-  inline bool IsData() { return WaitForRead(0, 0); };
-  inline bool IsDisconnected() const { return !IsConnected(); };
+  inline bool IsOk() const { return (m_socket != NULL); }
+  inline bool Error() const { return m_error; }
+  inline bool IsConnected() const { return m_connected; }
+  inline bool IsData() { return WaitForRead(0, 0); }
+  inline bool IsDisconnected() const { return !IsConnected(); }
   inline wxUint32 LastCount() const { return m_lcount; }
   inline wxSocketError LastError() const { return (wxSocketError)m_socket->GetError(); }
   void SaveState();
@@ -134,7 +134,7 @@ public:
   wxSocketBase& Write(const void *buffer, wxUint32 nbytes);
   wxSocketBase& WriteMsg(const void *buffer, wxUint32 nbytes);
 
-  void InterruptWait() { m_interrupt = true; };
+  void InterruptWait() { m_interrupt = true; }
   bool Wait(long seconds = -1, long milliseconds = 0);
   bool WaitForRead(long seconds = -1, long milliseconds = 0);
   bool WaitForWrite(long seconds = -1, long milliseconds = 0);
@@ -146,7 +146,7 @@ public:
 
   bool GetOption(int level, int optname, void *optval, int *optlen);
   bool SetOption(int level, int optname, const void *optval, int optlen);
-  inline wxUint32 GetLastIOSize() const { return m_lcount; };
+  inline wxUint32 GetLastIOSize() const { return m_lcount; }
 
   // event handling
   void *GetClientData() const { return m_clientData; }
diff --git a/include/wx/sstream.h b/include/wx/sstream.h
index 02f878681b..fd34ae3ab7 100644
--- a/include/wx/sstream.h
+++ b/include/wx/sstream.h
@@ -66,6 +66,10 @@ public:
         m_pos = m_str->length() / sizeof(wxChar);
     }
 
+#if wxABI_VERSION >= 20804 && wxUSE_UNICODE
+    virtual ~wxStringOutputStream();
+#endif // wx 2.8.4+
+
     // get the string containing current output
     const wxString& GetString() const { return *m_str; }
 
diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
deleted file mode 100644
index a48accc7f4..0000000000
--- a/include/wx/stc/stc.h
+++ /dev/null
@@ -1,3621 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Name:        stc.h
-// Purpose:     A wxWidgets 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"
-#include "wx/dnd.h"
-
-
-#ifdef WXMAKINGDLL_STC
-    #define WXDLLIMPEXP_STC WXEXPORT
-#elif defined(WXUSINGDLL)
-    #define WXDLLIMPEXP_STC WXIMPORT
-#else // not making nor using DLL
-    #define WXDLLIMPEXP_STC
-#endif
-
-
-// SWIG can't handle "#if" type of conditionals, only "#ifdef"
-#ifdef SWIG
-#define STC_USE_DND 1
-#else
-#if wxUSE_DRAG_AND_DROP
-#define STC_USE_DND 1
-#endif
-#endif
-
-//----------------------------------------------------------------------
-
-// Should a wxPopupWindow be used for the call tips and autocomplete windows?
-#ifndef wxSTC_USE_POPUP
-#define wxSTC_USE_POPUP 1
-#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
-
-#define wxSTC_INVALID_POSITION -1
-
-// Define start of Scintilla messages to be greater than all Windows edit (EM_*) messages
-// as many EM_ messages can be used although that use is deprecated.
-#define wxSTC_START 2000
-#define wxSTC_OPTIONAL_START 3000
-#define wxSTC_LEXER_START 4000
-#define wxSTC_WS_INVISIBLE 0
-#define wxSTC_WS_VISIBLEALWAYS 1
-#define wxSTC_WS_VISIBLEAFTERINDENT 2
-#define wxSTC_EOL_CRLF 0
-#define wxSTC_EOL_CR 1
-#define wxSTC_EOL_LF 2
-
-// The SC_CP_UTF8 value can be used to enter Unicode mode.
-// This is the same value as CP_UTF8 in Windows
-#define wxSTC_CP_UTF8 65001
-
-// The SC_CP_DBCS value can be used to indicate a DBCS mode for GTK+.
-#define wxSTC_CP_DBCS 1
-#define wxSTC_MARKER_MAX 31
-#define wxSTC_MARK_CIRCLE 0
-#define wxSTC_MARK_ROUNDRECT 1
-#define wxSTC_MARK_ARROW 2
-#define wxSTC_MARK_SMALLRECT 3
-#define wxSTC_MARK_SHORTARROW 4
-#define wxSTC_MARK_EMPTY 5
-#define wxSTC_MARK_ARROWDOWN 6
-#define wxSTC_MARK_MINUS 7
-#define wxSTC_MARK_PLUS 8
-
-// Shapes used for outlining column.
-#define wxSTC_MARK_VLINE 9
-#define wxSTC_MARK_LCORNER 10
-#define wxSTC_MARK_TCORNER 11
-#define wxSTC_MARK_BOXPLUS 12
-#define wxSTC_MARK_BOXPLUSCONNECTED 13
-#define wxSTC_MARK_BOXMINUS 14
-#define wxSTC_MARK_BOXMINUSCONNECTED 15
-#define wxSTC_MARK_LCORNERCURVE 16
-#define wxSTC_MARK_TCORNERCURVE 17
-#define wxSTC_MARK_CIRCLEPLUS 18
-#define wxSTC_MARK_CIRCLEPLUSCONNECTED 19
-#define wxSTC_MARK_CIRCLEMINUS 20
-#define wxSTC_MARK_CIRCLEMINUSCONNECTED 21
-
-// Invisible mark that only sets the line background color.
-#define wxSTC_MARK_BACKGROUND 22
-#define wxSTC_MARK_DOTDOTDOT 23
-#define wxSTC_MARK_ARROWS 24
-#define wxSTC_MARK_PIXMAP 25
-#define wxSTC_MARK_FULLRECT 26
-#define wxSTC_MARK_CHARACTER 10000
-
-// Markers used for outlining column.
-#define wxSTC_MARKNUM_FOLDEREND 25
-#define wxSTC_MARKNUM_FOLDEROPENMID 26
-#define wxSTC_MARKNUM_FOLDERMIDTAIL 27
-#define wxSTC_MARKNUM_FOLDERTAIL 28
-#define wxSTC_MARKNUM_FOLDERSUB 29
-#define wxSTC_MARKNUM_FOLDER 30
-#define wxSTC_MARKNUM_FOLDEROPEN 31
-#define wxSTC_MASK_FOLDERS 0xFE000000
-#define wxSTC_MARGIN_SYMBOL 0
-#define wxSTC_MARGIN_NUMBER 1
-#define wxSTC_MARGIN_BACK 2
-#define wxSTC_MARGIN_FORE 3
-
-// Styles in range 32..38 are predefined for parts of the UI and are not used as normal styles.
-// Style 39 is for future use.
-#define wxSTC_STYLE_DEFAULT 32
-#define wxSTC_STYLE_LINENUMBER 33
-#define wxSTC_STYLE_BRACELIGHT 34
-#define wxSTC_STYLE_BRACEBAD 35
-#define wxSTC_STYLE_CONTROLCHAR 36
-#define wxSTC_STYLE_INDENTGUIDE 37
-#define wxSTC_STYLE_CALLTIP 38
-#define wxSTC_STYLE_LASTPREDEFINED 39
-#define wxSTC_STYLE_MAX 127
-
-// Character set identifiers are used in StyleSetCharacterSet.
-// The values are the same as the Windows *_CHARSET values.
-#define wxSTC_CHARSET_ANSI 0
-#define wxSTC_CHARSET_DEFAULT 1
-#define wxSTC_CHARSET_BALTIC 186
-#define wxSTC_CHARSET_CHINESEBIG5 136
-#define wxSTC_CHARSET_EASTEUROPE 238
-#define wxSTC_CHARSET_GB2312 134
-#define wxSTC_CHARSET_GREEK 161
-#define wxSTC_CHARSET_HANGUL 129
-#define wxSTC_CHARSET_MAC 77
-#define wxSTC_CHARSET_OEM 255
-#define wxSTC_CHARSET_RUSSIAN 204
-#define wxSTC_CHARSET_CYRILLIC 1251
-#define wxSTC_CHARSET_SHIFTJIS 128
-#define wxSTC_CHARSET_SYMBOL 2
-#define wxSTC_CHARSET_TURKISH 162
-#define wxSTC_CHARSET_JOHAB 130
-#define wxSTC_CHARSET_HEBREW 177
-#define wxSTC_CHARSET_ARABIC 178
-#define wxSTC_CHARSET_VIETNAMESE 163
-#define wxSTC_CHARSET_THAI 222
-#define wxSTC_CHARSET_8859_15 1000
-#define wxSTC_CASE_MIXED 0
-#define wxSTC_CASE_UPPER 1
-#define wxSTC_CASE_LOWER 2
-#define wxSTC_INDIC_MAX 7
-#define wxSTC_INDIC_PLAIN 0
-#define wxSTC_INDIC_SQUIGGLE 1
-#define wxSTC_INDIC_TT 2
-#define wxSTC_INDIC_DIAGONAL 3
-#define wxSTC_INDIC_STRIKE 4
-#define wxSTC_INDIC_HIDDEN 5
-#define wxSTC_INDIC_BOX 6
-#define wxSTC_INDIC_ROUNDBOX 7
-#define wxSTC_INDIC0_MASK 0x20
-#define wxSTC_INDIC1_MASK 0x40
-#define wxSTC_INDIC2_MASK 0x80
-#define wxSTC_INDICS_MASK 0xE0
-
-// PrintColourMode - use same colours as screen.
-#define wxSTC_PRINT_NORMAL 0
-
-// PrintColourMode - invert the light value of each style for printing.
-#define wxSTC_PRINT_INVERTLIGHT 1
-
-// PrintColourMode - force black text on white background for printing.
-#define wxSTC_PRINT_BLACKONWHITE 2
-
-// PrintColourMode - text stays coloured, but all background is forced to be white for printing.
-#define wxSTC_PRINT_COLOURONWHITE 3
-
-// PrintColourMode - only the default-background is forced to be white for printing.
-#define wxSTC_PRINT_COLOURONWHITEDEFAULTBG 4
-#define wxSTC_FIND_WHOLEWORD 2
-#define wxSTC_FIND_MATCHCASE 4
-#define wxSTC_FIND_WORDSTART 0x00100000
-#define wxSTC_FIND_REGEXP 0x00200000
-#define wxSTC_FIND_POSIX 0x00400000
-#define wxSTC_FOLDLEVELBASE 0x400
-#define wxSTC_FOLDLEVELWHITEFLAG 0x1000
-#define wxSTC_FOLDLEVELHEADERFLAG 0x2000
-#define wxSTC_FOLDLEVELBOXHEADERFLAG 0x4000
-#define wxSTC_FOLDLEVELBOXFOOTERFLAG 0x8000
-#define wxSTC_FOLDLEVELCONTRACTED 0x10000
-#define wxSTC_FOLDLEVELUNINDENT 0x20000
-#define wxSTC_FOLDLEVELNUMBERMASK 0x0FFF
-#define wxSTC_FOLDFLAG_LINEBEFORE_EXPANDED 0x0002
-#define wxSTC_FOLDFLAG_LINEBEFORE_CONTRACTED 0x0004
-#define wxSTC_FOLDFLAG_LINEAFTER_EXPANDED 0x0008
-#define wxSTC_FOLDFLAG_LINEAFTER_CONTRACTED 0x0010
-#define wxSTC_FOLDFLAG_LEVELNUMBERS 0x0040
-#define wxSTC_FOLDFLAG_BOX 0x0001
-#define wxSTC_TIME_FOREVER 10000000
-#define wxSTC_WRAP_NONE 0
-#define wxSTC_WRAP_WORD 1
-#define wxSTC_WRAP_CHAR 2
-#define wxSTC_WRAPVISUALFLAG_NONE 0x0000
-#define wxSTC_WRAPVISUALFLAG_END 0x0001
-#define wxSTC_WRAPVISUALFLAG_START 0x0002
-#define wxSTC_WRAPVISUALFLAGLOC_DEFAULT 0x0000
-#define wxSTC_WRAPVISUALFLAGLOC_END_BY_TEXT 0x0001
-#define wxSTC_WRAPVISUALFLAGLOC_START_BY_TEXT 0x0002
-#define wxSTC_CACHE_NONE 0
-#define wxSTC_CACHE_CARET 1
-#define wxSTC_CACHE_PAGE 2
-#define wxSTC_CACHE_DOCUMENT 3
-#define wxSTC_EDGE_NONE 0
-#define wxSTC_EDGE_LINE 1
-#define wxSTC_EDGE_BACKGROUND 2
-#define wxSTC_CURSORNORMAL -1
-#define wxSTC_CURSORWAIT 4
-
-// Constants for use with SetVisiblePolicy, similar to SetCaretPolicy.
-#define wxSTC_VISIBLE_SLOP 0x01
-#define wxSTC_VISIBLE_STRICT 0x04
-
-// Caret policy, used by SetXCaretPolicy and SetYCaretPolicy.
-// If CARET_SLOP is set, we can define a slop value: caretSlop.
-// This value defines an unwanted zone (UZ) where the caret is... unwanted.
-// This zone is defined as a number of pixels near the vertical margins,
-// and as a number of lines near the horizontal margins.
-// By keeping the caret away from the edges, it is seen within its context,
-// so it is likely that the identifier that the caret is on can be completely seen,
-// and that the current line is seen with some of the lines following it which are
-// often dependent on that line.
-#define wxSTC_CARET_SLOP 0x01
-
-// If CARET_STRICT is set, the policy is enforced... strictly.
-// The caret is centred on the display if slop is not set,
-// and cannot go in the UZ if slop is set.
-#define wxSTC_CARET_STRICT 0x04
-
-// If CARET_JUMPS is set, the display is moved more energetically
-// so the caret can move in the same direction longer before the policy is applied again.
-#define wxSTC_CARET_JUMPS 0x10
-
-// If CARET_EVEN is not set, instead of having symmetrical UZs,
-// the left and bottom UZs are extended up to right and top UZs respectively.
-// This way, we favour the displaying of useful information: the begining of lines,
-// where most code reside, and the lines after the caret, eg. the body of a function.
-#define wxSTC_CARET_EVEN 0x08
-
-// Selection modes
-#define wxSTC_SEL_STREAM 0
-#define wxSTC_SEL_RECTANGLE 1
-#define wxSTC_SEL_LINES 2
-#define wxSTC_ALPHA_TRANSPARENT 0
-#define wxSTC_ALPHA_OPAQUE 255
-#define wxSTC_ALPHA_NOALPHA 256
-
-// Maximum value of keywordSet parameter of SetKeyWords.
-#define wxSTC_KEYWORDSET_MAX 8
-
-// 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 wxSTC_MOD_INSERTTEXT 0x1
-#define wxSTC_MOD_DELETETEXT 0x2
-#define wxSTC_MOD_CHANGESTYLE 0x4
-#define wxSTC_MOD_CHANGEFOLD 0x8
-#define wxSTC_PERFORMED_USER 0x10
-#define wxSTC_PERFORMED_UNDO 0x20
-#define wxSTC_PERFORMED_REDO 0x40
-#define wxSTC_MULTISTEPUNDOREDO 0x80
-#define wxSTC_LASTSTEPINUNDOREDO 0x100
-#define wxSTC_MOD_CHANGEMARKER 0x200
-#define wxSTC_MOD_BEFOREINSERT 0x400
-#define wxSTC_MOD_BEFOREDELETE 0x800
-#define wxSTC_MULTILINEUNDOREDO 0x1000
-#define wxSTC_MODEVENTMASKALL 0x1FFF
-
-// Symbolic key codes and modifier flags.
-// ASCII and other printable characters below 256.
-// Extended keys above 300.
-#define wxSTC_KEY_DOWN 300
-#define wxSTC_KEY_UP 301
-#define wxSTC_KEY_LEFT 302
-#define wxSTC_KEY_RIGHT 303
-#define wxSTC_KEY_HOME 304
-#define wxSTC_KEY_END 305
-#define wxSTC_KEY_PRIOR 306
-#define wxSTC_KEY_NEXT 307
-#define wxSTC_KEY_DELETE 308
-#define wxSTC_KEY_INSERT 309
-#define wxSTC_KEY_ESCAPE 7
-#define wxSTC_KEY_BACK 8
-#define wxSTC_KEY_TAB 9
-#define wxSTC_KEY_RETURN 13
-#define wxSTC_KEY_ADD 310
-#define wxSTC_KEY_SUBTRACT 311
-#define wxSTC_KEY_DIVIDE 312
-#define wxSTC_SCMOD_NORM 0
-#define wxSTC_SCMOD_SHIFT 1
-#define wxSTC_SCMOD_CTRL 2
-#define wxSTC_SCMOD_ALT 4
-
-// For SciLexer.h
-#define wxSTC_LEX_CONTAINER 0
-#define wxSTC_LEX_NULL 1
-#define wxSTC_LEX_PYTHON 2
-#define wxSTC_LEX_CPP 3
-#define wxSTC_LEX_HTML 4
-#define wxSTC_LEX_XML 5
-#define wxSTC_LEX_PERL 6
-#define wxSTC_LEX_SQL 7
-#define wxSTC_LEX_VB 8
-#define wxSTC_LEX_PROPERTIES 9
-#define wxSTC_LEX_ERRORLIST 10
-#define wxSTC_LEX_MAKEFILE 11
-#define wxSTC_LEX_BATCH 12
-#define wxSTC_LEX_XCODE 13
-#define wxSTC_LEX_LATEX 14
-#define wxSTC_LEX_LUA 15
-#define wxSTC_LEX_DIFF 16
-#define wxSTC_LEX_CONF 17
-#define wxSTC_LEX_PASCAL 18
-#define wxSTC_LEX_AVE 19
-#define wxSTC_LEX_ADA 20
-#define wxSTC_LEX_LISP 21
-#define wxSTC_LEX_RUBY 22
-#define wxSTC_LEX_EIFFEL 23
-#define wxSTC_LEX_EIFFELKW 24
-#define wxSTC_LEX_TCL 25
-#define wxSTC_LEX_NNCRONTAB 26
-#define wxSTC_LEX_BULLANT 27
-#define wxSTC_LEX_VBSCRIPT 28
-#define wxSTC_LEX_BAAN 31
-#define wxSTC_LEX_MATLAB 32
-#define wxSTC_LEX_SCRIPTOL 33
-#define wxSTC_LEX_ASM 34
-#define wxSTC_LEX_CPPNOCASE 35
-#define wxSTC_LEX_FORTRAN 36
-#define wxSTC_LEX_F77 37
-#define wxSTC_LEX_CSS 38
-#define wxSTC_LEX_POV 39
-#define wxSTC_LEX_LOUT 40
-#define wxSTC_LEX_ESCRIPT 41
-#define wxSTC_LEX_PS 42
-#define wxSTC_LEX_NSIS 43
-#define wxSTC_LEX_MMIXAL 44
-#define wxSTC_LEX_CLW 45
-#define wxSTC_LEX_CLWNOCASE 46
-#define wxSTC_LEX_LOT 47
-#define wxSTC_LEX_YAML 48
-#define wxSTC_LEX_TEX 49
-#define wxSTC_LEX_METAPOST 50
-#define wxSTC_LEX_POWERBASIC 51
-#define wxSTC_LEX_FORTH 52
-#define wxSTC_LEX_ERLANG 53
-#define wxSTC_LEX_OCTAVE 54
-#define wxSTC_LEX_MSSQL 55
-#define wxSTC_LEX_VERILOG 56
-#define wxSTC_LEX_KIX 57
-#define wxSTC_LEX_GUI4CLI 58
-#define wxSTC_LEX_SPECMAN 59
-#define wxSTC_LEX_AU3 60
-#define wxSTC_LEX_APDL 61
-#define wxSTC_LEX_BASH 62
-#define wxSTC_LEX_ASN1 63
-#define wxSTC_LEX_VHDL 64
-#define wxSTC_LEX_CAML 65
-#define wxSTC_LEX_BLITZBASIC 66
-#define wxSTC_LEX_PUREBASIC 67
-#define wxSTC_LEX_HASKELL 68
-#define wxSTC_LEX_PHPSCRIPT 69
-#define wxSTC_LEX_TADS3 70
-#define wxSTC_LEX_REBOL 71
-#define wxSTC_LEX_SMALLTALK 72
-#define wxSTC_LEX_FLAGSHIP 73
-#define wxSTC_LEX_CSOUND 74
-#define wxSTC_LEX_FREEBASIC 75
-#define wxSTC_LEX_INNOSETUP 76
-#define wxSTC_LEX_OPAL 77
-#define wxSTC_LEX_SPICE 78
-
-// When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
-// value assigned in sequence from SCLEX_AUTOMATIC+1.
-#define wxSTC_LEX_AUTOMATIC 1000
-
-// Lexical states for SCLEX_PYTHON
-#define wxSTC_P_DEFAULT 0
-#define wxSTC_P_COMMENTLINE 1
-#define wxSTC_P_NUMBER 2
-#define wxSTC_P_STRING 3
-#define wxSTC_P_CHARACTER 4
-#define wxSTC_P_WORD 5
-#define wxSTC_P_TRIPLE 6
-#define wxSTC_P_TRIPLEDOUBLE 7
-#define wxSTC_P_CLASSNAME 8
-#define wxSTC_P_DEFNAME 9
-#define wxSTC_P_OPERATOR 10
-#define wxSTC_P_IDENTIFIER 11
-#define wxSTC_P_COMMENTBLOCK 12
-#define wxSTC_P_STRINGEOL 13
-#define wxSTC_P_WORD2 14
-#define wxSTC_P_DECORATOR 15
-
-// Lexical states for SCLEX_CPP
-#define wxSTC_C_DEFAULT 0
-#define wxSTC_C_COMMENT 1
-#define wxSTC_C_COMMENTLINE 2
-#define wxSTC_C_COMMENTDOC 3
-#define wxSTC_C_NUMBER 4
-#define wxSTC_C_WORD 5
-#define wxSTC_C_STRING 6
-#define wxSTC_C_CHARACTER 7
-#define wxSTC_C_UUID 8
-#define wxSTC_C_PREPROCESSOR 9
-#define wxSTC_C_OPERATOR 10
-#define wxSTC_C_IDENTIFIER 11
-#define wxSTC_C_STRINGEOL 12
-#define wxSTC_C_VERBATIM 13
-#define wxSTC_C_REGEX 14
-#define wxSTC_C_COMMENTLINEDOC 15
-#define wxSTC_C_WORD2 16
-#define wxSTC_C_COMMENTDOCKEYWORD 17
-#define wxSTC_C_COMMENTDOCKEYWORDERROR 18
-#define wxSTC_C_GLOBALCLASS 19
-
-// Lexical states for SCLEX_TCL
-#define wxSTC_TCL_DEFAULT 0
-#define wxSTC_TCL_COMMENT 1
-#define wxSTC_TCL_COMMENTLINE 2
-#define wxSTC_TCL_NUMBER 3
-#define wxSTC_TCL_WORD_IN_QUOTE 4
-#define wxSTC_TCL_IN_QUOTE 5
-#define wxSTC_TCL_OPERATOR 6
-#define wxSTC_TCL_IDENTIFIER 7
-#define wxSTC_TCL_SUBSTITUTION 8
-#define wxSTC_TCL_SUB_BRACE 9
-#define wxSTC_TCL_MODIFIER 10
-#define wxSTC_TCL_EXPAND 11
-#define wxSTC_TCL_WORD 12
-#define wxSTC_TCL_WORD2 13
-#define wxSTC_TCL_WORD3 14
-#define wxSTC_TCL_WORD4 15
-#define wxSTC_TCL_WORD5 16
-#define wxSTC_TCL_WORD6 17
-#define wxSTC_TCL_WORD7 18
-#define wxSTC_TCL_WORD8 19
-#define wxSTC_TCL_COMMENT_BOX 20
-#define wxSTC_TCL_BLOCK_COMMENT 21
-
-// Lexical states for SCLEX_HTML, SCLEX_XML
-#define wxSTC_H_DEFAULT 0
-#define wxSTC_H_TAG 1
-#define wxSTC_H_TAGUNKNOWN 2
-#define wxSTC_H_ATTRIBUTE 3
-#define wxSTC_H_ATTRIBUTEUNKNOWN 4
-#define wxSTC_H_NUMBER 5
-#define wxSTC_H_DOUBLESTRING 6
-#define wxSTC_H_SINGLESTRING 7
-#define wxSTC_H_OTHER 8
-#define wxSTC_H_COMMENT 9
-#define wxSTC_H_ENTITY 10
-
-// XML and ASP
-#define wxSTC_H_TAGEND 11
-#define wxSTC_H_XMLSTART 12
-#define wxSTC_H_XMLEND 13
-#define wxSTC_H_SCRIPT 14
-#define wxSTC_H_ASP 15
-#define wxSTC_H_ASPAT 16
-#define wxSTC_H_CDATA 17
-#define wxSTC_H_QUESTION 18
-
-// More HTML
-#define wxSTC_H_VALUE 19
-
-// X-Code
-#define wxSTC_H_XCCOMMENT 20
-
-// SGML
-#define wxSTC_H_SGML_DEFAULT 21
-#define wxSTC_H_SGML_COMMAND 22
-#define wxSTC_H_SGML_1ST_PARAM 23
-#define wxSTC_H_SGML_DOUBLESTRING 24
-#define wxSTC_H_SGML_SIMPLESTRING 25
-#define wxSTC_H_SGML_ERROR 26
-#define wxSTC_H_SGML_SPECIAL 27
-#define wxSTC_H_SGML_ENTITY 28
-#define wxSTC_H_SGML_COMMENT 29
-#define wxSTC_H_SGML_1ST_PARAM_COMMENT 30
-#define wxSTC_H_SGML_BLOCK_DEFAULT 31
-
-// Embedded Javascript
-#define wxSTC_HJ_START 40
-#define wxSTC_HJ_DEFAULT 41
-#define wxSTC_HJ_COMMENT 42
-#define wxSTC_HJ_COMMENTLINE 43
-#define wxSTC_HJ_COMMENTDOC 44
-#define wxSTC_HJ_NUMBER 45
-#define wxSTC_HJ_WORD 46
-#define wxSTC_HJ_KEYWORD 47
-#define wxSTC_HJ_DOUBLESTRING 48
-#define wxSTC_HJ_SINGLESTRING 49
-#define wxSTC_HJ_SYMBOLS 50
-#define wxSTC_HJ_STRINGEOL 51
-#define wxSTC_HJ_REGEX 52
-
-// ASP Javascript
-#define wxSTC_HJA_START 55
-#define wxSTC_HJA_DEFAULT 56
-#define wxSTC_HJA_COMMENT 57
-#define wxSTC_HJA_COMMENTLINE 58
-#define wxSTC_HJA_COMMENTDOC 59
-#define wxSTC_HJA_NUMBER 60
-#define wxSTC_HJA_WORD 61
-#define wxSTC_HJA_KEYWORD 62
-#define wxSTC_HJA_DOUBLESTRING 63
-#define wxSTC_HJA_SINGLESTRING 64
-#define wxSTC_HJA_SYMBOLS 65
-#define wxSTC_HJA_STRINGEOL 66
-#define wxSTC_HJA_REGEX 67
-
-// Embedded VBScript
-#define wxSTC_HB_START 70
-#define wxSTC_HB_DEFAULT 71
-#define wxSTC_HB_COMMENTLINE 72
-#define wxSTC_HB_NUMBER 73
-#define wxSTC_HB_WORD 74
-#define wxSTC_HB_STRING 75
-#define wxSTC_HB_IDENTIFIER 76
-#define wxSTC_HB_STRINGEOL 77
-
-// ASP VBScript
-#define wxSTC_HBA_START 80
-#define wxSTC_HBA_DEFAULT 81
-#define wxSTC_HBA_COMMENTLINE 82
-#define wxSTC_HBA_NUMBER 83
-#define wxSTC_HBA_WORD 84
-#define wxSTC_HBA_STRING 85
-#define wxSTC_HBA_IDENTIFIER 86
-#define wxSTC_HBA_STRINGEOL 87
-
-// Embedded Python
-#define wxSTC_HP_START 90
-#define wxSTC_HP_DEFAULT 91
-#define wxSTC_HP_COMMENTLINE 92
-#define wxSTC_HP_NUMBER 93
-#define wxSTC_HP_STRING 94
-#define wxSTC_HP_CHARACTER 95
-#define wxSTC_HP_WORD 96
-#define wxSTC_HP_TRIPLE 97
-#define wxSTC_HP_TRIPLEDOUBLE 98
-#define wxSTC_HP_CLASSNAME 99
-#define wxSTC_HP_DEFNAME 100
-#define wxSTC_HP_OPERATOR 101
-#define wxSTC_HP_IDENTIFIER 102
-
-// PHP
-#define wxSTC_HPHP_COMPLEX_VARIABLE 104
-
-// ASP Python
-#define wxSTC_HPA_START 105
-#define wxSTC_HPA_DEFAULT 106
-#define wxSTC_HPA_COMMENTLINE 107
-#define wxSTC_HPA_NUMBER 108
-#define wxSTC_HPA_STRING 109
-#define wxSTC_HPA_CHARACTER 110
-#define wxSTC_HPA_WORD 111
-#define wxSTC_HPA_TRIPLE 112
-#define wxSTC_HPA_TRIPLEDOUBLE 113
-#define wxSTC_HPA_CLASSNAME 114
-#define wxSTC_HPA_DEFNAME 115
-#define wxSTC_HPA_OPERATOR 116
-#define wxSTC_HPA_IDENTIFIER 117
-
-// PHP
-#define wxSTC_HPHP_DEFAULT 118
-#define wxSTC_HPHP_HSTRING 119
-#define wxSTC_HPHP_SIMPLESTRING 120
-#define wxSTC_HPHP_WORD 121
-#define wxSTC_HPHP_NUMBER 122
-#define wxSTC_HPHP_VARIABLE 123
-#define wxSTC_HPHP_COMMENT 124
-#define wxSTC_HPHP_COMMENTLINE 125
-#define wxSTC_HPHP_HSTRING_VARIABLE 126
-#define wxSTC_HPHP_OPERATOR 127
-
-// Lexical states for SCLEX_PERL
-#define wxSTC_PL_DEFAULT 0
-#define wxSTC_PL_ERROR 1
-#define wxSTC_PL_COMMENTLINE 2
-#define wxSTC_PL_POD 3
-#define wxSTC_PL_NUMBER 4
-#define wxSTC_PL_WORD 5
-#define wxSTC_PL_STRING 6
-#define wxSTC_PL_CHARACTER 7
-#define wxSTC_PL_PUNCTUATION 8
-#define wxSTC_PL_PREPROCESSOR 9
-#define wxSTC_PL_OPERATOR 10
-#define wxSTC_PL_IDENTIFIER 11
-#define wxSTC_PL_SCALAR 12
-#define wxSTC_PL_ARRAY 13
-#define wxSTC_PL_HASH 14
-#define wxSTC_PL_SYMBOLTABLE 15
-#define wxSTC_PL_VARIABLE_INDEXER 16
-#define wxSTC_PL_REGEX 17
-#define wxSTC_PL_REGSUBST 18
-#define wxSTC_PL_LONGQUOTE 19
-#define wxSTC_PL_BACKTICKS 20
-#define wxSTC_PL_DATASECTION 21
-#define wxSTC_PL_HERE_DELIM 22
-#define wxSTC_PL_HERE_Q 23
-#define wxSTC_PL_HERE_QQ 24
-#define wxSTC_PL_HERE_QX 25
-#define wxSTC_PL_STRING_Q 26
-#define wxSTC_PL_STRING_QQ 27
-#define wxSTC_PL_STRING_QX 28
-#define wxSTC_PL_STRING_QR 29
-#define wxSTC_PL_STRING_QW 30
-#define wxSTC_PL_POD_VERB 31
-
-// Lexical states for SCLEX_RUBY
-#define wxSTC_RB_DEFAULT 0
-#define wxSTC_RB_ERROR 1
-#define wxSTC_RB_COMMENTLINE 2
-#define wxSTC_RB_POD 3
-#define wxSTC_RB_NUMBER 4
-#define wxSTC_RB_WORD 5
-#define wxSTC_RB_STRING 6
-#define wxSTC_RB_CHARACTER 7
-#define wxSTC_RB_CLASSNAME 8
-#define wxSTC_RB_DEFNAME 9
-#define wxSTC_RB_OPERATOR 10
-#define wxSTC_RB_IDENTIFIER 11
-#define wxSTC_RB_REGEX 12
-#define wxSTC_RB_GLOBAL 13
-#define wxSTC_RB_SYMBOL 14
-#define wxSTC_RB_MODULE_NAME 15
-#define wxSTC_RB_INSTANCE_VAR 16
-#define wxSTC_RB_CLASS_VAR 17
-#define wxSTC_RB_BACKTICKS 18
-#define wxSTC_RB_DATASECTION 19
-#define wxSTC_RB_HERE_DELIM 20
-#define wxSTC_RB_HERE_Q 21
-#define wxSTC_RB_HERE_QQ 22
-#define wxSTC_RB_HERE_QX 23
-#define wxSTC_RB_STRING_Q 24
-#define wxSTC_RB_STRING_QQ 25
-#define wxSTC_RB_STRING_QX 26
-#define wxSTC_RB_STRING_QR 27
-#define wxSTC_RB_STRING_QW 28
-#define wxSTC_RB_WORD_DEMOTED 29
-#define wxSTC_RB_STDIN 30
-#define wxSTC_RB_STDOUT 31
-#define wxSTC_RB_STDERR 40
-#define wxSTC_RB_UPPER_BOUND 41
-
-// Lexical states for SCLEX_VB, SCLEX_VBSCRIPT, SCLEX_POWERBASIC
-#define wxSTC_B_DEFAULT 0
-#define wxSTC_B_COMMENT 1
-#define wxSTC_B_NUMBER 2
-#define wxSTC_B_KEYWORD 3
-#define wxSTC_B_STRING 4
-#define wxSTC_B_PREPROCESSOR 5
-#define wxSTC_B_OPERATOR 6
-#define wxSTC_B_IDENTIFIER 7
-#define wxSTC_B_DATE 8
-#define wxSTC_B_STRINGEOL 9
-#define wxSTC_B_KEYWORD2 10
-#define wxSTC_B_KEYWORD3 11
-#define wxSTC_B_KEYWORD4 12
-#define wxSTC_B_CONSTANT 13
-#define wxSTC_B_ASM 14
-#define wxSTC_B_LABEL 15
-#define wxSTC_B_ERROR 16
-#define wxSTC_B_HEXNUMBER 17
-#define wxSTC_B_BINNUMBER 18
-
-// Lexical states for SCLEX_PROPERTIES
-#define wxSTC_PROPS_DEFAULT 0
-#define wxSTC_PROPS_COMMENT 1
-#define wxSTC_PROPS_SECTION 2
-#define wxSTC_PROPS_ASSIGNMENT 3
-#define wxSTC_PROPS_DEFVAL 4
-#define wxSTC_PROPS_KEY 5
-
-// Lexical states for SCLEX_LATEX
-#define wxSTC_L_DEFAULT 0
-#define wxSTC_L_COMMAND 1
-#define wxSTC_L_TAG 2
-#define wxSTC_L_MATH 3
-#define wxSTC_L_COMMENT 4
-
-// Lexical states for SCLEX_LUA
-#define wxSTC_LUA_DEFAULT 0
-#define wxSTC_LUA_COMMENT 1
-#define wxSTC_LUA_COMMENTLINE 2
-#define wxSTC_LUA_COMMENTDOC 3
-#define wxSTC_LUA_NUMBER 4
-#define wxSTC_LUA_WORD 5
-#define wxSTC_LUA_STRING 6
-#define wxSTC_LUA_CHARACTER 7
-#define wxSTC_LUA_LITERALSTRING 8
-#define wxSTC_LUA_PREPROCESSOR 9
-#define wxSTC_LUA_OPERATOR 10
-#define wxSTC_LUA_IDENTIFIER 11
-#define wxSTC_LUA_STRINGEOL 12
-#define wxSTC_LUA_WORD2 13
-#define wxSTC_LUA_WORD3 14
-#define wxSTC_LUA_WORD4 15
-#define wxSTC_LUA_WORD5 16
-#define wxSTC_LUA_WORD6 17
-#define wxSTC_LUA_WORD7 18
-#define wxSTC_LUA_WORD8 19
-
-// Lexical states for SCLEX_ERRORLIST
-#define wxSTC_ERR_DEFAULT 0
-#define wxSTC_ERR_PYTHON 1
-#define wxSTC_ERR_GCC 2
-#define wxSTC_ERR_MS 3
-#define wxSTC_ERR_CMD 4
-#define wxSTC_ERR_BORLAND 5
-#define wxSTC_ERR_PERL 6
-#define wxSTC_ERR_NET 7
-#define wxSTC_ERR_LUA 8
-#define wxSTC_ERR_CTAG 9
-#define wxSTC_ERR_DIFF_CHANGED 10
-#define wxSTC_ERR_DIFF_ADDITION 11
-#define wxSTC_ERR_DIFF_DELETION 12
-#define wxSTC_ERR_DIFF_MESSAGE 13
-#define wxSTC_ERR_PHP 14
-#define wxSTC_ERR_ELF 15
-#define wxSTC_ERR_IFC 16
-#define wxSTC_ERR_IFORT 17
-#define wxSTC_ERR_ABSF 18
-#define wxSTC_ERR_TIDY 19
-#define wxSTC_ERR_JAVA_STACK 20
-
-// Lexical states for SCLEX_BATCH
-#define wxSTC_BAT_DEFAULT 0
-#define wxSTC_BAT_COMMENT 1
-#define wxSTC_BAT_WORD 2
-#define wxSTC_BAT_LABEL 3
-#define wxSTC_BAT_HIDE 4
-#define wxSTC_BAT_COMMAND 5
-#define wxSTC_BAT_IDENTIFIER 6
-#define wxSTC_BAT_OPERATOR 7
-
-// Lexical states for SCLEX_MAKEFILE
-#define wxSTC_MAKE_DEFAULT 0
-#define wxSTC_MAKE_COMMENT 1
-#define wxSTC_MAKE_PREPROCESSOR 2
-#define wxSTC_MAKE_IDENTIFIER 3
-#define wxSTC_MAKE_OPERATOR 4
-#define wxSTC_MAKE_TARGET 5
-#define wxSTC_MAKE_IDEOL 9
-
-// Lexical states for SCLEX_DIFF
-#define wxSTC_DIFF_DEFAULT 0
-#define wxSTC_DIFF_COMMENT 1
-#define wxSTC_DIFF_COMMAND 2
-#define wxSTC_DIFF_HEADER 3
-#define wxSTC_DIFF_POSITION 4
-#define wxSTC_DIFF_DELETED 5
-#define wxSTC_DIFF_ADDED 6
-
-// Lexical states for SCLEX_CONF (Apache Configuration Files Lexer)
-#define wxSTC_CONF_DEFAULT 0
-#define wxSTC_CONF_COMMENT 1
-#define wxSTC_CONF_NUMBER 2
-#define wxSTC_CONF_IDENTIFIER 3
-#define wxSTC_CONF_EXTENSION 4
-#define wxSTC_CONF_PARAMETER 5
-#define wxSTC_CONF_STRING 6
-#define wxSTC_CONF_OPERATOR 7
-#define wxSTC_CONF_IP 8
-#define wxSTC_CONF_DIRECTIVE 9
-
-// Lexical states for SCLEX_AVE, Avenue
-#define wxSTC_AVE_DEFAULT 0
-#define wxSTC_AVE_COMMENT 1
-#define wxSTC_AVE_NUMBER 2
-#define wxSTC_AVE_WORD 3
-#define wxSTC_AVE_STRING 6
-#define wxSTC_AVE_ENUM 7
-#define wxSTC_AVE_STRINGEOL 8
-#define wxSTC_AVE_IDENTIFIER 9
-#define wxSTC_AVE_OPERATOR 10
-#define wxSTC_AVE_WORD1 11
-#define wxSTC_AVE_WORD2 12
-#define wxSTC_AVE_WORD3 13
-#define wxSTC_AVE_WORD4 14
-#define wxSTC_AVE_WORD5 15
-#define wxSTC_AVE_WORD6 16
-
-// Lexical states for SCLEX_ADA
-#define wxSTC_ADA_DEFAULT 0
-#define wxSTC_ADA_WORD 1
-#define wxSTC_ADA_IDENTIFIER 2
-#define wxSTC_ADA_NUMBER 3
-#define wxSTC_ADA_DELIMITER 4
-#define wxSTC_ADA_CHARACTER 5
-#define wxSTC_ADA_CHARACTEREOL 6
-#define wxSTC_ADA_STRING 7
-#define wxSTC_ADA_STRINGEOL 8
-#define wxSTC_ADA_LABEL 9
-#define wxSTC_ADA_COMMENTLINE 10
-#define wxSTC_ADA_ILLEGAL 11
-
-// Lexical states for SCLEX_BAAN
-#define wxSTC_BAAN_DEFAULT 0
-#define wxSTC_BAAN_COMMENT 1
-#define wxSTC_BAAN_COMMENTDOC 2
-#define wxSTC_BAAN_NUMBER 3
-#define wxSTC_BAAN_WORD 4
-#define wxSTC_BAAN_STRING 5
-#define wxSTC_BAAN_PREPROCESSOR 6
-#define wxSTC_BAAN_OPERATOR 7
-#define wxSTC_BAAN_IDENTIFIER 8
-#define wxSTC_BAAN_STRINGEOL 9
-#define wxSTC_BAAN_WORD2 10
-
-// Lexical states for SCLEX_LISP
-#define wxSTC_LISP_DEFAULT 0
-#define wxSTC_LISP_COMMENT 1
-#define wxSTC_LISP_NUMBER 2
-#define wxSTC_LISP_KEYWORD 3
-#define wxSTC_LISP_KEYWORD_KW 4
-#define wxSTC_LISP_SYMBOL 5
-#define wxSTC_LISP_STRING 6
-#define wxSTC_LISP_STRINGEOL 8
-#define wxSTC_LISP_IDENTIFIER 9
-#define wxSTC_LISP_OPERATOR 10
-#define wxSTC_LISP_SPECIAL 11
-#define wxSTC_LISP_MULTI_COMMENT 12
-
-// Lexical states for SCLEX_EIFFEL and SCLEX_EIFFELKW
-#define wxSTC_EIFFEL_DEFAULT 0
-#define wxSTC_EIFFEL_COMMENTLINE 1
-#define wxSTC_EIFFEL_NUMBER 2
-#define wxSTC_EIFFEL_WORD 3
-#define wxSTC_EIFFEL_STRING 4
-#define wxSTC_EIFFEL_CHARACTER 5
-#define wxSTC_EIFFEL_OPERATOR 6
-#define wxSTC_EIFFEL_IDENTIFIER 7
-#define wxSTC_EIFFEL_STRINGEOL 8
-
-// Lexical states for SCLEX_NNCRONTAB (nnCron crontab Lexer)
-#define wxSTC_NNCRONTAB_DEFAULT 0
-#define wxSTC_NNCRONTAB_COMMENT 1
-#define wxSTC_NNCRONTAB_TASK 2
-#define wxSTC_NNCRONTAB_SECTION 3
-#define wxSTC_NNCRONTAB_KEYWORD 4
-#define wxSTC_NNCRONTAB_MODIFIER 5
-#define wxSTC_NNCRONTAB_ASTERISK 6
-#define wxSTC_NNCRONTAB_NUMBER 7
-#define wxSTC_NNCRONTAB_STRING 8
-#define wxSTC_NNCRONTAB_ENVIRONMENT 9
-#define wxSTC_NNCRONTAB_IDENTIFIER 10
-
-// Lexical states for SCLEX_FORTH (Forth Lexer)
-#define wxSTC_FORTH_DEFAULT 0
-#define wxSTC_FORTH_COMMENT 1
-#define wxSTC_FORTH_COMMENT_ML 2
-#define wxSTC_FORTH_IDENTIFIER 3
-#define wxSTC_FORTH_CONTROL 4
-#define wxSTC_FORTH_KEYWORD 5
-#define wxSTC_FORTH_DEFWORD 6
-#define wxSTC_FORTH_PREWORD1 7
-#define wxSTC_FORTH_PREWORD2 8
-#define wxSTC_FORTH_NUMBER 9
-#define wxSTC_FORTH_STRING 10
-#define wxSTC_FORTH_LOCALE 11
-
-// Lexical states for SCLEX_MATLAB
-#define wxSTC_MATLAB_DEFAULT 0
-#define wxSTC_MATLAB_COMMENT 1
-#define wxSTC_MATLAB_COMMAND 2
-#define wxSTC_MATLAB_NUMBER 3
-#define wxSTC_MATLAB_KEYWORD 4
-
-// single quoted string
-#define wxSTC_MATLAB_STRING 5
-#define wxSTC_MATLAB_OPERATOR 6
-#define wxSTC_MATLAB_IDENTIFIER 7
-#define wxSTC_MATLAB_DOUBLEQUOTESTRING 8
-
-// Lexical states for SCLEX_SCRIPTOL
-#define wxSTC_SCRIPTOL_DEFAULT 0
-#define wxSTC_SCRIPTOL_WHITE 1
-#define wxSTC_SCRIPTOL_COMMENTLINE 2
-#define wxSTC_SCRIPTOL_PERSISTENT 3
-#define wxSTC_SCRIPTOL_CSTYLE 4
-#define wxSTC_SCRIPTOL_COMMENTBLOCK 5
-#define wxSTC_SCRIPTOL_NUMBER 6
-#define wxSTC_SCRIPTOL_STRING 7
-#define wxSTC_SCRIPTOL_CHARACTER 8
-#define wxSTC_SCRIPTOL_STRINGEOL 9
-#define wxSTC_SCRIPTOL_KEYWORD 10
-#define wxSTC_SCRIPTOL_OPERATOR 11
-#define wxSTC_SCRIPTOL_IDENTIFIER 12
-#define wxSTC_SCRIPTOL_TRIPLE 13
-#define wxSTC_SCRIPTOL_CLASSNAME 14
-#define wxSTC_SCRIPTOL_PREPROCESSOR 15
-
-// Lexical states for SCLEX_ASM
-#define wxSTC_ASM_DEFAULT 0
-#define wxSTC_ASM_COMMENT 1
-#define wxSTC_ASM_NUMBER 2
-#define wxSTC_ASM_STRING 3
-#define wxSTC_ASM_OPERATOR 4
-#define wxSTC_ASM_IDENTIFIER 5
-#define wxSTC_ASM_CPUINSTRUCTION 6
-#define wxSTC_ASM_MATHINSTRUCTION 7
-#define wxSTC_ASM_REGISTER 8
-#define wxSTC_ASM_DIRECTIVE 9
-#define wxSTC_ASM_DIRECTIVEOPERAND 10
-#define wxSTC_ASM_COMMENTBLOCK 11
-#define wxSTC_ASM_CHARACTER 12
-#define wxSTC_ASM_STRINGEOL 13
-#define wxSTC_ASM_EXTINSTRUCTION 14
-
-// Lexical states for SCLEX_FORTRAN
-#define wxSTC_F_DEFAULT 0
-#define wxSTC_F_COMMENT 1
-#define wxSTC_F_NUMBER 2
-#define wxSTC_F_STRING1 3
-#define wxSTC_F_STRING2 4
-#define wxSTC_F_STRINGEOL 5
-#define wxSTC_F_OPERATOR 6
-#define wxSTC_F_IDENTIFIER 7
-#define wxSTC_F_WORD 8
-#define wxSTC_F_WORD2 9
-#define wxSTC_F_WORD3 10
-#define wxSTC_F_PREPROCESSOR 11
-#define wxSTC_F_OPERATOR2 12
-#define wxSTC_F_LABEL 13
-#define wxSTC_F_CONTINUATION 14
-
-// Lexical states for SCLEX_CSS
-#define wxSTC_CSS_DEFAULT 0
-#define wxSTC_CSS_TAG 1
-#define wxSTC_CSS_CLASS 2
-#define wxSTC_CSS_PSEUDOCLASS 3
-#define wxSTC_CSS_UNKNOWN_PSEUDOCLASS 4
-#define wxSTC_CSS_OPERATOR 5
-#define wxSTC_CSS_IDENTIFIER 6
-#define wxSTC_CSS_UNKNOWN_IDENTIFIER 7
-#define wxSTC_CSS_VALUE 8
-#define wxSTC_CSS_COMMENT 9
-#define wxSTC_CSS_ID 10
-#define wxSTC_CSS_IMPORTANT 11
-#define wxSTC_CSS_DIRECTIVE 12
-#define wxSTC_CSS_DOUBLESTRING 13
-#define wxSTC_CSS_SINGLESTRING 14
-#define wxSTC_CSS_IDENTIFIER2 15
-#define wxSTC_CSS_ATTRIBUTE 16
-
-// Lexical states for SCLEX_POV
-#define wxSTC_POV_DEFAULT 0
-#define wxSTC_POV_COMMENT 1
-#define wxSTC_POV_COMMENTLINE 2
-#define wxSTC_POV_NUMBER 3
-#define wxSTC_POV_OPERATOR 4
-#define wxSTC_POV_IDENTIFIER 5
-#define wxSTC_POV_STRING 6
-#define wxSTC_POV_STRINGEOL 7
-#define wxSTC_POV_DIRECTIVE 8
-#define wxSTC_POV_BADDIRECTIVE 9
-#define wxSTC_POV_WORD2 10
-#define wxSTC_POV_WORD3 11
-#define wxSTC_POV_WORD4 12
-#define wxSTC_POV_WORD5 13
-#define wxSTC_POV_WORD6 14
-#define wxSTC_POV_WORD7 15
-#define wxSTC_POV_WORD8 16
-
-// Lexical states for SCLEX_LOUT
-#define wxSTC_LOUT_DEFAULT 0
-#define wxSTC_LOUT_COMMENT 1
-#define wxSTC_LOUT_NUMBER 2
-#define wxSTC_LOUT_WORD 3
-#define wxSTC_LOUT_WORD2 4
-#define wxSTC_LOUT_WORD3 5
-#define wxSTC_LOUT_WORD4 6
-#define wxSTC_LOUT_STRING 7
-#define wxSTC_LOUT_OPERATOR 8
-#define wxSTC_LOUT_IDENTIFIER 9
-#define wxSTC_LOUT_STRINGEOL 10
-
-// Lexical states for SCLEX_ESCRIPT
-#define wxSTC_ESCRIPT_DEFAULT 0
-#define wxSTC_ESCRIPT_COMMENT 1
-#define wxSTC_ESCRIPT_COMMENTLINE 2
-#define wxSTC_ESCRIPT_COMMENTDOC 3
-#define wxSTC_ESCRIPT_NUMBER 4
-#define wxSTC_ESCRIPT_WORD 5
-#define wxSTC_ESCRIPT_STRING 6
-#define wxSTC_ESCRIPT_OPERATOR 7
-#define wxSTC_ESCRIPT_IDENTIFIER 8
-#define wxSTC_ESCRIPT_BRACE 9
-#define wxSTC_ESCRIPT_WORD2 10
-#define wxSTC_ESCRIPT_WORD3 11
-
-// Lexical states for SCLEX_PS
-#define wxSTC_PS_DEFAULT 0
-#define wxSTC_PS_COMMENT 1
-#define wxSTC_PS_DSC_COMMENT 2
-#define wxSTC_PS_DSC_VALUE 3
-#define wxSTC_PS_NUMBER 4
-#define wxSTC_PS_NAME 5
-#define wxSTC_PS_KEYWORD 6
-#define wxSTC_PS_LITERAL 7
-#define wxSTC_PS_IMMEVAL 8
-#define wxSTC_PS_PAREN_ARRAY 9
-#define wxSTC_PS_PAREN_DICT 10
-#define wxSTC_PS_PAREN_PROC 11
-#define wxSTC_PS_TEXT 12
-#define wxSTC_PS_HEXSTRING 13
-#define wxSTC_PS_BASE85STRING 14
-#define wxSTC_PS_BADSTRINGCHAR 15
-
-// Lexical states for SCLEX_NSIS
-#define wxSTC_NSIS_DEFAULT 0
-#define wxSTC_NSIS_COMMENT 1
-#define wxSTC_NSIS_STRINGDQ 2
-#define wxSTC_NSIS_STRINGLQ 3
-#define wxSTC_NSIS_STRINGRQ 4
-#define wxSTC_NSIS_FUNCTION 5
-#define wxSTC_NSIS_VARIABLE 6
-#define wxSTC_NSIS_LABEL 7
-#define wxSTC_NSIS_USERDEFINED 8
-#define wxSTC_NSIS_SECTIONDEF 9
-#define wxSTC_NSIS_SUBSECTIONDEF 10
-#define wxSTC_NSIS_IFDEFINEDEF 11
-#define wxSTC_NSIS_MACRODEF 12
-#define wxSTC_NSIS_STRINGVAR 13
-#define wxSTC_NSIS_NUMBER 14
-#define wxSTC_NSIS_SECTIONGROUP 15
-#define wxSTC_NSIS_PAGEEX 16
-#define wxSTC_NSIS_FUNCTIONDEF 17
-#define wxSTC_NSIS_COMMENTBOX 18
-
-// Lexical states for SCLEX_MMIXAL
-#define wxSTC_MMIXAL_LEADWS 0
-#define wxSTC_MMIXAL_COMMENT 1
-#define wxSTC_MMIXAL_LABEL 2
-#define wxSTC_MMIXAL_OPCODE 3
-#define wxSTC_MMIXAL_OPCODE_PRE 4
-#define wxSTC_MMIXAL_OPCODE_VALID 5
-#define wxSTC_MMIXAL_OPCODE_UNKNOWN 6
-#define wxSTC_MMIXAL_OPCODE_POST 7
-#define wxSTC_MMIXAL_OPERANDS 8
-#define wxSTC_MMIXAL_NUMBER 9
-#define wxSTC_MMIXAL_REF 10
-#define wxSTC_MMIXAL_CHAR 11
-#define wxSTC_MMIXAL_STRING 12
-#define wxSTC_MMIXAL_REGISTER 13
-#define wxSTC_MMIXAL_HEX 14
-#define wxSTC_MMIXAL_OPERATOR 15
-#define wxSTC_MMIXAL_SYMBOL 16
-#define wxSTC_MMIXAL_INCLUDE 17
-
-// Lexical states for SCLEX_CLW
-#define wxSTC_CLW_DEFAULT 0
-#define wxSTC_CLW_LABEL 1
-#define wxSTC_CLW_COMMENT 2
-#define wxSTC_CLW_STRING 3
-#define wxSTC_CLW_USER_IDENTIFIER 4
-#define wxSTC_CLW_INTEGER_CONSTANT 5
-#define wxSTC_CLW_REAL_CONSTANT 6
-#define wxSTC_CLW_PICTURE_STRING 7
-#define wxSTC_CLW_KEYWORD 8
-#define wxSTC_CLW_COMPILER_DIRECTIVE 9
-#define wxSTC_CLW_RUNTIME_EXPRESSIONS 10
-#define wxSTC_CLW_BUILTIN_PROCEDURES_FUNCTION 11
-#define wxSTC_CLW_STRUCTURE_DATA_TYPE 12
-#define wxSTC_CLW_ATTRIBUTE 13
-#define wxSTC_CLW_STANDARD_EQUATE 14
-#define wxSTC_CLW_ERROR 15
-#define wxSTC_CLW_DEPRECATED 16
-
-// Lexical states for SCLEX_LOT
-#define wxSTC_LOT_DEFAULT 0
-#define wxSTC_LOT_HEADER 1
-#define wxSTC_LOT_BREAK 2
-#define wxSTC_LOT_SET 3
-#define wxSTC_LOT_PASS 4
-#define wxSTC_LOT_FAIL 5
-#define wxSTC_LOT_ABORT 6
-
-// Lexical states for SCLEX_YAML
-#define wxSTC_YAML_DEFAULT 0
-#define wxSTC_YAML_COMMENT 1
-#define wxSTC_YAML_IDENTIFIER 2
-#define wxSTC_YAML_KEYWORD 3
-#define wxSTC_YAML_NUMBER 4
-#define wxSTC_YAML_REFERENCE 5
-#define wxSTC_YAML_DOCUMENT 6
-#define wxSTC_YAML_TEXT 7
-#define wxSTC_YAML_ERROR 8
-
-// Lexical states for SCLEX_TEX
-#define wxSTC_TEX_DEFAULT 0
-#define wxSTC_TEX_SPECIAL 1
-#define wxSTC_TEX_GROUP 2
-#define wxSTC_TEX_SYMBOL 3
-#define wxSTC_TEX_COMMAND 4
-#define wxSTC_TEX_TEXT 5
-#define wxSTC_METAPOST_DEFAULT 0
-#define wxSTC_METAPOST_SPECIAL 1
-#define wxSTC_METAPOST_GROUP 2
-#define wxSTC_METAPOST_SYMBOL 3
-#define wxSTC_METAPOST_COMMAND 4
-#define wxSTC_METAPOST_TEXT 5
-#define wxSTC_METAPOST_EXTRA 6
-
-// Lexical states for SCLEX_ERLANG
-#define wxSTC_ERLANG_DEFAULT 0
-#define wxSTC_ERLANG_COMMENT 1
-#define wxSTC_ERLANG_VARIABLE 2
-#define wxSTC_ERLANG_NUMBER 3
-#define wxSTC_ERLANG_KEYWORD 4
-#define wxSTC_ERLANG_STRING 5
-#define wxSTC_ERLANG_OPERATOR 6
-#define wxSTC_ERLANG_ATOM 7
-#define wxSTC_ERLANG_FUNCTION_NAME 8
-#define wxSTC_ERLANG_CHARACTER 9
-#define wxSTC_ERLANG_MACRO 10
-#define wxSTC_ERLANG_RECORD 11
-#define wxSTC_ERLANG_SEPARATOR 12
-#define wxSTC_ERLANG_NODE_NAME 13
-#define wxSTC_ERLANG_UNKNOWN 31
-
-// Lexical states for SCLEX_OCTAVE are identical to MatLab
-// Lexical states for SCLEX_MSSQL
-#define wxSTC_MSSQL_DEFAULT 0
-#define wxSTC_MSSQL_COMMENT 1
-#define wxSTC_MSSQL_LINE_COMMENT 2
-#define wxSTC_MSSQL_NUMBER 3
-#define wxSTC_MSSQL_STRING 4
-#define wxSTC_MSSQL_OPERATOR 5
-#define wxSTC_MSSQL_IDENTIFIER 6
-#define wxSTC_MSSQL_VARIABLE 7
-#define wxSTC_MSSQL_COLUMN_NAME 8
-#define wxSTC_MSSQL_STATEMENT 9
-#define wxSTC_MSSQL_DATATYPE 10
-#define wxSTC_MSSQL_SYSTABLE 11
-#define wxSTC_MSSQL_GLOBAL_VARIABLE 12
-#define wxSTC_MSSQL_FUNCTION 13
-#define wxSTC_MSSQL_STORED_PROCEDURE 14
-#define wxSTC_MSSQL_DEFAULT_PREF_DATATYPE 15
-#define wxSTC_MSSQL_COLUMN_NAME_2 16
-
-// Lexical states for SCLEX_VERILOG
-#define wxSTC_V_DEFAULT 0
-#define wxSTC_V_COMMENT 1
-#define wxSTC_V_COMMENTLINE 2
-#define wxSTC_V_COMMENTLINEBANG 3
-#define wxSTC_V_NUMBER 4
-#define wxSTC_V_WORD 5
-#define wxSTC_V_STRING 6
-#define wxSTC_V_WORD2 7
-#define wxSTC_V_WORD3 8
-#define wxSTC_V_PREPROCESSOR 9
-#define wxSTC_V_OPERATOR 10
-#define wxSTC_V_IDENTIFIER 11
-#define wxSTC_V_STRINGEOL 12
-#define wxSTC_V_USER 19
-
-// Lexical states for SCLEX_KIX
-#define wxSTC_KIX_DEFAULT 0
-#define wxSTC_KIX_COMMENT 1
-#define wxSTC_KIX_STRING1 2
-#define wxSTC_KIX_STRING2 3
-#define wxSTC_KIX_NUMBER 4
-#define wxSTC_KIX_VAR 5
-#define wxSTC_KIX_MACRO 6
-#define wxSTC_KIX_KEYWORD 7
-#define wxSTC_KIX_FUNCTIONS 8
-#define wxSTC_KIX_OPERATOR 9
-#define wxSTC_KIX_IDENTIFIER 31
-
-// Lexical states for SCLEX_GUI4CLI
-#define wxSTC_GC_DEFAULT 0
-#define wxSTC_GC_COMMENTLINE 1
-#define wxSTC_GC_COMMENTBLOCK 2
-#define wxSTC_GC_GLOBAL 3
-#define wxSTC_GC_EVENT 4
-#define wxSTC_GC_ATTRIBUTE 5
-#define wxSTC_GC_CONTROL 6
-#define wxSTC_GC_COMMAND 7
-#define wxSTC_GC_STRING 8
-#define wxSTC_GC_OPERATOR 9
-
-// Lexical states for SCLEX_SPECMAN
-#define wxSTC_SN_DEFAULT 0
-#define wxSTC_SN_CODE 1
-#define wxSTC_SN_COMMENTLINE 2
-#define wxSTC_SN_COMMENTLINEBANG 3
-#define wxSTC_SN_NUMBER 4
-#define wxSTC_SN_WORD 5
-#define wxSTC_SN_STRING 6
-#define wxSTC_SN_WORD2 7
-#define wxSTC_SN_WORD3 8
-#define wxSTC_SN_PREPROCESSOR 9
-#define wxSTC_SN_OPERATOR 10
-#define wxSTC_SN_IDENTIFIER 11
-#define wxSTC_SN_STRINGEOL 12
-#define wxSTC_SN_REGEXTAG 13
-#define wxSTC_SN_SIGNAL 14
-#define wxSTC_SN_USER 19
-
-// Lexical states for SCLEX_AU3
-#define wxSTC_AU3_DEFAULT 0
-#define wxSTC_AU3_COMMENT 1
-#define wxSTC_AU3_COMMENTBLOCK 2
-#define wxSTC_AU3_NUMBER 3
-#define wxSTC_AU3_FUNCTION 4
-#define wxSTC_AU3_KEYWORD 5
-#define wxSTC_AU3_MACRO 6
-#define wxSTC_AU3_STRING 7
-#define wxSTC_AU3_OPERATOR 8
-#define wxSTC_AU3_VARIABLE 9
-#define wxSTC_AU3_SENT 10
-#define wxSTC_AU3_PREPROCESSOR 11
-#define wxSTC_AU3_SPECIAL 12
-#define wxSTC_AU3_EXPAND 13
-#define wxSTC_AU3_COMOBJ 14
-#define wxSTC_AU3_UDF 15
-
-// Lexical states for SCLEX_APDL
-#define wxSTC_APDL_DEFAULT 0
-#define wxSTC_APDL_COMMENT 1
-#define wxSTC_APDL_COMMENTBLOCK 2
-#define wxSTC_APDL_NUMBER 3
-#define wxSTC_APDL_STRING 4
-#define wxSTC_APDL_OPERATOR 5
-#define wxSTC_APDL_WORD 6
-#define wxSTC_APDL_PROCESSOR 7
-#define wxSTC_APDL_COMMAND 8
-#define wxSTC_APDL_SLASHCOMMAND 9
-#define wxSTC_APDL_STARCOMMAND 10
-#define wxSTC_APDL_ARGUMENT 11
-#define wxSTC_APDL_FUNCTION 12
-
-// Lexical states for SCLEX_BASH
-#define wxSTC_SH_DEFAULT 0
-#define wxSTC_SH_ERROR 1
-#define wxSTC_SH_COMMENTLINE 2
-#define wxSTC_SH_NUMBER 3
-#define wxSTC_SH_WORD 4
-#define wxSTC_SH_STRING 5
-#define wxSTC_SH_CHARACTER 6
-#define wxSTC_SH_OPERATOR 7
-#define wxSTC_SH_IDENTIFIER 8
-#define wxSTC_SH_SCALAR 9
-#define wxSTC_SH_PARAM 10
-#define wxSTC_SH_BACKTICKS 11
-#define wxSTC_SH_HERE_DELIM 12
-#define wxSTC_SH_HERE_Q 13
-
-// Lexical states for SCLEX_ASN1
-#define wxSTC_ASN1_DEFAULT 0
-#define wxSTC_ASN1_COMMENT 1
-#define wxSTC_ASN1_IDENTIFIER 2
-#define wxSTC_ASN1_STRING 3
-#define wxSTC_ASN1_OID 4
-#define wxSTC_ASN1_SCALAR 5
-#define wxSTC_ASN1_KEYWORD 6
-#define wxSTC_ASN1_ATTRIBUTE 7
-#define wxSTC_ASN1_DESCRIPTOR 8
-#define wxSTC_ASN1_TYPE 9
-#define wxSTC_ASN1_OPERATOR 10
-
-// Lexical states for SCLEX_VHDL
-#define wxSTC_VHDL_DEFAULT 0
-#define wxSTC_VHDL_COMMENT 1
-#define wxSTC_VHDL_COMMENTLINEBANG 2
-#define wxSTC_VHDL_NUMBER 3
-#define wxSTC_VHDL_STRING 4
-#define wxSTC_VHDL_OPERATOR 5
-#define wxSTC_VHDL_IDENTIFIER 6
-#define wxSTC_VHDL_STRINGEOL 7
-#define wxSTC_VHDL_KEYWORD 8
-#define wxSTC_VHDL_STDOPERATOR 9
-#define wxSTC_VHDL_ATTRIBUTE 10
-#define wxSTC_VHDL_STDFUNCTION 11
-#define wxSTC_VHDL_STDPACKAGE 12
-#define wxSTC_VHDL_STDTYPE 13
-#define wxSTC_VHDL_USERWORD 14
-
-// Lexical states for SCLEX_CAML
-#define wxSTC_CAML_DEFAULT 0
-#define wxSTC_CAML_IDENTIFIER 1
-#define wxSTC_CAML_TAGNAME 2
-#define wxSTC_CAML_KEYWORD 3
-#define wxSTC_CAML_KEYWORD2 4
-#define wxSTC_CAML_KEYWORD3 5
-#define wxSTC_CAML_LINENUM 6
-#define wxSTC_CAML_OPERATOR 7
-#define wxSTC_CAML_NUMBER 8
-#define wxSTC_CAML_CHAR 9
-#define wxSTC_CAML_STRING 11
-#define wxSTC_CAML_COMMENT 12
-#define wxSTC_CAML_COMMENT1 13
-#define wxSTC_CAML_COMMENT2 14
-#define wxSTC_CAML_COMMENT3 15
-
-// Lexical states for SCLEX_HASKELL
-#define wxSTC_HA_DEFAULT 0
-#define wxSTC_HA_IDENTIFIER 1
-#define wxSTC_HA_KEYWORD 2
-#define wxSTC_HA_NUMBER 3
-#define wxSTC_HA_STRING 4
-#define wxSTC_HA_CHARACTER 5
-#define wxSTC_HA_CLASS 6
-#define wxSTC_HA_MODULE 7
-#define wxSTC_HA_CAPITAL 8
-#define wxSTC_HA_DATA 9
-#define wxSTC_HA_IMPORT 10
-#define wxSTC_HA_OPERATOR 11
-#define wxSTC_HA_INSTANCE 12
-#define wxSTC_HA_COMMENTLINE 13
-#define wxSTC_HA_COMMENTBLOCK 14
-#define wxSTC_HA_COMMENTBLOCK2 15
-#define wxSTC_HA_COMMENTBLOCK3 16
-
-// Lexical states of SCLEX_TADS3
-#define wxSTC_T3_DEFAULT 0
-#define wxSTC_T3_X_DEFAULT 1
-#define wxSTC_T3_PREPROCESSOR 2
-#define wxSTC_T3_BLOCK_COMMENT 3
-#define wxSTC_T3_LINE_COMMENT 4
-#define wxSTC_T3_OPERATOR 5
-#define wxSTC_T3_KEYWORD 6
-#define wxSTC_T3_NUMBER 7
-#define wxSTC_T3_IDENTIFIER 8
-#define wxSTC_T3_S_STRING 9
-#define wxSTC_T3_D_STRING 10
-#define wxSTC_T3_X_STRING 11
-#define wxSTC_T3_LIB_DIRECTIVE 12
-#define wxSTC_T3_MSG_PARAM 13
-#define wxSTC_T3_HTML_TAG 14
-#define wxSTC_T3_HTML_DEFAULT 15
-#define wxSTC_T3_HTML_STRING 16
-#define wxSTC_T3_USER1 17
-#define wxSTC_T3_USER2 18
-#define wxSTC_T3_USER3 19
-
-// Lexical states for SCLEX_REBOL
-#define wxSTC_REBOL_DEFAULT 0
-#define wxSTC_REBOL_COMMENTLINE 1
-#define wxSTC_REBOL_COMMENTBLOCK 2
-#define wxSTC_REBOL_PREFACE 3
-#define wxSTC_REBOL_OPERATOR 4
-#define wxSTC_REBOL_CHARACTER 5
-#define wxSTC_REBOL_QUOTEDSTRING 6
-#define wxSTC_REBOL_BRACEDSTRING 7
-#define wxSTC_REBOL_NUMBER 8
-#define wxSTC_REBOL_PAIR 9
-#define wxSTC_REBOL_TUPLE 10
-#define wxSTC_REBOL_BINARY 11
-#define wxSTC_REBOL_MONEY 12
-#define wxSTC_REBOL_ISSUE 13
-#define wxSTC_REBOL_TAG 14
-#define wxSTC_REBOL_FILE 15
-#define wxSTC_REBOL_EMAIL 16
-#define wxSTC_REBOL_URL 17
-#define wxSTC_REBOL_DATE 18
-#define wxSTC_REBOL_TIME 19
-#define wxSTC_REBOL_IDENTIFIER 20
-#define wxSTC_REBOL_WORD 21
-#define wxSTC_REBOL_WORD2 22
-#define wxSTC_REBOL_WORD3 23
-#define wxSTC_REBOL_WORD4 24
-#define wxSTC_REBOL_WORD5 25
-#define wxSTC_REBOL_WORD6 26
-#define wxSTC_REBOL_WORD7 27
-#define wxSTC_REBOL_WORD8 28
-
-// Lexical states for SCLEX_SQL
-#define wxSTC_SQL_DEFAULT 0
-#define wxSTC_SQL_COMMENT 1
-#define wxSTC_SQL_COMMENTLINE 2
-#define wxSTC_SQL_COMMENTDOC 3
-#define wxSTC_SQL_NUMBER 4
-#define wxSTC_SQL_WORD 5
-#define wxSTC_SQL_STRING 6
-#define wxSTC_SQL_CHARACTER 7
-#define wxSTC_SQL_SQLPLUS 8
-#define wxSTC_SQL_SQLPLUS_PROMPT 9
-#define wxSTC_SQL_OPERATOR 10
-#define wxSTC_SQL_IDENTIFIER 11
-#define wxSTC_SQL_SQLPLUS_COMMENT 13
-#define wxSTC_SQL_COMMENTLINEDOC 15
-#define wxSTC_SQL_WORD2 16
-#define wxSTC_SQL_COMMENTDOCKEYWORD 17
-#define wxSTC_SQL_COMMENTDOCKEYWORDERROR 18
-#define wxSTC_SQL_USER1 19
-#define wxSTC_SQL_USER2 20
-#define wxSTC_SQL_USER3 21
-#define wxSTC_SQL_USER4 22
-#define wxSTC_SQL_QUOTEDIDENTIFIER 23
-
-// Lexical states for SCLEX_SMALLTALK
-#define wxSTC_ST_DEFAULT 0
-#define wxSTC_ST_STRING 1
-#define wxSTC_ST_NUMBER 2
-#define wxSTC_ST_COMMENT 3
-#define wxSTC_ST_SYMBOL 4
-#define wxSTC_ST_BINARY 5
-#define wxSTC_ST_BOOL 6
-#define wxSTC_ST_SELF 7
-#define wxSTC_ST_SUPER 8
-#define wxSTC_ST_NIL 9
-#define wxSTC_ST_GLOBAL 10
-#define wxSTC_ST_RETURN 11
-#define wxSTC_ST_SPECIAL 12
-#define wxSTC_ST_KWSEND 13
-#define wxSTC_ST_ASSIGN 14
-#define wxSTC_ST_CHARACTER 15
-#define wxSTC_ST_SPEC_SEL 16
-
-// Lexical states for SCLEX_FLAGSHIP (clipper)
-#define wxSTC_FS_DEFAULT 0
-#define wxSTC_FS_COMMENT 1
-#define wxSTC_FS_COMMENTLINE 2
-#define wxSTC_FS_COMMENTDOC 3
-#define wxSTC_FS_COMMENTLINEDOC 4
-#define wxSTC_FS_COMMENTDOCKEYWORD 5
-#define wxSTC_FS_COMMENTDOCKEYWORDERROR 6
-#define wxSTC_FS_KEYWORD 7
-#define wxSTC_FS_KEYWORD2 8
-#define wxSTC_FS_KEYWORD3 9
-#define wxSTC_FS_KEYWORD4 10
-#define wxSTC_FS_NUMBER 11
-#define wxSTC_FS_STRING 12
-#define wxSTC_FS_PREPROCESSOR 13
-#define wxSTC_FS_OPERATOR 14
-#define wxSTC_FS_IDENTIFIER 15
-#define wxSTC_FS_DATE 16
-#define wxSTC_FS_STRINGEOL 17
-#define wxSTC_FS_CONSTANT 18
-#define wxSTC_FS_ASM 19
-#define wxSTC_FS_LABEL 20
-#define wxSTC_FS_ERROR 21
-#define wxSTC_FS_HEXNUMBER 22
-#define wxSTC_FS_BINNUMBER 23
-
-// Lexical states for SCLEX_CSOUND
-#define wxSTC_CSOUND_DEFAULT 0
-#define wxSTC_CSOUND_COMMENT 1
-#define wxSTC_CSOUND_NUMBER 2
-#define wxSTC_CSOUND_OPERATOR 3
-#define wxSTC_CSOUND_INSTR 4
-#define wxSTC_CSOUND_IDENTIFIER 5
-#define wxSTC_CSOUND_OPCODE 6
-#define wxSTC_CSOUND_HEADERSTMT 7
-#define wxSTC_CSOUND_USERKEYWORD 8
-#define wxSTC_CSOUND_COMMENTBLOCK 9
-#define wxSTC_CSOUND_PARAM 10
-#define wxSTC_CSOUND_ARATE_VAR 11
-#define wxSTC_CSOUND_KRATE_VAR 12
-#define wxSTC_CSOUND_IRATE_VAR 13
-#define wxSTC_CSOUND_GLOBAL_VAR 14
-#define wxSTC_CSOUND_STRINGEOL 15
-
-// Lexical states for SCLEX_INNOSETUP
-#define wxSTC_INNO_DEFAULT 0
-#define wxSTC_INNO_COMMENT 1
-#define wxSTC_INNO_KEYWORD 2
-#define wxSTC_INNO_PARAMETER 3
-#define wxSTC_INNO_SECTION 4
-#define wxSTC_INNO_PREPROC 5
-#define wxSTC_INNO_PREPROC_INLINE 6
-#define wxSTC_INNO_COMMENT_PASCAL 7
-#define wxSTC_INNO_KEYWORD_PASCAL 8
-#define wxSTC_INNO_KEYWORD_USER 9
-#define wxSTC_INNO_STRING_DOUBLE 10
-#define wxSTC_INNO_STRING_SINGLE 11
-#define wxSTC_INNO_IDENTIFIER 12
-
-// Lexical states for SCLEX_OPAL
-#define wxSTC_OPAL_SPACE 0
-#define wxSTC_OPAL_COMMENT_BLOCK 1
-#define wxSTC_OPAL_COMMENT_LINE 2
-#define wxSTC_OPAL_INTEGER 3
-#define wxSTC_OPAL_KEYWORD 4
-#define wxSTC_OPAL_SORT 5
-#define wxSTC_OPAL_STRING 6
-#define wxSTC_OPAL_PAR 7
-#define wxSTC_OPAL_BOOL_CONST 8
-#define wxSTC_OPAL_DEFAULT 32
-
-// Lexical states for SCLEX_SPICE
-#define wxSTC_SPICE_DEFAULT 0
-#define wxSTC_SPICE_IDENTIFIER 1
-#define wxSTC_SPICE_KEYWORD 2
-#define wxSTC_SPICE_KEYWORD2 3
-#define wxSTC_SPICE_KEYWORD3 4
-#define wxSTC_SPICE_NUMBER 5
-#define wxSTC_SPICE_DELIMITER 6
-#define wxSTC_SPICE_VALUE 7
-#define wxSTC_SPICE_COMMENTLINE 8
-
-
-//-----------------------------------------
-// Commands that can be bound to keystrokes
-
-
-// Redoes the next action on the undo history.
-#define wxSTC_CMD_REDO 2011
-
-// Select all the text in the document.
-#define wxSTC_CMD_SELECTALL 2013
-
-// Undo one action in the undo history.
-#define wxSTC_CMD_UNDO 2176
-
-// Cut the selection to the clipboard.
-#define wxSTC_CMD_CUT 2177
-
-// Copy the selection to the clipboard.
-#define wxSTC_CMD_COPY 2178
-
-// Paste the contents of the clipboard into the document replacing the selection.
-#define wxSTC_CMD_PASTE 2179
-
-// Clear the selection.
-#define wxSTC_CMD_CLEAR 2180
-
-// Move caret down one line.
-#define wxSTC_CMD_LINEDOWN 2300
-
-// Move caret down one line extending selection to new caret position.
-#define wxSTC_CMD_LINEDOWNEXTEND 2301
-
-// Move caret up one line.
-#define wxSTC_CMD_LINEUP 2302
-
-// Move caret up one line extending selection to new caret position.
-#define wxSTC_CMD_LINEUPEXTEND 2303
-
-// Move caret left one character.
-#define wxSTC_CMD_CHARLEFT 2304
-
-// Move caret left one character extending selection to new caret position.
-#define wxSTC_CMD_CHARLEFTEXTEND 2305
-
-// Move caret right one character.
-#define wxSTC_CMD_CHARRIGHT 2306
-
-// Move caret right one character extending selection to new caret position.
-#define wxSTC_CMD_CHARRIGHTEXTEND 2307
-
-// Move caret left one word.
-#define wxSTC_CMD_WORDLEFT 2308
-
-// Move caret left one word extending selection to new caret position.
-#define wxSTC_CMD_WORDLEFTEXTEND 2309
-
-// Move caret right one word.
-#define wxSTC_CMD_WORDRIGHT 2310
-
-// Move caret right one word extending selection to new caret position.
-#define wxSTC_CMD_WORDRIGHTEXTEND 2311
-
-// Move caret to first position on line.
-#define wxSTC_CMD_HOME 2312
-
-// Move caret to first position on line extending selection to new caret position.
-#define wxSTC_CMD_HOMEEXTEND 2313
-
-// Move caret to last position on line.
-#define wxSTC_CMD_LINEEND 2314
-
-// Move caret to last position on line extending selection to new caret position.
-#define wxSTC_CMD_LINEENDEXTEND 2315
-
-// Move caret to first position in document.
-#define wxSTC_CMD_DOCUMENTSTART 2316
-
-// Move caret to first position in document extending selection to new caret position.
-#define wxSTC_CMD_DOCUMENTSTARTEXTEND 2317
-
-// Move caret to last position in document.
-#define wxSTC_CMD_DOCUMENTEND 2318
-
-// Move caret to last position in document extending selection to new caret position.
-#define wxSTC_CMD_DOCUMENTENDEXTEND 2319
-
-// Move caret one page up.
-#define wxSTC_CMD_PAGEUP 2320
-
-// Move caret one page up extending selection to new caret position.
-#define wxSTC_CMD_PAGEUPEXTEND 2321
-
-// Move caret one page down.
-#define wxSTC_CMD_PAGEDOWN 2322
-
-// Move caret one page down extending selection to new caret position.
-#define wxSTC_CMD_PAGEDOWNEXTEND 2323
-
-// Switch from insert to overtype mode or the reverse.
-#define wxSTC_CMD_EDITTOGGLEOVERTYPE 2324
-
-// Cancel any modes such as call tip or auto-completion list display.
-#define wxSTC_CMD_CANCEL 2325
-
-// Delete the selection or if no selection, the character before the caret.
-#define wxSTC_CMD_DELETEBACK 2326
-
-// If selection is empty or all on one line replace the selection with a tab character.
-// If more than one line selected, indent the lines.
-#define wxSTC_CMD_TAB 2327
-
-// Dedent the selected lines.
-#define wxSTC_CMD_BACKTAB 2328
-
-// Insert a new line, may use a CRLF, CR or LF depending on EOL mode.
-#define wxSTC_CMD_NEWLINE 2329
-
-// Insert a Form Feed character.
-#define wxSTC_CMD_FORMFEED 2330
-
-// Move caret to before first visible character on line.
-// If already there move to first character on line.
-#define wxSTC_CMD_VCHOME 2331
-
-// Like VCHome but extending selection to new caret position.
-#define wxSTC_CMD_VCHOMEEXTEND 2332
-
-// Magnify the displayed text by increasing the sizes by 1 point.
-#define wxSTC_CMD_ZOOMIN 2333
-
-// Make the displayed text smaller by decreasing the sizes by 1 point.
-#define wxSTC_CMD_ZOOMOUT 2334
-
-// Delete the word to the left of the caret.
-#define wxSTC_CMD_DELWORDLEFT 2335
-
-// Delete the word to the right of the caret.
-#define wxSTC_CMD_DELWORDRIGHT 2336
-
-// Cut the line containing the caret.
-#define wxSTC_CMD_LINECUT 2337
-
-// Delete the line containing the caret.
-#define wxSTC_CMD_LINEDELETE 2338
-
-// Switch the current line with the previous.
-#define wxSTC_CMD_LINETRANSPOSE 2339
-
-// Duplicate the current line.
-#define wxSTC_CMD_LINEDUPLICATE 2404
-
-// Transform the selection to lower case.
-#define wxSTC_CMD_LOWERCASE 2340
-
-// Transform the selection to upper case.
-#define wxSTC_CMD_UPPERCASE 2341
-
-// Scroll the document down, keeping the caret visible.
-#define wxSTC_CMD_LINESCROLLDOWN 2342
-
-// Scroll the document up, keeping the caret visible.
-#define wxSTC_CMD_LINESCROLLUP 2343
-
-// Delete the selection or if no selection, the character before the caret.
-// Will not delete the character before at the start of a line.
-#define wxSTC_CMD_DELETEBACKNOTLINE 2344
-
-// Move caret to first position on display line.
-#define wxSTC_CMD_HOMEDISPLAY 2345
-
-// Move caret to first position on display line extending selection to
-// new caret position.
-#define wxSTC_CMD_HOMEDISPLAYEXTEND 2346
-
-// Move caret to last position on display line.
-#define wxSTC_CMD_LINEENDDISPLAY 2347
-
-// Move caret to last position on display line extending selection to new
-// caret position.
-#define wxSTC_CMD_LINEENDDISPLAYEXTEND 2348
-
-// These are like their namesakes Home(Extend)?, LineEnd(Extend)?, VCHome(Extend)?
-// except they behave differently when word-wrap is enabled:
-// They go first to the start / end of the display line, like (Home|LineEnd)Display
-// The difference is that, the cursor is already at the point, it goes on to the start
-// or end of the document line, as appropriate for (Home|LineEnd|VCHome)(Extend)?.
-#define wxSTC_CMD_HOMEWRAP 2349
-#define wxSTC_CMD_HOMEWRAPEXTEND 2450
-#define wxSTC_CMD_LINEENDWRAP 2451
-#define wxSTC_CMD_LINEENDWRAPEXTEND 2452
-#define wxSTC_CMD_VCHOMEWRAP 2453
-#define wxSTC_CMD_VCHOMEWRAPEXTEND 2454
-
-// Copy the line containing the caret.
-#define wxSTC_CMD_LINECOPY 2455
-
-// Move to the previous change in capitalisation.
-#define wxSTC_CMD_WORDPARTLEFT 2390
-
-// Move to the previous change in capitalisation extending selection
-// to new caret position.
-#define wxSTC_CMD_WORDPARTLEFTEXTEND 2391
-
-// Move to the change next in capitalisation.
-#define wxSTC_CMD_WORDPARTRIGHT 2392
-
-// Move to the next change in capitalisation extending selection
-// to new caret position.
-#define wxSTC_CMD_WORDPARTRIGHTEXTEND 2393
-
-// Delete back from the current position to the start of the line.
-#define wxSTC_CMD_DELLINELEFT 2395
-
-// Delete forwards from the current position to the end of the line.
-#define wxSTC_CMD_DELLINERIGHT 2396
-
-// Move caret between paragraphs (delimited by empty lines).
-#define wxSTC_CMD_PARADOWN 2413
-#define wxSTC_CMD_PARADOWNEXTEND 2414
-#define wxSTC_CMD_PARAUP 2415
-#define wxSTC_CMD_PARAUPEXTEND 2416
-
-// Move caret down one line, extending rectangular selection to new caret position.
-#define wxSTC_CMD_LINEDOWNRECTEXTEND 2426
-
-// Move caret up one line, extending rectangular selection to new caret position.
-#define wxSTC_CMD_LINEUPRECTEXTEND 2427
-
-// Move caret left one character, extending rectangular selection to new caret position.
-#define wxSTC_CMD_CHARLEFTRECTEXTEND 2428
-
-// Move caret right one character, extending rectangular selection to new caret position.
-#define wxSTC_CMD_CHARRIGHTRECTEXTEND 2429
-
-// Move caret to first position on line, extending rectangular selection to new caret position.
-#define wxSTC_CMD_HOMERECTEXTEND 2430
-
-// Move caret to before first visible character on line.
-// If already there move to first character on line.
-// In either case, extend rectangular selection to new caret position.
-#define wxSTC_CMD_VCHOMERECTEXTEND 2431
-
-// Move caret to last position on line, extending rectangular selection to new caret position.
-#define wxSTC_CMD_LINEENDRECTEXTEND 2432
-
-// Move caret one page up, extending rectangular selection to new caret position.
-#define wxSTC_CMD_PAGEUPRECTEXTEND 2433
-
-// Move caret one page down, extending rectangular selection to new caret position.
-#define wxSTC_CMD_PAGEDOWNRECTEXTEND 2434
-
-// Move caret to top of page, or one page up if already at top of page.
-#define wxSTC_CMD_STUTTEREDPAGEUP 2435
-
-// Move caret to top of page, or one page up if already at top of page, extending selection to new caret position.
-#define wxSTC_CMD_STUTTEREDPAGEUPEXTEND 2436
-
-// Move caret to bottom of page, or one page down if already at bottom of page.
-#define wxSTC_CMD_STUTTEREDPAGEDOWN 2437
-
-// Move caret to bottom of page, or one page down if already at bottom of page, extending selection to new caret position.
-#define wxSTC_CMD_STUTTEREDPAGEDOWNEXTEND 2438
-
-// Move caret left one word, position cursor at end of word.
-#define wxSTC_CMD_WORDLEFTEND 2439
-
-// Move caret left one word, position cursor at end of word, extending selection to new caret position.
-#define wxSTC_CMD_WORDLEFTENDEXTEND 2440
-
-// Move caret right one word, position cursor at end of word.
-#define wxSTC_CMD_WORDRIGHTEND 2441
-
-// Move caret right one word, position cursor at end of word, extending selection to new caret position.
-#define wxSTC_CMD_WORDRIGHTENDEXTEND 2442
-
-
-// END of generated section
-//----------------------------------------------------------------------
-
-class  ScintillaWX;                      // forward declare
-class  WordList;
-struct SCNotification;
-
-#ifndef SWIG
-extern WXDLLIMPEXP_STC const wxChar* wxSTCNameStr;
-class  WXDLLIMPEXP_STC wxStyledTextCtrl;
-class  WXDLLIMPEXP_STC wxStyledTextEvent;
-#endif
-
-//----------------------------------------------------------------------
-
-class WXDLLIMPEXP_STC wxStyledTextCtrl : public wxControl {
-public:
-
-#ifdef SWIG
-    %pythonAppend wxStyledTextCtrl   "self._setOORInfo(self)"
-    %pythonAppend wxStyledTextCtrl() ""
-
-    wxStyledTextCtrl(wxWindow *parent, wxWindowID id=wxID_ANY,
-                     const wxPoint& pos = wxDefaultPosition,
-                     const wxSize& size = wxDefaultSize, long style = 0,
-                     const wxString& name = wxPySTCNameStr);
-    %RenameCtor(PreStyledTextCtrl,  wxStyledTextCtrl());
-
-#else
-    wxStyledTextCtrl(wxWindow *parent, wxWindowID id=wxID_ANY,
-                     const wxPoint& pos = wxDefaultPosition,
-                     const wxSize& size = wxDefaultSize, long style = 0,
-                     const wxString& name = wxSTCNameStr);
-    wxStyledTextCtrl() { m_swx = NULL; }
-    ~wxStyledTextCtrl();
-
-#endif
-
-    bool Create(wxWindow *parent, wxWindowID id=wxID_ANY,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize, long style = 0,
-                const wxString& name = wxSTCNameStr);
-
-
-//----------------------------------------------------------------------
-// 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
-
-
-    // Add text to the document at current position.
-    void AddText(const wxString& text);
-
-    // Add array of cells to document.
-    void AddStyledText(const wxMemoryBuffer& data);
-
-    // Insert string at a position.
-    void InsertText(int pos, const wxString& text);
-
-    // Delete all text in the document.
-    void ClearAll();
-
-    // Set all style bytes to 0, remove all folding information.
-    void ClearDocumentStyle();
-
-    // Returns the number of characters in the document.
-    int GetLength();
-
-    // Returns the character byte at the position.
-    int GetCharAt(int pos);
-
-    // Returns the position of the caret.
-    int GetCurrentPos();
-
-    // Returns the position of the opposite end of the selection to the caret.
-    int GetAnchor();
-
-    // Returns the style byte at the position.
-    int GetStyleAt(int pos);
-
-    // Redoes the next action on the undo history.
-    void Redo();
-
-    // Choose between collecting actions into the undo
-    // history and discarding them.
-    void SetUndoCollection(bool collectUndo);
-
-    // Select all the text in the document.
-    void SelectAll();
-
-    // Remember the current position in the undo history as the position
-    // at which the document was saved.
-    void SetSavePoint();
-
-    // Retrieve a buffer of cells.
-    wxMemoryBuffer GetStyledText(int startPos, int endPos);
-
-    // Are there any redoable actions in the undo history?
-    bool CanRedo();
-
-    // Retrieve the line number at which a particular marker is located.
-    int MarkerLineFromHandle(int handle);
-
-    // Delete a marker.
-    void MarkerDeleteHandle(int handle);
-
-    // Is undo history being collected?
-    bool GetUndoCollection();
-
-    // Are white space characters currently visible?
-    // Returns one of SCWS_* constants.
-    int GetViewWhiteSpace();
-
-    // Make white space characters invisible, always visible or visible outside indentation.
-    void SetViewWhiteSpace(int viewWS);
-
-    // Find the position from a point within the window.
-    int PositionFromPoint(wxPoint pt);
-
-    // Find the position from a point within the window but return
-    // INVALID_POSITION if not close to text.
-    int PositionFromPointClose(int x, int y);
-
-    // Set caret to start of a line and ensure it is visible.
-    void GotoLine(int line);
-
-    // Set caret to a position and ensure it is visible.
-    void GotoPos(int pos);
-
-    // Set the selection anchor to a position. The anchor is the opposite
-    // end of the selection from the caret.
-    void SetAnchor(int posAnchor);
-
-    // Retrieve the text of the line containing the caret.
-    // Returns the index of the caret on the line.
-    #ifdef SWIG
-    wxString GetCurLine(int* OUTPUT);
-#else
-    wxString GetCurLine(int* linePos=NULL);
-#endif
-
-    // Retrieve the position of the last correctly styled character.
-    int GetEndStyled();
-
-    // Convert all line endings in the document to one mode.
-    void ConvertEOLs(int eolMode);
-
-    // Retrieve the current end of line mode - one of CRLF, CR, or LF.
-    int GetEOLMode();
-
-    // Set the current end of line mode.
-    void SetEOLMode(int eolMode);
-
-    // Set the current styling position to pos and the styling mask to mask.
-    // The styling mask can be used to protect some bits in each styling byte from modification.
-    void StartStyling(int pos, int mask);
-
-    // Change style from current styling position for length characters to a style
-    // and move the current styling position to after this newly styled segment.
-    void SetStyling(int length, int style);
-
-    // Is drawing done first into a buffer or direct to the screen?
-    bool GetBufferedDraw();
-
-    // If drawing is buffered then each line of text is drawn into a bitmap buffer
-    // before drawing it to the screen to avoid flicker.
-    void SetBufferedDraw(bool buffered);
-
-    // Change the visible size of a tab to be a multiple of the width of a space character.
-    void SetTabWidth(int tabWidth);
-
-    // Retrieve the visible size of a tab.
-    int GetTabWidth();
-
-    // Set the code page used to interpret the bytes of the document as characters.
-    void SetCodePage(int codePage);
-
-    // Set the symbol used for a particular marker number,
-    // and optionally the fore and background colours.
-    void MarkerDefine(int markerNumber, int markerSymbol,
-                const wxColour& foreground = wxNullColour,
-                const wxColour& background = wxNullColour);
-
-    // Set the foreground colour used for a particular marker number.
-    void MarkerSetForeground(int markerNumber, const wxColour& fore);
-
-    // Set the background colour used for a particular marker number.
-    void MarkerSetBackground(int markerNumber, const wxColour& back);
-
-    // Add a marker to a line, returning an ID which can be used to find or delete the marker.
-    int MarkerAdd(int line, int markerNumber);
-
-    // Delete a marker from a line.
-    void MarkerDelete(int line, int markerNumber);
-
-    // Delete all markers with a particular number from all lines.
-    void MarkerDeleteAll(int markerNumber);
-
-    // Get a bit mask of all the markers set on a line.
-    int MarkerGet(int line);
-
-    // Find the next line after lineStart that includes a marker in mask.
-    int MarkerNext(int lineStart, int markerMask);
-
-    // Find the previous line before lineStart that includes a marker in mask.
-    int MarkerPrevious(int lineStart, int markerMask);
-
-    // Define a marker from a bitmap
-    void MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp);
-
-    // Add a set of markers to a line.
-    void MarkerAddSet(int line, int set);
-
-    // Set the alpha used for a marker that is drawn in the text area, not the margin.
-    void MarkerSetAlpha(int markerNumber, int alpha);
-
-    // Set a margin to be either numeric or symbolic.
-    void SetMarginType(int margin, int marginType);
-
-    // Retrieve the type of a margin.
-    int GetMarginType(int margin);
-
-    // Set the width of a margin to a width expressed in pixels.
-    void SetMarginWidth(int margin, int pixelWidth);
-
-    // Retrieve the width of a margin in pixels.
-    int GetMarginWidth(int margin);
-
-    // Set a mask that determines which markers are displayed in a margin.
-    void SetMarginMask(int margin, int mask);
-
-    // Retrieve the marker mask of a margin.
-    int GetMarginMask(int margin);
-
-    // Make a margin sensitive or insensitive to mouse clicks.
-    void SetMarginSensitive(int margin, bool sensitive);
-
-    // Retrieve the mouse click sensitivity of a margin.
-    bool GetMarginSensitive(int margin);
-
-    // Clear all the styles and make equivalent to the global default style.
-    void StyleClearAll();
-
-    // Set the foreground colour of a style.
-    void StyleSetForeground(int style, const wxColour& fore);
-
-    // Set the background colour of a style.
-    void StyleSetBackground(int style, const wxColour& back);
-
-    // Set a style to be bold or not.
-    void StyleSetBold(int style, bool bold);
-
-    // Set a style to be italic or not.
-    void StyleSetItalic(int style, bool italic);
-
-    // Set the size of characters of a style.
-    void StyleSetSize(int style, int sizePoints);
-
-    // Set the font of a style.
-    void StyleSetFaceName(int style, const wxString& fontName);
-
-    // Set a style to have its end of line filled or not.
-    void StyleSetEOLFilled(int style, bool filled);
-
-    // Reset the default style to its state at startup
-    void StyleResetDefault();
-
-    // Set a style to be underlined or not.
-    void StyleSetUnderline(int style, bool underline);
-
-    // Set a style to be mixed case, or to force upper or lower case.
-    void StyleSetCase(int style, int caseForce);
-
-    // Set a style to be a hotspot or not.
-    void StyleSetHotSpot(int style, bool hotspot);
-
-    // Set the foreground colour of the selection and whether to use this setting.
-    void SetSelForeground(bool useSetting, const wxColour& fore);
-
-    // Set the background colour of the selection and whether to use this setting.
-    void SetSelBackground(bool useSetting, const wxColour& back);
-
-    // Get the alpha of the selection.
-    int GetSelAlpha();
-
-    // Set the alpha of the selection.
-    void SetSelAlpha(int alpha);
-
-    // Set the foreground colour of the caret.
-    void SetCaretForeground(const wxColour& fore);
-
-    // When key+modifier combination km is pressed perform msg.
-    void CmdKeyAssign(int key, int modifiers, int cmd);
-
-    // When key+modifier combination km is pressed do nothing.
-    void CmdKeyClear(int key, int modifiers);
-
-    // Drop all key mappings.
-    void CmdKeyClearAll();
-
-    // Set the styles for a segment of the document.
-    void SetStyleBytes(int length, char* styleBytes);
-
-    // Set a style to be visible or not.
-    void StyleSetVisible(int style, bool visible);
-
-    // Get the time in milliseconds that the caret is on and off.
-    int GetCaretPeriod();
-
-    // Get the time in milliseconds that the caret is on and off. 0 = steady on.
-    void SetCaretPeriod(int periodMilliseconds);
-
-    // Set the set of characters making up words for when moving or selecting by word.
-    // First sets deaults like SetCharsDefault.
-    void SetWordChars(const wxString& characters);
-
-    // Start a sequence of actions that is undone and redone as a unit.
-    // May be nested.
-    void BeginUndoAction();
-
-    // End a sequence of actions that is undone and redone as a unit.
-    void EndUndoAction();
-
-    // Set an indicator to plain, squiggle or TT.
-    void IndicatorSetStyle(int indic, int style);
-
-    // Retrieve the style of an indicator.
-    int IndicatorGetStyle(int indic);
-
-    // Set the foreground colour of an indicator.
-    void IndicatorSetForeground(int indic, const wxColour& fore);
-
-    // Retrieve the foreground colour of an indicator.
-    wxColour IndicatorGetForeground(int indic);
-
-    // Set the foreground colour of all whitespace and whether to use this setting.
-    void SetWhitespaceForeground(bool useSetting, const wxColour& fore);
-
-    // Set the background colour of all whitespace and whether to use this setting.
-    void SetWhitespaceBackground(bool useSetting, const wxColour& back);
-
-    // Divide each styling byte into lexical class bits (default: 5) and indicator
-    // bits (default: 3). If a lexer requires more than 32 lexical states, then this
-    // is used to expand the possible states.
-    void SetStyleBits(int bits);
-
-    // Retrieve number of bits in style bytes used to hold the lexical state.
-    int GetStyleBits();
-
-    // Used to hold extra styling information for each line.
-    void SetLineState(int line, int state);
-
-    // Retrieve the extra styling information for a line.
-    int GetLineState(int line);
-
-    // Retrieve the last line number that has line state.
-    int GetMaxLineState();
-
-    // Is the background of the line containing the caret in a different colour?
-    bool GetCaretLineVisible();
-
-    // Display the background of the line containing the caret in a different colour.
-    void SetCaretLineVisible(bool show);
-
-    // Get the colour of the background of the line containing the caret.
-    wxColour GetCaretLineBackground();
-
-    // Set the colour of the background of the line containing the caret.
-    void SetCaretLineBackground(const wxColour& back);
-
-    // Set a style to be changeable or not (read only).
-    // Experimental feature, currently buggy.
-    void StyleSetChangeable(int style, bool changeable);
-
-    // Display a auto-completion list.
-    // The lenEntered parameter indicates how many characters before
-    // the caret should be used to provide context.
-    void AutoCompShow(int lenEntered, const wxString& itemList);
-
-    // Remove the auto-completion list from the screen.
-    void AutoCompCancel();
-
-    // Is there an auto-completion list visible?
-    bool AutoCompActive();
-
-    // Retrieve the position of the caret when the auto-completion list was displayed.
-    int AutoCompPosStart();
-
-    // User has selected an item so remove the list and insert the selection.
-    void AutoCompComplete();
-
-    // Define a set of character that when typed cancel the auto-completion list.
-    void AutoCompStops(const wxString& characterSet);
-
-    // Change the separator character in the string setting up an auto-completion list.
-    // Default is space but can be changed if items contain space.
-    void AutoCompSetSeparator(int separatorCharacter);
-
-    // Retrieve the auto-completion list separator character.
-    int AutoCompGetSeparator();
-
-    // Select the item in the auto-completion list that starts with a string.
-    void AutoCompSelect(const wxString& text);
-
-    // Should the auto-completion list be cancelled if the user backspaces to a
-    // position before where the box was created.
-    void AutoCompSetCancelAtStart(bool cancel);
-
-    // Retrieve whether auto-completion cancelled by backspacing before start.
-    bool AutoCompGetCancelAtStart();
-
-    // Define a set of characters that when typed will cause the autocompletion to
-    // choose the selected item.
-    void AutoCompSetFillUps(const wxString& characterSet);
-
-    // Should a single item auto-completion list automatically choose the item.
-    void AutoCompSetChooseSingle(bool chooseSingle);
-
-    // Retrieve whether a single item auto-completion list automatically choose the item.
-    bool AutoCompGetChooseSingle();
-
-    // Set whether case is significant when performing auto-completion searches.
-    void AutoCompSetIgnoreCase(bool ignoreCase);
-
-    // Retrieve state of ignore case flag.
-    bool AutoCompGetIgnoreCase();
-
-    // Display a list of strings and send notification when user chooses one.
-    void UserListShow(int listType, const wxString& itemList);
-
-    // Set whether or not autocompletion is hidden automatically when nothing matches.
-    void AutoCompSetAutoHide(bool autoHide);
-
-    // Retrieve whether or not autocompletion is hidden automatically when nothing matches.
-    bool AutoCompGetAutoHide();
-
-    // Set whether or not autocompletion deletes any word characters
-    // after the inserted text upon completion.
-    void AutoCompSetDropRestOfWord(bool dropRestOfWord);
-
-    // Retrieve whether or not autocompletion deletes any word characters
-    // after the inserted text upon completion.
-    bool AutoCompGetDropRestOfWord();
-
-    // Register an image for use in autocompletion lists.
-    void RegisterImage(int type, const wxBitmap& bmp);
-
-    // Clear all the registered images.
-    void ClearRegisteredImages();
-
-    // Retrieve the auto-completion list type-separator character.
-    int AutoCompGetTypeSeparator();
-
-    // Change the type-separator character in the string setting up an auto-completion list.
-    // Default is '?' but can be changed if items contain '?'.
-    void AutoCompSetTypeSeparator(int separatorCharacter);
-
-    // Set the maximum width, in characters, of auto-completion and user lists.
-    // Set to 0 to autosize to fit longest item, which is the default.
-    void AutoCompSetMaxWidth(int characterCount);
-
-    // Get the maximum width, in characters, of auto-completion and user lists.
-    int AutoCompGetMaxWidth();
-
-    // Set the maximum height, in rows, of auto-completion and user lists.
-    // The default is 5 rows.
-    void AutoCompSetMaxHeight(int rowCount);
-
-    // Set the maximum height, in rows, of auto-completion and user lists.
-    int AutoCompGetMaxHeight();
-
-    // Set the number of spaces used for one level of indentation.
-    void SetIndent(int indentSize);
-
-    // Retrieve indentation size.
-    int GetIndent();
-
-    // Indentation will only use space characters if useTabs is false, otherwise
-    // it will use a combination of tabs and spaces.
-    void SetUseTabs(bool useTabs);
-
-    // Retrieve whether tabs will be used in indentation.
-    bool GetUseTabs();
-
-    // Change the indentation of a line to a number of columns.
-    void SetLineIndentation(int line, int indentSize);
-
-    // Retrieve the number of columns that a line is indented.
-    int GetLineIndentation(int line);
-
-    // Retrieve the position before the first non indentation character on a line.
-    int GetLineIndentPosition(int line);
-
-    // Retrieve the column number of a position, taking tab width into account.
-    int GetColumn(int pos);
-
-    // Show or hide the horizontal scroll bar.
-    void SetUseHorizontalScrollBar(bool show);
-
-    // Is the horizontal scroll bar visible?
-    bool GetUseHorizontalScrollBar();
-
-    // Show or hide indentation guides.
-    void SetIndentationGuides(bool show);
-
-    // Are the indentation guides visible?
-    bool GetIndentationGuides();
-
-    // Set the highlighted indentation guide column.
-    // 0 = no highlighted guide.
-    void SetHighlightGuide(int column);
-
-    // Get the highlighted indentation guide column.
-    int GetHighlightGuide();
-
-    // Get the position after the last visible characters on a line.
-    int GetLineEndPosition(int line);
-
-    // Get the code page used to interpret the bytes of the document as characters.
-    int GetCodePage();
-
-    // Get the foreground colour of the caret.
-    wxColour GetCaretForeground();
-
-    // In read-only mode?
-    bool GetReadOnly();
-
-    // Sets the position of the caret.
-    void SetCurrentPos(int pos);
-
-    // Sets the position that starts the selection - this becomes the anchor.
-    void SetSelectionStart(int pos);
-
-    // Returns the position at the start of the selection.
-    int GetSelectionStart();
-
-    // Sets the position that ends the selection - this becomes the currentPosition.
-    void SetSelectionEnd(int pos);
-
-    // Returns the position at the end of the selection.
-    int GetSelectionEnd();
-
-    // Sets the print magnification added to the point size of each style for printing.
-    void SetPrintMagnification(int magnification);
-
-    // Returns the print magnification.
-    int GetPrintMagnification();
-
-    // Modify colours when printing for clearer printed text.
-    void SetPrintColourMode(int mode);
-
-    // Returns the print colour mode.
-    int GetPrintColourMode();
-
-    // Find some text in the document.
-    int FindText(int minPos, int maxPos, const wxString& text, int flags=0);
-
-    // On Windows, will draw the document into a display context such as a printer.
-    int FormatRange(bool   doDraw,
-               int    startPos,
-               int    endPos,
-               wxDC*  draw,
-               wxDC*  target, 
-               wxRect renderRect,
-               wxRect pageRect);
-
-    // Retrieve the display line at the top of the display.
-    int GetFirstVisibleLine();
-
-    // Retrieve the contents of a line.
-    wxString GetLine(int line);
-
-    // Returns the number of lines in the document. There is always at least one.
-    int GetLineCount();
-
-    // Sets the size in pixels of the left margin.
-    void SetMarginLeft(int pixelWidth);
-
-    // Returns the size in pixels of the left margin.
-    int GetMarginLeft();
-
-    // Sets the size in pixels of the right margin.
-    void SetMarginRight(int pixelWidth);
-
-    // Returns the size in pixels of the right margin.
-    int GetMarginRight();
-
-    // Is the document different from when it was last saved?
-    bool GetModify();
-
-    // Select a range of text.
-    void SetSelection(int start, int end);
-
-    // Retrieve the selected text.
-    wxString GetSelectedText();
-
-    // Retrieve a range of text.
-    wxString GetTextRange(int startPos, int endPos);
-
-    // Draw the selection in normal style or with selection highlighted.
-    void HideSelection(bool normal);
-
-    // Retrieve the line containing a position.
-    int LineFromPosition(int pos);
-
-    // Retrieve the position at the start of a line.
-    int PositionFromLine(int line);
-
-    // Scroll horizontally and vertically.
-    void LineScroll(int columns, int lines);
-
-    // Ensure the caret is visible.
-    void EnsureCaretVisible();
-
-    // Replace the selected text with the argument text.
-    void ReplaceSelection(const wxString& text);
-
-    // Set to read only or read write.
-    void SetReadOnly(bool readOnly);
-
-    // Will a paste succeed?
-    bool CanPaste();
-
-    // Are there any undoable actions in the undo history?
-    bool CanUndo();
-
-    // Delete the undo history.
-    void EmptyUndoBuffer();
-
-    // Undo one action in the undo history.
-    void Undo();
-
-    // Cut the selection to the clipboard.
-    void Cut();
-
-    // Copy the selection to the clipboard.
-    void Copy();
-
-    // Paste the contents of the clipboard into the document replacing the selection.
-    void Paste();
-
-    // Clear the selection.
-    void Clear();
-
-    // Replace the contents of the document with the argument text.
-    void SetText(const wxString& text);
-
-    // Retrieve all the text in the document.
-    wxString GetText();
-
-    // Retrieve the number of characters in the document.
-    int GetTextLength();
-
-    // Set to overtype (true) or insert mode.
-    void SetOvertype(bool overtype);
-
-    // Returns true if overtype mode is active otherwise false is returned.
-    bool GetOvertype();
-
-    // Set the width of the insert mode caret.
-    void SetCaretWidth(int pixelWidth);
-
-    // Returns the width of the insert mode caret.
-    int GetCaretWidth();
-
-    // Sets the position that starts the target which is used for updating the
-    // document without affecting the scroll position.
-    void SetTargetStart(int pos);
-
-    // Get the position that starts the target.
-    int GetTargetStart();
-
-    // Sets the position that ends the target which is used for updating the
-    // document without affecting the scroll position.
-    void SetTargetEnd(int pos);
-
-    // Get the position that ends the target.
-    int GetTargetEnd();
-
-    // Replace the target text with the argument text.
-    // Text is counted so it can contain NULs.
-    // Returns the length of the replacement text.
-    int ReplaceTarget(const wxString& text);
-
-    // Replace the target text with the argument text after \d processing.
-    // Text is counted so it can contain NULs.
-    // Looks for \d where d is between 1 and 9 and replaces these with the strings
-    // matched in the last search operation which were surrounded by \( and \).
-    // Returns the length of the replacement text including any change
-    // caused by processing the \d patterns.
-    int ReplaceTargetRE(const wxString& text);
-
-    // Search for a counted string in the target and set the target to the found
-    // range. Text is counted so it can contain NULs.
-    // Returns length of range or -1 for failure in which case target is not moved.
-    int SearchInTarget(const wxString& text);
-
-    // Set the search flags used by SearchInTarget.
-    void SetSearchFlags(int flags);
-
-    // Get the search flags used by SearchInTarget.
-    int GetSearchFlags();
-
-    // Show a call tip containing a definition near position pos.
-    void CallTipShow(int pos, const wxString& definition);
-
-    // Remove the call tip from the screen.
-    void CallTipCancel();
-
-    // Is there an active call tip?
-    bool CallTipActive();
-
-    // Retrieve the position where the caret was before displaying the call tip.
-    int CallTipPosAtStart();
-
-    // Highlight a segment of the definition.
-    void CallTipSetHighlight(int start, int end);
-
-    // Set the background colour for the call tip.
-    void CallTipSetBackground(const wxColour& back);
-
-    // Set the foreground colour for the call tip.
-    void CallTipSetForeground(const wxColour& fore);
-
-    // Set the foreground colour for the highlighted part of the call tip.
-    void CallTipSetForegroundHighlight(const wxColour& fore);
-
-    // Enable use of STYLE_CALLTIP and set call tip tab size in pixels.
-    void CallTipUseStyle(int tabSize);
-
-    // Find the display line of a document line taking hidden lines into account.
-    int VisibleFromDocLine(int line);
-
-    // Find the document line of a display line taking hidden lines into account.
-    int DocLineFromVisible(int lineDisplay);
-
-    // The number of display lines needed to wrap a document line
-    int WrapCount(int line);
-
-    // Set the fold level of a line.
-    // This encodes an integer level along with flags indicating whether the
-    // line is a header and whether it is effectively white space.
-    void SetFoldLevel(int line, int level);
-
-    // Retrieve the fold level of a line.
-    int GetFoldLevel(int line);
-
-    // Find the last child line of a header line.
-    int GetLastChild(int line, int level);
-
-    // Find the parent line of a child line.
-    int GetFoldParent(int line);
-
-    // Make a range of lines visible.
-    void ShowLines(int lineStart, int lineEnd);
-
-    // Make a range of lines invisible.
-    void HideLines(int lineStart, int lineEnd);
-
-    // Is a line visible?
-    bool GetLineVisible(int line);
-
-    // Show the children of a header line.
-    void SetFoldExpanded(int line, bool expanded);
-
-    // Is a header line expanded?
-    bool GetFoldExpanded(int line);
-
-    // Switch a header line between expanded and contracted.
-    void ToggleFold(int line);
-
-    // Ensure a particular line is visible by expanding any header line hiding it.
-    void EnsureVisible(int line);
-
-    // Set some style options for folding.
-    void SetFoldFlags(int flags);
-
-    // Ensure a particular line is visible by expanding any header line hiding it.
-    // Use the currently set visibility policy to determine which range to display.
-    void EnsureVisibleEnforcePolicy(int line);
-
-    // Sets whether a tab pressed when caret is within indentation indents.
-    void SetTabIndents(bool tabIndents);
-
-    // Does a tab pressed when caret is within indentation indent?
-    bool GetTabIndents();
-
-    // Sets whether a backspace pressed when caret is within indentation unindents.
-    void SetBackSpaceUnIndents(bool bsUnIndents);
-
-    // Does a backspace pressed when caret is within indentation unindent?
-    bool GetBackSpaceUnIndents();
-
-    // Sets the time the mouse must sit still to generate a mouse dwell event.
-    void SetMouseDwellTime(int periodMilliseconds);
-
-    // Retrieve the time the mouse must sit still to generate a mouse dwell event.
-    int GetMouseDwellTime();
-
-    // Get position of start of word.
-    int WordStartPosition(int pos, bool onlyWordCharacters);
-
-    // Get position of end of word.
-    int WordEndPosition(int pos, bool onlyWordCharacters);
-
-    // Sets whether text is word wrapped.
-    void SetWrapMode(int mode);
-
-    // Retrieve whether text is word wrapped.
-    int GetWrapMode();
-
-    // Set the display mode of visual flags for wrapped lines.
-    void SetWrapVisualFlags(int wrapVisualFlags);
-
-    // Retrive the display mode of visual flags for wrapped lines.
-    int GetWrapVisualFlags();
-
-    // Set the location of visual flags for wrapped lines.
-    void SetWrapVisualFlagsLocation(int wrapVisualFlagsLocation);
-
-    // Retrive the location of visual flags for wrapped lines.
-    int GetWrapVisualFlagsLocation();
-
-    // Set the start indent for wrapped lines.
-    void SetWrapStartIndent(int indent);
-
-    // Retrive the start indent for wrapped lines.
-    int GetWrapStartIndent();
-
-    // Sets the degree of caching of layout information.
-    void SetLayoutCache(int mode);
-
-    // Retrieve the degree of caching of layout information.
-    int GetLayoutCache();
-
-    // Sets the document width assumed for scrolling.
-    void SetScrollWidth(int pixelWidth);
-
-    // Retrieve the document width assumed for scrolling.
-    int GetScrollWidth();
-
-    // Measure the pixel width of some text in a particular style.
-    // NUL terminated text argument.
-    // Does not handle tab or control characters.
-    int TextWidth(int style, const wxString& text);
-
-    // Sets the scroll range so that maximum scroll position has
-    // the last line at the bottom of the view (default).
-    // Setting this to false allows scrolling one page below the last line.
-    void SetEndAtLastLine(bool endAtLastLine);
-
-    // Retrieve whether the maximum scroll position has the last
-    // line at the bottom of the view.
-    bool GetEndAtLastLine();
-
-    // Retrieve the height of a particular line of text in pixels.
-    int TextHeight(int line);
-
-    // Show or hide the vertical scroll bar.
-    void SetUseVerticalScrollBar(bool show);
-
-    // Is the vertical scroll bar visible?
-    bool GetUseVerticalScrollBar();
-
-    // Append a string to the end of the document without changing the selection.
-    void AppendText(const wxString& text);
-
-    // Is drawing done in two phases with backgrounds drawn before foregrounds?
-    bool GetTwoPhaseDraw();
-
-    // In twoPhaseDraw mode, drawing is performed in two phases, first the background
-    // and then the foreground. This avoids chopping off characters that overlap the next run.
-    void SetTwoPhaseDraw(bool twoPhase);
-
-    // Make the target range start and end be the same as the selection range start and end.
-    void TargetFromSelection();
-
-    // Join the lines in the target.
-    void LinesJoin();
-
-    // Split the lines in the target into lines that are less wide than pixelWidth
-    // where possible.
-    void LinesSplit(int pixelWidth);
-
-    // Set the colours used as a chequerboard pattern in the fold margin
-    void SetFoldMarginColour(bool useSetting, const wxColour& back);
-    void SetFoldMarginHiColour(bool useSetting, const wxColour& fore);
-
-    // Move caret down one line.
-    void LineDown();
-
-    // Move caret down one line extending selection to new caret position.
-    void LineDownExtend();
-
-    // Move caret up one line.
-    void LineUp();
-
-    // Move caret up one line extending selection to new caret position.
-    void LineUpExtend();
-
-    // Move caret left one character.
-    void CharLeft();
-
-    // Move caret left one character extending selection to new caret position.
-    void CharLeftExtend();
-
-    // Move caret right one character.
-    void CharRight();
-
-    // Move caret right one character extending selection to new caret position.
-    void CharRightExtend();
-
-    // Move caret left one word.
-    void WordLeft();
-
-    // Move caret left one word extending selection to new caret position.
-    void WordLeftExtend();
-
-    // Move caret right one word.
-    void WordRight();
-
-    // Move caret right one word extending selection to new caret position.
-    void WordRightExtend();
-
-    // Move caret to first position on line.
-    void Home();
-
-    // Move caret to first position on line extending selection to new caret position.
-    void HomeExtend();
-
-    // Move caret to last position on line.
-    void LineEnd();
-
-    // Move caret to last position on line extending selection to new caret position.
-    void LineEndExtend();
-
-    // Move caret to first position in document.
-    void DocumentStart();
-
-    // Move caret to first position in document extending selection to new caret position.
-    void DocumentStartExtend();
-
-    // Move caret to last position in document.
-    void DocumentEnd();
-
-    // Move caret to last position in document extending selection to new caret position.
-    void DocumentEndExtend();
-
-    // Move caret one page up.
-    void PageUp();
-
-    // Move caret one page up extending selection to new caret position.
-    void PageUpExtend();
-
-    // Move caret one page down.
-    void PageDown();
-
-    // Move caret one page down extending selection to new caret position.
-    void PageDownExtend();
-
-    // Switch from insert to overtype mode or the reverse.
-    void EditToggleOvertype();
-
-    // Cancel any modes such as call tip or auto-completion list display.
-    void Cancel();
-
-    // Delete the selection or if no selection, the character before the caret.
-    void DeleteBack();
-
-    // If selection is empty or all on one line replace the selection with a tab character.
-    // If more than one line selected, indent the lines.
-    void Tab();
-
-    // Dedent the selected lines.
-    void BackTab();
-
-    // Insert a new line, may use a CRLF, CR or LF depending on EOL mode.
-    void NewLine();
-
-    // Insert a Form Feed character.
-    void FormFeed();
-
-    // Move caret to before first visible character on line.
-    // If already there move to first character on line.
-    void VCHome();
-
-    // Like VCHome but extending selection to new caret position.
-    void VCHomeExtend();
-
-    // Magnify the displayed text by increasing the sizes by 1 point.
-    void ZoomIn();
-
-    // Make the displayed text smaller by decreasing the sizes by 1 point.
-    void ZoomOut();
-
-    // Delete the word to the left of the caret.
-    void DelWordLeft();
-
-    // Delete the word to the right of the caret.
-    void DelWordRight();
-
-    // Cut the line containing the caret.
-    void LineCut();
-
-    // Delete the line containing the caret.
-    void LineDelete();
-
-    // Switch the current line with the previous.
-    void LineTranspose();
-
-    // Duplicate the current line.
-    void LineDuplicate();
-
-    // Transform the selection to lower case.
-    void LowerCase();
-
-    // Transform the selection to upper case.
-    void UpperCase();
-
-    // Scroll the document down, keeping the caret visible.
-    void LineScrollDown();
-
-    // Scroll the document up, keeping the caret visible.
-    void LineScrollUp();
-
-    // Delete the selection or if no selection, the character before the caret.
-    // Will not delete the character before at the start of a line.
-    void DeleteBackNotLine();
-
-    // Move caret to first position on display line.
-    void HomeDisplay();
-
-    // Move caret to first position on display line extending selection to
-    // new caret position.
-    void HomeDisplayExtend();
-
-    // Move caret to last position on display line.
-    void LineEndDisplay();
-
-    // Move caret to last position on display line extending selection to new
-    // caret position.
-    void LineEndDisplayExtend();
-
-    // These are like their namesakes Home(Extend)?, LineEnd(Extend)?, VCHome(Extend)?
-    // except they behave differently when word-wrap is enabled:
-    // They go first to the start / end of the display line, like (Home|LineEnd)Display
-    // The difference is that, the cursor is already at the point, it goes on to the start
-    // or end of the document line, as appropriate for (Home|LineEnd|VCHome)(Extend)?.
-    void HomeWrap();
-    void HomeWrapExtend();
-    void LineEndWrap();
-    void LineEndWrapExtend();
-    void VCHomeWrap();
-    void VCHomeWrapExtend();
-
-    // Copy the line containing the caret.
-    void LineCopy();
-
-    // Move the caret inside current view if it's not there already.
-    void MoveCaretInsideView();
-
-    // How many characters are on a line, not including end of line characters?
-    int LineLength(int line);
-
-    // Highlight the characters at two positions.
-    void BraceHighlight(int pos1, int pos2);
-
-    // Highlight the character at a position indicating there is no matching brace.
-    void BraceBadLight(int pos);
-
-    // Find the position of a matching brace or INVALID_POSITION if no match.
-    int BraceMatch(int pos);
-
-    // Are the end of line characters visible?
-    bool GetViewEOL();
-
-    // Make the end of line characters visible or invisible.
-    void SetViewEOL(bool visible);
-
-    // Retrieve a pointer to the document object.
-    void* GetDocPointer();
-
-    // Change the document object used.
-    void SetDocPointer(void* docPointer);
-
-    // Set which document modification events are sent to the container.
-    void SetModEventMask(int mask);
-
-    // Retrieve the column number which text should be kept within.
-    int GetEdgeColumn();
-
-    // Set the column number of the edge.
-    // If text goes past the edge then it is highlighted.
-    void SetEdgeColumn(int column);
-
-    // Retrieve the edge highlight mode.
-    int GetEdgeMode();
-
-    // The edge may be displayed by a line (EDGE_LINE) or by highlighting text that
-    // goes beyond it (EDGE_BACKGROUND) or not displayed at all (EDGE_NONE).
-    void SetEdgeMode(int mode);
-
-    // Retrieve the colour used in edge indication.
-    wxColour GetEdgeColour();
-
-    // Change the colour used in edge indication.
-    void SetEdgeColour(const wxColour& edgeColour);
-
-    // Sets the current caret position to be the search anchor.
-    void SearchAnchor();
-
-    // Find some text starting at the search anchor.
-    // Does not ensure the selection is visible.
-    int SearchNext(int flags, const wxString& text);
-
-    // Find some text starting at the search anchor and moving backwards.
-    // Does not ensure the selection is visible.
-    int SearchPrev(int flags, const wxString& text);
-
-    // Retrieves the number of lines completely visible.
-    int LinesOnScreen();
-
-    // Set whether a pop up menu is displayed automatically when the user presses
-    // the wrong mouse button.
-    void UsePopUp(bool allowPopUp);
-
-    // Is the selection rectangular? The alternative is the more common stream selection.
-    bool SelectionIsRectangle();
-
-    // Set the zoom level. This number of points is added to the size of all fonts.
-    // It may be positive to magnify or negative to reduce.
-    void SetZoom(int zoom);
-
-    // Retrieve the zoom level.
-    int GetZoom();
-
-    // Create a new document object.
-    // Starts with reference count of 1 and not selected into editor.
-    void* CreateDocument();
-
-    // Extend life of document.
-    void AddRefDocument(void* docPointer);
-
-    // Release a reference to the document, deleting document if it fades to black.
-    void ReleaseDocument(void* docPointer);
-
-    // Get which document modification events are sent to the container.
-    int GetModEventMask();
-
-    // Change internal focus flag.
-    void SetSTCFocus(bool focus);
-
-    // Get internal focus flag.
-    bool GetSTCFocus();
-
-    // Change error status - 0 = OK.
-    void SetStatus(int statusCode);
-
-    // Get error status.
-    int GetStatus();
-
-    // Set whether the mouse is captured when its button is pressed.
-    void SetMouseDownCaptures(bool captures);
-
-    // Get whether mouse gets captured.
-    bool GetMouseDownCaptures();
-
-    // Sets the cursor to one of the SC_CURSOR* values.
-    void SetSTCCursor(int cursorType);
-
-    // Get cursor type.
-    int GetSTCCursor();
-
-    // Change the way control characters are displayed:
-    // If symbol is < 32, keep the drawn way, else, use the given character.
-    void SetControlCharSymbol(int symbol);
-
-    // Get the way control characters are displayed.
-    int GetControlCharSymbol();
-
-    // Move to the previous change in capitalisation.
-    void WordPartLeft();
-
-    // Move to the previous change in capitalisation extending selection
-    // to new caret position.
-    void WordPartLeftExtend();
-
-    // Move to the change next in capitalisation.
-    void WordPartRight();
-
-    // Move to the next change in capitalisation extending selection
-    // to new caret position.
-    void WordPartRightExtend();
-
-    // Set the way the display area is determined when a particular line
-    // is to be moved to by Find, FindNext, GotoLine, etc.
-    void SetVisiblePolicy(int visiblePolicy, int visibleSlop);
-
-    // Delete back from the current position to the start of the line.
-    void DelLineLeft();
-
-    // Delete forwards from the current position to the end of the line.
-    void DelLineRight();
-
-    // Get and Set the xOffset (ie, horizonal scroll position).
-    void SetXOffset(int newOffset);
-    int GetXOffset();
-
-    // Set the last x chosen value to be the caret x position.
-    void ChooseCaretX();
-
-    // Set the way the caret is kept visible when going sideway.
-    // The exclusion zone is given in pixels.
-    void SetXCaretPolicy(int caretPolicy, int caretSlop);
-
-    // Set the way the line the caret is on is kept visible.
-    // The exclusion zone is given in lines.
-    void SetYCaretPolicy(int caretPolicy, int caretSlop);
-
-    // Set printing to line wrapped (SC_WRAP_WORD) or not line wrapped (SC_WRAP_NONE).
-    void SetPrintWrapMode(int mode);
-
-    // Is printing line wrapped?
-    int GetPrintWrapMode();
-
-    // Set a fore colour for active hotspots.
-    void SetHotspotActiveForeground(bool useSetting, const wxColour& fore);
-
-    // Set a back colour for active hotspots.
-    void SetHotspotActiveBackground(bool useSetting, const wxColour& back);
-
-    // Enable / Disable underlining active hotspots.
-    void SetHotspotActiveUnderline(bool underline);
-
-    // Limit hotspots to single line so hotspots on two lines don't merge.
-    void SetHotspotSingleLine(bool singleLine);
-
-    // Move caret between paragraphs (delimited by empty lines).
-    void ParaDown();
-    void ParaDownExtend();
-    void ParaUp();
-    void ParaUpExtend();
-
-    // Given a valid document position, return the previous position taking code
-    // page into account. Returns 0 if passed 0.
-    int PositionBefore(int pos);
-
-    // Given a valid document position, return the next position taking code
-    // page into account. Maximum value returned is the last position in the document.
-    int PositionAfter(int pos);
-
-    // Copy a range of text to the clipboard. Positions are clipped into the document.
-    void CopyRange(int start, int end);
-
-    // Copy argument text to the clipboard.
-    void CopyText(int length, const wxString& text);
-
-    // Set the selection mode to stream (SC_SEL_STREAM) or rectangular (SC_SEL_RECTANGLE) or
-    // by lines (SC_SEL_LINES).
-    void SetSelectionMode(int mode);
-
-    // Get the mode of the current selection.
-    int GetSelectionMode();
-
-    // Retrieve the position of the start of the selection at the given line (INVALID_POSITION if no selection on this line).
-    int GetLineSelStartPosition(int line);
-
-    // Retrieve the position of the end of the selection at the given line (INVALID_POSITION if no selection on this line).
-    int GetLineSelEndPosition(int line);
-
-    // Move caret down one line, extending rectangular selection to new caret position.
-    void LineDownRectExtend();
-
-    // Move caret up one line, extending rectangular selection to new caret position.
-    void LineUpRectExtend();
-
-    // Move caret left one character, extending rectangular selection to new caret position.
-    void CharLeftRectExtend();
-
-    // Move caret right one character, extending rectangular selection to new caret position.
-    void CharRightRectExtend();
-
-    // Move caret to first position on line, extending rectangular selection to new caret position.
-    void HomeRectExtend();
-
-    // Move caret to before first visible character on line.
-    // If already there move to first character on line.
-    // In either case, extend rectangular selection to new caret position.
-    void VCHomeRectExtend();
-
-    // Move caret to last position on line, extending rectangular selection to new caret position.
-    void LineEndRectExtend();
-
-    // Move caret one page up, extending rectangular selection to new caret position.
-    void PageUpRectExtend();
-
-    // Move caret one page down, extending rectangular selection to new caret position.
-    void PageDownRectExtend();
-
-    // Move caret to top of page, or one page up if already at top of page.
-    void StutteredPageUp();
-
-    // Move caret to top of page, or one page up if already at top of page, extending selection to new caret position.
-    void StutteredPageUpExtend();
-
-    // Move caret to bottom of page, or one page down if already at bottom of page.
-    void StutteredPageDown();
-
-    // Move caret to bottom of page, or one page down if already at bottom of page, extending selection to new caret position.
-    void StutteredPageDownExtend();
-
-    // Move caret left one word, position cursor at end of word.
-    void WordLeftEnd();
-
-    // Move caret left one word, position cursor at end of word, extending selection to new caret position.
-    void WordLeftEndExtend();
-
-    // Move caret right one word, position cursor at end of word.
-    void WordRightEnd();
-
-    // Move caret right one word, position cursor at end of word, extending selection to new caret position.
-    void WordRightEndExtend();
-
-    // Set the set of characters making up whitespace for when moving or selecting by word.
-    // Should be called after SetWordChars.
-    void SetWhitespaceChars(const wxString& characters);
-
-    // Reset the set of characters for whitespace and word characters to the defaults.
-    void SetCharsDefault();
-
-    // Get currently selected item position in the auto-completion list
-    int AutoCompGetCurrent();
-
-    // Enlarge the document to a particular size of text bytes.
-    void Allocate(int bytes);
-
-    // Find the position of a column on a line taking into account tabs and
-    // multi-byte characters. If beyond end of line, return line end position.
-    int FindColumn(int line, int column);
-
-    // Can the caret preferred x position only be changed by explicit movement commands?
-    bool GetCaretSticky();
-
-    // Stop the caret preferred x position changing when the user types.
-    void SetCaretSticky(bool useCaretStickyBehaviour);
-
-    // Switch between sticky and non-sticky: meant to be bound to a key.
-    void ToggleCaretSticky();
-
-    // Enable/Disable convert-on-paste for line endings
-    void SetPasteConvertEndings(bool convert);
-
-    // Get convert-on-paste setting
-    bool GetPasteConvertEndings();
-
-    // Duplicate the selection. If selection empty duplicate the line containing the caret.
-    void SelectionDuplicate();
-
-    // Set background alpha of the caret line.
-    void SetCaretLineBackAlpha(int alpha);
-
-    // Get the background alpha of the caret line.
-    int GetCaretLineBackAlpha();
-
-    // Start notifying the container of all key presses and commands.
-    void StartRecord();
-
-    // Stop notifying the container of all key presses and commands.
-    void StopRecord();
-
-    // Set the lexing language of the document.
-    void SetLexer(int lexer);
-
-    // Retrieve the lexing language of the document.
-    int GetLexer();
-
-    // Colourise a segment of the document using the current lexing language.
-    void Colourise(int start, int end);
-
-    // Set up a value that may be used by a lexer for some optional feature.
-    void SetProperty(const wxString& key, const wxString& value);
-
-    // Set up the key words used by the lexer.
-    void SetKeyWords(int keywordSet, const wxString& keyWords);
-
-    // Set the lexing language of the document based on string name.
-    void SetLexerLanguage(const wxString& language);
-
-    // Retrieve a 'property' value previously set with SetProperty.
-    wxString GetProperty(const wxString& key);
-
-    // Retrieve a 'property' value previously set with SetProperty,
-    // with '$()' variable replacement on returned buffer.
-    wxString GetPropertyExpanded(const wxString& key);
-
-    // Retrieve a 'property' value previously set with SetProperty,
-    // interpreted as an int AFTER any '$()' variable replacement.
-    int GetPropertyInt(const wxString& key);
-
-    // Retrieve the number of bits the current lexer needs for styling.
-    int GetStyleBitsNeeded();
-
-// 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:[name or #RRGGBB]  sets the foreground colour
-    //      back:[name or #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,
-                          wxFontEncoding encoding=wxFONTENCODING_DEFAULT);
-
-
-    // Set the character set of the font in a style.  Converts the Scintilla
-    // character set values to a wxFontEncoding.
-    void StyleSetCharacterSet(int style, int characterSet);
-
-    // Set the font encoding to be used by a style.
-    void StyleSetFontEncoding(int style, wxFontEncoding encoding);
-    
-
-    // 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);
-
-
-    // Send a message to Scintilla
-    long SendMsg(int msg, long wp=0, long lp=0);
-
-
-    // Set the vertical scrollbar to use instead of the ont that's built-in.
-    void SetVScrollBar(wxScrollBar* bar);
-
-
-    // Set the horizontal scrollbar to use instead of the ont that's built-in.
-    void SetHScrollBar(wxScrollBar* bar);
-
-    // Can be used to prevent the EVT_CHAR handler from adding the char
-    bool GetLastKeydownProcessed() { return m_lastKeyDownConsumed; }
-    void SetLastKeydownProcessed(bool val) { m_lastKeyDownConsumed = val; }
-
-    // Write the contents of the editor to filename
-    bool SaveFile(const wxString& filename);
-
-    // Load the contents of filename into the editor
-    bool LoadFile(const wxString& filename);
-
-#ifdef STC_USE_DND
-    // Allow for simulating a DnD DragOver
-    wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def);
-
-    // Allow for simulating a DnD DropText
-    bool DoDropText(long x, long y, const wxString& data);
-#endif
-
-    // Specify whether anti-aliased fonts should be used.  Will have no effect
-    // on some platforms, but on some (wxMac for example) can greatly improve
-    // performance.
-    void SetUseAntiAliasing(bool useAA);
-
-    // Returns the current UseAntiAliasing setting.
-    bool GetUseAntiAliasing();
-
-
-    
-    // The following methods are nearly equivallent to their similarly named
-    // cousins above.  The difference is that these methods bypass wxString
-    // and always use a char* even if used in a unicode build of wxWidgets.
-    // In that case the character data will be utf-8 encoded since that is
-    // what is used internally by Scintilla in unicode builds.
-    
-    // Add text to the document at current position.
-    void AddTextRaw(const char* text);
-
-    // Insert string at a position.
-    void InsertTextRaw(int pos, const char* text);
-
-    // Retrieve the text of the line containing the caret.
-    // Returns the index of the caret on the line.
-#ifdef SWIG
-    wxCharBuffer GetCurLineRaw(int* OUTPUT);
-#else
-    wxCharBuffer GetCurLineRaw(int* linePos=NULL);
-#endif
-
-    // Retrieve the contents of a line.
-    wxCharBuffer GetLineRaw(int line);
-
-    // Retrieve the selected text.
-    wxCharBuffer GetSelectedTextRaw();
-
-    // Retrieve a range of text.
-    wxCharBuffer GetTextRangeRaw(int startPos, int endPos);
-
-    // Replace the contents of the document with the argument text.
-    void SetTextRaw(const char* text);
-
-    // Retrieve all the text in the document.
-    wxCharBuffer GetTextRaw();
-
-    // Append a string to the end of the document without changing the selection.
-    void AppendTextRaw(const char* text);
-
-#ifdef SWIG
-    %pythoncode "_stc_utf8_methods.py"
-#endif
-//----------------------------------------------------------------------
-
-
-#ifndef SWIG
-protected:
-    // Event handlers
-    void OnPaint(wxPaintEvent& evt);
-    void OnScrollWin(wxScrollWinEvent& evt);
-    void OnScroll(wxScrollEvent& evt);
-    void OnSize(wxSizeEvent& evt);
-    void OnMouseLeftDown(wxMouseEvent& evt);
-    void OnMouseMove(wxMouseEvent& evt);
-    void OnMouseLeftUp(wxMouseEvent& evt);
-    void OnMouseRightUp(wxMouseEvent& evt);
-    void OnMouseMiddleUp(wxMouseEvent& evt);
-    void OnContextMenu(wxContextMenuEvent& evt);
-    void OnMouseWheel(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);
-    void OnIdle(wxIdleEvent& evt);
-
-    virtual wxSize DoGetBestSize() const;
-
-    // Turn notifications from Scintilla into events
-    void NotifyChange();
-    void NotifyParent(SCNotification* scn);
-
-private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxStyledTextCtrl)
-
-protected:
-
-    ScintillaWX*        m_swx;
-    wxStopWatch         m_stopWatch;
-    wxScrollBar*        m_vScrollBar;
-    wxScrollBar*        m_hScrollBar;
-
-    bool                m_lastKeyDownConsumed;
-
-    friend class ScintillaWX;
-    friend class Platform;
-#endif
-};
-
-//----------------------------------------------------------------------
-
-class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
-public:
-    wxStyledTextEvent(wxEventType commandType=0, int id=0);
-#ifndef SWIG
-    wxStyledTextEvent(const wxStyledTextEvent& event);
-#endif
-    ~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 wxString& 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; }
-    void SetListType(int val)             { m_listType = val; }
-    void SetX(int val)                    { m_x = val; }
-    void SetY(int val)                    { m_y = val; }
-    void SetDragText(const wxString& val) { m_dragText = val; }
-    void SetDragAllowMove(bool val)       { m_dragAllowMove = val; }
-#ifdef  STC_USE_DND
-    void SetDragResult(wxDragResult val)  { m_dragResult = val; }
-#endif
-
-    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; }
-    int  GetListType() const         { return m_listType; }
-    int  GetX() const                { return m_x; }
-    int  GetY() const                { return m_y; }
-    wxString GetDragText()           { return m_dragText; }
-    bool GetDragAllowMove()          { return m_dragAllowMove; }
-#ifdef STC_USE_DND
-    wxDragResult GetDragResult()     { return m_dragResult; }
-#endif
-
-    bool GetShift() const;
-    bool GetControl() const;
-    bool GetAlt() const;
-
-    virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); }
-
-#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;
-
-    int m_listType;
-    int m_x;
-    int m_y;
-
-    wxString m_dragText;        // wxEVT_STC_START_DRAG, wxEVT_STC_DO_DROP
-    bool     m_dragAllowMove;   // wxEVT_STC_START_DRAG
-
-#if wxUSE_DRAG_AND_DROP
-    wxDragResult m_dragResult; // wxEVT_STC_DRAG_OVER,wxEVT_STC_DO_DROP
-#endif
-#endif
-};
-
-
-
-#ifndef SWIG
-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_CHANGE,             1650)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_STYLENEEDED,        1651)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_CHARADDED,          1652)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_SAVEPOINTREACHED,   1653)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_SAVEPOINTLEFT,      1654)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_ROMODIFYATTEMPT,    1655)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_KEY,                1656)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_DOUBLECLICK,        1657)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_UPDATEUI,           1658)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_MODIFIED,           1659)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_MACRORECORD,        1660)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_MARGINCLICK,        1661)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_NEEDSHOWN,          1662)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_PAINTED,            1664)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_USERLISTSELECTION,  1665)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_URIDROPPED,         1666)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_DWELLSTART,         1667)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_DWELLEND,           1668)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_START_DRAG,         1669)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_DRAG_OVER,          1670)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_DO_DROP,            1671)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_ZOOM,               1672)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_HOTSPOT_CLICK,      1673)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_HOTSPOT_DCLICK,     1674)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_CALLTIP_CLICK,      1675)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_AUTOCOMP_SELECTION, 1676)
-END_DECLARE_EVENT_TYPES()
-#else
-    enum {
-        wxEVT_STC_CHANGE,
-        wxEVT_STC_STYLENEEDED,
-        wxEVT_STC_CHARADDED,
-        wxEVT_STC_SAVEPOINTREACHED,
-        wxEVT_STC_SAVEPOINTLEFT,
-        wxEVT_STC_ROMODIFYATTEMPT,
-        wxEVT_STC_KEY,
-        wxEVT_STC_DOUBLECLICK,
-        wxEVT_STC_UPDATEUI,
-        wxEVT_STC_MODIFIED,
-        wxEVT_STC_MACRORECORD,
-        wxEVT_STC_MARGINCLICK,
-        wxEVT_STC_NEEDSHOWN,
-        wxEVT_STC_PAINTED,
-        wxEVT_STC_USERLISTSELECTION,
-        wxEVT_STC_URIDROPPED,
-        wxEVT_STC_DWELLSTART,
-        wxEVT_STC_DWELLEND,
-        wxEVT_STC_START_DRAG,
-        wxEVT_STC_DRAG_OVER,
-        wxEVT_STC_DO_DROP,
-        wxEVT_STC_ZOOM,
-        wxEVT_STC_HOTSPOT_CLICK,
-        wxEVT_STC_HOTSPOT_DCLICK,
-        wxEVT_STC_CALLTIP_CLICK,
-        wxEVT_STC_AUTOCOMP_SELECTION
-    };
-#endif
-
-
-
-#ifndef SWIG
-typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
-
-#define EVT_STC_CHANGE(id, fn)             DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CHANGE,                id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_STYLENEEDED(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_STYLENEEDED,           id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_CHARADDED(id, fn)          DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CHARADDED,             id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_SAVEPOINTREACHED(id, fn)   DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_SAVEPOINTREACHED,      id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_SAVEPOINTLEFT(id, fn)      DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_SAVEPOINTLEFT,         id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_ROMODIFYATTEMPT(id, fn)    DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_ROMODIFYATTEMPT,       id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_KEY(id, fn)                DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_KEY,                   id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_DOUBLECLICK(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DOUBLECLICK,           id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_UPDATEUI(id, fn)           DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_UPDATEUI,              id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_MODIFIED(id, fn)           DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MODIFIED,              id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_MACRORECORD(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MACRORECORD,           id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_MARGINCLICK(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MARGINCLICK,           id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_NEEDSHOWN(id, fn)          DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_NEEDSHOWN,             id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_PAINTED(id, fn)            DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_PAINTED,               id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_USERLISTSELECTION(id, fn)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_USERLISTSELECTION,     id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_URIDROPPED(id, fn)         DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_URIDROPPED,            id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_DWELLSTART(id, fn)         DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLSTART,            id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_DWELLEND(id, fn)           DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLEND,              id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_START_DRAG(id, fn)         DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_START_DRAG,            id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_DRAG_OVER(id, fn)          DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DRAG_OVER,             id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_DO_DROP(id, fn)            DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DO_DROP,               id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_ZOOM(id, fn)               DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_ZOOM,                  id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_HOTSPOT_CLICK(id, fn)      DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_CLICK,         id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_HOTSPOT_DCLICK(id, fn)     DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_DCLICK,        id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_CALLTIP_CLICK(id, fn))     DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CALLTIP_CLICK          id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_AUTOCOMP_SELECTION(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_AUTOCOMP_SELECTION     id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#endif
-
-//----------------------------------------------------------------------
-// Utility functions used within wxSTC
-
-#ifndef SWIG
-#if wxUSE_UNICODE
-
-WXDLLIMPEXP_STC wxString stc2wx(const char* str);
-WXDLLIMPEXP_STC wxString stc2wx(const char* str, size_t len);
-WXDLLIMPEXP_STC const wxWX2MBbuf wx2stc(const wxString& str);
-
-#else // not UNICODE
-
-inline wxString stc2wx(const char* str) {
-    return wxString(str);
-}
-inline wxString stc2wx(const char* str, size_t len) {
-    return wxString(str, len);
-}
-inline const wxWX2MBbuf wx2stc(const wxString& str) {
-    return str.mbc_str();
-}
-
-#endif // UNICODE
-#endif // SWIG
-
-//----------------------------------------------------------------------
-#endif
-
-
diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 58ba99ac0c..39ce201c80 100644
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -523,10 +523,27 @@ extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent;
 #if wxUSE_UNICODE
     #define wxConvertWX2MB(s)   wxConvCurrent->cWX2MB(s)
     #define wxConvertMB2WX(s)   wxConvCurrent->cMB2WX(s)
+
+#if wxABI_VERSION >= 20802
+    // these functions should be used when the conversions really, really have
+    // to succeed (usually because we pass their results to a standard C
+    // function which would crash if we passed NULL to it), so these functions
+    // always return a valid pointer if their argument is non-NULL
+
+    // this function safety is achieved by trying wxConvLibc first, wxConvUTF8
+    // next if it fails and, finally, wxConvISO8859_1 which always succeeds
+    extern WXDLLIMPEXP_BASE wxWCharBuffer wxSafeConvertMB2WX(const char *s);
+
+    // this function uses wxConvLibc and wxConvUTF8(MAP_INVALID_UTF8_TO_OCTAL)
+    // if it fails
+    extern WXDLLIMPEXP_BASE wxCharBuffer wxSafeConvertWX2MB(const wchar_t *ws);
+#endif // wxABI 2.8.2+
 #else // ANSI
     // no conversions to do
     #define wxConvertWX2MB(s)   (s)
     #define wxConvertMB2WX(s)   (s)
+    #define wxSafeConvertMB2WX(s) (s)
+    #define wxSafeConvertWX2MB(s) (s)
 #endif // Unicode/ANSI
 
 #endif // _WX_STRCONV_H_
diff --git a/include/wx/string.h b/include/wx/string.h
index fb73ad8757..0455a59df1 100644
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -836,6 +836,15 @@ public:
     // identical to c_str(), for MFC compatibility
     const wxChar* GetData() const { return c_str(); }
 
+    // conversion to *non-const* multibyte or widestring buffer; modifying
+    // returned buffer won't affect the string, these methods are only useful
+    // for passing values to const-incorrect functions
+    wxWritableCharBuffer char_str(const wxMBConv& conv = wxConvLibc) const
+      { return mb_str(conv); }
+#if wxUSE_WCHAR_T
+    wxWritableWCharBuffer wchar_str() const { return wc_str(wxConvLibc); }
+#endif
+
     // conversion to/from plain (i.e. 7 bit) ASCII: this is useful for
     // converting numbers or strings which are certain not to contain special
     // chars (typically system functions, X atoms, environment variables etc.)
diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 3aa70ce99d..677866a528 100644
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -402,14 +402,14 @@ public:
     // get/set the size of the bitmaps used by the toolbar: should be called
     // before adding any tools to the toolbar
     virtual void SetToolBitmapSize(const wxSize& size)
-        { m_defaultWidth = size.x; m_defaultHeight = size.y; };
+        { m_defaultWidth = size.x; m_defaultHeight = size.y; }
     virtual wxSize GetToolBitmapSize() const
         { return wxSize(m_defaultWidth, m_defaultHeight); }
 
     // the button size in some implementations is bigger than the bitmap size:
     // get the total button size (by default the same as bitmap size)
     virtual wxSize GetToolSize() const
-        { return GetToolBitmapSize(); } ;
+        { return GetToolBitmapSize(); }
 
     // returns a (non separator) tool containing the point (x, y) or NULL if
     // there is no tool at this point (corrdinates are client)
diff --git a/include/wx/validate.h b/include/wx/validate.h
index f45efe1376..b80ca09b8e 100644
--- a/include/wx/validate.h
+++ b/include/wx/validate.h
@@ -50,13 +50,13 @@ public:
 
     // Called when the value in the window must be validated.
     // This function can pop up an error message.
-    virtual bool Validate(wxWindow *WXUNUSED(parent)) { return false; };
+    virtual bool Validate(wxWindow *WXUNUSED(parent)) { return false; }
 
     // Called to transfer data to the window
     virtual bool TransferToWindow() { return false; }
 
     // Called to transfer data from the window
-    virtual bool TransferFromWindow() { return false; };
+    virtual bool TransferFromWindow() { return false; }
 
     // accessors
     wxWindow *GetWindow() const { return (wxWindow *)m_validatorWindow; }
diff --git a/include/wx/vector.h b/include/wx/vector.h
index 8ffc4a74f1..f8aa5625eb 100644
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -155,7 +155,7 @@ public:\
 #define _WX_DECLARE_VECTOR(obj, cls, exp)\
 class exp cls : public wxVectorBase\
 {\
-    WX_DECLARE_VECTORBASE(obj, cls);\
+    WX_DECLARE_VECTORBASE(obj, cls)\
 public:\
     void push_back(const obj& o)\
     {\
diff --git a/include/wx/version.h b/include/wx/version.h
index 8dd5783af4..91f6b1d905 100644
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -28,9 +28,9 @@
 /*  NB: this file is parsed by automatic tools so don't change its format! */
 #define wxMAJOR_VERSION      2
 #define wxMINOR_VERSION      8
-#define wxRELEASE_NUMBER     1
-#define wxSUBRELEASE_NUMBER  1
-#define wxVERSION_STRING   _T("wxWidgets 2.8.1")
+#define wxRELEASE_NUMBER     4
+#define wxSUBRELEASE_NUMBER  0
+#define wxVERSION_STRING   _T("wxWidgets 2.8.4")
 
 /*  nothing to update below this line when updating the version */
 /*  ---------------------------------------------------------------------------- */
diff --git a/include/wx/window.h b/include/wx/window.h
index 30f4f2f57c..ffbf0dc120 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1069,7 +1069,7 @@ public:
     void SetAccessible(wxAccessible* accessible) ;
 
     // Returns the accessible object.
-    wxAccessible* GetAccessible() { return m_accessible; };
+    wxAccessible* GetAccessible() { return m_accessible; }
 
     // Returns the accessible object, creating if necessary.
     wxAccessible* GetOrCreateAccessible() ;
diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 84e8ee28f2..e237d86e59 100644
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -129,6 +129,7 @@
 #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x520)
     #define wxHAVE_TCHAR_SUPPORT
     #include <ctype.h>
+    #include <memory.h>
 #elif defined(__WATCOMC__)
     #define wxHAVE_TCHAR_SUPPORT
 #elif defined(__DMC__)
diff --git a/samples/Info.plist b/samples/Info.plist
index 8741bc5ce9..f9e02a98d3 100755
--- a/samples/Info.plist
+++ b/samples/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleGetInfoString</key>
-	<string>$(PRODUCT_NAME) version 2.6.0, (c) 2006 wxWidgets</string>
+	<string>$(PRODUCT_NAME) version 2.8.3, (c) 2007 wxWidgets</string>
 	<key>CFBundleIconFile</key>
 	<string>wxmac.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -15,22 +15,22 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>
-	<string>2.6.0, (c) 2006 wxWidgets</string>
+	<string>2.8.3, (c) 2007 wxWidgets</string>
 	<key>CFBundleName</key>
-	<string>minimal</string>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.0</string>
+	<string>2.8.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.6.0</string>
+	<string>2.8.3</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2006 wxWidgets</string>
+	<string>Copyright 2007 wxWidgets</string>
 </dict>
 </plist>
diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in
index 3caf488612..f3256c758f 100644
--- a/samples/access/Makefile.in
+++ b/samples/access/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 ACCESSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/animate/Makefile.in b/samples/animate/Makefile.in
index 167b1d51bd..c361fded3b 100644
--- a/samples/animate/Makefile.in
+++ b/samples/animate/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 ANITEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in
index 24ac4d44ae..a10f13b0b8 100644
--- a/samples/artprov/Makefile.in
+++ b/samples/artprov/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 ARTTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in
index 31dbb9e7f8..c232700422 100644
--- a/samples/aui/Makefile.in
+++ b/samples/aui/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 AUIDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp
index cfd0c27efc..f2be296664 100644
--- a/samples/aui/auidemo.cpp
+++ b/samples/aui/auidemo.cpp
@@ -277,7 +277,7 @@ public:
         //vert->Add(1, 1, 1, wxEXPAND);
 
         wxBoxSizer* s1 = new wxBoxSizer(wxHORIZONTAL);
-        m_border_size = new wxSpinCtrl(this, ID_PaneBorderSize, wxEmptyString, wxDefaultPosition, wxSize(50,20));
+        m_border_size = new wxSpinCtrl(this, ID_PaneBorderSize, wxString::Format(wxT("%d"), frame->GetDockArt()->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE)), wxDefaultPosition, wxSize(50,20), wxSP_ARROW_KEYS, 0, 100, frame->GetDockArt()->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE));
         s1->Add(1, 1, 1, wxEXPAND);
         s1->Add(new wxStaticText(this, wxID_ANY, wxT("Pane Border Size:")));
         s1->Add(m_border_size);
@@ -286,7 +286,7 @@ public:
         //vert->Add(s1, 0, wxEXPAND | wxLEFT | wxBOTTOM, 5);
 
         wxBoxSizer* s2 = new wxBoxSizer(wxHORIZONTAL);
-        m_sash_size = new wxSpinCtrl(this, ID_SashSize, wxEmptyString, wxDefaultPosition, wxSize(50,20));
+        m_sash_size = new wxSpinCtrl(this, ID_SashSize, wxString::Format(wxT("%d"), frame->GetDockArt()->GetMetric(wxAUI_DOCKART_SASH_SIZE)), wxDefaultPosition, wxSize(50,20), wxSP_ARROW_KEYS, 0, 100, frame->GetDockArt()->GetMetric(wxAUI_DOCKART_SASH_SIZE));
         s2->Add(1, 1, 1, wxEXPAND);
         s2->Add(new wxStaticText(this, wxID_ANY, wxT("Sash Size:")));
         s2->Add(m_sash_size);
@@ -295,7 +295,7 @@ public:
         //vert->Add(s2, 0, wxEXPAND | wxLEFT | wxBOTTOM, 5);
 
         wxBoxSizer* s3 = new wxBoxSizer(wxHORIZONTAL);
-        m_caption_size = new wxSpinCtrl(this, ID_CaptionSize, wxEmptyString, wxDefaultPosition, wxSize(50,20));
+        m_caption_size = new wxSpinCtrl(this, ID_CaptionSize, wxString::Format(wxT("%d"), frame->GetDockArt()->GetMetric(wxAUI_DOCKART_CAPTION_SIZE)), wxDefaultPosition, wxSize(50,20), wxSP_ARROW_KEYS, 0, 100, frame->GetDockArt()->GetMetric(wxAUI_DOCKART_CAPTION_SIZE));
         s3->Add(1, 1, 1, wxEXPAND);
         s3->Add(new wxStaticText(this, wxID_ANY, wxT("Caption Size:")));
         s3->Add(m_caption_size);
@@ -402,11 +402,11 @@ public:
         cont_sizer->Add(grid_sizer, 1, wxEXPAND | wxALL, 5);
         SetSizer(cont_sizer);
         GetSizer()->SetSizeHints(this);
-
+#if 0
         m_border_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE));
         m_sash_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_DOCKART_SASH_SIZE));
         m_caption_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_DOCKART_CAPTION_SIZE));
-
+#endif
         UpdateColors();
     }
 
diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in
index a0394261c4..679b0ece75 100644
--- a/samples/calendar/Makefile.in
+++ b/samples/calendar/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 CALENDAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in
index 429adb5e58..91abe17b45 100644
--- a/samples/caret/Makefile.in
+++ b/samples/caret/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 CARET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/checklst/Makefile.in b/samples/checklst/Makefile.in
index a7f27619fc..07fa93a736 100644
--- a/samples/checklst/Makefile.in
+++ b/samples/checklst/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 CHECKLST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/collpane/Makefile.in b/samples/collpane/Makefile.in
index c555262339..3eab73ba47 100644
--- a/samples/collpane/Makefile.in
+++ b/samples/collpane/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 COLLPANE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in
index 93dff4cedd..1895514125 100644
--- a/samples/combo/Makefile.in
+++ b/samples/combo/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 COMBO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in
index 1e350afb9f..ae033549e6 100644
--- a/samples/config/Makefile.in
+++ b/samples/config/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in
index f2d86673b6..59ff0931ba 100644
--- a/samples/controls/Makefile.in
+++ b/samples/controls/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 CONTROLS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in
index d1d6027399..568db4d290 100644
--- a/samples/dataview/Makefile.in
+++ b/samples/dataview/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 DATAVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in
index f0f193cec7..4af815a7bd 100644
--- a/samples/db/Makefile.in
+++ b/samples/db/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 DBTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/debugrpt/Makefile.in b/samples/debugrpt/Makefile.in
index 310a6640ed..9115327afb 100644
--- a/samples/debugrpt/Makefile.in
+++ b/samples/debugrpt/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 DEBUGRPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in
index 77257a6104..4ac847f618 100644
--- a/samples/dialogs/Makefile.in
+++ b/samples/dialogs/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 DIALOGS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in
index 1c34151b17..0aa39c812a 100644
--- a/samples/dialup/Makefile.in
+++ b/samples/dialup/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 NETTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in
index 7556ee8da6..a932f585ee 100644
--- a/samples/display/Makefile.in
+++ b/samples/display/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 DISPLAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in
index f50f6b52c1..4b21b7c0f5 100644
--- a/samples/dnd/Makefile.in
+++ b/samples/dnd/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 DND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in
index 618c028192..9003f65f77 100644
--- a/samples/docview/Makefile.in
+++ b/samples/docview/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/docvwmdi/Makefile.in b/samples/docvwmdi/Makefile.in
index 205f152806..86a761bd76 100644
--- a/samples/docvwmdi/Makefile.in
+++ b/samples/docvwmdi/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 DOCVWMDI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in
index b6325bb8e5..706cfaedd7 100644
--- a/samples/dragimag/Makefile.in
+++ b/samples/dragimag/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 DRAGIMAG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in
index ab9ff4c49c..2407100dd5 100644
--- a/samples/drawing/Makefile.in
+++ b/samples/drawing/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 DRAWING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/dynamic/Makefile.in b/samples/dynamic/Makefile.in
index 7e641418fe..eb0f18ffe7 100644
--- a/samples/dynamic/Makefile.in
+++ b/samples/dynamic/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 DYNAMIC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in
index 35470b70e5..e03036ab19 100644
--- a/samples/erase/Makefile.in
+++ b/samples/erase/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 ERASE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in
index 797aed2e3f..2aeb93d74e 100644
--- a/samples/event/Makefile.in
+++ b/samples/event/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 EVENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in
index 22406be019..3fefcf8bd4 100644
--- a/samples/except/Makefile.in
+++ b/samples/except/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 EXCEPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in
index cb74d1262f..d8ef3e3422 100644
--- a/samples/exec/Makefile.in
+++ b/samples/exec/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 EXEC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in
index b8c568afd3..b179b010f1 100644
--- a/samples/font/Makefile.in
+++ b/samples/font/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 FONT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in
index 33b8b01435..2d664d3d99 100644
--- a/samples/grid/Makefile.in
+++ b/samples/grid/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 GRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in
index 7b82add45d..ed622a37d1 100644
--- a/samples/help/Makefile.in
+++ b/samples/help/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in
index 8057f33865..abbb32bc92 100644
--- a/samples/htlbox/Makefile.in
+++ b/samples/htlbox/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 HTLBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in
index fa0a298cdc..f5df160066 100644
--- a/samples/html/about/Makefile.in
+++ b/samples/html/about/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 ABOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in
index b406dc9adf..f0bd8ecda9 100644
--- a/samples/html/help/Makefile.in
+++ b/samples/html/help/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 HTMLHELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in
index f9e9500a68..45751df4ea 100644
--- a/samples/html/helpview/Makefile.in
+++ b/samples/html/helpview/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/html/helpview/helpview.cpp b/samples/html/helpview/helpview.cpp
index ba4c62925d..70614e0c2b 100644
--- a/samples/html/helpview/helpview.cpp
+++ b/samples/html/helpview/helpview.cpp
@@ -43,20 +43,34 @@ class MyApp : public wxApp
         virtual bool OnInit();
         virtual int OnExit();
 
-    private:
-        wxHtmlHelpController *help;
+        /// Respond to idle event
+        void OnIdle(wxIdleEvent& event);
+
+private:
+        bool                    m_exitIfNoMainWindow;
+        wxHtmlHelpController *  help;
+DECLARE_EVENT_TABLE()
 };
 
 
 IMPLEMENT_APP(MyApp)
 
+BEGIN_EVENT_TABLE(MyApp, wxApp)
+    EVT_IDLE(MyApp::OnIdle)
+END_EVENT_TABLE()
 
 bool MyApp::OnInit()
 {
+    m_exitIfNoMainWindow = false;
 #ifdef __WXMOTIF__
     delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
 #endif
 
+    // Don't exit on frame deletion, since the help window is programmed
+    // to cause the app to exit even if it is still open. We need to have the app
+    // close by other means.
+    SetExitOnFrameDelete(false);
+
     wxInitAllImageHandlers();
     wxFileSystem::AddHandler(new wxZipFSHandler);
 
@@ -64,7 +78,7 @@ bool MyApp::OnInit()
     SetAppName(wxT("wxHTMLHelp")); 
     wxConfig::Get(); // create an instance
 
-    help = new wxHtmlHelpController;
+    help = new wxHtmlHelpController(wxHF_DEFAULT_STYLE|wxHF_OPEN_FILES);
 
     if (argc < 2) {
         wxLogError(wxT("Usage : helpview <helpfile> [<more helpfiles>]"));
@@ -80,10 +94,20 @@ bool MyApp::OnInit()
 #endif
 
     help -> DisplayContents();
+    SetTopWindow(help->GetFrame());
+    m_exitIfNoMainWindow = true;
 
     return true;
 }
 
+void MyApp::OnIdle(wxIdleEvent& event)
+{
+    if (m_exitIfNoMainWindow && !GetTopWindow())
+        ExitMainLoop();
+
+    event.Skip();
+    event.RequestMore();
+}
 
 int MyApp::OnExit()
 {
diff --git a/samples/html/htmlctrl/Makefile.in b/samples/html/htmlctrl/Makefile.in
index 2d85878aef..3ea1a743a4 100644
--- a/samples/html/htmlctrl/Makefile.in
+++ b/samples/html/htmlctrl/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 HTMLCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in
index 098f1b4b7f..2c9340e217 100644
--- a/samples/html/printing/Makefile.in
+++ b/samples/html/printing/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 HTMLPRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in
index b238546407..6df132abd6 100644
--- a/samples/html/test/Makefile.in
+++ b/samples/html/test/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in
index 243968cff0..efeb977d17 100644
--- a/samples/html/virtual/Makefile.in
+++ b/samples/html/virtual/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 VIRTUAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in
index 4a37bbd2a8..40838edcd9 100644
--- a/samples/html/widget/Makefile.in
+++ b/samples/html/widget/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 WIDGET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in
index 650dd82a2e..3761210036 100644
--- a/samples/html/zip/Makefile.in
+++ b/samples/html/zip/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 ZIP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in
index 9ecc38cd5e..6e8299d9c6 100644
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
index feedee88fc..d1779e5541 100644
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 INTERNAT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in
index 9b870af676..51b2fe5fc6 100644
--- a/samples/ipc/Makefile.in
+++ b/samples/ipc/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 IPCCLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in
index 669c3d665b..d4ca4c75ea 100644
--- a/samples/joytest/Makefile.in
+++ b/samples/joytest/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 JOYTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in
index e5cffc7547..e01f1082a4 100644
--- a/samples/keyboard/Makefile.in
+++ b/samples/keyboard/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 KEYBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in
index b00400bd82..0e181e4096 100644
--- a/samples/layout/Makefile.in
+++ b/samples/layout/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 LAYOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/listbox/Makefile.in b/samples/listbox/Makefile.in
index ee4a50cddd..5e6752311a 100644
--- a/samples/listbox/Makefile.in
+++ b/samples/listbox/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 LISTBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in
index 522d8d96e5..fb58cc2e76 100644
--- a/samples/listctrl/Makefile.in
+++ b/samples/listctrl/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 LISTCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in
index b1cbec6bc3..a54653d24f 100644
--- a/samples/mdi/Makefile.in
+++ b/samples/mdi/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 MDI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in
index 7aa7144434..08df1c8dba 100644
--- a/samples/mediaplayer/Makefile.in
+++ b/samples/mediaplayer/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 MEDIAPLAYER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in
index 0fe8800849..d393ac0adb 100644
--- a/samples/memcheck/Makefile.in
+++ b/samples/memcheck/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 MEMCHECK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in
index 1c9166f8c0..6c5a491792 100644
--- a/samples/menu/Makefile.in
+++ b/samples/menu/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 MENU_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/mfc/Makefile.in b/samples/mfc/Makefile.in
index 06a9a5f52b..924316e0ae 100644
--- a/samples/mfc/Makefile.in
+++ b/samples/mfc/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 MFCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/minifram/Makefile.in b/samples/minifram/Makefile.in
index 0337125fdc..e4f8f342d5 100644
--- a/samples/minifram/Makefile.in
+++ b/samples/minifram/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 MINIFRAM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/minimal/Info.plist b/samples/minimal/Info.plist
index 6620db7ad4..f9e02a98d3 100644
--- a/samples/minimal/Info.plist
+++ b/samples/minimal/Info.plist
@@ -7,30 +7,30 @@
 	<key>CFBundleExecutable</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleGetInfoString</key>
-	<string>minimal version 2.6.0, (c) 2005 wxWidgets</string>
+	<string>$(PRODUCT_NAME) version 2.8.3, (c) 2007 wxWidgets</string>
 	<key>CFBundleIconFile</key>
 	<string>wxmac.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.wxwidgets.samples.minimal</string>
+	<string>org.wxwidgets.samples.$(PRODUCT_NAME)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>
-	<string>2.6.0, (c) 2005 wxWidgets</string>
+	<string>2.8.3, (c) 2007 wxWidgets</string>
 	<key>CFBundleName</key>
-	<string>minimal</string>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.0</string>
+	<string>2.8.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.6.0</string>
+	<string>2.8.3</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2005 wxWidgets</string>
+	<string>Copyright 2007 wxWidgets</string>
 </dict>
 </plist>
diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in
index 21a83a2e44..59c5ed5978 100644
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 MINIMAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/minimal/minimal.xcodeproj/project.pbxproj b/samples/minimal/minimal.xcodeproj/project.pbxproj
index a36f068875..38b25697a3 100644
--- a/samples/minimal/minimal.xcodeproj/project.pbxproj
+++ b/samples/minimal/minimal.xcodeproj/project.pbxproj
@@ -466,7 +466,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(NATIVE_ARCH)";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = ../../include/wx/wxprec.h;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -595,10 +594,6 @@
 		1842CAB508565A280032BCF7 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
 				COPY_PHASE_STRIP = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
diff --git a/samples/mobile/styles/Makefile.in b/samples/mobile/styles/Makefile.in
index 779b80646a..ac2821456b 100644
--- a/samples/mobile/styles/Makefile.in
+++ b/samples/mobile/styles/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 STYLES_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/mobile/wxedit/Makefile.in b/samples/mobile/wxedit/Makefile.in
index b128bdc5f5..2029511528 100644
--- a/samples/mobile/wxedit/Makefile.in
+++ b/samples/mobile/wxedit/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 WXEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/multimon/Makefile.in b/samples/multimon/Makefile.in
index 22c9e51da5..095f36cf1e 100644
--- a/samples/multimon/Makefile.in
+++ b/samples/multimon/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 MULTIMON_TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in
index c8bcf12661..c9a4883dd8 100644
--- a/samples/nativdlg/Makefile.in
+++ b/samples/nativdlg/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 NATIVDLG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in
index 172dfce7f7..bb46bd0057 100644
--- a/samples/notebook/Makefile.in
+++ b/samples/notebook/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 NOTEBOOK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in
index bee7130f93..f34821a1e3 100644
--- a/samples/oleauto/Makefile.in
+++ b/samples/oleauto/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 OLEAUTO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in
index c97c566f12..2c81a6f098 100644
--- a/samples/opengl/cube/Makefile.in
+++ b/samples/opengl/cube/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 CUBE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in
index 5ca01f8f13..2b6e29c536 100644
--- a/samples/opengl/isosurf/Makefile.in
+++ b/samples/opengl/isosurf/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in
index 944ded51d5..c1937a6249 100644
--- a/samples/opengl/penguin/Makefile.in
+++ b/samples/opengl/penguin/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in
index dbb4c818c9..c23571b789 100644
--- a/samples/ownerdrw/Makefile.in
+++ b/samples/ownerdrw/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 OWNERDRW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/png/Makefile.in b/samples/png/Makefile.in
index fe62b1bd83..4d398654be 100644
--- a/samples/png/Makefile.in
+++ b/samples/png/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 PNG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/popup/Makefile.in b/samples/popup/Makefile.in
index 28e871ddf3..a5a247fb34 100644
--- a/samples/popup/Makefile.in
+++ b/samples/popup/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 POPUP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/power/Makefile.in b/samples/power/Makefile.in
index 9f3cdc06dc..cbbe48a692 100644
--- a/samples/power/Makefile.in
+++ b/samples/power/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 POWER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in
index a9dc7ff757..0b792826dc 100644
--- a/samples/printing/Makefile.in
+++ b/samples/printing/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/propsize/Makefile.in b/samples/propsize/Makefile.in
index c14d1eb562..83e2a37d4f 100644
--- a/samples/propsize/Makefile.in
+++ b/samples/propsize/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 PROPSIZE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in
index 05e4059b94..a56e0c9595 100644
--- a/samples/regtest/Makefile.in
+++ b/samples/regtest/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 REGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/regtest/regtest.cpp b/samples/regtest/regtest.cpp
index a0c05f3a96..9c99785332 100644
--- a/samples/regtest/regtest.cpp
+++ b/samples/regtest/regtest.cpp
@@ -259,9 +259,10 @@ END_EVENT_TABLE()
 #if DO_REGTEST
 
 BEGIN_EVENT_TABLE(RegTreeCtrl, wxTreeCtrl)
-    EVT_TREE_DELETE_ITEM   (Ctrl_RegTree, RegTreeCtrl::OnDeleteItem)
-    EVT_TREE_ITEM_EXPANDING(Ctrl_RegTree, RegTreeCtrl::OnItemExpanding)
-    EVT_TREE_SEL_CHANGED   (Ctrl_RegTree, RegTreeCtrl::OnSelChanged)
+    EVT_TREE_DELETE_ITEM    (Ctrl_RegTree, RegTreeCtrl::OnDeleteItem)
+    EVT_TREE_ITEM_EXPANDING (Ctrl_RegTree, RegTreeCtrl::OnItemExpanding)
+    EVT_TREE_ITEM_COLLAPSING(Ctrl_RegTree, RegTreeCtrl::OnItemExpanding)
+    EVT_TREE_SEL_CHANGED    (Ctrl_RegTree, RegTreeCtrl::OnSelChanged)
 
     EVT_TREE_BEGIN_LABEL_EDIT(Ctrl_RegTree, RegTreeCtrl::OnBeginEdit)
     EVT_TREE_END_LABEL_EDIT  (Ctrl_RegTree, RegTreeCtrl::OnEndEdit)
@@ -710,7 +711,7 @@ void RegTreeCtrl::OnSelChanged(wxTreeEvent& event)
 void RegTreeCtrl::OnItemExpanding(wxTreeEvent& event)
 {
     TreeNode *pNode = GetNode(event);
-    bool bExpanding = event.GetKeyCode() == wxTREE_EXPAND_EXPAND;
+    bool bExpanding = event.GetEventType() == wxEVT_COMMAND_TREE_ITEM_EXPANDING;
 
     // expansion might take some time
     wxSetCursor(*wxHOURGLASS_CURSOR);
diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in
index 1ef167d2d5..fe11303037 100644
--- a/samples/render/Makefile.in
+++ b/samples/render/Makefile.in
@@ -49,7 +49,7 @@ wx_top_builddir = @wx_top_builddir@
 DESTDIR = 
 WX_RELEASE = 2.8
 WX_RELEASE_NODOT = 28
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0)
 RENDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
diff --git a/samples/resource/makefile.wat b/samples/resource/makefile.wat
deleted file mode 100644
index 1d277645e2..0000000000
--- a/samples/resource/makefile.wat
+++ /dev/null
@@ -1,12 +0,0 @@
-# 
-# Makefile for WATCOM 
-# 
-# Created by Julian Smart, January 1999 
-#  
-# 
-# 
-# 
-PROGRAM = resource 
-OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
-# 
-!include $(%WXWIN)\src\makeprog.wat 
diff --git a/samples/richtext/Makefile.in b/samples/richtext/Makefile.in
index e1fe17d6b7..7335b126e4 100644
--- a/samples/richtext/Makefile.in
+++ b/samples/richtext/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 RICHTEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/richtext/richtext.cpp b/samples/richtext/richtext.cpp
index 2f0fb87c69..894045e0ae 100644
--- a/samples/richtext/richtext.cpp
+++ b/samples/richtext/richtext.cpp
@@ -754,9 +754,12 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
     r.WriteText(wxT("colour, like this red bit."));
     r.EndTextColour();
 
-    r.BeginTextColour(wxColour(0, 0, 255));
-    r.WriteText(wxT(" And this blue bit."));
-    r.EndTextColour();
+    wxRichTextAttr backgroundColourAttr;
+    backgroundColourAttr.SetBackgroundColour(*wxGREEN);
+    backgroundColourAttr.SetTextColour(wxColour(0, 0, 255));
+    r.BeginStyle(backgroundColourAttr);
+    r.WriteText(wxT(" And this blue on green bit."));
+    r.EndStyle();
 
     r.WriteText(wxT(" Naturally you can make things "));
     r.BeginBold();
diff --git a/samples/rotate/Makefile.in b/samples/rotate/Makefile.in
index a73e730002..1426d89618 100644
--- a/samples/rotate/Makefile.in
+++ b/samples/rotate/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 ROTATE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in
index 1a04fd57aa..b2052289a5 100644
--- a/samples/sashtest/Makefile.in
+++ b/samples/sashtest/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 SASHTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in
index ff27a50275..6b95454f55 100644
--- a/samples/scroll/Makefile.in
+++ b/samples/scroll/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 SCROLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/scrollsub/Makefile.in b/samples/scrollsub/Makefile.in
index 1ce3f669a7..6da40198e0 100644
--- a/samples/scrollsub/Makefile.in
+++ b/samples/scrollsub/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 SCROLLSUB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in
index 4df0a242f5..5c798795db 100644
--- a/samples/shaped/Makefile.in
+++ b/samples/shaped/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 SHAPED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in
index d7cabb4e82..4d89b55ac6 100644
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in
index ea561df1cd..a898a0be86 100644
--- a/samples/sound/Makefile.in
+++ b/samples/sound/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 SOUND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/splash/Makefile.in b/samples/splash/Makefile.in
index 734e522f46..c3c877e2ed 100644
--- a/samples/splash/Makefile.in
+++ b/samples/splash/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 SPLASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in
index b94c0cb746..c19be8d752 100644
--- a/samples/splitter/Makefile.in
+++ b/samples/splitter/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 SPLITTER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in
index c2941bc487..c3364c7634 100644
--- a/samples/statbar/Makefile.in
+++ b/samples/statbar/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 STATBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/stc/.cvsignore b/samples/stc/.cvsignore
deleted file mode 100644
index bfe355bda3..0000000000
--- a/samples/stc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-stctest.res
diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in
deleted file mode 100644
index 8ef158fc6e..0000000000
--- a/samples/stc/Makefile.in
+++ /dev/null
@@ -1,214 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-EXEEXT = @EXEEXT@
-WINDRES = @WINDRES@
-REZ = @REZ@
-SETFILE = @SETFILE@
-NM = @NM@
-BK_DEPS = @BK_DEPS@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-LIBS = @LIBS@
-LDFLAGS_GUI = @LDFLAGS_GUI@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR = 
-WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-STCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \
-	-I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
-STCTEST_OBJECTS =  \
-	$(__stctest___win32rc) \
-	$(__stctest_os2_lib_res) \
-	stctest_stctest.o \
-	stctest_edit.o \
-	stctest_prefs.o
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
-@COND_PLATFORM_MAC_1@__stctest___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C stctest$(EXEEXT)
-@COND_PLATFORM_MAC_1@__stctest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
-COND_PLATFORM_OS2_1___stctest___os2_emxbindcmd = $(NM) stctest$(EXEEXT) | if \
-	grep -q pmwin.763 ; then emxbind -ep stctest$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__stctest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___stctest___os2_emxbindcmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
-@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
-@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__stctest___win32rc = stctest_sample_rc.o
-@COND_PLATFORM_OS2_1@__stctest_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__stctest_bundle___depname = stctest_bundle
-@COND_TOOLKIT_COCOA@____stctest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	stctest.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____stctest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	stctest.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
-	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
-	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
-	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
-	$(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
-	$(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -i \
-	$(srcdir)/../../include -o stctest$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: stctest$(EXEEXT) $(__stctest_bundle___depname) data
-
-install: all
-
-uninstall: 
-
-install-strip: install
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f stctest$(EXEEXT)
-	rm -rf stctest.app
-
-distclean: clean
-	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc)
-	$(CXX) -o $@ $(STCTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
-	$(__stctest___mac_rezcmd)
-	$(__stctest___mac_setfilecmd)
-	$(__stctest___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p stctest.app/Contents
-	mkdir -p stctest.app/Contents/MacOS
-	mkdir -p stctest.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/stctest/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >stctest.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >stctest.app/Contents/PkgInfo
-	
-	
-	ln -f stctest$(EXEEXT) stctest.app/Contents/MacOS/stctest
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns stctest.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@stctest_bundle: $(____stctest_BUNDLE_TGT_REF_DEP)
-
-data: 
-	@mkdir -p .
-	@for f in stctest.cpp; do \
-	if test ! -f ./$$f -a ! -d ./$$f ; \
-	then x=yep ; \
-	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
-	fi; \
-	case "$$x" in ?*) \
-	cp -pRf $(srcdir)/$$f . ;; \
-	esac; \
-	done
-
-stctest_sample_rc.o: $(srcdir)/../../../samples/sample.rc
-	$(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
-
-stctest_stctest.o: $(srcdir)/stctest.cpp
-	$(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $(srcdir)/stctest.cpp
-
-stctest_edit.o: $(srcdir)/edit.cpp
-	$(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $(srcdir)/edit.cpp
-
-stctest_prefs.o: $(srcdir)/prefs.cpp
-	$(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $(srcdir)/prefs.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean stctest_bundle data
diff --git a/samples/stc/defsext.h b/samples/stc/defsext.h
deleted file mode 100644
index e7428b7da5..0000000000
--- a/samples/stc/defsext.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        defsext.h extensions
-// Purpose:     STC test declarations
-// Maintainer:  Wyo
-// Created:     2003-09-01
-// RCS-ID:      $Id$
-// Copyright:   (c) wxGuide
-// Licence:     wxWindows licence
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DEFSEXT_H_
-#define _WX_DEFSEXT_H_
-
-//----------------------------------------------------------------------------
-// headers
-//----------------------------------------------------------------------------
-
-//! wxWidgets headers
-#include "wx/print.h"    // printing support
-#include "wx/printdlg.h" // printing dialog
-
-
-//============================================================================
-// declarations
-//============================================================================
-
-#define DEFAULT_LANGUAGE _("<default>")
-
-#define PAGE_COMMON _("Common")
-#define PAGE_LANGUAGES _("Languages")
-#define PAGE_STYLE_TYPES _("Style types")
-
-#define STYLE_TYPES_COUNT 32
-
-
-// ----------------------------------------------------------------------------
-// standard IDs
-// ----------------------------------------------------------------------------
-
-enum {
-    // menu IDs
-    myID_PROPERTIES = wxID_HIGHEST,
-    myID_INDENTINC,
-    myID_INDENTRED,
-    myID_FINDNEXT,
-    myID_REPLACE,
-    myID_REPLACENEXT,
-    myID_BRACEMATCH,
-    myID_GOTO,
-    myID_PAGEACTIVE,
-    myID_DISPLAYEOL,
-    myID_INDENTGUIDE,
-    myID_LINENUMBER,
-    myID_LONGLINEON,
-    myID_WHITESPACE,
-    myID_FOLDTOGGLE,
-    myID_OVERTYPE,
-    myID_READONLY,
-    myID_WRAPMODEON,
-    myID_CHANGECASE,
-    myID_CHANGELOWER,
-    myID_CHANGEUPPER,
-    myID_HILIGHTLANG,
-    myID_HILIGHTFIRST,
-    myID_HILIGHTLAST = myID_HILIGHTFIRST + 99,
-    myID_CONVERTEOL,
-    myID_CONVERTCR,
-    myID_CONVERTCRLF,
-    myID_CONVERTLF,
-    myID_USECHARSET,
-    myID_CHARSETANSI,
-    myID_CHARSETMAC,
-    myID_PAGEPREV,
-    myID_PAGENEXT,
-    myID_SELECTLINE,
-
-    // other IDs
-    myID_STATUSBAR,
-    myID_TITLEBAR,
-    myID_ABOUTTIMER,
-    myID_UPDATETIMER,
-
-    // dialog find IDs
-    myID_DLG_FIND_TEXT,
-
-    // preferences IDs
-    myID_PREFS_LANGUAGE,
-    myID_PREFS_STYLETYPE,
-    myID_PREFS_KEYWORDS,
-};
-
-// ----------------------------------------------------------------------------
-// global items
-// ----------------------------------------------------------------------------
-
-//! global application name
-extern wxString *g_appname;
-
-#if wxUSE_PRINTING_ARCHITECTURE
-
-//! global print data, to remember settings during the session
-extern wxPrintData *g_printData;
-extern wxPageSetupData *g_pageSetupData;
-
-#endif // wxUSE_PRINTING_ARCHITECTURE
-
-#endif // _WX_DEFSEXT_H_
diff --git a/samples/stc/edit.cpp b/samples/stc/edit.cpp
deleted file mode 100644
index 24be6831a8..0000000000
--- a/samples/stc/edit.cpp
+++ /dev/null
@@ -1,834 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// File:        contrib/samples/stc/edit.cpp
-// Purpose:     STC test module
-// Maintainer:  Wyo
-// Created:     2003-09-01
-// RCS-ID:      $Id$
-// Copyright:   (c) wxGuide
-// Licence:     wxWindows licence
-//////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-// informations
-//----------------------------------------------------------------------------
-
-
-//----------------------------------------------------------------------------
-// headers
-//----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all 'standard' wxWidgets headers)
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
-//! wxWidgets headers
-#include "wx/file.h"     // raw file io support
-#include "wx/filename.h" // filename support
-
-//! application headers
-#include "defsext.h"     // additional definitions
-
-#include "edit.h"        // edit module
-
-
-//----------------------------------------------------------------------------
-// resources
-//----------------------------------------------------------------------------
-
-
-//============================================================================
-// declarations
-//============================================================================
-
-
-//============================================================================
-// implementation
-//============================================================================
-
-//----------------------------------------------------------------------------
-// Edit
-//----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE (Edit, wxStyledTextCtrl)
-    // common
-    EVT_SIZE (                         Edit::OnSize)
-    // edit
-    EVT_MENU (wxID_CLEAR,              Edit::OnEditClear)
-    EVT_MENU (wxID_CUT,                Edit::OnEditCut)
-    EVT_MENU (wxID_COPY,               Edit::OnEditCopy)
-    EVT_MENU (wxID_PASTE,              Edit::OnEditPaste)
-    EVT_MENU (myID_INDENTINC,          Edit::OnEditIndentInc)
-    EVT_MENU (myID_INDENTRED,          Edit::OnEditIndentRed)
-    EVT_MENU (wxID_SELECTALL,          Edit::OnEditSelectAll)
-    EVT_MENU (myID_SELECTLINE,         Edit::OnEditSelectLine)
-    EVT_MENU (wxID_REDO,               Edit::OnEditRedo)
-    EVT_MENU (wxID_UNDO,               Edit::OnEditUndo)
-    // find
-    EVT_MENU (wxID_FIND,               Edit::OnFind)
-    EVT_MENU (myID_FINDNEXT,           Edit::OnFindNext)
-    EVT_MENU (myID_REPLACE,            Edit::OnReplace)
-    EVT_MENU (myID_REPLACENEXT,        Edit::OnReplaceNext)
-    EVT_MENU (myID_BRACEMATCH,         Edit::OnBraceMatch)
-    EVT_MENU (myID_GOTO,               Edit::OnGoto)
-    // view
-    EVT_MENU_RANGE (myID_HILIGHTFIRST, myID_HILIGHTLAST,
-                                       Edit::OnHilightLang)
-    EVT_MENU (myID_DISPLAYEOL,         Edit::OnDisplayEOL)
-    EVT_MENU (myID_INDENTGUIDE,        Edit::OnIndentGuide)
-    EVT_MENU (myID_LINENUMBER,         Edit::OnLineNumber)
-    EVT_MENU (myID_LONGLINEON,         Edit::OnLongLineOn)
-    EVT_MENU (myID_WHITESPACE,         Edit::OnWhiteSpace)
-    EVT_MENU (myID_FOLDTOGGLE,         Edit::OnFoldToggle)
-    EVT_MENU (myID_OVERTYPE,           Edit::OnSetOverType)
-    EVT_MENU (myID_READONLY,           Edit::OnSetReadOnly)
-    EVT_MENU (myID_WRAPMODEON,         Edit::OnWrapmodeOn)
-    EVT_MENU (myID_CHARSETANSI,        Edit::OnUseCharset)
-    EVT_MENU (myID_CHARSETMAC,         Edit::OnUseCharset)
-    // extra
-    EVT_MENU (myID_CHANGELOWER,        Edit::OnChangeCase)
-    EVT_MENU (myID_CHANGEUPPER,        Edit::OnChangeCase)
-    EVT_MENU (myID_CONVERTCR,          Edit::OnConvertEOL)
-    EVT_MENU (myID_CONVERTCRLF,        Edit::OnConvertEOL)
-    EVT_MENU (myID_CONVERTLF,          Edit::OnConvertEOL)
-    // stc
-    EVT_STC_MARGINCLICK (wxID_ANY,     Edit::OnMarginClick)
-    EVT_STC_CHARADDED (wxID_ANY,       Edit::OnCharAdded)
-END_EVENT_TABLE()
-
-Edit::Edit (wxWindow *parent, wxWindowID id,
-            const wxPoint &pos,
-            const wxSize &size,
-            long style)
-    : wxStyledTextCtrl (parent, id, pos, size, style) {
-
-    m_filename = wxEmptyString;
-
-    m_LineNrID = 0;
-    m_DividerID = 1;
-    m_FoldingID = 2;
-
-    // initialize language
-    m_language = NULL;
-
-    // default font for all styles
-    SetViewEOL (g_CommonPrefs.displayEOLEnable);
-    SetIndentationGuides (g_CommonPrefs.indentGuideEnable);
-    SetEdgeMode (g_CommonPrefs.longLineOnEnable?
-                 wxSTC_EDGE_LINE: wxSTC_EDGE_NONE);
-    SetViewWhiteSpace (g_CommonPrefs.whiteSpaceEnable?
-                       wxSTC_WS_VISIBLEALWAYS: wxSTC_WS_INVISIBLE);
-    SetOvertype (g_CommonPrefs.overTypeInitial);
-    SetReadOnly (g_CommonPrefs.readOnlyInitial);
-    SetWrapMode (g_CommonPrefs.wrapModeInitial?
-                 wxSTC_WRAP_WORD: wxSTC_WRAP_NONE);
-    wxFont font (10, wxMODERN, wxNORMAL, wxNORMAL);
-    StyleSetFont (wxSTC_STYLE_DEFAULT, font);
-    StyleSetForeground (wxSTC_STYLE_DEFAULT, *wxBLACK);
-    StyleSetBackground (wxSTC_STYLE_DEFAULT, *wxWHITE);
-    StyleSetForeground (wxSTC_STYLE_LINENUMBER, wxColour (_T("DARK GREY")));
-    StyleSetBackground (wxSTC_STYLE_LINENUMBER, *wxWHITE);
-    StyleSetForeground(wxSTC_STYLE_INDENTGUIDE, wxColour (_T("DARK GREY")));
-    InitializePrefs (DEFAULT_LANGUAGE);
-
-    // set visibility
-    SetVisiblePolicy (wxSTC_VISIBLE_STRICT|wxSTC_VISIBLE_SLOP, 1);
-    SetXCaretPolicy (wxSTC_CARET_EVEN|wxSTC_VISIBLE_STRICT|wxSTC_CARET_SLOP, 1);
-    SetYCaretPolicy (wxSTC_CARET_EVEN|wxSTC_VISIBLE_STRICT|wxSTC_CARET_SLOP, 1);
-
-    // markers
-    MarkerDefine (wxSTC_MARKNUM_FOLDER,        wxSTC_MARK_DOTDOTDOT, _T("BLACK"), _T("BLACK"));
-    MarkerDefine (wxSTC_MARKNUM_FOLDEROPEN,    wxSTC_MARK_ARROWDOWN, _T("BLACK"), _T("BLACK"));
-    MarkerDefine (wxSTC_MARKNUM_FOLDERSUB,     wxSTC_MARK_EMPTY,     _T("BLACK"), _T("BLACK"));
-    MarkerDefine (wxSTC_MARKNUM_FOLDEREND,     wxSTC_MARK_DOTDOTDOT, _T("BLACK"), _T("WHITE"));
-    MarkerDefine (wxSTC_MARKNUM_FOLDEROPENMID, wxSTC_MARK_ARROWDOWN, _T("BLACK"), _T("WHITE"));
-    MarkerDefine (wxSTC_MARKNUM_FOLDERMIDTAIL, wxSTC_MARK_EMPTY,     _T("BLACK"), _T("BLACK"));
-    MarkerDefine (wxSTC_MARKNUM_FOLDERTAIL,    wxSTC_MARK_EMPTY,     _T("BLACK"), _T("BLACK"));
-
-    // miscelaneous
-    m_LineNrMargin = TextWidth (wxSTC_STYLE_LINENUMBER, _T("_999999"));
-    m_FoldingMargin = 16;
-    CmdKeyClear (wxSTC_KEY_TAB, 0); // this is done by the menu accelerator key
-    SetLayoutCache (wxSTC_CACHE_PAGE);
-
-}
-
-Edit::~Edit () {}
-
-//----------------------------------------------------------------------------
-// common event handlers
-void Edit::OnSize( wxSizeEvent& event ) {
-    int x = GetClientSize().x +
-            (g_CommonPrefs.lineNumberEnable? m_LineNrMargin: 0) +
-            (g_CommonPrefs.foldEnable? m_FoldingMargin: 0);
-    if (x > 0) SetScrollWidth (x);
-    event.Skip();
-}
-
-// edit event handlers
-void Edit::OnEditRedo (wxCommandEvent &WXUNUSED(event)) {
-    if (!CanRedo()) return;
-    Redo ();
-}
-
-void Edit::OnEditUndo (wxCommandEvent &WXUNUSED(event)) {
-    if (!CanUndo()) return;
-    Undo ();
-}
-
-void Edit::OnEditClear (wxCommandEvent &WXUNUSED(event)) {
-    if (GetReadOnly()) return;
-    Clear ();
-}
-
-void Edit::OnEditCut (wxCommandEvent &WXUNUSED(event)) {
-    if (GetReadOnly() || (GetSelectionEnd()-GetSelectionStart() <= 0)) return;
-    Cut ();
-}
-
-void Edit::OnEditCopy (wxCommandEvent &WXUNUSED(event)) {
-    if (GetSelectionEnd()-GetSelectionStart() <= 0) return;
-    Copy ();
-}
-
-void Edit::OnEditPaste (wxCommandEvent &WXUNUSED(event)) {
-    if (!CanPaste()) return;
-    Paste ();
-}
-
-void Edit::OnFind (wxCommandEvent &WXUNUSED(event)) {
-}
-
-void Edit::OnFindNext (wxCommandEvent &WXUNUSED(event)) {
-}
-
-void Edit::OnReplace (wxCommandEvent &WXUNUSED(event)) {
-}
-
-void Edit::OnReplaceNext (wxCommandEvent &WXUNUSED(event)) {
-}
-
-void Edit::OnBraceMatch (wxCommandEvent &WXUNUSED(event)) {
-    int min = GetCurrentPos ();
-    int max = BraceMatch (min);
-    if (max > (min+1)) {
-        BraceHighlight (min+1, max);
-        SetSelection (min+1, max);
-    }else{
-        BraceBadLight (min);
-    }
-}
-
-void Edit::OnGoto (wxCommandEvent &WXUNUSED(event)) {
-}
-
-void Edit::OnEditIndentInc (wxCommandEvent &WXUNUSED(event)) {
-    CmdKeyExecute (wxSTC_CMD_TAB);
-}
-
-void Edit::OnEditIndentRed (wxCommandEvent &WXUNUSED(event)) {
-    CmdKeyExecute (wxSTC_CMD_DELETEBACK);
-}
-
-void Edit::OnEditSelectAll (wxCommandEvent &WXUNUSED(event)) {
-    SetSelection (0, GetTextLength ());
-}
-
-void Edit::OnEditSelectLine (wxCommandEvent &WXUNUSED(event)) {
-    int lineStart = PositionFromLine (GetCurrentLine());
-    int lineEnd = PositionFromLine (GetCurrentLine() + 1);
-    SetSelection (lineStart, lineEnd);
-}
-
-void Edit::OnHilightLang (wxCommandEvent &event) {
-    InitializePrefs (g_LanguagePrefs [event.GetId() - myID_HILIGHTFIRST].name);
-}
-
-void Edit::OnDisplayEOL (wxCommandEvent &WXUNUSED(event)) {
-    SetViewEOL (!GetViewEOL());
-}
-
-void Edit::OnIndentGuide (wxCommandEvent &WXUNUSED(event)) {
-    SetIndentationGuides (!GetIndentationGuides());
-}
-
-void Edit::OnLineNumber (wxCommandEvent &WXUNUSED(event)) {
-    SetMarginWidth (m_LineNrID,
-                    GetMarginWidth (m_LineNrID) == 0? m_LineNrMargin: 0);
-}
-
-void Edit::OnLongLineOn (wxCommandEvent &WXUNUSED(event)) {
-    SetEdgeMode (GetEdgeMode() == 0? wxSTC_EDGE_LINE: wxSTC_EDGE_NONE);
-}
-
-void Edit::OnWhiteSpace (wxCommandEvent &WXUNUSED(event)) {
-    SetViewWhiteSpace (GetViewWhiteSpace() == 0?
-                       wxSTC_WS_VISIBLEALWAYS: wxSTC_WS_INVISIBLE);
-}
-
-void Edit::OnFoldToggle (wxCommandEvent &WXUNUSED(event)) {
-    ToggleFold (GetFoldParent(GetCurrentLine()));
-}
-
-void Edit::OnSetOverType (wxCommandEvent &WXUNUSED(event)) {
-    SetOvertype (!GetOvertype());
-}
-
-void Edit::OnSetReadOnly (wxCommandEvent &WXUNUSED(event)) {
-    SetReadOnly (!GetReadOnly());
-}
-
-void Edit::OnWrapmodeOn (wxCommandEvent &WXUNUSED(event)) {
-    SetWrapMode (GetWrapMode() == 0? wxSTC_WRAP_WORD: wxSTC_WRAP_NONE);
-}
-
-void Edit::OnUseCharset (wxCommandEvent &event) {
-    int Nr;
-    int charset = GetCodePage();
-    switch (event.GetId()) {
-        case myID_CHARSETANSI: {charset = wxSTC_CHARSET_ANSI; break;}
-        case myID_CHARSETMAC: {charset = wxSTC_CHARSET_ANSI; break;}
-    }
-    for (Nr = 0; Nr < wxSTC_STYLE_LASTPREDEFINED; Nr++) {
-        StyleSetCharacterSet (Nr, charset);
-    }
-    SetCodePage (charset);
-}
-
-void Edit::OnChangeCase (wxCommandEvent &event) {
-    switch (event.GetId()) {
-        case myID_CHANGELOWER: {
-            CmdKeyExecute (wxSTC_CMD_LOWERCASE);
-            break;
-        }
-        case myID_CHANGEUPPER: {
-            CmdKeyExecute (wxSTC_CMD_UPPERCASE);
-            break;
-        }
-    }
-}
-
-void Edit::OnConvertEOL (wxCommandEvent &event) {
-    int eolMode = GetEOLMode();
-    switch (event.GetId()) {
-        case myID_CONVERTCR: { eolMode = wxSTC_EOL_CR; break;}
-        case myID_CONVERTCRLF: { eolMode = wxSTC_EOL_CRLF; break;}
-        case myID_CONVERTLF: { eolMode = wxSTC_EOL_LF; break;}
-    }
-    ConvertEOLs (eolMode);
-    SetEOLMode (eolMode);
-}
-
-//! misc
-void Edit::OnMarginClick (wxStyledTextEvent &event) {
-    if (event.GetMargin() == 2) {
-        int lineClick = LineFromPosition (event.GetPosition());
-        int levelClick = GetFoldLevel (lineClick);
-        if ((levelClick & wxSTC_FOLDLEVELHEADERFLAG) > 0) {
-            ToggleFold (lineClick);
-        }
-    }
-}
-
-void Edit::OnCharAdded (wxStyledTextEvent &event) {
-    char chr = (char)event.GetKey();
-    int currentLine = GetCurrentLine();
-    // Change this if support for mac files with \r is needed
-    if (chr == '\n') {
-        int lineInd = 0;
-        if (currentLine > 0) {
-            lineInd = GetLineIndentation(currentLine - 1);
-        }
-        if (lineInd == 0) return;
-        SetLineIndentation (currentLine, lineInd);
-        GotoPos(PositionFromLine (currentLine) + lineInd);
-    }
-}
-
-
-//----------------------------------------------------------------------------
-// private functions
-wxString Edit::DeterminePrefs (const wxString &filename) {
-
-    LanguageInfo const* curInfo;
-
-    // determine language from filepatterns
-    int languageNr;
-    for (languageNr = 0; languageNr < g_LanguagePrefsSize; languageNr++) {
-        curInfo = &g_LanguagePrefs [languageNr];
-        wxString filepattern = curInfo->filepattern;
-        filepattern.Lower();
-        while (!filepattern.empty()) {
-            wxString cur = filepattern.BeforeFirst (';');
-            if ((cur == filename) ||
-                (cur == (filename.BeforeLast ('.') + _T(".*"))) ||
-                (cur == (_T("*.") + filename.AfterLast ('.')))) {
-                return curInfo->name;
-            }
-            filepattern = filepattern.AfterFirst (';');
-        }
-    }
-    return wxEmptyString;
-
-}
-
-bool Edit::InitializePrefs (const wxString &name) {
-
-    // initialize styles
-    StyleClearAll();
-    LanguageInfo const* curInfo = NULL;
-
-    // determine language
-    bool found = false;
-    int languageNr;
-    for (languageNr = 0; languageNr < g_LanguagePrefsSize; languageNr++) {
-        curInfo = &g_LanguagePrefs [languageNr];
-        if (curInfo->name == name) {
-            found = true;
-            break;
-        }
-    }
-    if (!found) return false;
-
-    // set lexer and language
-    SetLexer (curInfo->lexer);
-    m_language = curInfo;
-
-    // set margin for line numbers
-    SetMarginType (m_LineNrID, wxSTC_MARGIN_NUMBER);
-    StyleSetForeground (wxSTC_STYLE_LINENUMBER, wxColour (_T("DARK GREY")));
-    StyleSetBackground (wxSTC_STYLE_LINENUMBER, *wxWHITE);
-    SetMarginWidth (m_LineNrID, 0); // start out not visible
-
-    // default fonts for all styles!
-    int Nr;
-    for (Nr = 0; Nr < wxSTC_STYLE_LASTPREDEFINED; Nr++) {
-        wxFont font (10, wxMODERN, wxNORMAL, wxNORMAL);
-        StyleSetFont (Nr, font);
-    }
-
-    // set common styles
-    StyleSetForeground (wxSTC_STYLE_DEFAULT, wxColour (_T("DARK GREY")));
-    StyleSetForeground (wxSTC_STYLE_INDENTGUIDE, wxColour (_T("DARK GREY")));
-
-    // initialize settings
-    if (g_CommonPrefs.syntaxEnable) {
-        int keywordnr = 0;
-        for (Nr = 0; Nr < STYLE_TYPES_COUNT; Nr++) {
-            if (curInfo->styles[Nr].type == -1) continue;
-            const StyleInfo &curType = g_StylePrefs [curInfo->styles[Nr].type];
-            wxFont font (curType.fontsize, wxMODERN, wxNORMAL, wxNORMAL, false,
-                         curType.fontname);
-            StyleSetFont (Nr, font);
-            if (curType.foreground) {
-                StyleSetForeground (Nr, wxColour (curType.foreground));
-            }
-            if (curType.background) {
-                StyleSetBackground (Nr, wxColour (curType.background));
-            }
-            StyleSetBold (Nr, (curType.fontstyle & mySTC_STYLE_BOLD) > 0);
-            StyleSetItalic (Nr, (curType.fontstyle & mySTC_STYLE_ITALIC) > 0);
-            StyleSetUnderline (Nr, (curType.fontstyle & mySTC_STYLE_UNDERL) > 0);
-            StyleSetVisible (Nr, (curType.fontstyle & mySTC_STYLE_HIDDEN) == 0);
-            StyleSetCase (Nr, curType.lettercase);
-            const wxChar *pwords = curInfo->styles[Nr].words;
-            if (pwords) {
-                SetKeyWords (keywordnr, pwords);
-                keywordnr += 1;
-            }
-        }
-    }
-
-    // set margin as unused
-    SetMarginType (m_DividerID, wxSTC_MARGIN_SYMBOL);
-    SetMarginWidth (m_DividerID, 0);
-    SetMarginSensitive (m_DividerID, false);
-
-    // folding
-    SetMarginType (m_FoldingID, wxSTC_MARGIN_SYMBOL);
-    SetMarginMask (m_FoldingID, wxSTC_MASK_FOLDERS);
-    StyleSetBackground (m_FoldingID, *wxWHITE);
-    SetMarginWidth (m_FoldingID, 0);
-    SetMarginSensitive (m_FoldingID, false);
-    if (g_CommonPrefs.foldEnable) {
-        SetMarginWidth (m_FoldingID, curInfo->folds != 0? m_FoldingMargin: 0);
-        SetMarginSensitive (m_FoldingID, curInfo->folds != 0);
-        SetProperty (_T("fold"), curInfo->folds != 0? _T("1"): _T("0"));
-        SetProperty (_T("fold.comment"),
-                     (curInfo->folds & mySTC_FOLD_COMMENT) > 0? _T("1"): _T("0"));
-        SetProperty (_T("fold.compact"),
-                     (curInfo->folds & mySTC_FOLD_COMPACT) > 0? _T("1"): _T("0"));
-        SetProperty (_T("fold.preprocessor"),
-                     (curInfo->folds & mySTC_FOLD_PREPROC) > 0? _T("1"): _T("0"));
-        SetProperty (_T("fold.html"),
-                     (curInfo->folds & mySTC_FOLD_HTML) > 0? _T("1"): _T("0"));
-        SetProperty (_T("fold.html.preprocessor"),
-                     (curInfo->folds & mySTC_FOLD_HTMLPREP) > 0? _T("1"): _T("0"));
-        SetProperty (_T("fold.comment.python"),
-                     (curInfo->folds & mySTC_FOLD_COMMENTPY) > 0? _T("1"): _T("0"));
-        SetProperty (_T("fold.quotes.python"),
-                     (curInfo->folds & mySTC_FOLD_QUOTESPY) > 0? _T("1"): _T("0"));
-    }
-    SetFoldFlags (wxSTC_FOLDFLAG_LINEBEFORE_CONTRACTED |
-                  wxSTC_FOLDFLAG_LINEAFTER_CONTRACTED);
-
-    // set spaces and indention
-    SetTabWidth (4);
-    SetUseTabs (false);
-    SetTabIndents (true);
-    SetBackSpaceUnIndents (true);
-    SetIndent (g_CommonPrefs.indentEnable? 4: 0);
-
-    // others
-    SetViewEOL (g_CommonPrefs.displayEOLEnable);
-    SetIndentationGuides (g_CommonPrefs.indentGuideEnable);
-    SetEdgeColumn (80);
-    SetEdgeMode (g_CommonPrefs.longLineOnEnable? wxSTC_EDGE_LINE: wxSTC_EDGE_NONE);
-    SetViewWhiteSpace (g_CommonPrefs.whiteSpaceEnable?
-                       wxSTC_WS_VISIBLEALWAYS: wxSTC_WS_INVISIBLE);
-    SetOvertype (g_CommonPrefs.overTypeInitial);
-    SetReadOnly (g_CommonPrefs.readOnlyInitial);
-    SetWrapMode (g_CommonPrefs.wrapModeInitial?
-                 wxSTC_WRAP_WORD: wxSTC_WRAP_NONE);
-
-    return true;
-}
-
-bool Edit::LoadFile ()
-{
-#if wxUSE_FILEDLG
-    // get filname
-    if (!m_filename) {
-        wxFileDialog dlg (this, _T("Open file"), wxEmptyString, wxEmptyString,
-                          _T("Any file (*)|*"), wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_CHANGE_DIR);
-        if (dlg.ShowModal() != wxID_OK) return false;
-        m_filename = dlg.GetPath();
-    }
-
-    // load file
-    return LoadFile (m_filename);
-#else
-    return false;
-#endif // wxUSE_FILEDLG
-}
-
-bool Edit::LoadFile (const wxString &filename) {
-
-    // load file in edit and clear undo
-    if (!filename.empty()) m_filename = filename;
-//     wxFile file (m_filename);
-//     if (!file.IsOpened()) return false;
-    ClearAll ();
-//     long lng = file.Length ();
-//     if (lng > 0) {
-//         wxString buf;
-//         wxChar *buff = buf.GetWriteBuf (lng);
-//         file.Read (buff, lng);
-//         buf.UngetWriteBuf ();
-//         InsertText (0, buf);
-//     }
-//     file.Close();
-
-    wxStyledTextCtrl::LoadFile(m_filename);
-
-    EmptyUndoBuffer();
-
-    // determine lexer language
-    wxFileName fname (m_filename);
-    InitializePrefs (DeterminePrefs (fname.GetFullName()));
-
-    return true;
-}
-
-bool Edit::SaveFile ()
-{
-#if wxUSE_FILEDLG
-    // return if no change
-    if (!Modified()) return true;
-
-    // get filname
-    if (!m_filename) {
-        wxFileDialog dlg (this, _T("Save file"), wxEmptyString, wxEmptyString, _T("Any file (*)|*"),
-                          wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
-        if (dlg.ShowModal() != wxID_OK) return false;
-        m_filename = dlg.GetPath();
-    }
-
-    // save file
-    return SaveFile (m_filename);
-#else
-    return false;
-#endif // wxUSE_FILEDLG
-}
-
-bool Edit::SaveFile (const wxString &filename) {
-
-    // return if no change
-    if (!Modified()) return true;
-
-//     // save edit in file and clear undo
-//     if (!filename.empty()) m_filename = filename;
-//     wxFile file (m_filename, wxFile::write);
-//     if (!file.IsOpened()) return false;
-//     wxString buf = GetText();
-//     bool okay = file.Write (buf);
-//     file.Close();
-//     if (!okay) return false;
-//     EmptyUndoBuffer();
-//     SetSavePoint();
-
-//     return true;
-
-    return wxStyledTextCtrl::SaveFile(filename);
-
-}
-
-bool Edit::Modified () {
-
-    // return modified state
-    return (GetModify() && !GetReadOnly());
-}
-
-//----------------------------------------------------------------------------
-// EditProperties
-//----------------------------------------------------------------------------
-
-EditProperties::EditProperties (Edit *edit,
-                                long style)
-        : wxDialog (edit, wxID_ANY, wxEmptyString,
-                    wxDefaultPosition, wxDefaultSize,
-                    style | wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) {
-
-    // sets the application title
-    SetTitle (_("Properties"));
-    wxString text;
-
-    // fullname
-    wxBoxSizer *fullname = new wxBoxSizer (wxHORIZONTAL);
-    fullname->Add (10, 0);
-    fullname->Add (new wxStaticText (this, wxID_ANY, _("Full filename"),
-                                     wxDefaultPosition, wxSize(80, wxDefaultCoord)),
-                   0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL);
-    fullname->Add (new wxStaticText (this, wxID_ANY, edit->GetFilename()),
-                   0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL);
-
-    // text info
-    wxGridSizer *textinfo = new wxGridSizer (4, 0, 2);
-    textinfo->Add (new wxStaticText (this, wxID_ANY, _("Language"),
-                                     wxDefaultPosition, wxSize(80, wxDefaultCoord)),
-                   0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT, 4);
-    textinfo->Add (new wxStaticText (this, wxID_ANY, edit->m_language->name),
-                   0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 4);
-    textinfo->Add (new wxStaticText (this, wxID_ANY, _("Lexer-ID: "),
-                                     wxDefaultPosition, wxSize(80, wxDefaultCoord)),
-                   0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT, 4);
-    text = wxString::Format (_T("%d"), edit->GetLexer());
-    textinfo->Add (new wxStaticText (this, wxID_ANY, text),
-                   0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 4);
-    wxString EOLtype = wxEmptyString;
-    switch (edit->GetEOLMode()) {
-        case wxSTC_EOL_CR: {EOLtype = _T("CR (Unix)"); break; }
-        case wxSTC_EOL_CRLF: {EOLtype = _T("CRLF (Windows)"); break; }
-        case wxSTC_EOL_LF: {EOLtype = _T("CR (Macintosh)"); break; }
-    }
-    textinfo->Add (new wxStaticText (this, wxID_ANY, _("Line endings"),
-                                     wxDefaultPosition, wxSize(80, wxDefaultCoord)),
-                   0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT, 4);
-    textinfo->Add (new wxStaticText (this, wxID_ANY, EOLtype),
-                   0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 4);
-
-    // text info box
-    wxStaticBoxSizer *textinfos = new wxStaticBoxSizer (
-                     new wxStaticBox (this, wxID_ANY, _("Informations")),
-                     wxVERTICAL);
-    textinfos->Add (textinfo, 0, wxEXPAND);
-    textinfos->Add (0, 6);
-
-    // statistic
-    wxGridSizer *statistic = new wxGridSizer (4, 0, 2);
-    statistic->Add (new wxStaticText (this, wxID_ANY, _("Total lines"),
-                                     wxDefaultPosition, wxSize(80, wxDefaultCoord)),
-                    0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT, 4);
-    text = wxString::Format (_T("%d"), edit->GetLineCount());
-    statistic->Add (new wxStaticText (this, wxID_ANY, text),
-                    0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 4);
-    statistic->Add (new wxStaticText (this, wxID_ANY, _("Total chars"),
-                                     wxDefaultPosition, wxSize(80, wxDefaultCoord)),
-                    0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT, 4);
-    text = wxString::Format (_T("%d"), edit->GetTextLength());
-    statistic->Add (new wxStaticText (this, wxID_ANY, text),
-                    0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 4);
-    statistic->Add (new wxStaticText (this, wxID_ANY, _("Current line"),
-                                     wxDefaultPosition, wxSize(80, wxDefaultCoord)),
-                    0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT, 4);
-    text = wxString::Format (_T("%d"), edit->GetCurrentLine());
-    statistic->Add (new wxStaticText (this, wxID_ANY, text),
-                    0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 4);
-    statistic->Add (new wxStaticText (this, wxID_ANY, _("Current pos"),
-                                     wxDefaultPosition, wxSize(80, wxDefaultCoord)),
-                    0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT, 4);
-    text = wxString::Format (_T("%d"), edit->GetCurrentPos());
-    statistic->Add (new wxStaticText (this, wxID_ANY, text),
-                    0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 4);
-
-    // char/line statistics
-    wxStaticBoxSizer *statistics = new wxStaticBoxSizer (
-                     new wxStaticBox (this, wxID_ANY, _("Statistics")),
-                     wxVERTICAL);
-    statistics->Add (statistic, 0, wxEXPAND);
-    statistics->Add (0, 6);
-
-    // total pane
-    wxBoxSizer *totalpane = new wxBoxSizer (wxVERTICAL);
-    totalpane->Add (fullname, 0, wxEXPAND | wxLEFT | wxRIGHT | wxTOP, 10);
-    totalpane->Add (0, 6);
-    totalpane->Add (textinfos, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
-    totalpane->Add (0, 10);
-    totalpane->Add (statistics, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
-    totalpane->Add (0, 6);
-    wxButton *okButton = new wxButton (this, wxID_OK, _("OK"));
-    okButton->SetDefault();
-    totalpane->Add (okButton, 0, wxALIGN_CENTER | wxALL, 10);
-
-    SetSizerAndFit (totalpane);
-
-    ShowModal();
-}
-
-#if wxUSE_PRINTING_ARCHITECTURE
-
-//----------------------------------------------------------------------------
-// EditPrint
-//----------------------------------------------------------------------------
-
-EditPrint::EditPrint (Edit *edit, wxChar *title)
-              : wxPrintout(title) {
-    m_edit = edit;
-    m_printed = 0;
-
-}
-
-bool EditPrint::OnPrintPage (int page) {
-
-    wxDC *dc = GetDC();
-    if (!dc) return false;
-
-    // scale DC
-    PrintScaling (dc);
-
-    // print page
-    if (page == 1) m_printed = 0;
-    m_printed = m_edit->FormatRange (1, m_printed, m_edit->GetLength(),
-                                     dc, dc, m_printRect, m_pageRect);
-
-    return true;
-}
-
-bool EditPrint::OnBeginDocument (int startPage, int endPage) {
-
-    if (!wxPrintout::OnBeginDocument (startPage, endPage)) {
-        return false;
-    }
-
-    return true;
-}
-
-void EditPrint::GetPageInfo (int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) {
-
-    // initialize values
-    *minPage = 0;
-    *maxPage = 0;
-    *selPageFrom = 0;
-    *selPageTo = 0;
-
-    // scale DC if possible
-    wxDC *dc = GetDC();
-    if (!dc) return;
-    PrintScaling (dc);
-
-    // get print page informations and convert to printer pixels
-    wxSize ppiScr;
-    GetPPIScreen (&ppiScr.x, &ppiScr.y);
-    wxSize page = g_pageSetupData->GetPaperSize();
-    page.x = static_cast<int> (page.x * ppiScr.x / 25.4);
-    page.y = static_cast<int> (page.y * ppiScr.y / 25.4);
-    m_pageRect = wxRect (0,
-                         0,
-                         page.x,
-                         page.y);
-
-    // get margins informations and convert to printer pixels
-    wxPoint pt = g_pageSetupData->GetMarginTopLeft();
-    int left = pt.x;
-    int top = pt.y;
-    pt = g_pageSetupData->GetMarginBottomRight();
-    int right = pt.x;
-    int bottom = pt.y;
-
-    top = static_cast<int> (top * ppiScr.y / 25.4);
-    bottom = static_cast<int> (bottom * ppiScr.y / 25.4);
-    left = static_cast<int> (left * ppiScr.x / 25.4);
-    right = static_cast<int> (right * ppiScr.x / 25.4);
-
-    m_printRect = wxRect (left,
-                          top,
-                          page.x - (left + right),
-                          page.y - (top + bottom));
-
-    // count pages
-    while (HasPage (*maxPage)) {
-        m_printed = m_edit->FormatRange (0, m_printed, m_edit->GetLength(),
-                                       dc, dc, m_printRect, m_pageRect);
-        *maxPage += 1;
-    }
-    if (*maxPage > 0) *minPage = 1;
-    *selPageFrom = *minPage;
-    *selPageTo = *maxPage;
-}
-
-bool EditPrint::HasPage (int WXUNUSED(page)) {
-
-    return (m_printed < m_edit->GetLength());
-}
-
-bool EditPrint::PrintScaling (wxDC *dc){
-
-    // check for dc, return if none
-    if (!dc) return false;
-
-    // get printer and screen sizing values
-    wxSize ppiScr;
-    GetPPIScreen (&ppiScr.x, &ppiScr.y);
-    if (ppiScr.x == 0) { // most possible guess 96 dpi
-        ppiScr.x = 96;
-        ppiScr.y = 96;
-    }
-    wxSize ppiPrt;
-    GetPPIPrinter (&ppiPrt.x, &ppiPrt.y);
-    if (ppiPrt.x == 0) { // scaling factor to 1
-        ppiPrt.x = ppiScr.x;
-        ppiPrt.y = ppiScr.y;
-    }
-    wxSize dcSize = dc->GetSize();
-    wxSize pageSize;
-    GetPageSizePixels (&pageSize.x, &pageSize.y);
-
-    // set user scale
-    float scale_x = (float)(ppiPrt.x * dcSize.x) /
-                    (float)(ppiScr.x * pageSize.x);
-    float scale_y = (float)(ppiPrt.y * dcSize.y) /
-                    (float)(ppiScr.y * pageSize.y);
-    dc->SetUserScale (scale_x, scale_y);
-
-    return true;
-}
-
-#endif // wxUSE_PRINTING_ARCHITECTURE
diff --git a/samples/stc/edit.h b/samples/stc/edit.h
deleted file mode 100644
index 4a7ecf79d1..0000000000
--- a/samples/stc/edit.h
+++ /dev/null
@@ -1,172 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// File:        edit.h
-// Purpose:     STC test module
-// Maintainer:  Wyo
-// Created:     2003-09-01
-// RCS-ID:      $Id$
-// Copyright:   (c) wxGuide
-// Licence:     wxWindows licence
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef _EDIT_H_
-#define _EDIT_H_
-
-//----------------------------------------------------------------------------
-// informations
-//----------------------------------------------------------------------------
-
-
-//----------------------------------------------------------------------------
-// headers
-//----------------------------------------------------------------------------
-
-//! wxWidgets headers
-
-//! wxWidgets/contrib headers
-#include "wx/stc/stc.h"  // styled text control
-
-//! application headers
-#include "prefs.h"       // preferences
-
-
-//============================================================================
-// declarations
-//============================================================================
-
-class EditPrint;
-class EditProperties;
-
-
-//----------------------------------------------------------------------------
-//! Edit
-class Edit: public wxStyledTextCtrl {
-    friend class EditProperties;
-    friend class EditPrint;
-
-public:
-    //! constructor
-    Edit (wxWindow *parent, wxWindowID id = wxID_ANY,
-          const wxPoint &pos = wxDefaultPosition,
-          const wxSize &size = wxDefaultSize,
-          long style = wxSUNKEN_BORDER|wxVSCROLL
-         );
-
-    //! destructor
-    ~Edit ();
-
-    // event handlers
-    // common
-    void OnSize( wxSizeEvent &event );
-    // edit
-    void OnEditRedo (wxCommandEvent &event);
-    void OnEditUndo (wxCommandEvent &event);
-    void OnEditClear (wxCommandEvent &event);
-    void OnEditCut (wxCommandEvent &event);
-    void OnEditCopy (wxCommandEvent &event);
-    void OnEditPaste (wxCommandEvent &event);
-    // find
-    void OnFind (wxCommandEvent &event);
-    void OnFindNext (wxCommandEvent &event);
-    void OnReplace (wxCommandEvent &event);
-    void OnReplaceNext (wxCommandEvent &event);
-    void OnBraceMatch (wxCommandEvent &event);
-    void OnGoto (wxCommandEvent &event);
-    void OnEditIndentInc (wxCommandEvent &event);
-    void OnEditIndentRed (wxCommandEvent &event);
-    void OnEditSelectAll (wxCommandEvent &event);
-    void OnEditSelectLine (wxCommandEvent &event);
-    //! view
-    void OnHilightLang (wxCommandEvent &event);
-    void OnDisplayEOL (wxCommandEvent &event);
-    void OnIndentGuide (wxCommandEvent &event);
-    void OnLineNumber (wxCommandEvent &event);
-    void OnLongLineOn (wxCommandEvent &event);
-    void OnWhiteSpace (wxCommandEvent &event);
-    void OnFoldToggle (wxCommandEvent &event);
-    void OnSetOverType (wxCommandEvent &event);
-    void OnSetReadOnly (wxCommandEvent &event);
-    void OnWrapmodeOn (wxCommandEvent &event);
-    void OnUseCharset (wxCommandEvent &event);
-    //! extra
-    void OnChangeCase (wxCommandEvent &event);
-    void OnConvertEOL (wxCommandEvent &event);
-    // stc
-    void OnMarginClick (wxStyledTextEvent &event);
-    void OnCharAdded  (wxStyledTextEvent &event);
-
-    //! language/lexer
-    wxString DeterminePrefs (const wxString &filename);
-    bool InitializePrefs (const wxString &filename);
-    bool UserSettings (const wxString &filename);
-    LanguageInfo const* GetLanguageInfo () {return m_language;};
-
-    //! load/save file
-    bool LoadFile ();
-    bool LoadFile (const wxString &filename);
-    bool SaveFile ();
-    bool SaveFile (const wxString &filename);
-    bool Modified ();
-    wxString GetFilename () {return m_filename;};
-    void SetFilename (const wxString &filename) {m_filename = filename;};
-
-private:
-    // file
-    wxString m_filename;
-
-    // lanugage properties
-    LanguageInfo const* m_language;
-
-    // margin variables
-    int m_LineNrID;
-    int m_LineNrMargin;
-    int m_FoldingID;
-    int m_FoldingMargin;
-    int m_DividerID;
-
-    DECLARE_EVENT_TABLE()
-};
-
-//----------------------------------------------------------------------------
-//! EditProperties
-class EditProperties: public wxDialog {
-
-public:
-
-    //! constructor
-    EditProperties (Edit *edit, long style = 0);
-
-private:
-
-};
-
-#if wxUSE_PRINTING_ARCHITECTURE
-
-//----------------------------------------------------------------------------
-//! EditPrint
-class EditPrint: public wxPrintout {
-
-public:
-
-    //! constructor
-    EditPrint (Edit *edit, wxChar *title = _T(""));
-
-    //! event handlers
-    bool OnPrintPage (int page);
-    bool OnBeginDocument (int startPage, int endPage);
-
-    //! print functions
-    bool HasPage (int page);
-    void GetPageInfo (int *minPage, int *maxPage, int *selPageFrom, int *selPageTo);
-
-private:
-    Edit *m_edit;
-    int m_printed;
-    wxRect m_pageRect;
-    wxRect m_printRect;
-
-    bool PrintScaling (wxDC *dc);
-};
-
-#endif // wxUSE_PRINTING_ARCHITECTURE
-
-#endif // _EDIT_H_
diff --git a/samples/stc/makefile.bcc b/samples/stc/makefile.bcc
deleted file mode 100644
index daf1db793a..0000000000
--- a/samples/stc/makefile.bcc
+++ /dev/null
@@ -1,246 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-.autodepend
-
-!ifndef BCCDIR
-!ifndef MAKEDIR
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-BCCDIR = $(MAKEDIR)\..
-!endif
-
-!include ../../../build/msw/config.bcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 28
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-STCTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-	$(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
-	-I.\..\..\..\samples -DNOPCH -I.\..\..\include $(CPPFLAGS) $(CXXFLAGS)
-STCTEST_OBJECTS =  \
-	$(OBJS)\stctest_stctest.obj \
-	$(OBJS)\stctest_edit.obj \
-	$(OBJS)\stctest_prefs.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE = 
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =  
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_5 = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 = 
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = 
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\stctest.exe data
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.csm del $(OBJS)\*.csm
-	-if exist $(OBJS)\stctest.exe del $(OBJS)\stctest.exe
-	-if exist $(OBJS)\stctest.tds del $(OBJS)\stctest.tds
-	-if exist $(OBJS)\stctest.ilc del $(OBJS)\stctest.ilc
-	-if exist $(OBJS)\stctest.ild del $(OBJS)\stctest.ild
-	-if exist $(OBJS)\stctest.ilf del $(OBJS)\stctest.ilf
-	-if exist $(OBJS)\stctest.ils del $(OBJS)\stctest.ils
-
-$(OBJS)\stctest.exe: $(STCTEST_OBJECTS)  $(OBJS)\stctest_sample.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(STCTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\stctest_sample.res
-|
-
-data: 
-	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-$(OBJS)\stctest_sample.res: .\..\..\..\samples\sample.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples $**
-
-$(OBJS)\stctest_stctest.obj: .\stctest.cpp
-	$(CXX) -q -c -P -o$@ $(STCTEST_CXXFLAGS) $**
-
-$(OBJS)\stctest_edit.obj: .\edit.cpp
-	$(CXX) -q -c -P -o$@ $(STCTEST_CXXFLAGS) $**
-
-$(OBJS)\stctest_prefs.obj: .\prefs.cpp
-	$(CXX) -q -c -P -o$@ $(STCTEST_CXXFLAGS) $**
-
diff --git a/samples/stc/makefile.gcc b/samples/stc/makefile.gcc
deleted file mode 100644
index 8e52a17ee6..0000000000
--- a/samples/stc/makefile.gcc
+++ /dev/null
@@ -1,245 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD
-WX_RELEASE_NODOT = 28
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-STCTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-	$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-	$(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \
-	$(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH -I.\..\..\include \
-	$(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
-	$(CXXFLAGS)
-STCTEST_OBJECTS =  \
-	$(OBJS)\stctest_sample_rc.o \
-	$(OBJS)\stctest_stctest.o \
-	$(OBJS)\stctest_edit.o \
-	$(OBJS)\stctest_prefs.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-WXDEBUGFLAG = d
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE = 
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =  
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG_5 = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 = 
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_6 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 = 
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
-	-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(MSLU),1)
-__UNICOWS_LIB_p = -lunicows
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GDIPLUS_LIB_p = -lgdiplus
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = 
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO = 
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG = 
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\stctest.exe data
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(OBJS)\stctest.exe del $(OBJS)\stctest.exe
-
-$(OBJS)\stctest.exe: $(STCTEST_OBJECTS) $(OBJS)\stctest_sample_rc.o
-	$(CXX) -o $@ $(STCTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
-
-data: 
-	if not exist $(OBJS) mkdir $(OBJS)
-	for %%f in (stctest.cpp) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
-
-$(OBJS)\stctest_sample_rc.o: ./../../../samples/sample.rc
-	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples
-
-$(OBJS)\stctest_stctest.o: ./stctest.cpp
-	$(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\stctest_edit.o: ./edit.cpp
-	$(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\stctest_prefs.o: ./prefs.cpp
-	$(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean data
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/samples/stc/makefile.vc b/samples/stc/makefile.vc
deleted file mode 100644
index 050598060c..0000000000
--- a/samples/stc/makefile.vc
+++ /dev/null
@@ -1,321 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 28
-OBJS = \
-	vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = .\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-STCTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-	$(__DEBUGINFO_0) /Fd$(OBJS)\stctest.pdb $(____DEBUGRUNTIME_2_p) \
-	$(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-	$(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \
-	$(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH /I.\..\..\include \
-	$(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)
-STCTEST_OBJECTS =  \
-	$(OBJS)\stctest_sample.res \
-	$(OBJS)\stctest_stctest.obj \
-	$(OBJS)\stctest_edit.obj \
-	$(OBJS)\stctest_prefs.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE = 
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =  
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_3 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_4 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_4 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_7 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_7 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_9 = 
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_9 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_10 = 
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_10 = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\stctest.exe data
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-	-if exist $(OBJS)\stctest.exe del $(OBJS)\stctest.exe
-	-if exist $(OBJS)\stctest.ilk del $(OBJS)\stctest.ilk
-	-if exist $(OBJS)\stctest.pdb del $(OBJS)\stctest.pdb
-
-$(OBJS)\stctest.exe: $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(STCTEST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
-<<
-
-data: 
-	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-$(OBJS)\stctest_sample.res: .\..\..\..\samples\sample.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples $**
-
-$(OBJS)\stctest_stctest.obj: .\stctest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) $**
-
-$(OBJS)\stctest_edit.obj: .\edit.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) $**
-
-$(OBJS)\stctest_prefs.obj: .\prefs.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) $**
-
diff --git a/samples/stc/makefile.wat b/samples/stc/makefile.wat
deleted file mode 100644
index f111aabc20..0000000000
--- a/samples/stc/makefile.wat
+++ /dev/null
@@ -1,274 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include ../../../build/msw/config.wat
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-# Speed up compilation a bit:
-!ifdef __LOADDLL__
-!  loaddll wcc      wccd
-!  loaddll wccaxp   wccdaxp
-!  loaddll wcc386   wccd386
-!  loaddll wpp      wppdi86
-!  loaddll wppaxp   wppdaxp
-!  loaddll wpp386   wppd386
-!  loaddll wlink    wlink
-!  loaddll wlib     wlibd
-!endif
-
-# We need these variables in some bakefile-made rules:
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
-
-### Conditionally set variables: ###
-
-PORTNAME =
-!ifeq USE_GUI 0
-PORTNAME = base
-!endif
-!ifeq USE_GUI 1
-PORTNAME = msw
-!endif
-WXDEBUGFLAG =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-WXDEBUGFLAG = d
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-WXDEBUGFLAG = d
-!endif
-WXUNICODEFLAG =
-!ifeq UNICODE 1
-WXUNICODEFLAG = u
-!endif
-WXUNIVNAME =
-!ifeq WXUNIV 1
-WXUNIVNAME = univ
-!endif
-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif
-LIBTYPE_SUFFIX =
-!ifeq SHARED 0
-LIBTYPE_SUFFIX = lib
-!endif
-!ifeq SHARED 1
-LIBTYPE_SUFFIX = dll
-!endif
-EXTRALIBS_FOR_BASE =
-!ifeq MONOLITHIC 0
-EXTRALIBS_FOR_BASE = 
-!endif
-!ifeq MONOLITHIC 1
-EXTRALIBS_FOR_BASE =  
-!endif
-__DEBUGINFO_0 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_0 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_0 = -d2
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = 
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 = 
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = debug all
-!endif
-__OPTIMIZEFLAG_2 =
-!ifeq BUILD debug
-__OPTIMIZEFLAG_2 = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG_2 = -ot -ox
-!endif
-__THREADSFLAG_5 =
-!ifeq USE_THREADS 0
-__THREADSFLAG_5 = 
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG_5 = -bm
-!endif
-__RUNTIME_LIBS_6 =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS_6 = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS_6 = 
-!endif
-__RTTIFLAG_7 =
-!ifeq USE_RTTI 0
-__RTTIFLAG_7 = 
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG_7 = -xr
-!endif
-__EXCEPTIONSFLAG_8 =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_8 = 
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_8 = -xs
-!endif
-__WXLIB_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_CORE_p = &
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = &
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = &
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-__GDIPLUS_LIB_p =
-!ifeq USE_GDIPLUS 1
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-__WXUNIV_DEFINE_p =
-!ifeq WXUNIV 1
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
-!endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__EXCEPTIONS_DEFINE_p =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
-!endif
-__RTTI_DEFINE_p =
-!ifeq USE_RTTI 0
-__RTTI_DEFINE_p = -dwxNO_RTTI
-!endif
-__THREAD_DEFINE_p =
-!ifeq USE_THREADS 0
-__THREAD_DEFINE_p = -dwxNO_THREADS
-!endif
-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -d_UNICODE
-!endif
-__GFXCTX_DEFINE_p =
-!ifeq USE_GDIPLUS 1
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 28
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-STCTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
-	$(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
-	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-	$(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
-	-i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
-	$(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include &
-	$(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
-STCTEST_OBJECTS =  &
-	$(OBJS)\stctest_stctest.obj &
-	$(OBJS)\stctest_edit.obj &
-	$(OBJS)\stctest_prefs.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\stctest.exe data
-
-clean : .SYMBOLIC 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-	-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-	-if exist $(OBJS)\stctest.exe del $(OBJS)\stctest.exe
-
-$(OBJS)\stctest.exe :  $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res
-	@%create $(OBJS)\stctest.lbc
-	@%append $(OBJS)\stctest.lbc option quiet
-	@%append $(OBJS)\stctest.lbc name $^@
-	@%append $(OBJS)\stctest.lbc option caseexact
-	@%append $(OBJS)\stctest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(STCTEST_OBJECTS)) do @%append $(OBJS)\stctest.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\stctest.lbc library %i
-	@%append $(OBJS)\stctest.lbc option resource=$(OBJS)\stctest_sample.res
-	@for %i in () do @%append $(OBJS)\stctest.lbc option stack=%i
-	wlink @$(OBJS)\stctest.lbc
-
-data : .SYMBOLIC 
-	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
-
-$(OBJS)\stctest_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc
-	wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples $<
-
-$(OBJS)\stctest_stctest.obj :  .AUTODEPEND .\stctest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<
-
-$(OBJS)\stctest_edit.obj :  .AUTODEPEND .\edit.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<
-
-$(OBJS)\stctest_prefs.obj :  .AUTODEPEND .\prefs.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<
-
diff --git a/samples/stc/mondrian.ico b/samples/stc/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/stc/mondrian.ico and /dev/null differ
diff --git a/samples/stc/mondrian.xpm b/samples/stc/mondrian.xpm
deleted file mode 100644
index 409f27a843..0000000000
--- a/samples/stc/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char *mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-"  c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-"                                ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-"                                ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++      ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++                    ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-"                                "
-};
diff --git a/samples/stc/prefs.cpp b/samples/stc/prefs.cpp
deleted file mode 100644
index 5698a879f6..0000000000
--- a/samples/stc/prefs.cpp
+++ /dev/null
@@ -1,378 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// File:        contrib/samples/stc/prefs.cpp
-// Purpose:     STC test Preferences initialization
-// Maintainer:  Wyo
-// Created:     2003-09-01
-// RCS-ID:      $Id$
-// Copyright:   (c) wxGuide
-// Licence:     wxWindows licence
-//////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-// headers
-//----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all 'standard' wxWidgets headers)
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
-//! wxWidgets headers
-
-//! wxWidgets/contrib headers
-
-//! application headers
-#include "defsext.h"     // Additional definitions
-#include "prefs.h"       // Preferences
-
-
-//============================================================================
-// declarations
-//============================================================================
-
-//----------------------------------------------------------------------------
-//! language types
-const CommonInfo g_CommonPrefs = {
-    // editor functionality prefs
-    true,  // syntaxEnable
-    true,  // foldEnable
-    true,  // indentEnable
-    // display defaults prefs
-    false, // overTypeInitial
-    false, // readOnlyInitial
-    false,  // wrapModeInitial
-    false, // displayEOLEnable
-    false, // IndentGuideEnable
-    true,  // lineNumberEnable
-    false, // longLineOnEnable
-    false, // whiteSpaceEnable
-};
-
-//----------------------------------------------------------------------------
-// keywordlists
-// C++
-wxChar* CppWordlist1 =
-    _T("asm auto bool break case catch char class const const_cast ")
-    _T("continue default delete do double dynamic_cast else enum explicit ")
-    _T("export extern false float for friend goto if inline int long ")
-    _T("mutable namespace new operator private protected public register ")
-    _T("reinterpret_cast return short signed sizeof static static_cast ")
-    _T("struct switch template this throw true try typedef typeid ")
-    _T("typename union unsigned using virtual void volatile wchar_t ")
-    _T("while");
-wxChar* CppWordlist2 =
-    _T("file");
-wxChar* CppWordlist3 =
-    _T("a addindex addtogroup anchor arg attention author b brief bug c ")
-    _T("class code date def defgroup deprecated dontinclude e em endcode ")
-    _T("endhtmlonly endif endlatexonly endlink endverbatim enum example ")
-    _T("exception f$ f[ f] file fn hideinitializer htmlinclude ")
-    _T("htmlonly if image include ingroup internal invariant interface ")
-    _T("latexonly li line link mainpage name namespace nosubgrouping note ")
-    _T("overload p page par param post pre ref relates remarks return ")
-    _T("retval sa section see showinitializer since skip skipline struct ")
-    _T("subsection test throw todo typedef union until var verbatim ")
-    _T("verbinclude version warning weakgroup $ @ \"\" & < > # { }");
-
-// Python
-wxChar* PythonWordlist1 =
-    _T("and assert break class continue def del elif else except exec ")
-    _T("finally for from global if import in is lambda None not or pass ")
-    _T("print raise return try while yield");
-wxChar* PythonWordlist2 =
-    _T("ACCELERATORS ALT AUTO3STATE AUTOCHECKBOX AUTORADIOBUTTON BEGIN ")
-    _T("BITMAP BLOCK BUTTON CAPTION CHARACTERISTICS CHECKBOX CLASS ")
-    _T("COMBOBOX CONTROL CTEXT CURSOR DEFPUSHBUTTON DIALOG DIALOGEX ")
-    _T("DISCARDABLE EDITTEXT END EXSTYLE FONT GROUPBOX ICON LANGUAGE ")
-    _T("LISTBOX LTEXT MENU MENUEX MENUITEM MESSAGETABLE POPUP PUSHBUTTON ")
-    _T("RADIOBUTTON RCDATA RTEXT SCROLLBAR SEPARATOR SHIFT STATE3 ")
-    _T("STRINGTABLE STYLE TEXTINCLUDE VALUE VERSION VERSIONINFO VIRTKEY");
-
-
-//----------------------------------------------------------------------------
-//! languages
-const LanguageInfo g_LanguagePrefs [] = {
-    // C++
-    {_T("C++"),
-     _T("*.c;*.cc;*.cpp;*.cxx;*.cs;*.h;*.hh;*.hpp;*.hxx;*.sma"),
-     wxSTC_LEX_CPP,
-     {{mySTC_TYPE_DEFAULT, NULL},
-      {mySTC_TYPE_COMMENT, NULL},
-      {mySTC_TYPE_COMMENT_LINE, NULL},
-      {mySTC_TYPE_COMMENT_DOC, NULL},
-      {mySTC_TYPE_NUMBER, NULL},
-      {mySTC_TYPE_WORD1, CppWordlist1}, // KEYWORDS
-      {mySTC_TYPE_STRING, NULL},
-      {mySTC_TYPE_CHARACTER, NULL},
-      {mySTC_TYPE_UUID, NULL},
-      {mySTC_TYPE_PREPROCESSOR, NULL},
-      {mySTC_TYPE_OPERATOR, NULL},
-      {mySTC_TYPE_IDENTIFIER, NULL},
-      {mySTC_TYPE_STRING_EOL, NULL},
-      {mySTC_TYPE_DEFAULT, NULL}, // VERBATIM
-      {mySTC_TYPE_REGEX, NULL},
-      {mySTC_TYPE_COMMENT_SPECIAL, NULL}, // DOXY
-      {mySTC_TYPE_WORD2, CppWordlist2}, // EXTRA WORDS
-      {mySTC_TYPE_WORD3, CppWordlist3}, // DOXY KEYWORDS
-      {mySTC_TYPE_ERROR, NULL}, // KEYWORDS ERROR
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL}},
-     mySTC_FOLD_COMMENT | mySTC_FOLD_COMPACT | mySTC_FOLD_PREPROC},
-    // Python
-    {_T("Python"),
-     _T("*.py;*.pyw"),
-     wxSTC_LEX_PYTHON,
-     {{mySTC_TYPE_DEFAULT, NULL},
-      {mySTC_TYPE_COMMENT_LINE, NULL},
-      {mySTC_TYPE_NUMBER, NULL},
-      {mySTC_TYPE_STRING, NULL},
-      {mySTC_TYPE_CHARACTER, NULL},
-      {mySTC_TYPE_WORD1, PythonWordlist1}, // KEYWORDS
-      {mySTC_TYPE_DEFAULT, NULL}, // TRIPLE
-      {mySTC_TYPE_DEFAULT, NULL}, // TRIPLEDOUBLE
-      {mySTC_TYPE_DEFAULT, NULL}, // CLASSNAME
-      {mySTC_TYPE_DEFAULT, PythonWordlist2}, // DEFNAME
-      {mySTC_TYPE_OPERATOR, NULL},
-      {mySTC_TYPE_IDENTIFIER, NULL},
-      {mySTC_TYPE_DEFAULT, NULL}, // COMMENT_BLOCK
-      {mySTC_TYPE_STRING_EOL, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL}},
-     mySTC_FOLD_COMMENTPY | mySTC_FOLD_QUOTESPY},
-    // * (any)
-    {(wxChar *)DEFAULT_LANGUAGE,
-     _T("*.*"),
-     wxSTC_LEX_PROPERTIES,
-     {{mySTC_TYPE_DEFAULT, NULL},
-      {mySTC_TYPE_DEFAULT, NULL},
-      {mySTC_TYPE_DEFAULT, NULL},
-      {mySTC_TYPE_DEFAULT, NULL},
-      {mySTC_TYPE_DEFAULT, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL},
-      {-1, NULL}},
-     0},
-    };
-
-const int g_LanguagePrefsSize = WXSIZEOF(g_LanguagePrefs);
-
-//----------------------------------------------------------------------------
-//! style types
-const StyleInfo g_StylePrefs [] = {
-    // mySTC_TYPE_DEFAULT
-    {_T("Default"),
-     _T("BLACK"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_WORD1
-    {_T("Keyword1"),
-     _T("BLUE"), _T("WHITE"),
-     _T(""), 10, mySTC_STYLE_BOLD, 0},
-
-    // mySTC_TYPE_WORD2
-    {_T("Keyword2"),
-     _T("DARK BLUE"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_WORD3
-    {_T("Keyword3"),
-     _T("CORNFLOWER BLUE"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_WORD4
-    {_T("Keyword4"),
-     _T("CYAN"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_WORD5
-    {_T("Keyword5"),
-     _T("DARK GREY"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_WORD6
-    {_T("Keyword6"),
-     _T("GREY"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_COMMENT
-    {_T("Comment"),
-     _T("FOREST GREEN"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_COMMENT_DOC
-    {_T("Comment (Doc)"),
-     _T("FOREST GREEN"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_COMMENT_LINE
-    {_T("Comment line"),
-     _T("FOREST GREEN"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_COMMENT_SPECIAL
-    {_T("Special comment"),
-     _T("FOREST GREEN"), _T("WHITE"),
-     _T(""), 10, mySTC_STYLE_ITALIC, 0},
-
-    // mySTC_TYPE_CHARACTER
-    {_T("Character"),
-     _T("KHAKI"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_CHARACTER_EOL
-    {_T("Character (EOL)"),
-     _T("KHAKI"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_STRING
-    {_T("String"),
-     _T("BROWN"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_STRING_EOL
-    {_T("String (EOL)"),
-     _T("BROWN"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_DELIMITER
-    {_T("Delimiter"),
-     _T("ORANGE"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_PUNCTUATION
-    {_T("Punctuation"),
-     _T("ORANGE"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_OPERATOR
-    {_T("Operator"),
-     _T("BLACK"), _T("WHITE"),
-     _T(""), 10, mySTC_STYLE_BOLD, 0},
-
-    // mySTC_TYPE_BRACE
-    {_T("Label"),
-     _T("VIOLET"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_COMMAND
-    {_T("Command"),
-     _T("BLUE"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_IDENTIFIER
-    {_T("Identifier"),
-     _T("BLACK"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_LABEL
-    {_T("Label"),
-     _T("VIOLET"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_NUMBER
-    {_T("Number"),
-     _T("SIENNA"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_PARAMETER
-    {_T("Parameter"),
-     _T("VIOLET"), _T("WHITE"),
-     _T(""), 10, mySTC_STYLE_ITALIC, 0},
-
-    // mySTC_TYPE_REGEX
-    {_T("Regular expression"),
-     _T("ORCHID"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_UUID
-    {_T("UUID"),
-     _T("ORCHID"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_VALUE
-    {_T("Value"),
-     _T("ORCHID"), _T("WHITE"),
-     _T(""), 10, mySTC_STYLE_ITALIC, 0},
-
-    // mySTC_TYPE_PREPROCESSOR
-    {_T("Preprocessor"),
-     _T("GREY"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_SCRIPT
-    {_T("Script"),
-     _T("DARK GREY"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_ERROR
-    {_T("Error"),
-     _T("RED"), _T("WHITE"),
-     _T(""), 10, 0, 0},
-
-    // mySTC_TYPE_UNDEFINED
-    {_T("Undefined"),
-     _T("ORANGE"), _T("WHITE"),
-     _T(""), 10, 0, 0}
-
-    };
-
-const int g_StylePrefsSize = WXSIZEOF(g_StylePrefs);
diff --git a/samples/stc/prefs.h b/samples/stc/prefs.h
deleted file mode 100644
index 4ac01745e3..0000000000
--- a/samples/stc/prefs.h
+++ /dev/null
@@ -1,152 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// File:        prefs.h
-// Purpose:     STC test Preferences initialization
-// Maintainer:  Wyo
-// Created:     2003-09-01
-// RCS-ID:      $Id$
-// Copyright:   (c) wxGuide
-// Licence:     wxWindows licence
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef _PREFS_H_
-#define _PREFS_H_
-
-//----------------------------------------------------------------------------
-// informations
-//----------------------------------------------------------------------------
-
-
-//----------------------------------------------------------------------------
-// headers
-//----------------------------------------------------------------------------
-
-//! wxWidgets headers
-
-//! wxWidgets/contrib headers
-#include "wx/stc/stc.h"  // styled text control
-
-//! application headers
-
-
-//============================================================================
-// declarations
-//============================================================================
-
-//! general style types
-#define mySTC_TYPE_DEFAULT 0
-
-#define mySTC_TYPE_WORD1 1
-#define mySTC_TYPE_WORD2 2
-#define mySTC_TYPE_WORD3 3
-#define mySTC_TYPE_WORD4 4
-#define mySTC_TYPE_WORD5 5
-#define mySTC_TYPE_WORD6 6
-
-#define mySTC_TYPE_COMMENT 7
-#define mySTC_TYPE_COMMENT_DOC 8
-#define mySTC_TYPE_COMMENT_LINE 9
-#define mySTC_TYPE_COMMENT_SPECIAL 10
-
-#define mySTC_TYPE_CHARACTER 11
-#define mySTC_TYPE_CHARACTER_EOL 12
-#define mySTC_TYPE_STRING 13
-#define mySTC_TYPE_STRING_EOL 14
-
-#define mySTC_TYPE_DELIMITER 15
-
-#define mySTC_TYPE_PUNCTUATION 16
-
-#define mySTC_TYPE_OPERATOR 17
-
-#define mySTC_TYPE_BRACE 18
-
-#define mySTC_TYPE_COMMAND 19
-#define mySTC_TYPE_IDENTIFIER 20
-#define mySTC_TYPE_LABEL 21
-#define mySTC_TYPE_NUMBER 22
-#define mySTC_TYPE_PARAMETER 23
-#define mySTC_TYPE_REGEX 24
-#define mySTC_TYPE_UUID 25
-#define mySTC_TYPE_VALUE 26
-
-#define mySTC_TYPE_PREPROCESSOR 27
-#define mySTC_TYPE_SCRIPT 28
-
-#define mySTC_TYPE_ERROR 29
-
-//----------------------------------------------------------------------------
-//! style bits types
-#define mySTC_STYLE_BOLD 1
-#define mySTC_STYLE_ITALIC 2
-#define mySTC_STYLE_UNDERL 4
-#define mySTC_STYLE_HIDDEN 8
-
-//----------------------------------------------------------------------------
-//! general folding types
-#define mySTC_FOLD_COMMENT 1
-#define mySTC_FOLD_COMPACT 2
-#define mySTC_FOLD_PREPROC 4
-
-#define mySTC_FOLD_HTML 16
-#define mySTC_FOLD_HTMLPREP 32
-
-#define mySTC_FOLD_COMMENTPY 64
-#define mySTC_FOLD_QUOTESPY 128
-
-//----------------------------------------------------------------------------
-//! flags
-#define mySTC_FLAG_WRAPMODE 16
-
-//----------------------------------------------------------------------------
-// CommonInfo
-
-struct CommonInfo {
-    // editor functionality prefs
-    bool syntaxEnable;
-    bool foldEnable;
-    bool indentEnable;
-    // display defaults prefs
-    bool readOnlyInitial;
-    bool overTypeInitial;
-    bool wrapModeInitial;
-    bool displayEOLEnable;
-    bool indentGuideEnable;
-    bool lineNumberEnable;
-    bool longLineOnEnable;
-    bool whiteSpaceEnable;
-};
-extern const CommonInfo g_CommonPrefs;
-
-//----------------------------------------------------------------------------
-// LanguageInfo
-
-struct LanguageInfo {
-    wxChar *name;
-    wxChar *filepattern;
-    int lexer;
-    struct {
-        int type;
-        const wxChar *words;
-    } styles [STYLE_TYPES_COUNT];
-    int folds;
-};
-
-extern const LanguageInfo g_LanguagePrefs[];
-extern const int g_LanguagePrefsSize;
-
-//----------------------------------------------------------------------------
-// StyleInfo
-struct StyleInfo {
-    wxChar *name;
-    wxChar *foreground;
-    wxChar *background;
-    wxChar *fontname;
-    int fontsize;
-    int fontstyle;
-    int lettercase;
-};
-
-extern const StyleInfo g_StylePrefs[];
-extern const int g_StylePrefsSize;
-
-#endif // _PREFS_H_
diff --git a/samples/stc/stctest.bkl b/samples/stc/stctest.bkl
deleted file mode 100644
index a02c4fd40e..0000000000
--- a/samples/stc/stctest.bkl
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-
-    <include file="../../../build/bakefiles/common_samples.bkl"/>
-    <include file="../../../build/bakefiles/common_contrib.bkl"/>
-
-    <exe id="stctest" template="wx_contrib_sample" template_append="wx_append">
-        <sources>
-            stctest.cpp
-	    edit.cpp
-	    prefs.cpp
-        </sources>
-        <contrib-lib>stc</contrib-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-    </exe>
-
-    <wx-data id="data">   
-        <files>   
-             stctest.cpp   
-        </files>   
-    </wx-data>   
-  
-</makefile>
diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp
deleted file mode 100644
index fb3d1e02c8..0000000000
--- a/samples/stc/stctest.cpp
+++ /dev/null
@@ -1,683 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// File:        contrib/samples/stc/stctest.cpp
-// Purpose:     STC test application
-// Maintainer:  Otto Wyss
-// Created:     2003-09-01
-// RCS-ID:      $Id$
-// Copyright:   (c) wxGuide
-// Licence:     wxWindows licence
-//////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-// headers
-//----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all 'standard' wxWidgets headers)
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
-//! wxWidgets headers
-#include "wx/config.h"   // configuration support
-#include "wx/filedlg.h"  // file dialog support
-#include "wx/filename.h" // filename support
-#include "wx/notebook.h" // notebook support
-#include "wx/settings.h" // system settings
-#include "wx/string.h"   // strings support
-#include "wx/image.h"    // images support
-
-//! application headers
-#include "defsext.h"     // Additional definitions
-#include "edit.h"        // Edit module
-#include "prefs.h"       // Prefs
-
-
-//----------------------------------------------------------------------------
-// resources
-//----------------------------------------------------------------------------
-
-// the application icon (under Windows and OS/2 it is in resources)
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
-    #include "mondrian.xpm"
-#endif
-
-//============================================================================
-// declarations
-//============================================================================
-
-#define APP_NAME _T("STC-Test")
-#define APP_DESCR _("See http://wxguide.sourceforge.net/")
-
-#define APP_MAINT _T("Otto Wyss")
-#define APP_VENDOR _T("wxWidgets")
-#define APP_COPYRIGTH _T("(C) 2003 Otto Wyss")
-#define APP_LICENCE _T("wxWidgets")
-
-#define APP_VERSION _T("0.1.alpha")
-#define APP_BUILD __DATE__
-
-#define APP_WEBSITE _T("http://www.wxWidgets.org")
-#define APP_MAIL _T("mailto://???")
-
-#define NONAME _("<untitled>")
-
-class AppBook;
-
-
-//----------------------------------------------------------------------------
-//! global application name
-wxString *g_appname = NULL;
-
-#if wxUSE_PRINTING_ARCHITECTURE
-
-//! global print data, to remember settings during the session
-wxPrintData *g_printData = (wxPrintData*) NULL;
-wxPageSetupData *g_pageSetupData = (wxPageSetupData*) NULL;
-
-#endif // wxUSE_PRINTING_ARCHITECTURE
-
-
-class AppFrame;
-
-//----------------------------------------------------------------------------
-//! application APP_VENDOR-APP_NAME.
-class App: public wxApp {
-    friend class AppFrame;
-
-public:
-    //! the main function called durning application start
-    virtual bool OnInit ();
-
-    //! application exit function
-    virtual int OnExit ();
-
-private:
-    //! frame window
-    AppFrame* m_frame;
-
-};
-
-// created dynamically by wxWidgets
-DECLARE_APP (App);
-
-//----------------------------------------------------------------------------
-//! frame of the application APP_VENDOR-APP_NAME.
-class AppFrame: public wxFrame {
-    friend class App;
-    friend class AppBook;
-    friend class AppAbout;
-
-public:
-    //! constructor
-    AppFrame (const wxString &title);
-
-    //! destructor
-    ~AppFrame ();
-
-    //! event handlers
-    //! common
-    void OnClose (wxCloseEvent &event);
-    void OnAbout (wxCommandEvent &event);
-    void OnExit (wxCommandEvent &event);
-    void OnTimerEvent (wxTimerEvent &event);
-    //! file
-    void OnFileNew (wxCommandEvent &event);
-    void OnFileNewFrame (wxCommandEvent &event);
-    void OnFileOpen (wxCommandEvent &event);
-    void OnFileOpenFrame (wxCommandEvent &event);
-    void OnFileSave (wxCommandEvent &event);
-    void OnFileSaveAs (wxCommandEvent &event);
-    void OnFileClose (wxCommandEvent &event);
-    //! properties
-    void OnProperties (wxCommandEvent &event);
-    //! print
-    void OnPrintSetup (wxCommandEvent &event);
-    void OnPrintPreview (wxCommandEvent &event);
-    void OnPrint (wxCommandEvent &event);
-    //! edit events
-    void OnEdit (wxCommandEvent &event);
-
-private:
-    // edit object
-    Edit *m_edit;
-    void FileOpen (wxString fname);
-
-    //! creates the application menu bar
-    wxMenuBar *m_menuBar;
-    void CreateMenu ();
-
-    // print preview position and size
-    wxRect DeterminePrintSize ();
-
-    DECLARE_EVENT_TABLE()
-};
-
-//----------------------------------------------------------------------------
-//! about box of the application APP_VENDOR-APP_NAME
-class AppAbout: public wxDialog {
-
-public:
-    //! constructor
-    AppAbout (wxWindow *parent,
-              int milliseconds = 0,
-              long style = 0);
-
-    //! destructor
-    ~AppAbout ();
-
-    // event handlers
-    void OnTimerEvent (wxTimerEvent &event);
-
-private:
-    // timer
-    wxTimer *m_timer;
-
-    DECLARE_EVENT_TABLE()
-};
-
-
-//============================================================================
-// implementation
-//============================================================================
-
-IMPLEMENT_APP (App)
-
-//----------------------------------------------------------------------------
-// App
-//----------------------------------------------------------------------------
-
-bool App::OnInit () {
-
-    wxInitAllImageHandlers();
-
-    // set application and vendor name
-    SetAppName (APP_NAME);
-    SetVendorName (APP_VENDOR);
-    g_appname = new wxString ();
-    g_appname->Append (APP_VENDOR);
-    g_appname->Append (_T("-"));
-    g_appname->Append (APP_NAME);
-
-#if wxUSE_PRINTING_ARCHITECTURE
-    // initialize print data and setup
-    g_printData = new wxPrintData;
-    g_pageSetupData = new wxPageSetupDialogData;
-#endif // wxUSE_PRINTING_ARCHITECTURE
-
-    // create application frame
-    m_frame = new AppFrame (*g_appname);
-
-    // open application frame
-    m_frame->Layout ();
-    m_frame->Show (true);
-    SetTopWindow (m_frame);
-
-    return true;
-}
-
-int App::OnExit () {
-
-    // delete global appname
-    delete g_appname;
-
-#if wxUSE_PRINTING_ARCHITECTURE
-    // delete global print data and setup
-    if (g_printData) delete g_printData;
-    if (g_pageSetupData) delete g_pageSetupData;
-#endif // wxUSE_PRINTING_ARCHITECTURE
-
-    return 0;
-}
-
-//----------------------------------------------------------------------------
-// AppFrame
-//----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE (AppFrame, wxFrame)
-    // common
-    EVT_CLOSE (                      AppFrame::OnClose)
-    // file
-    EVT_MENU (wxID_OPEN,             AppFrame::OnFileOpen)
-    EVT_MENU (wxID_SAVE,             AppFrame::OnFileSave)
-    EVT_MENU (wxID_SAVEAS,           AppFrame::OnFileSaveAs)
-    EVT_MENU (wxID_CLOSE,            AppFrame::OnFileClose)
-    // properties
-    EVT_MENU (myID_PROPERTIES,       AppFrame::OnProperties)
-    // print and exit
-    EVT_MENU (wxID_PRINT_SETUP,      AppFrame::OnPrintSetup)
-    EVT_MENU (wxID_PREVIEW,          AppFrame::OnPrintPreview)
-    EVT_MENU (wxID_PRINT,            AppFrame::OnPrint)
-    EVT_MENU (wxID_EXIT,             AppFrame::OnExit)
-    // edit
-    EVT_MENU (wxID_CLEAR,            AppFrame::OnEdit)
-    EVT_MENU (wxID_CUT,              AppFrame::OnEdit)
-    EVT_MENU (wxID_COPY,             AppFrame::OnEdit)
-    EVT_MENU (wxID_PASTE,            AppFrame::OnEdit)
-    EVT_MENU (myID_INDENTINC,        AppFrame::OnEdit)
-    EVT_MENU (myID_INDENTRED,        AppFrame::OnEdit)
-    EVT_MENU (wxID_SELECTALL,        AppFrame::OnEdit)
-    EVT_MENU (myID_SELECTLINE,       AppFrame::OnEdit)
-    EVT_MENU (wxID_REDO,             AppFrame::OnEdit)
-    EVT_MENU (wxID_UNDO,             AppFrame::OnEdit)
-    // find
-    EVT_MENU (wxID_FIND,             AppFrame::OnEdit)
-    EVT_MENU (myID_FINDNEXT,         AppFrame::OnEdit)
-    EVT_MENU (myID_REPLACE,          AppFrame::OnEdit)
-    EVT_MENU (myID_REPLACENEXT,      AppFrame::OnEdit)
-    EVT_MENU (myID_BRACEMATCH,       AppFrame::OnEdit)
-    EVT_MENU (myID_GOTO,             AppFrame::OnEdit)
-    // view
-    EVT_MENU_RANGE (myID_HILIGHTFIRST, myID_HILIGHTLAST,
-                                     AppFrame::OnEdit)
-    EVT_MENU (myID_DISPLAYEOL,       AppFrame::OnEdit)
-    EVT_MENU (myID_INDENTGUIDE,      AppFrame::OnEdit)
-    EVT_MENU (myID_LINENUMBER,       AppFrame::OnEdit)
-    EVT_MENU (myID_LONGLINEON,       AppFrame::OnEdit)
-    EVT_MENU (myID_WHITESPACE,       AppFrame::OnEdit)
-    EVT_MENU (myID_FOLDTOGGLE,       AppFrame::OnEdit)
-    EVT_MENU (myID_OVERTYPE,         AppFrame::OnEdit)
-    EVT_MENU (myID_READONLY,         AppFrame::OnEdit)
-    EVT_MENU (myID_WRAPMODEON,       AppFrame::OnEdit)
-    // extra
-    EVT_MENU (myID_CHANGELOWER,      AppFrame::OnEdit)
-    EVT_MENU (myID_CHANGEUPPER,      AppFrame::OnEdit)
-    EVT_MENU (myID_CONVERTCR,        AppFrame::OnEdit)
-    EVT_MENU (myID_CONVERTCRLF,      AppFrame::OnEdit)
-    EVT_MENU (myID_CONVERTLF,        AppFrame::OnEdit)
-    EVT_MENU (myID_CHARSETANSI,      AppFrame::OnEdit)
-    EVT_MENU (myID_CHARSETMAC,       AppFrame::OnEdit)
-    // help
-    EVT_MENU (wxID_ABOUT,            AppFrame::OnAbout)
-END_EVENT_TABLE ()
-
-AppFrame::AppFrame (const wxString &title)
-        : wxFrame ((wxFrame *)NULL, wxID_ANY, title, wxDefaultPosition, wxSize(750,550),
-                    wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE) {
-
-    // intitialize important variables
-    m_edit = NULL;
-
-    // set icon and background
-    SetTitle (*g_appname);
-    SetIcon (wxICON (mondrian));
-    SetBackgroundColour (_T("WHITE"));
-
-    // about box shown for 1 seconds
-    AppAbout dlg(this, 1000);
-
-    // create menu
-    m_menuBar = new wxMenuBar;
-    CreateMenu ();
-
-    // open first page
-    m_edit = new Edit (this, wxID_ANY);
-    m_edit->SetFocus();
-
-    FileOpen (_T("stctest.cpp"));
-}
-
-AppFrame::~AppFrame () {
-}
-
-// common event handlers
-void AppFrame::OnClose (wxCloseEvent &event) {
-    wxCommandEvent evt;
-    OnFileClose (evt);
-    if (m_edit && m_edit->Modified()) {
-        if (event.CanVeto()) event.Veto (true);
-        return;
-    }
-    Destroy();
-}
-
-void AppFrame::OnAbout (wxCommandEvent &WXUNUSED(event)) {
-    AppAbout dlg(this);
-}
-
-void AppFrame::OnExit (wxCommandEvent &WXUNUSED(event)) {
-    Close (true);
-}
-
-// file event handlers
-void AppFrame::OnFileOpen (wxCommandEvent &WXUNUSED(event)) {
-    if (!m_edit) return;
-#if wxUSE_FILEDLG
-    wxString fname;
-    wxFileDialog dlg (this, _T("Open file"), wxEmptyString, wxEmptyString, _T("Any file (*)|*"),
-                      wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_CHANGE_DIR);
-    if (dlg.ShowModal() != wxID_OK) return;
-    fname = dlg.GetPath ();
-    FileOpen (fname);
-#endif // wxUSE_FILEDLG
-}
-
-void AppFrame::OnFileSave (wxCommandEvent &WXUNUSED(event)) {
-    if (!m_edit) return;
-    if (!m_edit->Modified()) {
-        wxMessageBox (_("There is nothing to save!"), _("Save file"),
-                      wxOK | wxICON_EXCLAMATION);
-        return;
-    }
-    m_edit->SaveFile ();
-}
-
-void AppFrame::OnFileSaveAs (wxCommandEvent &WXUNUSED(event)) {
-    if (!m_edit) return;
-#if wxUSE_FILEDLG
-    wxString filename = wxEmptyString;
-    wxFileDialog dlg (this, _T("Save file"), wxEmptyString, wxEmptyString, _T("Any file (*)|*"), wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
-    if (dlg.ShowModal() != wxID_OK) return;
-    filename = dlg.GetPath();
-    m_edit->SaveFile (filename);
-#endif // wxUSE_FILEDLG
-}
-
-void AppFrame::OnFileClose (wxCommandEvent &WXUNUSED(event)) {
-    if (!m_edit) return;
-    if (m_edit->Modified()) {
-        if (wxMessageBox (_("Text is not saved, save before closing?"), _("Close"),
-                          wxYES_NO | wxICON_QUESTION) == wxYES) {
-            m_edit->SaveFile();
-            if (m_edit->Modified()) {
-                wxMessageBox (_("Text could not be saved!"), _("Close abort"),
-                              wxOK | wxICON_EXCLAMATION);
-                return;
-            }
-        }
-    }
-    m_edit->SetFilename (wxEmptyString);
-    m_edit->ClearAll();
-    m_edit->SetSavePoint();
-}
-
-// properties event handlers
-void AppFrame::OnProperties (wxCommandEvent &WXUNUSED(event)) {
-    if (!m_edit) return;
-    EditProperties dlg(m_edit, 0);
-}
-
-// print event handlers
-void AppFrame::OnPrintSetup (wxCommandEvent &WXUNUSED(event)) {
-#if wxUSE_PRINTING_ARCHITECTURE
-    (*g_pageSetupData) = * g_printData;
-    wxPageSetupDialog pageSetupDialog(this, g_pageSetupData);
-    pageSetupDialog.ShowModal();
-    (*g_printData) = pageSetupDialog.GetPageSetupData().GetPrintData();
-    (*g_pageSetupData) = pageSetupDialog.GetPageSetupData();
-#endif // wxUSE_PRINTING_ARCHITECTURE
-}
-
-void AppFrame::OnPrintPreview (wxCommandEvent &WXUNUSED(event)) {
-#if wxUSE_PRINTING_ARCHITECTURE
-    wxPrintDialogData printDialogData( *g_printData);
-    wxPrintPreview *preview =
-        new wxPrintPreview (new EditPrint (m_edit),
-                            new EditPrint (m_edit),
-                            &printDialogData);
-    if (!preview->Ok()) {
-        delete preview;
-        wxMessageBox (_("There was a problem with previewing.\n\
-                         Perhaps your current printer is not correctly?"),
-                      _("Previewing"), wxOK);
-        return;
-    }
-    wxRect rect = DeterminePrintSize();
-    wxPreviewFrame *frame = new wxPreviewFrame (preview, this, _("Print Preview"));
-    frame->SetSize (rect);
-    frame->Centre(wxBOTH);
-    frame->Initialize();
-    frame->Show(true);
-#endif // wxUSE_PRINTING_ARCHITECTURE
-}
-
-void AppFrame::OnPrint (wxCommandEvent &WXUNUSED(event)) {
-#if wxUSE_PRINTING_ARCHITECTURE
-    wxPrintDialogData printDialogData( *g_printData);
-    wxPrinter printer (&printDialogData);
-    EditPrint printout (m_edit);
-    if (!printer.Print (this, &printout, true)) {
-        if (wxPrinter::GetLastError() == wxPRINTER_ERROR) {
-        wxMessageBox (_("There was a problem with printing.\n\
-                         Perhaps your current printer is not correctly?"),
-                      _("Previewing"), wxOK);
-            return;
-        }
-    }
-    (*g_printData) = printer.GetPrintDialogData().GetPrintData();
-#endif // wxUSE_PRINTING_ARCHITECTURE
-}
-
-// edit events
-void AppFrame::OnEdit (wxCommandEvent &event) {
-    if (m_edit) m_edit->ProcessEvent (event);
-}
-
-// private functions
-void AppFrame::CreateMenu ()
-{
-    // File menu
-    wxMenu *menuFile = new wxMenu;
-    menuFile->Append (wxID_OPEN, _("&Open ..\tCtrl+O"));
-    menuFile->Append (wxID_SAVE, _("&Save\tCtrl+S"));
-    menuFile->Append (wxID_SAVEAS, _("Save &as ..\tCtrl+Shift+S"));
-    menuFile->Append (wxID_CLOSE, _("&Close\tCtrl+W"));
-    menuFile->AppendSeparator();
-    menuFile->Append (myID_PROPERTIES, _("Proper&ties ..\tCtrl+I"));
-    menuFile->AppendSeparator();
-    menuFile->Append (wxID_PRINT_SETUP, _("Print Set&up .."));
-    menuFile->Append (wxID_PREVIEW, _("Print Pre&view\tCtrl+Shift+P"));
-    menuFile->Append (wxID_PRINT, _("&Print ..\tCtrl+P"));
-    menuFile->AppendSeparator();
-    menuFile->Append (wxID_EXIT, _("&Quit\tCtrl+Q"));
-
-    // Edit menu
-    wxMenu *menuEdit = new wxMenu;
-    menuEdit->Append (wxID_UNDO, _("&Undo\tCtrl+Z"));
-    menuEdit->Append (wxID_REDO, _("&Redo\tCtrl+Shift+Z"));
-    menuEdit->AppendSeparator();
-    menuEdit->Append (wxID_CUT, _("Cu&t\tCtrl+X"));
-    menuEdit->Append (wxID_COPY, _("&Copy\tCtrl+C"));
-    menuEdit->Append (wxID_PASTE, _("&Paste\tCtrl+V"));
-    menuEdit->Append (wxID_CLEAR, _("&Delete\tDel"));
-    menuEdit->AppendSeparator();
-    menuEdit->Append (wxID_FIND, _("&Find\tCtrl+F"));
-    menuEdit->Enable (wxID_FIND, false);
-    menuEdit->Append (myID_FINDNEXT, _("Find &next\tF3"));
-    menuEdit->Enable (myID_FINDNEXT, false);
-    menuEdit->Append (myID_REPLACE, _("&Replace\tCtrl+H"));
-    menuEdit->Enable (myID_REPLACE, false);
-    menuEdit->Append (myID_REPLACENEXT, _("Replace &again\tShift+F4"));
-    menuEdit->Enable (myID_REPLACENEXT, false);
-    menuEdit->AppendSeparator();
-    menuEdit->Append (myID_BRACEMATCH, _("&Match brace\tCtrl+M"));
-    menuEdit->Append (myID_GOTO, _("&Goto\tCtrl+G"));
-    menuEdit->Enable (myID_GOTO, false);
-    menuEdit->AppendSeparator();
-    menuEdit->Append (myID_INDENTINC, _("&Indent increase\tTab"));
-    menuEdit->Append (myID_INDENTRED, _("I&ndent reduce\tBksp"));
-    menuEdit->AppendSeparator();
-    menuEdit->Append (wxID_SELECTALL, _("&Select all\tCtrl+A"));
-    menuEdit->Append (myID_SELECTLINE, _("Select &line\tCtrl+L"));
-
-    // hilight submenu
-    wxMenu *menuHilight = new wxMenu;
-    int Nr;
-    for (Nr = 0; Nr < g_LanguagePrefsSize; Nr++) {
-        menuHilight->Append (myID_HILIGHTFIRST + Nr,
-                             g_LanguagePrefs [Nr].name);
-    }
-
-    // charset submenu
-    wxMenu *menuCharset = new wxMenu;
-    menuCharset->Append (myID_CHARSETANSI, _("&ANSI (Windows)"));
-    menuCharset->Append (myID_CHARSETMAC, _("&MAC (Macintosh)"));
-
-    // View menu
-    wxMenu *menuView = new wxMenu;
-    menuView->Append (myID_HILIGHTLANG, _("&Hilight language .."), menuHilight);
-    menuView->AppendSeparator();
-    menuView->AppendCheckItem (myID_FOLDTOGGLE, _("&Toggle current fold\tCtrl+T"));
-    menuView->AppendCheckItem (myID_OVERTYPE, _("&Overwrite mode\tIns"));
-    menuView->AppendCheckItem (myID_WRAPMODEON, _("&Wrap mode\tCtrl+U"));
-    menuView->AppendSeparator();
-    menuView->AppendCheckItem (myID_DISPLAYEOL, _("Show line &endings"));
-    menuView->AppendCheckItem (myID_INDENTGUIDE, _("Show &indent guides"));
-    menuView->AppendCheckItem (myID_LINENUMBER, _("Show line &numbers"));
-    menuView->AppendCheckItem (myID_LONGLINEON, _("Show &long line marker"));
-    menuView->AppendCheckItem (myID_WHITESPACE, _("Show white&space"));
-    menuView->AppendSeparator();
-    menuView->Append (myID_USECHARSET, _("Use &code page of .."), menuCharset);
-
-    // change case submenu
-    wxMenu *menuChangeCase = new wxMenu;
-    menuChangeCase->Append (myID_CHANGEUPPER, _("&Upper case"));
-    menuChangeCase->Append (myID_CHANGELOWER, _("&Lower case"));
-
-    // convert EOL submenu
-    wxMenu *menuConvertEOL = new wxMenu;
-    menuConvertEOL->Append (myID_CONVERTCR, _("CR (&Linux)"));
-    menuConvertEOL->Append (myID_CONVERTCRLF, _("CR+LF (&Windows)"));
-    menuConvertEOL->Append (myID_CONVERTLF, _("LF (&Macintosh)"));
-
-    // Extra menu
-    wxMenu *menuExtra = new wxMenu;
-    menuExtra->AppendCheckItem (myID_READONLY, _("&Readonly mode"));
-    menuExtra->AppendSeparator();
-    menuExtra->Append (myID_CHANGECASE, _("Change &case to .."), menuChangeCase);
-    menuExtra->AppendSeparator();
-    menuExtra->Append (myID_CONVERTEOL, _("Convert line &endings to .."), menuConvertEOL);
-
-    // Window menu
-    wxMenu *menuWindow = new wxMenu;
-    menuWindow->Append (myID_PAGEPREV, _("&Previous\tCtrl+Shift+Tab"));
-    menuWindow->Append (myID_PAGENEXT, _("&Next\tCtrl+Tab"));
-
-    // Help menu
-    wxMenu *menuHelp = new wxMenu;
-    menuHelp->Append (wxID_ABOUT, _("&About ..\tShift+F1"));
-
-    // construct menu
-    m_menuBar->Append (menuFile, _("&File"));
-    m_menuBar->Append (menuEdit, _("&Edit"));
-    m_menuBar->Append (menuView, _("&View"));
-    m_menuBar->Append (menuExtra, _("E&xtra"));
-    m_menuBar->Append (menuWindow, _("&Window"));
-    m_menuBar->Append (menuHelp, _("&Help"));
-    SetMenuBar (m_menuBar);
-}
-
-void AppFrame::FileOpen (wxString fname)
-{
-    wxFileName w(fname); w.Normalize(); fname = w.GetFullPath();
-    m_edit->LoadFile (fname);
-}
-
-wxRect AppFrame::DeterminePrintSize () {
-
-    wxSize scr = wxGetDisplaySize();
-
-    // determine position and size (shifting 16 left and down)
-    wxRect rect = GetRect();
-    rect.x += 16;
-    rect.y += 16;
-    rect.width = wxMin (rect.width, (scr.x - rect.x));
-    rect.height = wxMin (rect.height, (scr.x - rect.y));
-
-    return rect;
-}
-
-
-//----------------------------------------------------------------------------
-// AppAbout
-//----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE (AppAbout, wxDialog)
-    EVT_TIMER (myID_ABOUTTIMER, AppAbout::OnTimerEvent)
-END_EVENT_TABLE ()
-
-AppAbout::AppAbout (wxWindow *parent,
-                    int milliseconds,
-                    long style)
-        : wxDialog (parent, wxID_ANY, wxEmptyString,
-                    wxDefaultPosition, wxDefaultSize,
-                    style | wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) {
-
-    // set timer if any
-    m_timer = NULL;
-    if (milliseconds > 0) {
-        m_timer = new wxTimer (this, myID_ABOUTTIMER);
-        m_timer->Start (milliseconds, wxTIMER_ONE_SHOT);
-    }
-
-    // sets the application title
-    SetTitle (_("About .."));
-
-    // about info
-    wxGridSizer *aboutinfo = new wxGridSizer (2, 0, 2);
-    aboutinfo->Add (new wxStaticText(this, wxID_ANY, _("Written by: ")),
-                    0, wxALIGN_LEFT);
-    aboutinfo->Add (new wxStaticText(this, wxID_ANY, APP_MAINT),
-                    1, wxEXPAND | wxALIGN_LEFT);
-    aboutinfo->Add (new wxStaticText(this, wxID_ANY, _("Version: ")),
-                    0, wxALIGN_LEFT);
-    aboutinfo->Add (new wxStaticText(this, wxID_ANY, APP_VERSION),
-                    1, wxEXPAND | wxALIGN_LEFT);
-    aboutinfo->Add (new wxStaticText(this, wxID_ANY, _("Licence type: ")),
-                    0, wxALIGN_LEFT);
-    aboutinfo->Add (new wxStaticText(this, wxID_ANY, APP_LICENCE),
-                    1, wxEXPAND | wxALIGN_LEFT);
-    aboutinfo->Add (new wxStaticText(this, wxID_ANY, _("Copyright: ")),
-                    0, wxALIGN_LEFT);
-    aboutinfo->Add (new wxStaticText(this, wxID_ANY, APP_COPYRIGTH),
-                    1, wxEXPAND | wxALIGN_LEFT);
-
-    // about icontitle//info
-    wxBoxSizer *aboutpane = new wxBoxSizer (wxHORIZONTAL);
-    wxBitmap bitmap = wxBitmap(wxICON (mondrian));
-    aboutpane->Add (new wxStaticBitmap (this, wxID_ANY, bitmap),
-                    0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 20);
-    aboutpane->Add (aboutinfo, 1, wxEXPAND);
-    aboutpane->Add (60, 0);
-
-    // about complete
-    wxBoxSizer *totalpane = new wxBoxSizer (wxVERTICAL);
-    totalpane->Add (0, 20);
-    wxStaticText *appname = new wxStaticText(this, wxID_ANY, *g_appname);
-    appname->SetFont (wxFont (24, wxDEFAULT, wxNORMAL, wxBOLD));
-    totalpane->Add (appname, 0, wxALIGN_CENTER | wxLEFT | wxRIGHT, 40);
-    totalpane->Add (0, 10);
-    totalpane->Add (aboutpane, 0, wxEXPAND | wxALL, 4);
-    totalpane->Add (new wxStaticText(this, wxID_ANY, APP_DESCR),
-                    0, wxALIGN_CENTER | wxALL, 10);
-    wxButton *okButton = new wxButton (this, wxID_OK, _("OK"));
-    okButton->SetDefault();
-    totalpane->Add (okButton, 0, wxALIGN_CENTER | wxLEFT | wxRIGHT | wxBOTTOM, 10);
-
-    SetSizerAndFit (totalpane);
-
-    CenterOnScreen();
-    ShowModal();
-}
-
-AppAbout::~AppAbout () {
-    if (m_timer)  {
-        delete m_timer;
-        m_timer = NULL;
-    }
-}
-
-//----------------------------------------------------------------------------
-// event handlers
-void AppAbout::OnTimerEvent (wxTimerEvent &WXUNUSED(event)) {
-    if (m_timer) delete m_timer;
-    m_timer = NULL;
-    EndModal (wxID_OK);
-}
diff --git a/samples/stc/stctest.dsp b/samples/stc/stctest.dsp
deleted file mode 100644
index 0d17e957c3..0000000000
--- a/samples/stc/stctest.dsp
+++ /dev/null
@@ -1,488 +0,0 @@
-# Microsoft Developer Studio Project File - Name="stctest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=stctest - 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 "stctest.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 "stctest.mak" CFG="stctest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "stctest - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "stctest - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "stctest - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "stctest - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "stctest - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "stctest - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "stctest - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "stctest - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "stctest - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "stctest - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "stctest - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "stctest - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "stctest - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "stctest - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "stctest - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "stctest - Win32 Debug" (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)" == "stctest - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\stctest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\stctest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\stctest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\stctest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv28u_stc.lib wxmswuniv28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\stctest.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv28u_stc.lib wxmswuniv28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\stctest.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "stctest - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\stctest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\stctest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\stctest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\stctest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv28ud_stc.lib wxmswuniv28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\stctest.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv28ud_stc.lib wxmswuniv28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\stctest.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "stctest - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\stctest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\stctest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\stctest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\stctest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv28_stc.lib wxmswuniv28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\stctest.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv28_stc.lib wxmswuniv28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\stctest.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "stctest - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\stctest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\stctest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\stctest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\stctest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv28d_stc.lib wxmswuniv28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\stctest.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv28d_stc.lib wxmswuniv28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\stctest.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "stctest - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\stctest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\stctest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\stctest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\stctest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw28u_stc.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\stctest.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw28u_stc.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\stctest.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "stctest - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\stctest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\stctest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\stctest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\stctest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw28ud_stc.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\stctest.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw28ud_stc.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\stctest.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "stctest - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\stctest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\stctest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\stctest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\stctest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw28_stc.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\stctest.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw28_stc.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\stctest.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "stctest - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\stctest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\stctest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\stctest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\stctest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw28d_stc.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\stctest.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw28d_stc.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\stctest.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "stctest - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\stctest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\stctest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\stctest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\stctest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv28u_stc.lib wxmswuniv28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\stctest.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv28u_stc.lib wxmswuniv28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\stctest.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "stctest - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\stctest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\stctest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\stctest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\stctest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv28ud_stc.lib wxmswuniv28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\stctest.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv28ud_stc.lib wxmswuniv28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\stctest.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "stctest - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\stctest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\stctest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\stctest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\stctest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv28_stc.lib wxmswuniv28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\stctest.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv28_stc.lib wxmswuniv28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\stctest.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "stctest - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\stctest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\stctest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\stctest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\stctest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv28d_stc.lib wxmswuniv28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\stctest.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv28d_stc.lib wxmswuniv28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\stctest.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "stctest - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\stctest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\stctest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\stctest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\stctest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw28u_stc.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\stctest.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw28u_stc.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\stctest.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "stctest - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\stctest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\stctest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\stctest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\stctest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw28ud_stc.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\stctest.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw28ud_stc.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\stctest.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "stctest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\stctest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\stctest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\stctest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_msw\stctest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw28_stc.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\stctest.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw28_stc.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\stctest.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "stctest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\stctest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\stctest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\stctest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\stctest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw28d_stc.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\stctest.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw28d_stc.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\stctest.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "stctest - Win32 DLL Universal Unicode Release"
-# Name "stctest - Win32 DLL Universal Unicode Debug"
-# Name "stctest - Win32 DLL Universal Release"
-# Name "stctest - Win32 DLL Universal Debug"
-# Name "stctest - Win32 DLL Unicode Release"
-# Name "stctest - Win32 DLL Unicode Debug"
-# Name "stctest - Win32 DLL Release"
-# Name "stctest - Win32 DLL Debug"
-# Name "stctest - Win32 Universal Unicode Release"
-# Name "stctest - Win32 Universal Unicode Debug"
-# Name "stctest - Win32 Universal Release"
-# Name "stctest - Win32 Universal Debug"
-# Name "stctest - Win32 Unicode Release"
-# Name "stctest - Win32 Unicode Debug"
-# Name "stctest - Win32 Release"
-# Name "stctest - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\edit.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\prefs.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\..\..\..\samples\sample.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\stctest.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/samples/stc/stctest.rc b/samples/stc/stctest.rc
deleted file mode 100644
index 55808f0e34..0000000000
--- a/samples/stc/stctest.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
-
-
diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in
deleted file mode 100644
index 7be3a64654..0000000000
--- a/samples/svg/Makefile.in
+++ /dev/null
@@ -1,194 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-EXEEXT = @EXEEXT@
-WINDRES = @WINDRES@
-REZ = @REZ@
-SETFILE = @SETFILE@
-NM = @NM@
-BK_DEPS = @BK_DEPS@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-LIBS = @LIBS@
-LDFLAGS_GUI = @LDFLAGS_GUI@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR = 
-WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-SVGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \
-	-I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
-SVGTEST_OBJECTS =  \
-	$(__svgtest___win32rc) \
-	$(__svgtest_os2_lib_res) \
-	svgtest_svgtest.o
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
-@COND_PLATFORM_MAC_1@__svgtest___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C svgtest$(EXEEXT)
-@COND_PLATFORM_MAC_1@__svgtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
-COND_PLATFORM_OS2_1___svgtest___os2_emxbindcmd = $(NM) svgtest$(EXEEXT) | if \
-	grep -q pmwin.763 ; then emxbind -ep svgtest$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__svgtest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___svgtest___os2_emxbindcmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
-@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
-@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__svgtest___win32rc = svgtest_sample_rc.o
-@COND_PLATFORM_OS2_1@__svgtest_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__svgtest_bundle___depname = svgtest_bundle
-@COND_TOOLKIT_COCOA@____svgtest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	svgtest.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____svgtest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	svgtest.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
-	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
-	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
-	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
-	$(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
-	$(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -i \
-	$(srcdir)/../../include -o svgtest$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: svgtest$(EXEEXT) $(__svgtest_bundle___depname)
-
-install: all
-
-uninstall: 
-
-install-strip: install
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f svgtest$(EXEEXT)
-	rm -rf svgtest.app
-
-distclean: clean
-	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc)
-	$(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
-	$(__svgtest___mac_rezcmd)
-	$(__svgtest___mac_setfilecmd)
-	$(__svgtest___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p svgtest.app/Contents
-	mkdir -p svgtest.app/Contents/MacOS
-	mkdir -p svgtest.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/svgtest/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >svgtest.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >svgtest.app/Contents/PkgInfo
-	
-	
-	ln -f svgtest$(EXEEXT) svgtest.app/Contents/MacOS/svgtest
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns svgtest.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@svgtest_bundle: $(____svgtest_BUNDLE_TGT_REF_DEP)
-
-svgtest_sample_rc.o: $(srcdir)/../../../samples/sample.rc
-	$(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
-
-svgtest_svgtest.o: $(srcdir)/svgtest.cpp
-	$(CXXC) -c -o $@ $(SVGTEST_CXXFLAGS) $(srcdir)/svgtest.cpp
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean svgtest_bundle
diff --git a/samples/svg/SVGlogo24.bmp b/samples/svg/SVGlogo24.bmp
deleted file mode 100644
index 5c6e4a9693..0000000000
Binary files a/samples/svg/SVGlogo24.bmp and /dev/null differ
diff --git a/samples/svg/SVGlogo24.xpm b/samples/svg/SVGlogo24.xpm
deleted file mode 100644
index 113067233a..0000000000
--- a/samples/svg/SVGlogo24.xpm
+++ /dev/null
@@ -1,310 +0,0 @@
-/* XPM */
-static char *svgbitmap_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"64 48 256 2",
-"   c #550000",
-".  c #5c0000",
-"X  c #5f000a",
-"o  c #5c033a",
-"O  c #5a3615",
-"+  c #640000",
-"@  c #640009",
-"#  c #680605",
-"$  c #680807",
-"%  c #6d0e0e",
-"&  c #630015",
-"*  c #690717",
-"=  c #6d110e",
-"-  c #6e1412",
-";  c #701513",
-":  c #721b16",
-">  c #741c1a",
-",  c #650021",
-"<  c #65022b",
-"1  c #65003d",
-"2  c #650034",
-"3  c #6b1132",
-"4  c #711535",
-"5  c #76221c",
-"6  c #78211e",
-"7  c #642939",
-"8  c #643929",
-"9  c #663336",
-"0  c #772220",
-"q  c #792522",
-"w  c #7b2a23",
-"e  c #7d2d29",
-"r  c #7f312a",
-"t  c #5d004f",
-"y  c #560059",
-"u  c #5b005c",
-"i  c #5a0054",
-"p  c #5e0061",
-"a  c #64004a",
-"s  c #650046",
-"d  c #640150",
-"f  c #64025d",
-"g  c #660d58",
-"h  c #671746",
-"j  c #651352",
-"k  c #640064",
-"l  c #640069",
-"z  c #6d0e6c",
-"x  c #680767",
-"c  c #6e0f71",
-"v  c #6c106b",
-"b  c #6c1665",
-"n  c #711a6c",
-"m  c #731b72",
-"M  c #682847",
-"N  c #6d2653",
-"B  c #75236d",
-"V  c #7c2d74",
-"C  c #7d2c7a",
-"Z  c #782278",
-"A  c #7e3177",
-"S  c #565600",
-"D  c #5c5c00",
-"F  c #5e6100",
-"G  c #614416",
-"H  c #655f06",
-"J  c #655a0b",
-"K  c #70463b",
-"L  c #6e4538",
-"P  c #646400",
-"I  c #656a00",
-"U  c #6c6c0d",
-"Y  c #676708",
-"T  c #6d6914",
-"R  c #6d720f",
-"E  c #707014",
-"W  c #78781e",
-"Q  c #75771a",
-"!  c #75602d",
-"~  c #7a7a23",
-"^  c #7b7b2d",
-"/  c #812e2a",
-"(  c #82392d",
-")  c #81332d",
-"_  c #853a34",
-"`  c #843834",
-"'  c #833a7b",
-"]  c #8a443a",
-"[  c #884438",
-"{  c #8e4a42",
-"}  c #8d4542",
-"|  c #8b4055",
-" . c #914e48",
-".. c #94564a",
-"X. c #955250",
-"o. c #985b54",
-"O. c #995d55",
-"+. c #894679",
-"@. c #90506f",
-"#. c #995c7d",
-"$. c #97624d",
-"%. c #9e6a5b",
-"&. c #9c6756",
-"*. c #9e6460",
-"=. c #8d6a64",
-"-. c #a06a5d",
-";. c #a1715d",
-":. c #a26a66",
-">. c #a97c6c",
-",. c #a67568",
-"<. c #ac7b74",
-"1. c #ab7674",
-"2. c #812f81",
-"3. c #853a82",
-"4. c #823081",
-"5. c #8a4284",
-"6. c #8d4a84",
-"7. c #8f5080",
-"8. c #945689",
-"9. c #965792",
-"0. c #9a6389",
-"q. c #9d6397",
-"w. c #a2658e",
-"e. c #a16a99",
-"r. c #a5778f",
-"t. c #a77799",
-"y. c #ad78aa",
-"u. c #a76daa",
-"i. c #81812b",
-"p. c #878738",
-"a. c #888837",
-"s. c #8d8d40",
-"d. c #919145",
-"f. c #919149",
-"g. c #979753",
-"h. c #9c9c5a",
-"j. c #9b9b54",
-"k. c #9f8671",
-"l. c #9b856c",
-"z. c #aa826b",
-"x. c #ae8772",
-"c. c #b1847a",
-"v. c #b08c75",
-"b. c #b3897f",
-"n. c #b19374",
-"m. c #b6997d",
-"M. c #a99e77",
-"N. c #a1a25b",
-"B. c #a4a465",
-"V. c #abab73",
-"C. c #adad79",
-"Z. c #b6a079",
-"A. c #b2b278",
-"S. c #ab878d",
-"D. c #ac8396",
-"F. c #b78c86",
-"G. c #b69182",
-"H. c #b99c83",
-"J. c #bc9a8b",
-"K. c #bb9592",
-"L. c #b183ab",
-"P. c #b38ca3",
-"I. c #bd98b7",
-"U. c #b791a9",
-"Y. c #bba385",
-"T. c #bca696",
-"R. c #bbbb8c",
-"E. c #b8b785",
-"W. c #bebe94",
-"Q. c #bfa5a7",
-"!. c #c19c97",
-"~. c #c0a88d",
-"^. c #c3a896",
-"/. c #c3b48f",
-"(. c #c7b698",
-"). c #c6aba5",
-"_. c #c6aab7",
-"`. c #ccb7a8",
-"'. c #cdb8b5",
-"]. c #d0bbab",
-"[. c #d1bbb3",
-"{. c #c29bc2",
-"}. c #caa9c6",
-"|. c #d7bfd0",
-" X c #d2b8ca",
-".X c #c2c28e",
-"XX c #c8c294",
-"oX c #cbc59c",
-"OX c #ccca9b",
-"+X c #c4c595",
-"@X c #cccaa3",
-"#X c #ccc8a7",
-"$X c #d0cba5",
-"%X c #d3cbab",
-"&X c #d1c5aa",
-"*X c #d3c3b3",
-"=X c #d8c4ba",
-"-X c #d8cbbb",
-";X c #d5cab7",
-":X c #d4d4ab",
-">X c #d6dcaa",
-",X c #d8dbad",
-"<X c #d2d5a3",
-"1X c #d8d4b3",
-"2X c #dbd4bc",
-"3X c #dbdbb4",
-"4X c #dcdcbb",
-"5X c #d4d4b5",
-"6X c #dbe3ab",
-"7X c #dce1b4",
-"8X c #dee3bb",
-"9X c #dee9b8",
-"0X c #e0e4bd",
-"qX c #e1e8bc",
-"wX c #e0e7b5",
-"eX c #d9c8c3",
-"rX c #dbc8d4",
-"tX c #ddd3c1",
-"yX c #dddbc2",
-"uX c #dedaca",
-"iX c #e1cecd",
-"pX c #e0dcc4",
-"aX c #e2d8cb",
-"sX c #e6dcd2",
-"dX c #e5d8d7",
-"fX c #e1cfe0",
-"gX c #e2e2c3",
-"hX c #e3e2cb",
-"jX c #e3eac3",
-"kX c #e6eacb",
-"lX c #e8ebcc",
-"zX c #e5e4d3",
-"xX c #eaead3",
-"cX c #eeebde",
-"vX c #e9e5d8",
-"bX c #eaf1ce",
-"nX c #e8f2c7",
-"mX c #ebf2d3",
-"MX c #eef2da",
-"NX c #edf8d4",
-"BX c #effad8",
-"VX c #f0f6d6",
-"CX c #f0f3dd",
-"ZX c #f2fbda",
-"AX c #edece1",
-"SX c #efe6e7",
-"DX c #f0ebe5",
-"FX c #f2f3e4",
-"GX c #f4f4ea",
-"HX c #f4fae3",
-"JX c #f6fbea",
-"KX c #f8fdec",
-"LX c #f8fee4",
-"PX c #fbfdf4",
-"IX c #fefefe",
-"UX c #f8f4f2",
-/* pixels */
-"> % % % ; % % ; % % ; % % ; % % % % % % % ; % % % % % % % % % ; % % % % ; % % % = = % % % % = % % % % % ; % % ; % % ; % % ; % / ",
-"% + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + # ",
-"% + + + + + + + + + + + + + + + + + + = % = = % % % @ + + + + + + + + + + + % % % $ = $ % + + + + + + + # + + + + + + # + + + % ",
-"% + + + + + + + + + + + + # + + + + % rXUXSXDXcXcXaX6 . + + + + + + + + + 6 oX$X@XoXXXOXZ.# + + + + + + + + + + + + + + + + + % ",
-"% + + + + + + + + + + + + + # + + + . F.IXIXIXIXPXPX,.. + + + + + + + + + %.qX3X6X,X<X>X&.+ + + + + + + + + + + + + + + + + + ; ",
-"% + + + + + + + # + + + + + + + + + + ` UXPXaX[.aXPX;X@ + + + + + + + + $ (.0X(.m./.<XOX5 + + + + + + + + + + + + + + + + + + % ",
-"% + + + + + + + + + + # + + + + + + + + [.IXK.  ` FXFX_ + + + + + + + . [ 4X,Xw . >.wXM.+ + + + + + + + + + + + + # + + + + + ; ",
-"; + + + + + + + + + + + + # + + + + + . :.IXSX- . [.IXG.. + + + + + + + v.nXH.. = XX6X] + + + + + + + + + + + + + + + + + + + % ",
-"; + + + + + + + + + + + + + + + + + + + > SXIXO.  *.PXaX; + + + + + + ; %XjX..  ..6X(.= + + + + # + + + + + + + + + + + + + # % ",
-"% + + + + + + + # + + + + # + + + + + + + !.IX[.. ; zXJXO.. + + + + . O.kX#X= + m.9Xz.. + + + + + + + + + + + + + + + # + + + % ",
-"% + + + + + + + + + + + + + + + + + + + + } IXGXr   J.IX).+ + + + + + ^.bXx.  w :X<Xr   + + + + + + # + + + + + # + + + + + + ; ",
-"; + + + + + + + + + + # + + + # + + + + + # eXIXc.  } HXxXe . + + . r 8X8X(   ;.9XY.# + + + + + + + + + + + + + + + + + + + + % ",
-"% + + + + + + + + + + + + + + + + + + + +   1.IXiX$ # ;XKX<.. + + + >.mX(.+ $ (.9X$.. + + + + + + + + + + + + + + + + + + + + ; ",
-"% + + + + + + + + + + + # + + + + + + + + @ q GXPX .  ,.KX-X$ + + $ #XbX&.  [ 7X$X: + + + + + + + # + + + + + + + + # + + # + % ",
-"; + + + + + + + + + + + + + + + + + + + + + + ).IX^.. q vXMX{ . .  .kX5X> . n.jXn.+ + + + + + + + + + + + + + + + + + + + + + ; ",
-"% + # + + + + + + + + % > ; $ + + + + + + + . o.PXvX> . ^.KXJ.+ + J.BXH.. : %X8X[ . + + + + + . $ / {  ._ : + + + + + + + + + % ",
-"% + + + + + + + > ,.`.aXpXpX].x.( + + + + + + - sXPX:.  ..HXyX; : yXlX]   &.jX(.$ + + + + . ; <.-XxXVXVXkX1XH.[ + + + + + + + % ",
-"; + + + + + # 1.vXIXKXxXhXpXlXBX0Xm.: + + + +   F.IX[.+ % tXHXO.%.MX&X% + /.jX;.. + + + + ..sXIXJXaX].^.%XgXNX8Xn.- + + + + + % ",
-"% + + + + % ).IXPX`.O.e ; 6 ] v.1XnXoX( + + + + ` GXFX`   c.HX;XyXmX>.  r 8X3Xw + + + . 1.PXPX].X.% @ + + e >.1XjX/.: + + + + % ",
-"% + + + @ ^.IXcXo..   + # + +   5 m.qX$X( . + + + [.PXb.  ` lXxXlXgXe   z.nXY.+ + + . :.IXGX,.@   $ w ) ; +   w #X8X/.% + + + % ",
-"* + + . 1.IXDX`   > c.].2X%XH.] . . ;.,X(.5 . + . :.PXaX% + `.MXxX^.+ = %XjX..  +   _ PXPXO.  ; c.-XlXlXyX~.[ ;.3X7X>.$ + + + % ",
-"v 2 + / UXUX}    .sXHXMXxXlXBXkXm.) ..OX6Xn.+ + . > vXLXX.  &.MXmXO.  ..jX#X; + + # [.IX<.  r eXPXCXpX-XpXMXgXjX3X..+ + + + * g ",
-"c l t w.IXDXe   ,.PXFXG.w _ >.1XjX3XqX7X<X+X5 + + + !.PX^.. : pXyX- . Y.bXx.+ + . X.IXeX+ 0 sXPX].] % $ 5 ,.3X%X[ . + + * a k c ",
-"c k k l {.IXdX6 . b.LX;Xq X . > ~.1XZ.;.( - $ + + . { HXvXq . T.J.. w 2XgX_ . + + '.IXX.  `.IXJ.# . + + + . ( w . @ < d l l k c ",
-"c k k f x }.IXeX3 X J.JX;X: . . = - + . + + + + + + % -XKX,.  ` 6   ,.bX(.$ + + > UXdX+ } IX=X$ + + + @ + + . & 1 f l l l k k c ",
-"v k k k p z rXIX}.f d _.LX(.- + + + + + + + + + + + . <.KX*X$ . + $ `.bX;.  +   X.IXK.. !.IXX.. + + + @ , 1 f l l k k l k k k c ",
-"c k k k k f m rXPXI.u n [.ZXT.< & @ + + + + + + + + + e vXcX] . . ] kX3X6 + + . 1.IX*.@ sXsX% @ , 2 d f f p p p f p p p f f k c ",
-"c k k k k k f ' dXKXP.u n ;XNXP.f f a 1 < , & @ @ + + + (.KXF.. + G.BXH.+ + + . K.IX| 4 KX_.f f l l l l 6.6.6.6.6.+.+.+.+.+.z z ",
-"c k k k k k k k 3.vXLXt.y C 2XnXt.p l l l l k k f a a o #.HXuX4 h 2XkX@.o a a t {.IX4.Z PXI.p k k k k z yXjXjX9XqX3X6X>X<XOXB v ",
-"c k k k l k k k p 6.cXBX9.y 5.4XqX0.f k k l k l l k l l c aXMX9.9.bX;Xc p l l f {.IX3.m PX_.p l k k f z yX2X).).).T.T.T.XXOXn z ",
-"K g l l k k k k k p 9.MXlX6.y 6.0X7X7.p k k k k k k k k f P.ZX=XtXbXt.f k k p u L.IX9.l SXrXx p k k k z yXQ.p f f p k l T.oXc b ",
-"R H 8 g l l k x k k f e.BXgX' y 0.wX,X' p k k k k k k k p 3.xXlXlXhX' f k l k u q.IXy.u  XJXC f l k f z yX'.C V A C x z oXR.9 T ",
-"U I I H 8 j l p f k l f D.NX-XV y r.9X@XV k k k k k k k k x [.lXlX'.k k k k k f 2.IXrXu e.IXI.u f k k z yXkX4X3X3X`.x ' >XN.I E ",
-"U P P P F D G M 2.x p p p U.nX&Xm p S.6X(.B p l k k k k k p e.mXlX0.p l k k k k x fXIXC x dXJX9.u p f z '.*X;X3XqXk.O B.>Xa.H R ",
-"R P P U p.B.+XkXDXU.N i u f U.nX).b k K.6XT.b p k k k l l f Z hXpXm k k k k k k p y.IXI.y 9.KXFXq.x p p x A ).jX+XY Q <X+XU P U ",
-"U P D C.IXIXIXGXGXKXyXV.=.+.P.0XnXt.u B <X<XA f k l k k l p f _.Q.p k k k l k k p m SXPX5.y y.JXLX XP.t.U.2XlXOXQ D A.3Xj.P P U ",
-"U P P ~ AXIXyXp.a.5XGXKXMXlXmXkXE.K h S.6XS.k l l l k l l k k ' C f k k l l l l p p u.IXdXB o l.gXHXLXLXVXgXE.E S j.3X.XU P P U ",
-"E P P S g.IXFXg.S P g.+X:X@XE.a.D F h.,XOX! 8 9 M h j j g f f x f f x x g g j h M 7 8 #XIXyX~ S U g.A.A.B.i.D P j.3X,Xa.H P P U ",
-"yXf.P P D V.IXPXR.E S D P P D S E A.8X:Xa.P I I I I P Y Y H H J J J H H H P I P I I F E 2XIXvXB.Y S S S S P ~ E.0X3Xf.D P P P f.",
-"IXIX5Xf.P D B.GXIXhXE.d.i.i.d.C.:XgX,Xa.P P P P P P P P I P P I P P P I P P I P P P I F T @XPXKXgXE.B.j.B.+X4XlX:Xd.P P P p.#XIX",
-"IXIXIXIXyXh.T p.5XGXPXCXkXhXlXxXgX.X^ P P P P P P P P P P P P P P P P P P P P P P P P P D Y h.yXFXJXGXCXFXlX4XA.W H Y j.2XIXIXIX",
-"IXIXIXIXIXIXAXE.p.d.R.5XgX3X@XC.a.I P P P P P P P P P P P P P P P P P P P P P P P P P P P P D U d.A.R.W.A.h.~ D ^ A.zXIXIXIXIXIX",
-"IXIXIXIXIXIXIXIXIXuXC.p.E U Y P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P H D D P Y ^ V.yXIXIXIXIXIXIXIXIX",
-"IXIXIXIXIXIXIXIXIXIXIXIXzXW.h.~ Y P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P P W g.R.zXPXIXIXIXIXIXIXIXIXIXIX",
-"IXIXIXIXIXIXIXIXIXIXIXIXIXIXIXUXzX@XC.f.~ U P P P P P P P P P P P P P P P P P P P P P Y ~ d.V.+XhXPXIXIXIXIXIXIXIXIXIXIXIXIXIXIX",
-"IXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXAXyX#XW.C.B.h.f.s.p.p.a.a.p.s.f.j.B.C.R.#XyXAXPXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIX",
-"IXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIX",
-"IXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIX"
-};
diff --git a/samples/svg/bitmaps/help.xpm b/samples/svg/bitmaps/help.xpm
deleted file mode 100644
index 161b6b2658..0000000000
--- a/samples/svg/bitmaps/help.xpm
+++ /dev/null
@@ -1,71 +0,0 @@
-/* XPM */
-static char *help_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 50 1",
-"j c #4E7FD0",
-"8 c #EDF2FB",
-", c #7198D9",
-"e c #DCE6F6",
-"y c #FFFFFF",
-"5 c #95B2E3",
-"$ c #9AB6E4",
-"g c #EAF0FA",
-"1 c #2D59A3",
-"@ c #B1C7EB",
-"> c #6992D7",
-"a c #D9E4F5",
-"r c #356AC1",
-"6 c #9BB7E5",
-"= c #F7F9FD",
-"+ c #BED0EE",
-"z c #F0F5FC",
-"f c #ADC4E9",
-"# c #A8C0E8",
-"7 c #CBD9F1",
-"u c #366BC2",
-"  c None",
-"c c #FDFEFF",
-"w c #274D8D",
-"t c #C4D5F0",
-"% c #7CA0DC",
-"h c #E2EAF8",
-"p c #487BCE",
-"o c #4377CD",
-"4 c #2A549A",
-"< c #254A87",
-"O c #CCDAF2",
-"& c #89A9DF",
-"9 c #2B559B",
-"* c #D2DFF4",
-". c #3366BB",
-": c #2E5CA8",
-"x c #FAFCFE",
-"l c #F5F8FD",
-"2 c #799EDB",
-"d c #DFE8F7",
-"; c #A6BFE8",
-"3 c #638ED5",
-"- c #5282D0",
-"X c #2A5398",
-"0 c #B8CCEC",
-"s c #376EC9",
-"q c #2D5AA5",
-"i c #285092",
-"k c #8CACE0",
-/* pixels */
-"   .......Xo    ",
-"   .O+@#$%.&o   ",
-"   .*O+@#$.=&-  ",
-"  ;:::>#@#.==&: ",
-" ,<1234<>@....: ",
-"5<X67869<&0#$&. ",
-"q99wwe;9Xrt0#$. ",
-"<99X&yu99iOt0#. ",
-"<99wyp999<aOt0. ",
-"<99X<u99XsdaOt. ",
-",w9<y;99<fghaO. ",
-" j<X<XX<klzgha. ",
-"  5:::j7x=lzgh. ",
-"   .yyyccx=lzg. ",
-"   ............ "
-};
diff --git a/samples/svg/bitmaps/new.xpm b/samples/svg/bitmaps/new.xpm
deleted file mode 100644
index 0597eebd5e..0000000000
--- a/samples/svg/bitmaps/new.xpm
+++ /dev/null
@@ -1,52 +0,0 @@
-/* XPM */
-static char *new_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"15 15 31 1",
-". c #7198D9",
-"2 c #DCE6F6",
-", c #FFFFFF",
-"= c #9AB6E4",
-"6 c #EAF0FA",
-"w c #6992D7",
-"0 c #5886D2",
-"7 c #F7F9FD",
-"5 c #F0F5FC",
-"* c #A8C0E8",
-"  c None",
-"8 c #FDFEFF",
-"% c #C4D5F0",
-"3 c #E2EAF8",
-"+ c #4377CD",
-"O c #487BCE",
-"; c #6B94D7",
-"- c #89A9DF",
-": c #5584D1",
-"# c #3569BF",
-"@ c #3A70CA",
-"1 c #D2DFF4",
-"> c #3366BB",
-"$ c #2E5CA8",
-"9 c #FAFCFE",
-"4 c #F5F8FD",
-"q c #638ED5",
-"o c #5282D0",
-"& c #B8CCEC",
-"X c #376EC9",
-"< c #ACE95B",
-/* pixels */
-"   .XoO+@#$.   ",
-"   .%%&*=-O;:  ",
-"  >>>>%&*=O,=o ",
-"  ><<>%%&*O,,=o",
-">>><<>>>%&OOo+@",
-"><<<<<<>1%&*=-@",
-"><<<<<<>21%&*=@",
-">>><<>>>321%&*+",
-"  ><<>456321%&O",
-"  >>>>7456321%o",
-"   .,8974563210",
-"   .,,897456320",
-"   .,,,8974563q",
-"   .,,,,897456w",
-"   ............"
-};
diff --git a/samples/svg/bitmaps/save.xpm b/samples/svg/bitmaps/save.xpm
deleted file mode 100644
index accf1f9eb2..0000000000
--- a/samples/svg/bitmaps/save.xpm
+++ /dev/null
@@ -1,42 +0,0 @@
-/* XPM */
-static char *save_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 21 1",
-": c #AAC1E8",
-"1 c #B9CDED",
-"O c #FFFFFF",
-"  c #2C58A0",
-"* c #B0C6EA",
-"; c #2D59A3",
-"X c #1C3866",
-"= c #C3D4EF",
-"2 c #CBD9F1",
-"- c #DAE5F6",
-"# c #97B4E3",
-". c None",
-"$ c #274D8B",
-"& c #9FB9E5",
-"@ c #5584D1",
-"% c #82A5DE",
-"o c #3A70CA",
-"< c #A5BEE7",
-", c #D2DFF4",
-"+ c #3467BC",
-"> c #C0D1EE",
-/* pixels */
-"               .",
-" XoOOOOOOOOO+X .",
-" @oO#######O+@ .",
-" @oOOOOOOOOO+@ .",
-" @oO#######O+@ .",
-" @oOOOOOOOOO+@ .",
-" @@+++++++++@@ .",
-" @@@@@@@@@@@@@ .",
-" @@@$$$$$$$$@@ .",
-" @@$%%%&*=-O$@ .",
-" @@$%X;;*=-O$@ .",
-" @@$%X;;:>,O$@ .",
-" @@$%X;;<12O$@ .",
-" @@$<<2OOOOO$@ .",
-".             .."
-};
diff --git a/samples/svg/makefile.bcc b/samples/svg/makefile.bcc
deleted file mode 100644
index 922f664ee7..0000000000
--- a/samples/svg/makefile.bcc
+++ /dev/null
@@ -1,234 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-.autodepend
-
-!ifndef BCCDIR
-!ifndef MAKEDIR
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-BCCDIR = $(MAKEDIR)\..
-!endif
-
-!include ../../../build/msw/config.bcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 28
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-SVGTEST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-	$(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \
-	-I.\..\..\..\samples -DNOPCH -I.\..\..\include $(CPPFLAGS) $(CXXFLAGS)
-SVGTEST_OBJECTS =  \
-	$(OBJS)\svgtest_svgtest.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE = 
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =  
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_5 = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_5 = mt
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_6 = 
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_6 = -tWM
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 = 
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = 
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = -DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = -dwxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = -DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = -dwxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\svgtest.exe
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.csm del $(OBJS)\*.csm
-	-if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe
-	-if exist $(OBJS)\svgtest.tds del $(OBJS)\svgtest.tds
-	-if exist $(OBJS)\svgtest.ilc del $(OBJS)\svgtest.ilc
-	-if exist $(OBJS)\svgtest.ild del $(OBJS)\svgtest.ild
-	-if exist $(OBJS)\svgtest.ilf del $(OBJS)\svgtest.ilf
-	-if exist $(OBJS)\svgtest.ils del $(OBJS)\svgtest.ils
-
-$(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS)  $(OBJS)\svgtest_sample.res
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(SVGTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\svgtest_sample.res
-|
-
-$(OBJS)\svgtest_sample.res: .\..\..\..\samples\sample.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples $**
-
-$(OBJS)\svgtest_svgtest.obj: .\svgtest.cpp
-	$(CXX) -q -c -P -o$@ $(SVGTEST_CXXFLAGS) $**
-
diff --git a/samples/svg/makefile.gcc b/samples/svg/makefile.gcc
deleted file mode 100644
index d72414f835..0000000000
--- a/samples/svg/makefile.gcc
+++ /dev/null
@@ -1,233 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF$@.d -MD
-WX_RELEASE_NODOT = 28
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-SVGTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
-	$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-	$(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \
-	$(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH -I.\..\..\include \
-	$(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
-	$(CXXFLAGS)
-SVGTEST_OBJECTS =  \
-	$(OBJS)\svgtest_sample_rc.o \
-	$(OBJS)\svgtest_svgtest.o
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-WXDEBUGFLAG = d
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-WXDEBUGFLAG = d
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(SHARED),0)
-LIBTYPE_SUFFIX = lib
-endif
-ifeq ($(SHARED),1)
-LIBTYPE_SUFFIX = dll
-endif
-ifeq ($(MONOLITHIC),0)
-EXTRALIBS_FOR_BASE = 
-endif
-ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =  
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(USE_RTTI),0)
-__RTTIFLAG_5 = -fno-rtti
-endif
-ifeq ($(USE_RTTI),1)
-__RTTIFLAG_5 = 
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG_6 = -fno-exceptions
-endif
-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG_6 = 
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-endif
-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p = -DwxNO_RTTI
-endif
-ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p = -DwxNO_THREADS
-endif
-ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define _UNICODE
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = \
-	-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(MSLU),1)
-__UNICOWS_LIB_p = -lunicows
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GDIPLUS_LIB_p = -lgdiplus
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = 
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO = 
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(USE_THREADS),0)
-__THREADSFLAG = 
-endif
-ifeq ($(USE_THREADS),1)
-__THREADSFLAG = -mthreads
-endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\svgtest.exe
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\*.d del $(OBJS)\*.d
-	-if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe
-
-$(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample_rc.o
-	$(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
-
-$(OBJS)\svgtest_sample_rc.o: ./../../../samples/sample.rc
-	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples
-
-$(OBJS)\svgtest_svgtest.o: ./svgtest.cpp
-	$(CXX) -c -o $@ $(SVGTEST_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/samples/svg/makefile.vc b/samples/svg/makefile.vc
deleted file mode 100644
index 0027f7bff1..0000000000
--- a/samples/svg/makefile.vc
+++ /dev/null
@@ -1,309 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 28
-OBJS = \
-	vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = .\..\..\..\lib\vc$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-SVGTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-	$(__DEBUGINFO_0) /Fd$(OBJS)\svgtest.pdb $(____DEBUGRUNTIME_2_p) \
-	$(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-	$(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \
-	$(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH /I.\..\..\include \
-	$(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS)
-SVGTEST_OBJECTS =  \
-	$(OBJS)\svgtest_sample.res \
-	$(OBJS)\svgtest_svgtest.obj
-
-### Conditionally set variables: ###
-
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-DIR_SUFFIX_CPU = _amd64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(SHARED)" == "0"
-LIBTYPE_SUFFIX = lib
-!endif
-!if "$(SHARED)" == "1"
-LIBTYPE_SUFFIX = dll
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "amd64"
-LINK_TARGET_CPU = /MACHINE:AMD64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
-!if "$(MONOLITHIC)" == "0"
-EXTRALIBS_FOR_BASE = 
-!endif
-!if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =  
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p_1 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_3 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_4 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_4 = /O2
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREADSFLAG_7 = L
-!endif
-!if "$(USE_THREADS)" == "1"
-__THREADSFLAG_7 = T
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = $(__THREADSFLAG_7)
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTIFLAG_9 = 
-!endif
-!if "$(USE_RTTI)" == "1"
-__RTTIFLAG_9 = /GR
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_10 = 
-!endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_10 = /EHsc
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
-!endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p = /DwxNO_RTTI
-!endif
-!if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_1 = /d wxNO_RTTI
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p = /DwxNO_THREADS
-!endif
-!if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_1 = /d wxNO_THREADS
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d _UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
-!endif
-!if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = \
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\svgtest.exe
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-	-if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe
-	-if exist $(OBJS)\svgtest.ilk del $(OBJS)\svgtest.ilk
-	-if exist $(OBJS)\svgtest.pdb del $(OBJS)\svgtest.pdb
-
-$(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-	$(SVGTEST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib
-<<
-
-$(OBJS)\svgtest_sample.res: .\..\..\..\samples\sample.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples $**
-
-$(OBJS)\svgtest_svgtest.obj: .\svgtest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(SVGTEST_CXXFLAGS) $**
-
diff --git a/samples/svg/makefile.wat b/samples/svg/makefile.wat
deleted file mode 100644
index dda6931f6d..0000000000
--- a/samples/svg/makefile.wat
+++ /dev/null
@@ -1,262 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include ../../../build/msw/config.wat
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-# Speed up compilation a bit:
-!ifdef __LOADDLL__
-!  loaddll wcc      wccd
-!  loaddll wccaxp   wccdaxp
-!  loaddll wcc386   wccd386
-!  loaddll wpp      wppdi86
-!  loaddll wppaxp   wppdaxp
-!  loaddll wpp386   wppd386
-!  loaddll wlink    wlink
-!  loaddll wlib     wlibd
-!endif
-
-# We need these variables in some bakefile-made rules:
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
-
-### Conditionally set variables: ###
-
-PORTNAME =
-!ifeq USE_GUI 0
-PORTNAME = base
-!endif
-!ifeq USE_GUI 1
-PORTNAME = msw
-!endif
-WXDEBUGFLAG =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-WXDEBUGFLAG = d
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-WXDEBUGFLAG = d
-!endif
-WXUNICODEFLAG =
-!ifeq UNICODE 1
-WXUNICODEFLAG = u
-!endif
-WXUNIVNAME =
-!ifeq WXUNIV 1
-WXUNIVNAME = univ
-!endif
-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif
-LIBTYPE_SUFFIX =
-!ifeq SHARED 0
-LIBTYPE_SUFFIX = lib
-!endif
-!ifeq SHARED 1
-LIBTYPE_SUFFIX = dll
-!endif
-EXTRALIBS_FOR_BASE =
-!ifeq MONOLITHIC 0
-EXTRALIBS_FOR_BASE = 
-!endif
-!ifeq MONOLITHIC 1
-EXTRALIBS_FOR_BASE =  
-!endif
-__DEBUGINFO_0 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_0 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_0 = -d2
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = 
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 = 
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = debug all
-!endif
-__OPTIMIZEFLAG_2 =
-!ifeq BUILD debug
-__OPTIMIZEFLAG_2 = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG_2 = -ot -ox
-!endif
-__THREADSFLAG_5 =
-!ifeq USE_THREADS 0
-__THREADSFLAG_5 = 
-!endif
-!ifeq USE_THREADS 1
-__THREADSFLAG_5 = -bm
-!endif
-__RUNTIME_LIBS_6 =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS_6 = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS_6 = 
-!endif
-__RTTIFLAG_7 =
-!ifeq USE_RTTI 0
-__RTTIFLAG_7 = 
-!endif
-!ifeq USE_RTTI 1
-__RTTIFLAG_7 = -xr
-!endif
-__EXCEPTIONSFLAG_8 =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_8 = 
-!endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_8 = -xs
-!endif
-__WXLIB_CORE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_CORE_p = &
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
-!endif
-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = &
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = &
-	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
-!endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-__GDIPLUS_LIB_p =
-!ifeq USE_GDIPLUS 1
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-__WXUNIV_DEFINE_p =
-!ifeq WXUNIV 1
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
-!endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__EXCEPTIONS_DEFINE_p =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
-!endif
-__RTTI_DEFINE_p =
-!ifeq USE_RTTI 0
-__RTTI_DEFINE_p = -dwxNO_RTTI
-!endif
-__THREAD_DEFINE_p =
-!ifeq USE_THREADS 0
-__THREAD_DEFINE_p = -dwxNO_THREADS
-!endif
-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -d_UNICODE
-!endif
-__GFXCTX_DEFINE_p =
-!ifeq USE_GDIPLUS 1
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 28
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-SVGTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
-	$(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
-	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-	$(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
-	-i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
-	$(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include &
-	$(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
-SVGTEST_OBJECTS =  &
-	$(OBJS)\svgtest_svgtest.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\svgtest.exe
-
-clean : .SYMBOLIC 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-	-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-	-if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe
-
-$(OBJS)\svgtest.exe :  $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res
-	@%create $(OBJS)\svgtest.lbc
-	@%append $(OBJS)\svgtest.lbc option quiet
-	@%append $(OBJS)\svgtest.lbc name $^@
-	@%append $(OBJS)\svgtest.lbc option caseexact
-	@%append $(OBJS)\svgtest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-	@for %i in ($(SVGTEST_OBJECTS)) do @%append $(OBJS)\svgtest.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\svgtest.lbc library %i
-	@%append $(OBJS)\svgtest.lbc option resource=$(OBJS)\svgtest_sample.res
-	@for %i in () do @%append $(OBJS)\svgtest.lbc option stack=%i
-	wlink @$(OBJS)\svgtest.lbc
-
-$(OBJS)\svgtest_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc
-	wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples $<
-
-$(OBJS)\svgtest_svgtest.obj :  .AUTODEPEND .\svgtest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(SVGTEST_CXXFLAGS) $<
-
diff --git a/samples/svg/mondrian.ico b/samples/svg/mondrian.ico
deleted file mode 100644
index 2310c5d275..0000000000
Binary files a/samples/svg/mondrian.ico and /dev/null differ
diff --git a/samples/svg/mondrian.xpm b/samples/svg/mondrian.xpm
deleted file mode 100644
index 409f27a843..0000000000
--- a/samples/svg/mondrian.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char *mondrian_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-"  c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-"                                ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-"                                ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++      ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++                    ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-"                                "
-};
diff --git a/samples/svg/svgtest.bkl b/samples/svg/svgtest.bkl
deleted file mode 100644
index 59724bd0a6..0000000000
--- a/samples/svg/svgtest.bkl
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-
-    <include file="../../../build/bakefiles/common_samples.bkl"/>
-    <include file="../../../build/bakefiles/common_contrib.bkl"/>
-
-    <exe id="svgtest" template="wx_contrib_sample" template_append="wx_append">
-        <sources>
-            svgtest.cpp
-        </sources>
-        <contrib-lib>svg</contrib-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-    </exe>
-</makefile>
diff --git a/samples/svg/svgtest.cpp b/samples/svg/svgtest.cpp
deleted file mode 100644
index a353b440ce..0000000000
--- a/samples/svg/svgtest.cpp
+++ /dev/null
@@ -1,629 +0,0 @@
-// biol75@york.ac.uk (Chris Elliott) March 2000
-
-#ifdef __BIDE__
-#define _NO_VCL
-#include "condefs.h"
-USERC("svg.rc");
-//---------------------------------------------------------------------------
-#define WinMain WinMain
-#endif
-/////////////////////////////////////////////////////////////////////////////
-// Name:        svgtest.cpp
-// Purpose:     SVG sample
-// Author:      Chris Elliott
-// Modified by:
-// RCS-ID:      $Id$
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-// ===========================================================================
-// declarations
-// ===========================================================================
-
-// ---------------------------------------------------------------------------
-// headers
-// ---------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#include "wx/mdi.h"
-#endif
-
-#include "wx/toolbar.h"
-#include "wx/svg/dcsvg.h"
-
-#include "mondrian.xpm"
-
-#include "bitmaps/new.xpm"
-#include "bitmaps/save.xpm"
-#include "bitmaps/help.xpm"
-#include "SVGlogo24.xpm"
-
-class MyChild;
-
-// Define a new application
-class MyApp : public wxApp
-{
-    public:
-        bool OnInit();
-};
-
-// Define a new frame
-class MyFrame : public wxMDIParentFrame
-{
-    public:
-        int nWinCreated;
-
-        wxList m_children;
-
-        MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title,
-            const wxPoint& pos, const wxSize& size, const long style);
-
-        void InitToolBar(wxToolBar* toolBar);
-
-        void OnSize(wxSizeEvent& event);
-        void OnAbout(wxCommandEvent& event);
-        void OnNewWindow(wxCommandEvent& event);
-        void OnQuit(wxCommandEvent& event);
-        void OnClose(wxCloseEvent& event);
-        void FileSavePicture (wxCommandEvent & WXUNUSED(event) ) ;
-
-        DECLARE_EVENT_TABLE()
-};
-
-
-class MyCanvas : public wxScrolledWindow
-{
-    public:
-        int m_index ;
-
-        MyChild * m_child ;
-        MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size);
-        virtual void OnDraw(wxDC& dc);
-
-        DECLARE_EVENT_TABLE()
-};
-
-class MyChild: public wxMDIChildFrame
-{
-    public:
-        MyCanvas *m_canvas;
-        MyFrame  *m_frame ;
-
-        //////////////////// Methods
-
-        MyChild(wxMDIParentFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
-        ~MyChild();
-
-        void OnActivate(wxActivateEvent& event);
-        void OnQuit(wxCommandEvent& event);
-        void OnClose(wxCloseEvent& event);
-        bool OnSave(wxString filename) ;
-
-        DECLARE_EVENT_TABLE()
-};
-
-// menu items ids
-enum
-{
-    MDI_QUIT = 100,
-    MDI_NEW_WINDOW,
-    MDI_SAVE,
-    MDI_REFRESH,
-    MDI_CHILD_QUIT,
-    MDI_ABOUT
-};
-
-
-IMPLEMENT_APP(MyApp)
-
-// ---------------------------------------------------------------------------
-// global variables
-// ---------------------------------------------------------------------------
-
-MyFrame *frame = (MyFrame *) NULL;
-
-// ---------------------------------------------------------------------------
-// event tables
-// ---------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame)
-EVT_MENU(MDI_ABOUT, MyFrame::OnAbout)
-EVT_MENU(MDI_NEW_WINDOW, MyFrame::OnNewWindow)
-EVT_MENU(MDI_QUIT, MyFrame::OnQuit)
-EVT_MENU (MDI_SAVE, MyFrame::FileSavePicture)
-EVT_CLOSE(MyFrame::OnClose)
-
-EVT_SIZE(MyFrame::OnSize)
-END_EVENT_TABLE()
-
-// ===========================================================================
-// implementation
-// ===========================================================================
-
-// ---------------------------------------------------------------------------
-// MyApp
-// ---------------------------------------------------------------------------
-
-// Initialise this in OnInit, not statically
-bool MyApp::OnInit()
-{
-    // Create the main frame window
-
-    frame = new MyFrame((wxFrame *)NULL, -1, wxT("SVG Demo"),
-        wxPoint(-1, -1), wxSize(500, 400),
-        wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL);
-
-
-    // Make a menubar
-    wxMenu *file_menu = new wxMenu;
-
-    file_menu->Append(MDI_NEW_WINDOW, wxT("&New test\tCtrl+N"));
-    file_menu->Append(MDI_QUIT, wxT("&Exit\tAlt+X"));
-
-    wxMenu *help_menu = new wxMenu;
-    help_menu->Append(MDI_ABOUT, wxT("&About"));
-
-    wxMenuBar *menu_bar = new wxMenuBar;
-
-    menu_bar->Append(file_menu, wxT("&File"));
-    menu_bar->Append(help_menu, wxT("&Help"));
-
-    // Associate the menu bar with the frame
-    frame->SetMenuBar(menu_bar);
-
-#if wxUSE_STATUSBAR
-    frame->CreateStatusBar();
-#endif // wxUSE_STATUSBAR
-
-    frame->Show(true);
-
-    SetTopWindow(frame);
-
-    return true;
-}
-
-
-// ---------------------------------------------------------------------------
-// MyFrame
-// ---------------------------------------------------------------------------
-
-// Define my frame constructor
-MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title,
-    const wxPoint& pos, const wxSize& size, const long style)
-        : wxMDIParentFrame(parent, id, title, pos, size, style)
-{
-    nWinCreated = 0 ;
-
-    // Give it an icon
-    SetIcon(wxICON(mondrian));
-
-    CreateToolBar(wxNO_BORDER | wxTB_FLAT | wxTB_HORIZONTAL);
-    InitToolBar(GetToolBar());
-
-}
-
-
-void MyFrame::OnClose(wxCloseEvent& event)
-{
-    if ( !event.CanVeto() )
-    {
-        event.Skip();
-        return ;
-    }
-    if ( m_children.GetCount () < 1 )
-    {
-        event.Skip();
-        return ;
-    }
-    // now try the children
-    wxObjectList::compatibility_iterator pNode = m_children.GetFirst ();
-    wxObjectList::compatibility_iterator pNext ;
-    MyChild * pChild ;
-    while ( pNode )
-    {
-        pNext = pNode -> GetNext ();
-        pChild = (MyChild*) pNode -> GetData ();
-        if (pChild -> Close ())
-        {
-            m_children.Erase(pNode) ;
-        }
-        else
-        {
-            event.Veto();
-            return;
-        }
-        pNode = pNext ;
-    }
-    event.Skip();
-}
-
-
-void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
-    Close();
-}
-
-
-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
-{
-    (void)wxMessageBox(wxT("wxWidgets 2.0 SVG 1.0 Test\n")
-        wxT("Author: Chris Elliott (c) 2002\n")
-        wxT("Usage: svg.exe \nClick File | New to show tests\n\n"), wxT("About SVG Test"));
-}
-
-
-void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
-{
-    // Make another frame, containing a canvas
-    MyChild *subframe ;
-
-    m_children.Append (new MyChild(frame, wxT("SVG Frame"),
-        wxPoint(-1, -1), wxSize(-1, -1),
-        wxDEFAULT_FRAME_STYLE )   ) ;
-
-    subframe = (MyChild *) m_children.GetLast() -> GetData ();
-    wxString title;
-    title.Printf(wxT("SVG Test Window %d"), nWinCreated );
-    // counts number of children previously, even if now closed
-    nWinCreated ++ ;
-
-    // Give it a title and icon
-    subframe->SetTitle(title);
-    subframe->SetIcon(wxICON(mondrian));
-
-    // Make a menubar
-    wxMenu *file_menu = new wxMenu;
-
-    file_menu->Append(MDI_NEW_WINDOW, wxT("&Another test\tCtrl+N"));
-    file_menu->Append(MDI_SAVE, wxT("&Save\tCtrl+S"), wxT("Save in SVG format"));
-    file_menu->Append(MDI_CHILD_QUIT, wxT("&Close child\tCtrl+F4"));
-    file_menu->Append(MDI_QUIT, wxT("&Exit\tAlt+X"));
-
-    wxMenu *help_menu = new wxMenu;
-    help_menu->Append(MDI_ABOUT, wxT("&About"));
-
-    wxMenuBar *menu_bar = new wxMenuBar;
-
-    menu_bar->Append(file_menu, wxT("&File"));
-    menu_bar->Append(help_menu, wxT("&Help"));
-
-    // Associate the menu bar with the frame
-    subframe->SetMenuBar(menu_bar);
-
-    subframe->Show(true);
-}
-
-
-void MyFrame::OnSize(wxSizeEvent& event)
-{
-    int w, h;
-    GetClientSize(&w, &h);
-
-    GetClientWindow()->SetSize(0, 0, w, h);
-    event.Skip();
-}
-
-
-void MyFrame::InitToolBar(wxToolBar* toolBar)
-{
-    const int maxBitmaps = 3 ;
-    wxBitmap* bitmaps[maxBitmaps];
-
-    bitmaps[0] = new wxBitmap( new_xpm );
-    bitmaps[1] = new wxBitmap( save_xpm );
-    bitmaps[2] = new wxBitmap( help_xpm );
-
-    int width = 16;
-    int currentX = 5;
-
-    toolBar->AddTool( MDI_NEW_WINDOW, *(bitmaps[0]), wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, wxT("New SVG test window"));
-    currentX += width + 5;
-    toolBar->AddTool( MDI_SAVE, *bitmaps[1], wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, wxT("Save test in SVG format"));
-    currentX += width + 5;
-    toolBar->AddSeparator();
-    toolBar->AddTool(MDI_ABOUT, *bitmaps[2], wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, wxT("Help"));
-
-    toolBar->Realize();
-
-    int i;
-    for (i = 0; i < maxBitmaps; i++)
-        delete bitmaps[i];
-}
-
-
-void MyFrame::FileSavePicture (wxCommandEvent & WXUNUSED(event) )
-{
-#if wxUSE_FILEDLG
-    MyChild * pChild = (MyChild *)GetActiveChild ();
-    if (pChild == NULL)
-    {
-        return ;
-    }
-
-    wxFileDialog dialog(this, wxT("Save Picture as"), wxEmptyString, pChild->GetTitle(),
-        wxT("SVG vector picture files (*.svg)|*.svg"),
-        wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
-
-    if (dialog.ShowModal() == wxID_OK)
-    {
-        if (!pChild -> OnSave ( dialog.GetPath() ))
-        {
-            return ;
-        }
-    }
-    return ;
-#endif // wxUSE_FILEDLG
-}
-
-
-// Note that MDI_NEW_WINDOW and MDI_ABOUT commands get passed
-// to the parent window for processing, so no need to
-// duplicate event handlers here.
-BEGIN_EVENT_TABLE(MyChild, wxMDIChildFrame)
-    EVT_MENU(MDI_CHILD_QUIT, MyChild::OnQuit)
-    EVT_CLOSE(MyChild::OnClose)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
-
-END_EVENT_TABLE()
-
-// ---------------------------------------------------------------------------
-// MyCanvas
-// ---------------------------------------------------------------------------
-
-// Define a constructor for my canvas
-MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size)
-: wxScrolledWindow(parent, -1, pos, size,
-wxSUNKEN_BORDER|wxVSCROLL|wxHSCROLL)
-{
-    m_child = (MyChild *) parent ;
-    SetBackgroundColour(wxColour(_T("WHITE")));
-    m_index = m_child->m_frame->nWinCreated % 7 ;
-}
-
-
-// Define the repainting behaviour
-void MyCanvas::OnDraw(wxDC& dc)
-{
-    // vars to use ...
-#if wxUSE_STATUSBAR
-    wxString s ;
-#endif // wxUSE_STATUSBAR
-    wxPen wP ;
-    wxBrush wB ;
-    wxPoint points[6];
-    wxColour wC;
-    wxFont wF ;
-
-    dc.SetFont(*wxSWISS_FONT);
-    dc.SetPen(*wxGREEN_PEN);
-
-
-    switch (m_index)
-    {
-        default:
-        case 0:
-            // draw lines to make a cross
-            dc.DrawLine(0, 0, 200, 200);
-            dc.DrawLine(200, 0, 0, 200);
-            // draw point colored line and spline
-            wP = *wxCYAN_PEN ;
-            wP.SetWidth(3);
-            dc.SetPen(wP);
-
-            dc.DrawPoint (25,15) ;
-            dc.DrawLine(50, 30, 200, 30);
-            dc.DrawSpline(50, 200, 50, 100, 200, 10);
-#if wxUSE_STATUSBAR
-            s = wxT("Green Cross, Cyan Line and spline");
-#endif // wxUSE_STATUSBAR
-            break ;
-
-        case 1:
-            // draw standard shapes
-            dc.SetBrush(*wxCYAN_BRUSH);
-            dc.SetPen(*wxRED_PEN);
-            dc.DrawRectangle(10, 10, 100, 70);
-            wB = wxBrush (_T("DARK ORCHID"), wxTRANSPARENT);
-            dc.SetBrush (wB);
-            dc.DrawRoundedRectangle(50, 50, 100, 70, 20);
-            dc.SetBrush (wxBrush(_T("GOLDENROD"), wxSOLID) );
-            dc.DrawEllipse(100, 100, 100, 50);
-
-            points[0].x = 100; points[0].y = 200;
-            points[1].x = 70; points[1].y = 260;
-            points[2].x = 160; points[2].y = 230;
-            points[3].x = 40; points[3].y = 230;
-            points[4].x = 130; points[4].y = 260;
-            points[5].x = 100; points[5].y = 200;
-
-            dc.DrawPolygon(5, points);
-            dc.DrawLines (6, points, 160);
-#if wxUSE_STATUSBAR
-            s = wxT("Blue rectangle, red edge, clear rounded rectangle, gold ellipse, gold and clear stars");
-#endif // wxUSE_STATUSBAR
-            break ;
-
-        case 2:
-            // draw text in Arial or similar font
-            dc.DrawLine(50,25,50,35);
-            dc.DrawLine(45,30,55,30);
-            dc.DrawText(wxT("This is a Swiss-style string"), 50, 30);
-            wC = dc.GetTextForeground() ;
-            dc.SetTextForeground (_T("FIREBRICK"));
-
-            // no effect in msw ??
-            dc.SetTextBackground (_T("WHEAT"));
-            dc.DrawText(wxT("This is a Red string"), 50, 200);
-            dc.DrawRotatedText(wxT("This is a 45 deg string"), 50, 200, 45);
-            dc.DrawRotatedText(wxT("This is a 90 deg string"), 50, 200, 90);
-            wF = wxFont ( 18, wxROMAN, wxITALIC, wxBOLD, false, wxT("Times New Roman"));
-            dc.SetFont(wF);
-            dc.SetTextForeground (wC) ;
-            dc.DrawText(wxT("This is a Times-style string"), 50, 60);
-#if wxUSE_STATUSBAR
-            s = wxT("Swiss, Times text; red text, rotated and colored orange");
-#endif // wxUSE_STATUSBAR
-            break ;
-
-        case 3 :
-            // four arcs start and end points, center
-            dc.SetBrush(*wxGREEN_BRUSH);
-            dc.DrawArc ( 200,300, 370,230, 300,300 );
-            dc.SetBrush(*wxBLUE_BRUSH);
-            dc.DrawArc ( 270-50, 270-86, 270-86, 270-50, 270,270 );
-            dc.SetDeviceOrigin(-10,-10);
-            dc.DrawArc ( 270-50, 270-86, 270-86, 270-50, 270,270 );
-            dc.SetDeviceOrigin(0,0);
-
-            wP.SetColour (_T("CADET BLUE"));
-            dc.SetPen(wP);
-            dc.DrawArc ( 75,125, 110, 40, 75, 75 );
-
-            wP.SetColour (_T("SALMON"));
-            dc.SetPen(wP);
-            dc.SetBrush(*wxRED_BRUSH);
-            //top left corner, width and height, start and end angle
-                                 // 315 same center and x-radius as last pie-arc, half Y radius
-            dc.DrawEllipticArc(25,50,100,50,180.0,45.0) ;
-
-            wP = *wxCYAN_PEN ;
-            wP.SetWidth(3);
-            dc.SetPen(wP);
-                                 //wxTRANSPARENT));
-            dc.SetBrush (wxBrush (_T("SALMON"),wxSOLID)) ;
-            dc.DrawEllipticArc(300,  0,200,100, 0.0,145.0) ;
-                                 //same end point
-            dc.DrawEllipticArc(300, 50,200,100,90.0,145.0) ;
-            dc.DrawEllipticArc(300,100,200,100,90.0,345.0) ;
-
-#if wxUSE_STATUSBAR
-            s = wxT("This is an arc test page");
-#endif // wxUSE_STATUSBAR
-            break ;
-
-        case 4:
-            dc.DrawCheckMark ( 30,30,25,25);
-            dc.SetBrush (wxBrush (_T("SALMON"),wxTRANSPARENT));
-            dc.DrawCheckMark ( 80,50,75,75);
-            dc.DrawRectangle ( 80,50,75,75);
-#if wxUSE_STATUSBAR
-            s = wxT("Two check marks");
-#endif // wxUSE_STATUSBAR
-            break ;
-
-        case 5:
-            wF = wxFont ( 18, wxROMAN, wxITALIC, wxBOLD, false, wxT("Times New Roman"));
-            dc.SetFont(wF);
-            dc.DrawLine(0, 0, 200, 200);
-            dc.DrawLine(200, 0, 0, 200);
-            dc.DrawText(wxT("This is an 18pt string"), 50, 60);
-
-            // rescale and draw in blue
-            wP = *wxCYAN_PEN ;
-            dc.SetPen(wP);
-            dc.SetUserScale (2.0,0.5);
-            dc.SetDeviceOrigin(200,0);
-            dc.DrawLine(0, 0, 200, 200);
-            dc.DrawLine(200, 0, 0, 200);
-            dc.DrawText(wxT("This is an 18pt string 2 x 0.5 UserScaled"), 50, 60);
-            dc.SetUserScale (2.0,2.0);
-            dc.SetDeviceOrigin(200,200);
-            dc.DrawText(wxT("This is an 18pt string 2 x 2 UserScaled"), 50, 60);
-
-            wP = *wxRED_PEN ;
-            dc.SetPen(wP);
-            dc.SetUserScale (1.0,1.0);
-            dc.SetDeviceOrigin(0,10);
-            dc.SetMapMode (wxMM_METRIC) ; //svg ignores this
-            dc.DrawLine(0, 0, 200, 200);
-            dc.DrawLine(200, 0, 0, 200);
-            dc.DrawText(wxT("This is an 18pt string in MapMode"), 50, 60);
-#if wxUSE_STATUSBAR
-            s = wxT("Scaling test page");
-#endif // wxUSE_STATUSBAR
-            break ;
-
-        case 6:
-            dc.DrawIcon( wxIcon(mondrian_xpm), 10, 10 );
-            dc.DrawBitmap ( wxBitmap(svgbitmap_xpm), 50,15);
-#if wxUSE_STATUSBAR
-            s = wxT("Icon and Bitmap ");
-#endif // wxUSE_STATUSBAR
-            break ;
-
-    }
-#if wxUSE_STATUSBAR
-    m_child->SetStatusText(s);
-#endif // wxUSE_STATUSBAR
-}
-
-
-
-
-// ---------------------------------------------------------------------------
-// MyChild
-// ---------------------------------------------------------------------------
-
-MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title,
-const wxPoint& pos, const wxSize& size,
-const long style)
-: wxMDIChildFrame(parent, -1, title, pos, size, style)
-{
-
-    m_frame = (MyFrame *) parent ;
-#if wxUSE_STATUSBAR
-    CreateStatusBar();
-    SetStatusText(title);
-#endif // wxUSE_STATUSBAR
-
-    int w, h ;
-    GetClientSize ( &w, &h );
-    m_canvas = new MyCanvas(this, wxPoint(0, 0),  wxSize (w,h)  );
-    // Give it scrollbars
-    m_canvas->SetScrollbars(20, 20, 50, 50);
-
-}
-
-
-MyChild::~MyChild()
-{
-    m_frame->m_children.DeleteObject(this);
-}
-
-
-void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
-    Close(true);
-}
-
-
-bool MyChild::OnSave(wxString filename)
-{
-    wxSVGFileDC svgDC (filename, 600, 650) ;
-    m_canvas->OnDraw (svgDC);
-    return svgDC.Ok();
-}
-
-
-
-void MyChild::OnActivate(wxActivateEvent& event)
-{
-    if ( event.GetActive() && m_canvas )
-        m_canvas->SetFocus();
-}
-
-
-void MyChild::OnClose(wxCloseEvent& event)
-{
-    event.Skip();
-}
diff --git a/samples/svg/svgtest.dsp b/samples/svg/svgtest.dsp
deleted file mode 100644
index 3a04c8776b..0000000000
--- a/samples/svg/svgtest.dsp
+++ /dev/null
@@ -1,480 +0,0 @@
-# Microsoft Developer Studio Project File - Name="svgtest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=svgtest - 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 "svgtest.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 "svgtest.mak" CFG="svgtest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "svgtest - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "svgtest - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "svgtest - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "svgtest - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "svgtest - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "svgtest - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "svgtest - Win32 DLL Release" (based on "Win32 (x86) Application")
-!MESSAGE "svgtest - Win32 DLL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "svgtest - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "svgtest - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "svgtest - Win32 Universal Release" (based on "Win32 (x86) Application")
-!MESSAGE "svgtest - Win32 Universal Debug" (based on "Win32 (x86) Application")
-!MESSAGE "svgtest - Win32 Unicode Release" (based on "Win32 (x86) Application")
-!MESSAGE "svgtest - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE "svgtest - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "svgtest - Win32 Debug" (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)" == "svgtest - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\svgtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\svgtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv28u_svg.lib wxmswuniv28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\svgtest.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv28u_svg.lib wxmswuniv28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\svgtest.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "svgtest - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\svgtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\svgtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\svgtest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\svgtest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivud" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv28ud_svg.lib wxmswuniv28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\svgtest.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv28ud_svg.lib wxmswuniv28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\svgtest.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "svgtest - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\svgtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\svgtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswuniv" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_dll\mswuniv" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv28_svg.lib wxmswuniv28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\svgtest.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv28_svg.lib wxmswuniv28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\svgtest.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "svgtest - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\svgtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\svgtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\svgtest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\svgtest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_dll\mswunivd" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv28d_svg.lib wxmswuniv28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\svgtest.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmswuniv28d_svg.lib wxmswuniv28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\svgtest.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "svgtest - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\svgtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\svgtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw28u_svg.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\svgtest.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw28u_svg.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\svgtest.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "svgtest - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\svgtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\svgtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\svgtest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\svgtest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswud" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw28ud_svg.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\svgtest.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw28ud_svg.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\svgtest.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "svgtest - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\svgtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\svgtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\msw" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_dll\msw" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw28_svg.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\svgtest.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw28_svg.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\svgtest.exe" /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "svgtest - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\svgtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\svgtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\svgtest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\svgtest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_dll\mswd" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw28d_svg.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\svgtest.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-# ADD LINK32 wxmsw28d_svg.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\svgtest.exe" /debug /libpath:".\..\..\..\lib\vc_dll" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "svgtest - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\svgtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\svgtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv28u_svg.lib wxmswuniv28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\svgtest.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv28u_svg.lib wxmswuniv28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\svgtest.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "svgtest - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\svgtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\svgtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\svgtest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\svgtest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivud" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv28ud_svg.lib wxmswuniv28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\svgtest.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv28ud_svg.lib wxmswuniv28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\svgtest.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "svgtest - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\svgtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\svgtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswuniv" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\lib\vc_lib\mswuniv" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv28_svg.lib wxmswuniv28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\svgtest.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv28_svg.lib wxmswuniv28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\svgtest.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "svgtest - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\svgtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\svgtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\svgtest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\svgtest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_lib\mswunivd" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmswuniv28d_svg.lib wxmswuniv28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\svgtest.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmswuniv28d_svg.lib wxmswuniv28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\svgtest.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "svgtest - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\svgtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\svgtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw28u_svg.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\svgtest.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw28u_svg.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\svgtest.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "svgtest - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\svgtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\svgtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\svgtest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\svgtest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswud" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswud" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw28ud_svg.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\svgtest.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw28ud_svg.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\svgtest.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "svgtest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\svgtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\svgtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MD /Fdvc_msw\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\msw" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\..\lib\vc_lib\msw" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw28_svg.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\svgtest.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw28_svg.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\svgtest.exe" /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ELSEIF  "$(CFG)" == "svgtest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\svgtest"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\svgtest"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\svgtest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\svgtest.pdb /Od /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswd" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\lib\vc_lib\mswd" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d "NOPCH" /i .\..\..\include
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxmsw28d_svg.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\svgtest.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-# ADD LINK32 wxmsw28d_svg.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\svgtest.exe" /debug /libpath:".\..\..\..\lib\vc_lib" /subsystem:windows
-
-!ENDIF
-
-# Begin Target
-
-# Name "svgtest - Win32 DLL Universal Unicode Release"
-# Name "svgtest - Win32 DLL Universal Unicode Debug"
-# Name "svgtest - Win32 DLL Universal Release"
-# Name "svgtest - Win32 DLL Universal Debug"
-# Name "svgtest - Win32 DLL Unicode Release"
-# Name "svgtest - Win32 DLL Unicode Debug"
-# Name "svgtest - Win32 DLL Release"
-# Name "svgtest - Win32 DLL Debug"
-# Name "svgtest - Win32 Universal Unicode Release"
-# Name "svgtest - Win32 Universal Unicode Debug"
-# Name "svgtest - Win32 Universal Release"
-# Name "svgtest - Win32 Universal Debug"
-# Name "svgtest - Win32 Unicode Release"
-# Name "svgtest - Win32 Unicode Debug"
-# Name "svgtest - Win32 Release"
-# Name "svgtest - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\..\..\..\samples\sample.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\svgtest.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/samples/svg/svgtest.rc b/samples/svg/svgtest.rc
deleted file mode 100644
index 6df320751a..0000000000
--- a/samples/svg/svgtest.rc
+++ /dev/null
@@ -1,11 +0,0 @@
-aaaa                    ICON    "mondrian.ico"
-
-/* Useful if PROVIDE_DEFAULT_ICONS is set in wx_setup.h */
-#define IHaveMDIParentIcon
-#define IHaveMDIChildIcon
-
-mondrian 		ICON	"mondrian.ico"
-
-#include "wx/msw/wx.rc"
-
-svgbitmap               BITMAP  "SVGlogo24.bmp"
diff --git a/samples/tab/Makefile.in b/samples/tab/Makefile.in
deleted file mode 100644
index a103d17360..0000000000
--- a/samples/tab/Makefile.in
+++ /dev/null
@@ -1,173 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.1.6 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-EXEEXT = @EXEEXT@
-RESCOMP = @RESCOMP@
-SETFILE = @SETFILE@
-NM = @NM@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
-LDFLAGS_GUI = @LDFLAGS_GUI@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
-
-### Variables: ###
-
-DESTDIR = 
-WX_RELEASE = 2.5
-WX_VERSION = $(WX_RELEASE).4
-LIBDIRNAME = $(top_builddir)lib
-TAB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
-	$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
-TAB_OBJECTS =  \
-	$(__tab_os2_lib_res) \
-	tab_tab.o \
-	$(__tab___win32rc)
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
-@COND_PLATFORM_MAC_1@__tab___mac_setfilecmd = $(SETFILE) -a C tab$(EXEEXT)
-@COND_PLATFORM_MAC_1@__tab___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
-COND_PLATFORM_OS2_1___tab___os2_emxbindcmd = $(NM) tab$(EXEEXT) | if grep -q \
-	pmwin.763 ; then emxbind -ep tab$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__tab___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___tab___os2_emxbindcmd)
-@COND_PLATFORM_OS2_1@__tab_os2_lib_res = \
-@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__tab_bundle___depname = tab_bundle
-@COND_TOOLKIT_COCOA@____tab_BUNDLE_TGT_REF_DEP = tab.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____tab_BUNDLE_TGT_REF_DEP = tab.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
-	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-@COND_PLATFORM_WIN32_1@__tab___win32rc = tab_tab_rc.o
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
-	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
-	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
-	$(srcdir)/../../samples -i $(top_srcdir)/include -o tab$(EXEEXT) Carbon.r \
-	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: tab$(EXEEXT) $(__tab_bundle___depname)
-
-install: all
-
-uninstall: 
-
-install-strip: install
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f tab$(EXEEXT)
-	rm -rf tab.app
-
-distclean: clean
-	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-tab$(EXEEXT): $(TAB_OBJECTS) $(__tab___win32rc)
-	$(CXX) -o $@ $(TAB_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI)
-	$(__tab___mac_rezcmd)
-	$(__tab___mac_setfilecmd)
-	$(__tab___os2_emxbindcmd)
-	$(SAMPLES_RPATH_POSTLINK)
-
-tab.app/Contents/PkgInfo: tab$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p tab.app/Contents
-	mkdir -p tab.app/Contents/MacOS
-	mkdir -p tab.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/tab/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >tab.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >tab.app/Contents/PkgInfo
-	
-	
-	ln -f tab$(EXEEXT) tab.app/Contents/MacOS/tab
-	
-	
-	cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.rsrc tab.app/Contents/Resources/tab.rsrc
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns tab.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@tab_bundle: $(____tab_BUNDLE_TGT_REF_DEP)
-
-tab_tab.o: $(srcdir)/tab.cpp
-	$(CXXC) -c -o $@ $(TAB_CXXFLAGS) $(srcdir)/tab.cpp
-
-tab_tab_rc.o: $(srcdir)/tab.rc
-	$(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean tab_bundle
diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in
index 6abd4704b9..e34508ba63 100644
--- a/samples/taskbar/Makefile.in
+++ b/samples/taskbar/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 TASKBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in
index 51b2f18172..74248f6f41 100644
--- a/samples/text/Makefile.in
+++ b/samples/text/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 TEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in
index 9ac17186e8..03fcd025a2 100644
--- a/samples/thread/Makefile.in
+++ b/samples/thread/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 THREAD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in
index 09a6933e16..821d5f8314 100644
--- a/samples/toolbar/Makefile.in
+++ b/samples/toolbar/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 TOOLBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in
index 9538d7f262..653db04e9e 100644
--- a/samples/treectrl/Makefile.in
+++ b/samples/treectrl/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 TREECTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index 70988cda7c..a32d4d0c81 100644
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -352,14 +352,20 @@ void MyFrame::OnIdle(wxIdleEvent& event)
     if ( m_treeCtrl )
     {
         wxTreeItemId idRoot = m_treeCtrl->GetRootItem();
+        wxString status;
+        if (idRoot.IsOk())
+        {
+            wxTreeItemId idLast = m_treeCtrl->GetLastChild(idRoot);
+            status = wxString::Format(
+                _T("Root/last item is %svisible/%svisible"),
+                m_treeCtrl->IsVisible(idRoot) ? _T("") : _T("not "),
+                idLast.IsOk() && m_treeCtrl->IsVisible(idLast)
+                    ? _T("") : _T("not "));
+        }
+        else
+            status = _T("No root item");
 
-        SetStatusText(wxString::Format
-                      (
-                        _T("Root/last item is %svisible/%svisible"),
-                        m_treeCtrl->IsVisible(idRoot) ? _T("") : _T("not "),
-                        m_treeCtrl->IsVisible(m_treeCtrl->GetLastChild(idRoot))
-                            ? _T("") : _T("not ")
-                      ), 1);
+        SetStatusText(status, 1);
     }
 #endif // wxUSE_STATUSBAR
 
diff --git a/samples/treectrl/treetest.dsp b/samples/treectrl/treetest.dsp
deleted file mode 100644
index f362ccfe96..0000000000
--- a/samples/treectrl/treetest.dsp
+++ /dev/null
@@ -1,155 +0,0 @@
-# Microsoft Developer Studio Project File - Name="treetest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=treetest - 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 "treetest.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 "treetest.mak" CFG="treetest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "treetest - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE "treetest - Win32 Debug DLL" (based on "Win32 (x86) Application")
-!MESSAGE "treetest - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "treetest - Win32 Debug" (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)" == "treetest - 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 /W4 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
-# ADD CPP /nologo /MD /W4 /O2 /I "../../include" /I "..\..\lib\mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D "WXUSINGDLL" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /i "../../include" /d "NDEBUG"
-# ADD RSC /l 0x409 /i "../../include" /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 comctl32.lib rpcrt4.lib wsock32.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 ..\..\lib\wxmsw250.lib /nologo /subsystem:windows /machine:I386
-
-!ELSEIF  "$(CFG)" == "treetest - 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 /W4 /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
-# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../../include" /I "..\..\lib\mswdlld" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D "__WXDEBUG__" /D WXDEBUG=1 /D "WXUSINGDLL" /YX /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 0x409 /i "../../include" /d "_DEBUG"
-# ADD RSC /l 0x409 /i "../../include" /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 comctl32.lib rpcrt4.lib wsock32.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 ..\..\lib\wxmsw250d.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "treetest - 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 /W4 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
-# ADD CPP /nologo /MD /W4 /O2 /I "../../include" /I "..\..\lib\msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /i "../../include" /d "NDEBUG"
-# ADD RSC /l 0x409 /i "../../include" /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 comctl32.lib rpcrt4.lib wsock32.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 ..\..\lib\zlib.lib ..\..\lib\regex.lib ..\..\lib\png.lib ..\..\lib\jpeg.lib ..\..\lib\tiff.lib ..\..\lib\wxmsw.lib /nologo /subsystem:windows /machine:I386
-
-!ELSEIF  "$(CFG)" == "treetest - 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 /W4 /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
-# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../../include" /I "..\..\lib\mswd" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D "__WXDEBUG__" /D WXDEBUG=1 /YX /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 0x409 /i "../../include" /d "_DEBUG"
-# ADD RSC /l 0x409 /i "../../include" /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 comctl32.lib rpcrt4.lib wsock32.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 ..\..\lib\zlibd.lib ..\..\lib\regexd.lib ..\..\lib\pngd.lib ..\..\lib\jpegd.lib ..\..\lib\tiffd.lib ..\..\lib\wxmswd.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "treetest - Win32 Release DLL"
-# Name "treetest - Win32 Debug DLL"
-# Name "treetest - Win32 Release"
-# Name "treetest - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\treetest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\treetest.rc
-# End Source File
-# End Target
-# End Project
diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in
index acc073fcaf..b76b856833 100644
--- a/samples/typetest/Makefile.in
+++ b/samples/typetest/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 TYPETEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in
index 57782a1dea..fdd660f3c2 100644
--- a/samples/validate/Makefile.in
+++ b/samples/validate/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 VALIDATE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in
index 8bcb573381..2f7e4acb90 100644
--- a/samples/vscroll/Makefile.in
+++ b/samples/vscroll/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 VSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in
index f028147a17..c564b8f2f5 100644
--- a/samples/widgets/Makefile.in
+++ b/samples/widgets/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 WIDGETS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in
index 4207c47cb9..1d4c90b9f1 100644
--- a/samples/wizard/Makefile.in
+++ b/samples/wizard/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 WIZARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in
index 2299ec5977..bbb36d96f9 100644
--- a/samples/xrc/Makefile.in
+++ b/samples/xrc/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 XRCDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/setup.h.in b/setup.h.in
index b9ba86f943..b978ce3f6e 100644
--- a/setup.h.in
+++ b/setup.h.in
@@ -807,6 +807,9 @@
 /* Define if you have ftime() */
 #undef HAVE_FTIME
 
+/* Define if round() is available */
+#undef HAVE_ROUND
+
 /* Define if you have support for large (64 bit size) files */
 #undef HAVE_LARGEFILE_SUPPORT
 
diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp
index 87fcc78454..9dfb74508f 100644
--- a/src/aui/auibook.cpp
+++ b/src/aui/auibook.cpp
@@ -666,7 +666,14 @@ int wxAuiDefaultTabArt::ShowDropDown(wxWindow* wnd,
     for (i = 0; i < count; ++i)
     {
         const wxAuiNotebookPage& page = pages.Item(i);
-        menuPopup.AppendCheckItem(1000+i, page.caption);
+        wxString caption = page.caption;
+        
+        // if there is no caption, make it a space.  This will prevent
+        // an assert in the menu code.
+        if (caption.IsEmpty())
+            caption = wxT(" ");
+            
+        menuPopup.AppendCheckItem(1000+i, caption);
     }
 
     if (active_idx != -1)
@@ -1935,7 +1942,8 @@ void wxAuiTabContainer::DoShowHide()
     for (i = 0; i < page_count; ++i)
     {
         wxAuiNotebookPage& page = pages.Item(i);
-        ShowWnd(page.window, page.active);
+        if (!page.active)
+            ShowWnd(page.window, false);
     }
 }
 
@@ -2598,7 +2606,8 @@ bool wxAuiNotebook::InsertPage(size_t page_idx,
     // select is false, it must become the "current page"
     // (though no select events will be fired)
     if (!select && m_tabs.GetPageCount() == 1)
-        m_curpage = GetPageIndex(page);
+        select = true;
+        //m_curpage = GetPageIndex(page);
 
     wxAuiTabCtrl* active_tabctrl = GetActiveTabCtrl();
     if (page_idx >= active_tabctrl->GetPageCount())
diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp
index f2bfb08188..82f0d04aac 100644
--- a/src/aui/dockart.cpp
+++ b/src/aui/dockart.cpp
@@ -683,6 +683,8 @@ void wxAuiDefaultDockArt::DrawPaneButton(wxDC& dc, wxWindow *WXUNUSED(window),
                                       wxAuiPaneInfo& pane)
 {
     wxBitmap bmp;
+	if (!(&pane))
+		return;
     switch (button)
     {
         default:
diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index e758807ecc..ea05d8bbd7 100644
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -1866,7 +1866,19 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
 
     // empty all docks out
     for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
-        docks.Item(i).panes.Empty();
+    {
+        wxAuiDockInfo& dock = docks.Item(i);
+        
+        // empty out all panes, as they will be readded below
+        dock.panes.Empty();
+        
+        if (dock.fixed)
+        {
+            // always reset fixed docks' sizes, because
+            // the contained windows may have been resized
+            dock.size = 0;
+        }
+    }
 
 
     // iterate through all known panes, filing each
diff --git a/src/aui/tabmdi.cpp b/src/aui/tabmdi.cpp
index f7328f7864..853b5ae72b 100644
--- a/src/aui/tabmdi.cpp
+++ b/src/aui/tabmdi.cpp
@@ -177,7 +177,10 @@ void wxAuiMDIParentFrame::SetChildMenuBar(wxAuiMDIChildFrame* pChild)
     if (!pChild)
     {
         // No Child, set Our menu bar back.
-        SetMenuBar(m_pMyMenuBar);
+        if (m_pMyMenuBar)
+            SetMenuBar(m_pMyMenuBar);
+             else
+            SetMenuBar(GetMenuBar());
 
         // Make sure we know our menu bar is in use
         m_pMyMenuBar = NULL;
@@ -331,11 +334,6 @@ void wxAuiMDIParentFrame::DoHandleMenu(wxCommandEvent& event)
                 {
                     return; // failure
                 }
-                 else
-                {
-                    delete m_pActiveChild;
-                    m_pActiveChild = NULL;
-                }
             }
             break;
         case wxWINDOWNEXT:
diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 26a083b7b0..abf89f4fbd 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -1855,7 +1855,7 @@ void wxComboCtrlBase::ShowPopup()
     }
 
     winPopup->Enable();
-    
+
     wxASSERT( !m_popup || m_popup == popup ); // Consistency check.
 
     wxSize adjustedSize = m_popupInterface->GetAdjustedSize(widthPopup,
@@ -2191,16 +2191,19 @@ void wxComboCtrlBase::SetValueWithEvent(const wxString& value, bool withEvent)
             m_text->SelectAll();
     }
 
-    m_valueString = value;
-
-    Refresh();
-
     // Since wxComboPopup may want to paint the combo as well, we need
     // to set the string value here (as well as sometimes in ShowPopup).
-    if ( m_valueString != value && m_popupInterface )
+    if ( m_valueString != value )
     {
-        m_popupInterface->SetStringValue(value);
+        m_valueString = value;
+
+        EnsurePopupControl();
+
+        if (m_popupInterface)
+            m_popupInterface->SetStringValue(value);
     }
+
+    Refresh();
 }
 
 void wxComboCtrlBase::SetValue(const wxString& value)
diff --git a/src/common/config.cpp b/src/common/config.cpp
index 16cc86d8f2..c9d1ec2a23 100644
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -424,7 +424,7 @@ wxString wxExpandEnvVars(const wxString& str)
             else {
               // skip closing bracket unless the variables wasn't expanded
               if ( pszValue == NULL )
-                strResult << (char)bracket;
+                strResult << (wxChar)bracket;
               m++;
             }
           }
diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index c40dedee2b..a7d61a6d2d 100644
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -210,7 +210,18 @@ struct tm *wxLocaltime_r(const time_t* ticks, struct tm* temp)
   // thread local storage for localtime anyway.
   wxMutexLocker locker(timeLock);
 #endif
-  memcpy(temp, localtime(ticks), sizeof(struct tm));
+
+  // Borland CRT crashes when passed 0 ticks for some reason, see SF bug 1704438
+#ifdef __BORLANDC__
+  if ( !*ticks )
+      return NULL;
+#endif
+
+  const tm * const t = localtime(ticks);
+  if ( !t )
+      return NULL;
+
+  memcpy(temp, t, sizeof(struct tm));
   return temp;
 }
 #endif // !HAVE_LOCALTIME_R
@@ -223,6 +234,16 @@ struct tm *wxGmtime_r(const time_t* ticks, struct tm* temp)
   // using thread local storage for gmtime anyway.
   wxMutexLocker locker(timeLock);
 #endif
+
+#ifdef __BORLANDC__
+  if ( !*ticks )
+      return NULL;
+#endif
+
+  const tm * const t = gmtime(ticks);
+  if ( !t )
+      return NULL;
+
   memcpy(temp, gmtime(ticks), sizeof(struct tm));
   return temp;
 }
@@ -660,7 +681,7 @@ void wxDateTime::Tm::ComputeWeekDay()
     // compute the week day from day/month/year: we use the dumbest algorithm
     // possible: just compute our JDN and then use the (simple to derive)
     // formula: weekday = (JDN + 1.5) % 7
-    wday = (wxDateTime::wxDateTime_t)((wxDateTime::WeekDay)(GetTruncatedJDN(mday, mon, year) + 2) % 7);
+    wday = (wxDateTime::wxDateTime_t)((GetTruncatedJDN(mday, mon, year) + 2) % 7);
 }
 
 void wxDateTime::Tm::AddMonths(int monDiff)
diff --git a/src/common/db.cpp b/src/common/db.cpp
index 5e37eaf860..be855ba25c 100644
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -62,7 +62,10 @@ wxChar const *SQL_LOG_FILENAME         = wxT("sqllog.txt");
 wxChar const *SQL_CATALOG_FILENAME     = wxT("catalog.txt");
 
 #ifdef __WXDEBUG__
+    #include "wx/thread.h"
+
     extern wxList TablesInUse;
+    extern wxCriticalSection csTablesInUse;
 #endif
 
 // SQL Log defaults to be used by GetDbConnection
@@ -1746,21 +1749,24 @@ void wxDb::Close(void)
     wxASSERT(nTables == 0);
 
 #ifdef __WXDEBUG__
-    wxTablesInUse *tiu;
-    wxList::compatibility_iterator pNode;
-    pNode = TablesInUse.GetFirst();
-    wxString s,s2;
-    while (pNode)
     {
-        tiu = (wxTablesInUse *)pNode->GetData();
-        if (tiu->pDb == this)
+        wxCriticalSectionLocker lock(csTablesInUse);
+        wxTablesInUse *tiu;
+        wxList::compatibility_iterator pNode;
+        pNode = TablesInUse.GetFirst();
+        wxString s,s2;
+        while (pNode)
         {
-            s.Printf(wxT("(%-20s)     tableID:[%6lu]     pDb:[%p]"),
-                     tiu->tableName, tiu->tableID, wx_static_cast(void*, tiu->pDb));
-            s2.Printf(wxT("Orphaned table found using pDb:[%p]"), wx_static_cast(void*, this));
-            wxLogDebug(s.c_str(),s2.c_str());
+            tiu = (wxTablesInUse *)pNode->GetData();
+            if (tiu->pDb == this)
+            {
+                s.Printf(wxT("(%-20s)     tableID:[%6lu]     pDb:[%p]"),
+                        tiu->tableName, tiu->tableID, wx_static_cast(void*, tiu->pDb));
+                s2.Printf(wxT("Orphaned table found using pDb:[%p]"), wx_static_cast(void*, this));
+                wxLogDebug(s.c_str(),s2.c_str());
+            }
+            pNode = pNode->GetNext();
         }
-        pNode = pNode->GetNext();
     }
 #endif
 
@@ -2306,7 +2312,6 @@ bool wxDb::ExecSql(const wxString &pSqlStmt, wxDbColInf** columns, short& numcol
             return false;
         }
 
-        pColInf[colNum].sqlDataType = Sqllen;
         switch (Sqllen)
         {
 #if wxUSE_UNICODE
diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index 4d8f113e6c..423c1b5a98 100644
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -59,7 +59,10 @@ ULONG lastTableID = 0;
 
 
 #ifdef __WXDEBUG__
+    #include "wx/thread.h"
+
     wxList TablesInUse;
+    wxCriticalSection csTablesInUse;
 #endif
 
 
@@ -195,7 +198,10 @@ bool wxDbTable::initialize(wxDb *pwxDb, const wxString &tblName, const UWORD num
     tableInUse->tableName = tblName;
     tableInUse->tableID   = tableID;
     tableInUse->pDb       = pDb;
-    TablesInUse.Append(tableInUse);
+    {
+        wxCriticalSectionLocker lock(csTablesInUse);
+        TablesInUse.Append(tableInUse);
+    }
 #endif
 
     pDb->WriteSqlLog(s);
@@ -321,17 +327,20 @@ void wxDbTable::cleanup()
         bool found = false;
 
         wxList::compatibility_iterator pNode;
-        pNode = TablesInUse.GetFirst();
-        while (pNode && !found)
         {
-            if (((wxTablesInUse *)pNode->GetData())->tableID == tableID)
+            wxCriticalSectionLocker lock(csTablesInUse);
+            pNode = TablesInUse.GetFirst();
+            while (!found && pNode)
             {
-                found = true;
-                delete (wxTablesInUse *)pNode->GetData();
-                TablesInUse.Erase(pNode);
+                if (((wxTablesInUse *)pNode->GetData())->tableID == tableID)
+                {
+                    found = true;
+                    delete (wxTablesInUse *)pNode->GetData();
+                    TablesInUse.Erase(pNode);
+                }
+                else
+                    pNode = pNode->GetNext();
             }
-            else
-                pNode = pNode->GetNext();
         }
         if (!found)
         {
diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
index 613c6a1bcf..f795d13f05 100644
--- a/src/common/dcgraph.cpp
+++ b/src/common/dcgraph.cpp
@@ -200,6 +200,12 @@ void wxGCDC::DoSetClippingRegionAsRegion( const wxRegion &region )
 void wxGCDC::DestroyClippingRegion()
 {
     m_graphicContext->ResetClip();
+    // currently the clip eg of a window extends to the area between the scrollbars
+    // so we must explicitely make sure it only covers the area we want it to draw
+    int width, height ;
+    GetSize( &width , &height ) ;
+    m_graphicContext->Clip( DeviceToLogicalX(0) , DeviceToLogicalY(0) , width, height );
+    
     m_graphicContext->SetPen( m_pen );
     m_graphicContext->SetBrush( m_brush );
 
@@ -495,20 +501,15 @@ void wxGCDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
     if ( !m_logicalFunctionSupported )
         return;
 
-    bool fill = m_brush.GetStyle() != wxTRANSPARENT;
-
     wxGraphicsPath path = m_graphicContext->CreatePath();
     m_graphicContext->PushState();
-    m_graphicContext->Translate(x+w/2,y+h/2);
+    m_graphicContext->Translate(x+w/2.0,y+h/2.0);
     wxDouble factor = ((wxDouble) w) / h;
     m_graphicContext->Scale( factor , 1.0);
-    if ( fill && (sa!=ea) )
-        path.MoveToPoint(0,0);
+
     // since these angles (ea,sa) are measured counter-clockwise, we invert them to
     // get clockwise angles
-    path.AddArc( 0, 0, h/2 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
-    if ( fill && (sa!=ea) )
-        path.AddLineToPoint(0,0);
+    path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
     m_graphicContext->DrawPath( path );
     m_graphicContext->PopState();
 }
@@ -692,6 +693,13 @@ void wxGCDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y,
     if (w == 0 || h == 0)
         return;
 
+    if ( m_graphicContext->ShouldOffset() )
+    {
+        // if we are offsetting the entire rectangle is moved 0.5, so the
+        // border line gets off by 1
+        w -= 1;
+        h -= 1;
+    }
     m_graphicContext->DrawRoundedRectangle( x,y,w,h,radius);
 }
 
@@ -702,6 +710,13 @@ void wxGCDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
     if ( !m_logicalFunctionSupported )
         return;
 
+    if ( m_graphicContext->ShouldOffset() )
+    {
+        // if we are offsetting the entire rectangle is moved 0.5, so the
+        // border line gets off by 1
+        w -= 1;
+        h -= 1;
+    }
     m_graphicContext->DrawEllipse(x,y,w,h);
 }
 
diff --git a/src/common/dcsvg.cpp b/src/common/dcsvg.cpp
deleted file mode 100644
index 213cb11369..0000000000
--- a/src/common/dcsvg.cpp
+++ /dev/null
@@ -1,849 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        svg.cpp
-// Purpose:     SVG sample
-// Author:      Chris Elliott
-// Modified by:
-// RCS-ID:      $Id$
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/svg/dcsvg.h"
-
-#include "wx/image.h"
-
-#define wxSVG_DEBUG FALSE
-// or TRUE to see the calls being executed
-#define newline    wxString(wxT("\n"))
-#define space      wxString(wxT(" "))
-#define semicolon  wxString(wxT(";"))
-#define     wx_round(a)    (int)((a)+.5)
-
-#ifdef __BORLANDC__
-#pragma warn -rch
-#pragma warn -ccc
-#endif
-
-static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; } ;
-
-wxString wxColStr ( wxColour c )
-{
-    unsigned char r, g, b ;
-    r = c.Red ();
-    g = c.Green ();
-    b = c. Blue ();
-
-    // possible Unicode bug here
-    wxString s = wxDecToHex(r) + wxDecToHex(g) + wxDecToHex(b) ;
-    return s ;
-}
-
-
-wxString wxBrushString ( wxColour c, int style )
-{
-    wxString s = wxT("fill:#") + wxColStr (c)  + semicolon + space ;
-    switch ( style )
-    {
-        case wxSOLID :
-            s = s + wxT("fill-opacity:1.0; ");
-            break ;
-        case wxTRANSPARENT:
-            s = s + wxT("fill-opacity:0.0; ");
-            break ;
-
-        default :
-            wxASSERT_MSG(FALSE, wxT("wxSVGFileDC::Requested Brush Style not available")) ;
-
-    }
-    s = s + newline ;
-    return s ;
-}
-
-
-void wxSVGFileDC::Init (wxString f, int Width, int Height, float dpi)
-
-{
-    //set up things first  wxDCBase does all this?
-    m_width = Width ;
-    m_height = Height ;
-
-    m_clipping = FALSE;
-    m_OK = TRUE;
-
-    m_mm_to_pix_x = dpi/25.4;
-    m_mm_to_pix_y = dpi/25.4;
-
-    m_signX = m_signY = 1;
-
-    m_userScaleX = m_userScaleY =
-        m_deviceOriginX = m_deviceOriginY = 0;
-
-    m_OriginX = m_OriginY = 0;
-    m_logicalOriginX = m_logicalOriginY = 0;
-    m_logicalScaleX = m_logicalScaleY = 0 ;
-    m_scaleX = m_scaleY = 1.0 ;
-
-    m_logicalFunction = wxCOPY;
-    m_backgroundMode = wxTRANSPARENT;
-    m_mappingMode = wxMM_TEXT;
-
-    m_backgroundBrush = *wxTRANSPARENT_BRUSH;
-    m_textForegroundColour = *wxBLACK;
-    m_textBackgroundColour = *wxWHITE;
-    m_colour = wxColourDisplay();
-
-    m_pen   = *wxBLACK_PEN;
-    m_font  = *wxNORMAL_FONT;
-    m_brush = *wxWHITE_BRUSH;
-
-    m_graphics_changed = TRUE ;
-
-    ////////////////////code here
-
-    m_outfile = new wxFileOutputStream(f) ;
-    m_OK = m_outfile->Ok ();
-    if (m_OK)
-    {
-        m_filename = f ;
-        m_sub_images = 0 ;
-        wxString s ;
-        s = wxT("<?xml version=\"1.0\" standalone=\"no\"?>") ; s = s + newline ;
-        write(s);
-        s = wxT("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 20010904//EN\" ") + newline ;
-        write(s);
-        s = wxT("\"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd\"> ")+ newline ;
-        write(s);
-        s.Printf ( wxT("<svg width=\"%.2gcm\" height=\"%.2gcm\" viewBox=\"0 0 %d %d \"> \n"), float(Width)/dpi*2.54, float(Height)/dpi*2.54, Width, Height );
-        write(s);
-        s = wxT("<title>SVG Picture created as ") + wxFileNameFromPath(f) + wxT(" </title>") + newline ;
-        write(s);
-        s = wxString (wxT("<desc>Picture generated by wxSVG ")) + wxSVGVersion + wxT(" </desc>")+ newline ;
-        write(s);
-        s =  wxT("<g style=\"fill:black; stroke:black; stroke-width:1\">") + newline ;
-        write(s);
-
-    }
-}
-
-
-// constructors
-wxSVGFileDC::wxSVGFileDC (wxString f)
-{
-    // quarter 640x480 screen display at 72 dpi
-    Init (f,320,240,72.0);
-};
-
-wxSVGFileDC::wxSVGFileDC (wxString f, int Width, int Height)
-{
-    Init (f,Width,Height,72.0);
-};
-
-wxSVGFileDC::wxSVGFileDC (wxString f, int Width, int Height, float dpi)
-{
-    Init (f,Width,Height,dpi);
-};
-
-wxSVGFileDC::~wxSVGFileDC()
-{
-    wxString s = wxT("</g> \n</svg> \n") ;
-    write(s);
-    delete m_outfile ;
-}
-
-
-//////////////////////////////////////////////////////////////////////////////////////////
-
-void wxSVGFileDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
-{
-    if (m_graphics_changed) NewGraphics ();
-    wxString s ;
-    s.Printf ( wxT("<path d=\"M%d %d L%d %d\" /> \n"), x1,y1,x2,y2 );
-    if (m_OK)
-    {
-        write(s);
-    }
-    wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DrawLine Call executed")) ;
-    CalcBoundingBox(x1, y1) ;
-    CalcBoundingBox(x2, y2) ;
-    return;
-};
-
-void wxSVGFileDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset , wxCoord yoffset )
-{
-    for ( int i = 1; i < n ; i++ )
-    {
-        DoDrawLine ( points [i-1].x + xoffset, points [i-1].y + yoffset,
-            points [ i ].x + xoffset, points [ i ].y + yoffset ) ;
-    }
-}
-
-
-void wxSVGFileDC::DoDrawPoint (wxCoord x1, wxCoord y1)
-{
-    wxString s;
-    if (m_graphics_changed) NewGraphics ();
-    s = wxT("<g style = \"stroke-linecap:round;\" > ") + newline ;
-    write(s);
-    DrawLine ( x1,y1,x1,y1 );
-    s = wxT("</g>");
-    write(s);
-}
-
-
-void wxSVGFileDC::DoDrawCheckMark(wxCoord x1, wxCoord y1, wxCoord width, wxCoord height)
-{
-    wxDCBase::DoDrawCheckMark (x1,y1,width,height) ;
-}
-
-
-void wxSVGFileDC::DoDrawText(const wxString& text, wxCoord x1, wxCoord y1)
-{
-    DoDrawRotatedText(text, x1,y1,0.0);
-    wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DrawText Call executed")) ;
-}
-
-
-void wxSVGFileDC::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y, double angle)
-{
-    //known bug; if the font is drawn in a scaled DC, it will not behave exactly as wxMSW
-    if (m_graphics_changed) NewGraphics ();
-    wxString s, sTmp;
-
-    // calculate bounding box
-    wxCoord w, h, desc ;
-    DoGetTextExtent(sText, &w, &h, &desc);
-
-    double rad = DegToRad(angle);
-
-    // wxT("upper left") and wxT("upper right")
-    CalcBoundingBox(x, y);
-    CalcBoundingBox((wxCoord)(x + w*cos(rad)), (wxCoord)(y - h*sin(rad)));
-
-    // wxT("bottom left") and wxT("bottom right")
-    x += (wxCoord)(h*sin(rad));
-    y += (wxCoord)(h*cos(rad));
-    CalcBoundingBox(x, y);
-    CalcBoundingBox((wxCoord)(x + h*sin(rad)), (wxCoord)(y + h*cos(rad)));
-
-    if (m_backgroundMode == wxSOLID)
-    {
-        // draw background first
-        // just like DoDrawRectangle except we pass the text color to it and set the border to a 1 pixel wide text background
-
-        wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::Draw Rotated Text Call plotting text background")) ;
-        sTmp.Printf ( wxT(" <rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\"  "), x,y+desc-h, w, h );
-        s = sTmp + wxT("style=\"fill:#") + wxColStr (m_textBackgroundColour) + wxT("; ") ;
-        s = s + wxT("stroke-width:1; stroke:#") + wxColStr (m_textBackgroundColour) + wxT("; ") ;
-        sTmp.Printf ( wxT("\" transform=\"rotate( %.2g %d %d )  \">"), -angle, x,y ) ;
-        s = s + sTmp + newline ;
-        write(s);
-    }
-    //now do the text itself
-    s.Printf (wxT(" <text x=\"%d\" y=\"%d\" "),x,y );
-
-    sTmp = m_font.GetFaceName () ;
-    if (sTmp.Len () > 0)  s = s + wxT("style=\"font-family:") + sTmp + wxT("; ");
-    else s = s + wxT("style=\" ") ;
-
-    wxString fontweights [3] = { wxT("normal"), wxT("lighter"), wxT("bold") };
-    s = s + wxT("font-weight:") + fontweights[m_font.GetWeight() - wxNORMAL] + semicolon + space;
-
-    wxString fontstyles [5] = { wxT("normal"), wxT("style error"), wxT("style error"), wxT("italic"), wxT("oblique") };
-    s = s + wxT("font-style:") + fontstyles[m_font.GetStyle() - wxNORMAL] + semicolon  + space;
-
-    sTmp.Printf (wxT("font-size:%dpt; fill:#"), m_font.GetPointSize () );
-    s = s + sTmp ;
-    s = s + wxColStr (m_textForegroundColour) + wxT("; stroke:#") + wxColStr (m_textForegroundColour) + wxT("; ") ;
-    sTmp.Printf ( wxT("stroke-width:0;\"  transform=\"rotate( %.2g %d %d )  \" >"),  -angle, x,y ) ;
-    s = s + sTmp + sText + wxT("</text> ") + newline ;
-    if (m_OK)
-    {
-        write(s);
-    }
-    wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DrawRotatedText Call executed")) ;
-
-}
-
-
-void wxSVGFileDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
-{
-    DoDrawRoundedRectangle(x, y, width, height, 0)  ;
-}
-
-
-void wxSVGFileDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius )
-
-{
-    if (m_graphics_changed) NewGraphics ();
-    wxString s ;
-
-    s.Printf ( wxT(" <rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" rx=\"%.2g\" "),
-               x, y, width, height, radius );
-
-    s = s + wxT(" /> ") + newline ;
-    write(s);
-
-    wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawRoundedRectangle Call executed")) ;
-    CalcBoundingBox(x, y) ;
-    CalcBoundingBox(x + width, y + height) ;
-
-}
-
-
-void wxSVGFileDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle)
-{
-    if (m_graphics_changed) NewGraphics ();
-    wxString s, sTmp ;
-    s = wxT("<polygon style=\"") ;
-    if ( fillStyle == wxODDEVEN_RULE )
-        s = s + wxT("fill-rule:evenodd; ");
-    else
-        s = s + wxT("fill-rule:nonzero; ");
-
-    s = s  + wxT("\" \npoints=\"") ;
-
-    for (int i = 0; i < n;  i++)
-    {
-        sTmp.Printf ( wxT("%d,%d"), points [i].x+xoffset, points[i].y+yoffset );
-        s = s + sTmp + newline ;
-        CalcBoundingBox ( points [i].x+xoffset, points[i].y+yoffset);
-    }
-    s = s + wxT("\" /> ") ;
-    s = s + newline ;
-    write(s);
-
-    wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawPolygon Call executed")) ;
-}
-
-
-void wxSVGFileDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord height)
-
-{
-    if (m_graphics_changed) NewGraphics ();
-
-    int rh = height /2 ;
-    int rw = width  /2 ;
-
-    wxString s;
-    s.Printf ( wxT("<ellipse cx=\"%d\" cy=\"%d\" rx=\"%d\" ry=\"%d\" "), x+rw,y+rh, rw, rh );
-    s = s + wxT(" /> ") + newline ;
-
-    write(s);
-
-    wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawEllipse Call executed")) ;
-    CalcBoundingBox(x, y) ;
-    CalcBoundingBox(x + width, y + height) ;
-}
-
-
-void wxSVGFileDC::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc)
-{
-    /* Draws an arc of a circle, centred on (xc, yc), with starting point
-    (x1, y1) and ending at (x2, y2). The current pen is used for the outline
-    and the current brush for filling the shape.
-
-    The arc is drawn in an anticlockwise direction from the start point to
-    the end point.
-
-    Might be better described as Pie drawing */
-
-    if (m_graphics_changed) NewGraphics ();
-    wxString s ;
-
-    // we need the radius of the circle which has two estimates
-    double r1 = sqrt ( double( (x1-xc)*(x1-xc) ) + double( (y1-yc)*(y1-yc) ) );
-    double r2 = sqrt ( double( (x2-xc)*(x2-xc) ) + double( (y2-yc)*(y2-yc) ) );
-
-    wxASSERT_MSG( (fabs ( r2-r1 ) <= 3), wxT("wxSVGFileDC::DoDrawArc Error in getting radii of circle")) ;
-    if ( fabs ( r2-r1 ) > 3 )    //pixels
-    {
-        s = wxT("<!--- wxSVGFileDC::DoDrawArc Error in getting radii of circle --> \n") ;
-        write(s);
-    }
-
-    double theta1 = atan2((double)(yc-y1),(double)(x1-xc));
-    if ( theta1 < 0 ) theta1 = theta1 + M_PI * 2;
-    double theta2 = atan2((double)(yc-y2), (double)(x2-xc));
-    if ( theta2 < 0 ) theta2 = theta2 + M_PI * 2;
-    if ( theta2 < theta1 ) theta2 = theta2 + M_PI *2 ;
-
-    int fArc  ;                  // flag for large or small arc 0 means less than 180 degrees
-    if ( fabs(theta2 - theta1) > M_PI ) fArc = 1; else fArc = 0 ;
-
-    int fSweep = 0 ;             // flag for sweep always 0
-
-    s.Printf ( wxT("<path d=\"M%d %d A%.2g %.2g 0.0 %d %d %d %d L%d %d z "),
-        x1,y1, r1, r2, fArc, fSweep, x2, y2, xc, yc );
-
-    // the z means close the path and fill
-    s = s + wxT(" \" /> ") + newline ;
-
-
-    if (m_OK)
-    {
-        write(s);
-    }
-
-    wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawArc Call executed")) ;
-}
-
-
-void wxSVGFileDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
-{
-    /*
-    Draws an arc of an ellipse. The current pen is used for drawing the arc
-    and the current brush is used for drawing the pie. This function is
-    currently only available for X window and PostScript device contexts.
-
-    x and y specify the x and y coordinates of the upper-left corner of the
-    rectangle that contains the ellipse.
-
-    width and height specify the width and height of the rectangle that
-    contains the ellipse.
-
-    start and end specify the start and end of the arc relative to the
-    three-o'clock position from the center of the rectangle. Angles are
-    specified in degrees (360 is a complete circle). Positive values mean
-    counter-clockwise motion. If start is equal to end, a complete ellipse
-    will be drawn. */
-
-    //known bug: SVG draws with the current pen along the radii, but this does not happen in wxMSW
-
-    if (m_graphics_changed) NewGraphics ();
-
-    wxString s ;
-    //radius
-    double rx = w / 2 ;
-    double ry = h / 2 ;
-    // center
-    double xc = x + rx ;
-    double yc = y + ry ;
-
-    double xs, ys, xe, ye ;
-    xs = xc + rx * cos (DegToRad(sa)) ;
-    xe = xc + rx * cos (DegToRad(ea)) ;
-    ys = yc - ry * sin (DegToRad(sa)) ;
-    ye = yc - ry * sin (DegToRad(ea)) ;
-
-    ///now same as circle arc...
-
-    double theta1 = atan2(ys-yc, xs-xc);
-    double theta2 = atan2(ye-yc, xe-xc);
-
-    int fArc  ;                  // flag for large or small arc 0 means less than 180 degrees
-    if ( (theta2 - theta1) > 0 ) fArc = 1; else fArc = 0 ;
-
-    int fSweep ;
-    if ( fabs(theta2 - theta1) > M_PI) fSweep = 1; else fSweep = 0 ;
-
-    s.Printf ( wxT("<path d=\"M%d %d A%d %d 0.0 %d %d  %d %d L %d %d z "),
-        int(xs), int(ys), int(rx), int(ry),
-        fArc, fSweep, int(xe), int(ye), int(xc), int(yc)  );
-
-
-    s = s + wxT(" \" /> ") + newline ;
-
-    if (m_OK)
-    {
-        write(s);
-    }
-
-    wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawEllipticArc Call executed")) ;
-}
-
-
-void wxSVGFileDC::DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent , wxCoord *externalLeading , wxFont *font) const
-
-{
-    wxScreenDC sDC ;
-
-    sDC.SetFont (m_font);
-    if ( font != NULL ) sDC.SetFont ( *font );
-    sDC.GetTextExtent(string, w,  h, descent, externalLeading );
-    wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::GetTextExtent Call executed")) ;
-}
-
-
-wxCoord wxSVGFileDC::GetCharHeight() const
-
-{
-    wxScreenDC sDC ;
-    sDC.SetFont (m_font);
-
-    wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::GetCharHeight Call executing")) ;
-    return ( sDC.GetCharHeight() );
-
-}
-
-
-wxCoord wxSVGFileDC::GetCharWidth() const
-{
-    wxScreenDC sDC ;
-    sDC.SetFont (m_font);
-
-    wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::GetCharWidth Call executing")) ;
-    return ( sDC.GetCharWidth() ) ;
-
-}
-
-
-/// Set Functions /////////////////////////////////////////////////////////////////
-void wxSVGFileDC::SetBackground( const wxBrush &brush )
-{
-
-    m_backgroundBrush = brush;
-    return;
-}
-
-
-void wxSVGFileDC::SetBackgroundMode( int mode )
-{
-    m_backgroundMode = mode;
-    return;
-}
-
-
-void wxSVGFileDC::SetBrush(const wxBrush& brush)
-
-{
-    m_brush = brush ;
-
-    m_graphics_changed = TRUE ;
-    wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetBrush Call executed")) ;
-}
-
-
-void wxSVGFileDC::SetPen(const wxPen& pen)
-{
-    // width, color, ends, joins : currently implemented
-    // dashes, stipple :  not implemented
-    m_pen = pen ;
-
-    m_graphics_changed = TRUE ;
-    wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetPen Call executed")) ;
-}
-
-void wxSVGFileDC::NewGraphics ()
-{
-
-    int w = m_pen.GetWidth ();
-    wxColour c = m_pen.GetColour () ;
-
-    wxString s, sBrush, sPenCap, sPenJoin, sPenStyle, sLast, sWarn;
-
-    sBrush = wxT("</g>\n<g style=\"") + wxBrushString ( m_brush.GetColour (), m_brush.GetStyle () )
-             + wxT("  stroke:#") + wxColStr (c) + wxT("; ") ;
-
-    switch ( m_pen.GetCap () )
-    {
-        case  wxCAP_PROJECTING :
-            sPenCap = wxT("stroke-linecap:square; ") ;
-            break ;
-        case  wxCAP_BUTT :
-            sPenCap = wxT("stroke-linecap:butt; ") ;
-            break ;
-        case    wxCAP_ROUND :
-        default :
-            sPenCap = wxT("stroke-linecap:round; ") ;
-    };
-    switch ( m_pen.GetJoin () )
-    {
-        case  wxJOIN_BEVEL :
-            sPenJoin = wxT("stroke-linejoin:bevel; ") ;
-            break ;
-        case  wxJOIN_MITER :
-            sPenJoin = wxT("stroke-linejoin:miter; ") ;
-            break ;
-        case    wxJOIN_ROUND :
-        default :
-            sPenJoin = wxT("stroke-linejoin:round; ") ;
-    };
-
-    switch ( m_pen.GetStyle () )
-    {
-        case  wxSOLID :
-            sPenStyle = wxT("stroke-opacity:1.0; stroke-opacity:1.0; ") ;
-            break ;
-        case  wxTRANSPARENT :
-            sPenStyle = wxT("stroke-opacity:0.0; stroke-opacity:0.0; ") ;
-            break ;
-        default :
-            wxASSERT_MSG(FALSE, wxT("wxSVGFileDC::SetPen Call called to set a Style which is not available")) ;
-            sWarn = sWarn + wxT("<!--- wxSVGFileDC::SetPen Call called to set a Style which is not available --> \n") ;
-    }
-
-    sLast.Printf (   wxT("stroke-width:%d\" \n   transform=\"translate(%.2g %.2g) scale(%.2g %.2g)\">"),
-                  w, m_OriginX, m_OriginY, m_scaleX, m_scaleY  );
-
-    s = sBrush + sPenCap + sPenJoin + sPenStyle + sLast + newline + sWarn;
-    write(s);
-    m_graphics_changed = FALSE ;
-    wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::NewGraphics Call executed")) ;
-}
-
-
-void wxSVGFileDC::SetFont(const wxFont& font)
-
-{
-    m_font = font ;
-
-    wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetFont Call executed")) ;
-}
-
-
-void wxSVGFileDC::ComputeScaleAndOrigin()
-{
-    m_scaleX = m_logicalScaleX * m_userScaleX;
-    m_scaleY = m_logicalScaleY * m_userScaleY;
-    m_OriginX = m_logicalOriginX * m_logicalScaleX + m_deviceOriginX ;
-    m_OriginY = m_logicalOriginY * m_logicalScaleY + m_deviceOriginY ;
-    m_graphics_changed = TRUE;
-}
-
-
-int wxSVGFileDC::GetMapMode()
-{
-    return m_mappingMode ;
-}
-
-
-void wxSVGFileDC::SetMapMode( int mode )
-{
-    switch (mode)
-    {
-        case wxMM_TWIPS:
-            SetLogicalScale( twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y );
-            break;
-        case wxMM_POINTS:
-            SetLogicalScale( pt2mm*m_mm_to_pix_x, pt2mm*m_mm_to_pix_y );
-            break;
-        case wxMM_METRIC:
-            SetLogicalScale( m_mm_to_pix_x, m_mm_to_pix_y );
-            break;
-        case wxMM_LOMETRIC:
-            SetLogicalScale( m_mm_to_pix_x/10.0, m_mm_to_pix_y/10.0 );
-            break;
-        default:
-        case wxMM_TEXT:
-            SetLogicalScale( 1.0, 1.0 );
-            break;
-    }
-    m_mappingMode = mode;
-
-    /*  we don't do this mega optimisation
-        if (mode != wxMM_TEXT)
-        {
-            m_needComputeScaleX = TRUE;
-            m_needComputeScaleY = TRUE;
-        }
-    */
-}
-
-
-void wxSVGFileDC::GetUserScale(double *x, double *y) const
-{
-    *x = m_userScaleX ;
-    *y = m_userScaleY ;
-}
-
-
-void wxSVGFileDC::SetUserScale( double x, double y )
-{
-    // allow negative ? -> no
-    m_userScaleX = x;
-    m_userScaleY = y;
-    ComputeScaleAndOrigin();
-}
-
-
-void wxSVGFileDC::SetLogicalScale( double x, double y )
-{
-    // allow negative ?
-    m_logicalScaleX = x;
-    m_logicalScaleY = y;
-    ComputeScaleAndOrigin();
-}
-
-
-void wxSVGFileDC::SetLogicalOrigin( wxCoord x, wxCoord y )
-{
-    // is this still correct ?
-    m_logicalOriginX = x * m_signX;
-    m_logicalOriginY = y * m_signY;
-    ComputeScaleAndOrigin();
-}
-
-
-void wxSVGFileDC::SetDeviceOrigin( wxCoord x, wxCoord y )
-{
-    // only wxPostScripDC has m_signX = -1,
-    m_deviceOriginX = x;
-    m_deviceOriginY = y;
-    ComputeScaleAndOrigin();
-}
-
-
-void wxSVGFileDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
-{
-    // only wxPostScripDC has m_signX = -1,
-    m_signX = (xLeftRight ?  1 : -1);
-    m_signY = (yBottomUp  ? -1 :  1);
-    ComputeScaleAndOrigin();
-}
-
-
-// export a bitmap as a raster image in png
-bool wxSVGFileDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
-                         wxDC* source, wxCoord xsrc, wxCoord ysrc,
-                         int logicalFunc /*= wxCOPY*/, bool useMask /*= FALSE*/,
-                         wxCoord /*xsrcMask = -1*/, wxCoord /*ysrcMask = -1*/)
-{
-    if (logicalFunc != wxCOPY)
-    {
-        wxASSERT_MSG(FALSE, wxT("wxSVGFileDC::DoBlit Call requested nonCopy mode; this is not possible")) ;
-        return FALSE ;
-    }
-    if (useMask != FALSE)
-    {
-        wxASSERT_MSG(FALSE, wxT("wxSVGFileDC::DoBlit Call requested False mask ; this is not possible")) ;
-        return FALSE ;
-    }
-    wxBitmap myBitmap (width, height) ;
-    wxMemoryDC memDC;
-    memDC.SelectObject( myBitmap );
-    memDC.Blit(0, 0, width, height, source, xsrc, ysrc);
-    memDC.SelectObject( wxNullBitmap );
-    DoDrawBitmap(myBitmap, xdest, ydest);
-    wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoBlit Call executed")) ;
-    return FALSE ;
-}
-
-
-void wxSVGFileDC::DoDrawIcon(const class wxIcon & myIcon, wxCoord x, wxCoord y)
-{
-    wxBitmap myBitmap (myIcon.GetWidth(), myIcon.GetHeight() ) ;
-    wxMemoryDC memDC;
-    memDC.SelectObject( myBitmap );
-    memDC.DrawIcon(myIcon,0,0);
-    memDC.SelectObject( wxNullBitmap );
-    DoDrawBitmap(myBitmap, x, y);
-    wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawIcon Call executed")) ;
-    return ;
-}
-
-
-
-void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y , bool  WXUNUSED(bTransparent) /*=0*/ )
-{
-    if (m_graphics_changed) NewGraphics ();
-
-    wxString sTmp, s, sPNG ;
-    wxImage::AddHandler(new wxPNGHandler);
-
-// create suitable file name
-    sTmp.Printf ( wxT("_image%d.png"), m_sub_images);
-    sPNG = m_filename.BeforeLast(wxT('.')) + sTmp;
-    while (wxFile::Exists(sPNG) )
-    {
-        m_sub_images ++ ;
-        sTmp.Printf ( wxT("_image%d.png"), m_sub_images);
-        sPNG = m_filename.BeforeLast(wxT('.')) + sTmp;
-    }
-
-//create copy of bitmap (wxGTK doesn't like saving a constant bitmap)
-    wxBitmap myBitmap = bmp ;
-//save it
-    bool bPNG_OK = myBitmap.SaveFile(sPNG,wxBITMAP_TYPE_PNG);
-
-// refrence the bitmap from the SVG doc
-    int w = myBitmap.GetWidth();
-    int h = myBitmap.GetHeight();
-    sTmp.Printf ( wxT(" <image x=\"%d\" y=\"%d\" width=\"%dpx\" height=\"%dpx\" "), x,y,w,h );
-    s = s + sTmp ;
-    sTmp.Printf ( wxT(" xlink:href=\"%s\"> \n"), sPNG.c_str() );
-    s = s + sTmp + wxT("<title>Image from wxSVG</title>  </image>") + newline;
-
-    if (m_OK && bPNG_OK)
-    {
-        write(s);
-    }
-    m_OK = m_outfile->Ok () && bPNG_OK;
-    wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawBitmap Call executed")) ;
-
-    return  ;
-}
-
-
-// ---------------------------------------------------------------------------
-// coordinates transformations
-// ---------------------------------------------------------------------------
-
-wxCoord wxSVGFileDC::DeviceToLogicalX(wxCoord x) const
-{
-    return XDEV2LOG(x);
-}
-
-
-wxCoord wxSVGFileDC::DeviceToLogicalY(wxCoord y) const
-{
-    return YDEV2LOG(y);
-}
-
-
-wxCoord wxSVGFileDC::DeviceToLogicalXRel(wxCoord x) const
-{
-    return XDEV2LOGREL(x);
-}
-
-
-wxCoord wxSVGFileDC::DeviceToLogicalYRel(wxCoord y) const
-{
-    return YDEV2LOGREL(y);
-}
-
-
-wxCoord wxSVGFileDC::LogicalToDeviceX(wxCoord x) const
-{
-    return XLOG2DEV(x);
-}
-
-
-wxCoord wxSVGFileDC::LogicalToDeviceY(wxCoord y) const
-{
-    return YLOG2DEV(y);
-}
-
-
-wxCoord wxSVGFileDC::LogicalToDeviceXRel(wxCoord x) const
-{
-    return XLOG2DEVREL(x);
-}
-
-
-wxCoord wxSVGFileDC::LogicalToDeviceYRel(wxCoord y) const
-{
-    return YLOG2DEVREL(y);
-}
-
-void wxSVGFileDC::write(const wxString &s)
-{
-    const wxWX2MBbuf buf = s.mb_str(wxConvUTF8);
-    m_outfile->Write(buf, strlen((const char *)buf));
-    m_OK = m_outfile->Ok();
-}
-
-#ifdef __BORLANDC__
-#pragma warn .rch
-#pragma warn .ccc
-#endif
diff --git a/src/common/event.cpp b/src/common/event.cpp
index c254930217..598b66ae99 100644
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -352,7 +352,7 @@ wxEvent::wxEvent(int theId, wxEventType commandType )
 }
 
 wxEvent::wxEvent(const wxEvent &src)
-    : wxObject()
+    : wxObject(src)
     , m_eventObject(src.m_eventObject)
     , m_eventType(src.m_eventType)
     , m_timeStamp(src.m_timeStamp)
diff --git a/src/common/evtloopcmn.cpp b/src/common/evtloopcmn.cpp
index 711ada6006..bc4e88ef0f 100644
--- a/src/common/evtloopcmn.cpp
+++ b/src/common/evtloopcmn.cpp
@@ -30,6 +30,23 @@
     #include "wx/app.h"
 #endif //WX_PRECOMP
 
+// see the comment near the declaration of wxRunningEventLoopCount in
+// src/msw/thread.cpp for the explanation of this hack
+#if defined(__WXMSW__) && wxUSE_THREADS
+
+extern WXDLLIMPEXP_DATA_BASE(int) wxRunningEventLoopCount;
+struct wxRunningEventLoopCounter
+{
+    wxRunningEventLoopCounter() { wxRunningEventLoopCount++; }
+    ~wxRunningEventLoopCounter() { wxRunningEventLoopCount--; }
+};
+
+#else // !__WXMSW__
+
+struct wxRunningEventLoopCounter { };
+
+#endif // __WXMSW__/!__WXMSW__
+
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
@@ -59,6 +76,8 @@ int wxEventLoopManual::Run()
     // should undo
     wxEventLoopActivator activate(wx_static_cast(wxEventLoop *, this));
 
+    wxRunningEventLoopCounter evtLoopCounter;
+
     // we must ensure that OnExit() is called even if an exception is thrown
     // from inside Dispatch() but we must call it from Exit() in normal
     // situations because it is supposed to be called synchronously,
diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 06c4a1e2d0..3c59583b7e 100644
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -492,16 +492,16 @@ wxFileConfig::wxFileConfig(wxInputStream &inStream, const wxMBConv& conv)
     m_linesHead =
     m_linesTail = NULL;
 
-    // translate everything to the current (platform-dependent) line
-    // termination character
-    wxString strTrans;
+    // read the entire stream contents in memory
+    wxString str;
     {
-        wxString strTmp;
+        static const size_t chunkLen = 1024;
 
-        char buf[1024];
+        wxMemoryBuffer buf(chunkLen);
         do
         {
-            inStream.Read(buf, WXSIZEOF(buf)-1);  // leave room for the NULL
+            inStream.Read(buf.GetAppendBuf(chunkLen), chunkLen);
+            buf.UngetAppendBuf(inStream.LastRead());
 
             const wxStreamError err = inStream.GetLastError();
 
@@ -510,19 +510,27 @@ wxFileConfig::wxFileConfig(wxInputStream &inStream, const wxMBConv& conv)
                 wxLogError(_("Error reading config options."));
                 break;
             }
-
-            // FIXME: this is broken because if we have part of multibyte
-            //        character in the buffer (and another part hasn't been
-            //        read yet) we're going to lose data because of conversion
-            //        errors
-            buf[inStream.LastRead()] = '\0';
-            strTmp += conv.cMB2WX(buf);
         }
         while ( !inStream.Eof() );
 
-        strTrans = wxTextBuffer::Translate(strTmp);
+#if wxUSE_UNICODE
+        size_t len;
+        str = conv.cMB2WC((char *)buf.GetData(), buf.GetDataLen(), &len);
+        if ( !len && buf.GetDataLen() )
+        {
+            wxLogError(_("Failed to read config options."));
+        }
+#else // !wxUSE_UNICODE
+        // no need for conversion
+        str.assign((char *)buf.GetData(), buf.GetDataLen());
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
     }
 
+
+    // translate everything to the current (platform-dependent) line
+    // termination character
+    str = wxTextBuffer::Translate(str);
+
     wxMemoryText memText;
 
     // Now we can add the text to the memory text. To do this we extract line
@@ -534,21 +542,21 @@ wxFileConfig::wxFileConfig(wxInputStream &inStream, const wxMBConv& conv)
     const wxChar *pEOL = wxTextBuffer::GetEOL(wxTextBuffer::typeDefault);
     const size_t EOLLen = wxStrlen(pEOL);
 
-    int posLineStart = strTrans.Find(pEOL);
+    int posLineStart = str.Find(pEOL);
     while ( posLineStart != -1 )
     {
-        wxString line(strTrans.Left(posLineStart));
+        wxString line(str.Left(posLineStart));
 
         memText.AddLine(line);
 
-        strTrans = strTrans.Mid(posLineStart + EOLLen);
+        str = str.Mid(posLineStart + EOLLen);
 
-        posLineStart = strTrans.Find(pEOL);
+        posLineStart = str.Find(pEOL);
     }
 
     // also add whatever we have left in the translated string.
-    if ( !strTrans.empty() )
-        memText.AddLine(strTrans);
+    if ( !str.empty() )
+        memText.AddLine(str);
 
     // Finally we can parse it all.
     Parse(memText, true /* local */);
@@ -1047,15 +1055,17 @@ bool wxFileConfig::Flush(bool /* bCurrentOnly */)
   }
 
   // write all strings to file
+  wxString filetext;
+  filetext.reserve(4096);
   for ( wxFileConfigLineList *p = m_linesHead; p != NULL; p = p->Next() )
   {
-    wxString line = p->Text();
-    line += wxTextFile::GetEOL();
-    if ( !file.Write(line, *m_conv) )
-    {
-      wxLogError(_("can't write user configuration file."));
-      return false;
-    }
+    filetext << p->Text() << wxTextFile::GetEOL();
+  }
+
+  if ( !file.Write(filetext, *m_conv) )
+  {
+    wxLogError(_("can't write user configuration file."));
+    return false;
   }
 
   if ( !file.Commit() )
@@ -1763,7 +1773,7 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
 
             m_pLastGroup = NULL;
             for ( wxFileConfigLineList *pl = pLine->Prev();
-                  pl && pl != m_pLine && !m_pLastGroup;
+                  pl && !m_pLastGroup;
                   pl = pl->Prev() )
             {
                 // does this line belong to our subgroup?
@@ -1777,6 +1787,9 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
                         break;
                     }
                 }
+
+                if ( pl == m_pLine )
+                    break;
             }
         }
 
diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index e8c8fda943..058de3ffd2 100644
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -2328,14 +2328,11 @@ wxULongLong wxFileName::GetSize(const wxString &filename)
 
     DWORD lpFileSizeHigh;
     DWORD ret = GetFileSize(f, &lpFileSizeHigh);
-    if (ret == INVALID_FILE_SIZE)
+    if ( ret == INVALID_FILE_SIZE && ::GetLastError() != NO_ERROR )
         return wxInvalidSize;
 
-    // compose the low-order and high-order byte sizes
-    return wxULongLong(ret | (lpFileSizeHigh << sizeof(WORD)*2));
-
-#else           // ! __WIN32__
-
+    return wxULongLong(lpFileSizeHigh, ret);
+#else // ! __WIN32__
     wxStructStat st;
 #ifndef wxNEED_WX_UNISTD_H
     if (wxStat( filename.fn_str() , &st) != 0)
diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index b0ad197a09..a4e9d210b0 100644
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -447,6 +447,9 @@ void wxFrameBase::DoGiveHelp(const wxString& text, bool show)
     {
         // i.e. restore the old one
         help = m_oldStatusText;
+
+        // make sure we get the up to date text when showing it the next time
+        m_oldStatusText.clear();
     }
 
     statbar->SetStatusText(help, m_statusBarPane);
diff --git a/src/common/gbsizer.cpp b/src/common/gbsizer.cpp
index 8188383c6a..ccde4a9a34 100644
--- a/src/common/gbsizer.cpp
+++ b/src/common/gbsizer.cpp
@@ -537,20 +537,24 @@ void wxGridBagSizer::RecalcSizes()
     {
         int row, col, endrow, endcol;
         wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
-        item->GetPos(row, col);
-        item->GetEndPos(endrow, endcol);
 
-        height = 0;
-        for(idx=row; idx <= endrow; idx++)
-            height += m_rowHeights[idx];
-        height += (endrow - row) * m_vgap; // add a vgap for every row spanned
+        if ( item->IsShown() )
+        {
+            item->GetPos(row, col);
+            item->GetEndPos(endrow, endcol);
 
-        width = 0;
-        for (idx=col; idx <= endcol; idx++)
-            width += m_colWidths[idx];
-        width += (endcol - col) * m_hgap; // add a hgap for every col spanned
+            height = 0;
+            for(idx=row; idx <= endrow; idx++)
+                height += m_rowHeights[idx];
+            height += (endrow - row) * m_vgap; // add a vgap for every row spanned
 
-        SetItemBounds(item, colpos[col], rowpos[row], width, height);
+            width = 0;
+            for (idx=col; idx <= endcol; idx++)
+                width += m_colWidths[idx];
+            width += (endcol - col) * m_hgap; // add a hgap for every col spanned
+
+            SetItemBounds(item, colpos[col], rowpos[row], width, height);
+        }
 
         node = node->GetNext();
     }
diff --git a/src/common/http.cpp b/src/common/http.cpp
index af0512f967..f5f73ea461 100644
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -139,7 +139,7 @@ wxString wxHTTP::GenerateAuthString(const wxString& user, const wxString& pass)
         if (len == 1) {
             buf << wxString::Format(wxT("%c="), base64[(from[0] << 4) & 0x30]);
         } else {
-            buf << wxString::Format(wxT("%c%c"), base64[(from[0] << 4) & 0x30] + ((from[1] >> 4) & 0xf), base64[(from[1] << 2) & 0x3c]);
+            buf << wxString::Format(wxT("%c%c"), base64[((from[0] << 4) & 0x30) | ((from[1] >> 4) & 0xf)], base64[(from[1] << 2) & 0x3c]);
         }
         buf << wxString::Format(wxT("="));
     }
diff --git a/src/common/image.cpp b/src/common/image.cpp
index 3aae548ccc..2ea88dda7a 100644
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -2811,20 +2811,23 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
 
     bool has_alpha = HasAlpha();
 
+    const int w = GetWidth(),
+              h = GetHeight();
+
     // Create pointer-based array to accelerate access to wxImage's data
-    unsigned char ** data = new unsigned char * [GetHeight()];
+    unsigned char ** data = new unsigned char * [h];
     data[0] = GetData();
-    for (i = 1; i < GetHeight(); i++)
-        data[i] = data[i - 1] + (3 * GetWidth());
+    for (i = 1; i < h; i++)
+        data[i] = data[i - 1] + (3 * w);
 
     // Same for alpha channel
     unsigned char ** alpha = NULL;
     if (has_alpha)
     {
-        alpha = new unsigned char * [GetHeight()];
+        alpha = new unsigned char * [h];
         alpha[0] = GetAlpha();
-        for (i = 1; i < GetHeight(); i++)
-            alpha[i] = alpha[i - 1] + GetWidth();
+        for (i = 1; i < h; i++)
+            alpha[i] = alpha[i - 1] + w;
     }
 
     // precompute coefficients for rotation formula
@@ -2839,9 +2842,9 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
     const wxRealPoint p0(centre_of_rotation.x, centre_of_rotation.y);
 
     wxRealPoint p1 = wxRotatePoint (0, 0, cos_angle, sin_angle, p0);
-    wxRealPoint p2 = wxRotatePoint (0, GetHeight(), cos_angle, sin_angle, p0);
-    wxRealPoint p3 = wxRotatePoint (GetWidth(), 0, cos_angle, sin_angle, p0);
-    wxRealPoint p4 = wxRotatePoint (GetWidth(), GetHeight(), cos_angle, sin_angle, p0);
+    wxRealPoint p2 = wxRotatePoint (0, h, cos_angle, sin_angle, p0);
+    wxRealPoint p3 = wxRotatePoint (w, 0, cos_angle, sin_angle, p0);
+    wxRealPoint p4 = wxRotatePoint (w, h, cos_angle, sin_angle, p0);
 
     int x1a = (int) floor (wxMin (wxMin(p1.x, p2.x), wxMin(p3.x, p4.x)));
     int y1a = (int) floor (wxMin (wxMin(p1.y, p2.y), wxMin(p3.y, p4.y)));
@@ -2888,27 +2891,29 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
     // performing an inverse rotation (a rotation of -angle) and getting the
     // pixel at those coordinates
 
+    const int rH = rotated.GetHeight();
+    const int rW = rotated.GetWidth();
+
     // GRG: I've taken the (interpolating) test out of the loops, so that
     //      it is done only once, instead of repeating it for each pixel.
 
-    int x;
     if (interpolating)
     {
-        for (int y = 0; y < rotated.GetHeight(); y++)
+        for (int y = 0; y < rH; y++)
         {
-            for (x = 0; x < rotated.GetWidth(); x++)
+            for (int x = 0; x < rW; x++)
             {
                 wxRealPoint src = wxRotatePoint (x + x1a, y + y1a, cos_angle, -sin_angle, p0);
 
-                if (-0.25 < src.x && src.x < GetWidth() - 0.75 &&
-                    -0.25 < src.y && src.y < GetHeight() - 0.75)
+                if (-0.25 < src.x && src.x < w - 0.75 &&
+                    -0.25 < src.y && src.y < h - 0.75)
                 {
                     // interpolate using the 4 enclosing grid-points.  Those
                     // points can be obtained using floor and ceiling of the
                     // exact coordinates of the point
                     int x1, y1, x2, y2;
 
-                    if (0 < src.x && src.x < GetWidth() - 1)
+                    if (0 < src.x && src.x < w - 1)
                     {
                         x1 = wxRound(floor(src.x));
                         x2 = wxRound(ceil(src.x));
@@ -2918,7 +2923,7 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
                         x1 = x2 = wxRound (src.x);
                     }
 
-                    if (0 < src.y && src.y < GetHeight() - 1)
+                    if (0 < src.y && src.y < h - 1)
                     {
                         y1 = wxRound(floor(src.y));
                         y2 = wxRound(ceil(src.y));
@@ -3041,17 +3046,16 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
     }
     else    // not interpolating
     {
-        for (int y = 0; y < rotated.GetHeight(); y++)
+        for (int y = 0; y < rH; y++)
         {
-            for (x = 0; x < rotated.GetWidth(); x++)
+            for (int x = 0; x < rW; x++)
             {
                 wxRealPoint src = wxRotatePoint (x + x1a, y + y1a, cos_angle, -sin_angle, p0);
 
                 const int xs = wxRound (src.x);      // wxRound rounds to the
                 const int ys = wxRound (src.y);      // closest integer
 
-                if (0 <= xs && xs < GetWidth() &&
-                    0 <= ys && ys < GetHeight())
+                if (0 <= xs && xs < w && 0 <= ys && ys < h)
                 {
                     unsigned char *p = data[ys] + (3 * xs);
                     *(dst++) = *(p++);
@@ -3095,8 +3099,8 @@ class wxImageModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxImageModule)
 public:
     wxImageModule() {}
-    bool OnInit() { wxImage::InitStandardHandlers(); return true; };
-    void OnExit() { wxImage::CleanUpHandlers(); };
+    bool OnInit() { wxImage::InitStandardHandlers(); return true; }
+    void OnExit() { wxImage::CleanUpHandlers(); }
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 8b7a9c9426..95eb80b3e1 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -18,12 +18,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__BORLANDC__) && !defined(__WXDEBUG__)
-    // There's a bug in Borland's compiler that breaks wxLocale with -O2,
-    // so make sure that flag is not used for this file:
-    #pragma option -O1
-#endif
-
 #ifdef __EMX__
 // The following define is needed by Innotek's libc to
 // make the definition of struct localeconv available.
@@ -2505,7 +2499,9 @@ const wxLanguageInfo *wxLocale::GetLanguageInfo(int lang)
     {
         if ( ms_languagesDB->Item(i).Language == lang )
         {
-            return &ms_languagesDB->Item(i);
+            // We need to create a temporary here in order to make this work with BCC in final build mode
+            wxLanguageInfo *ptr = &ms_languagesDB->Item(i);
+            return ptr;
         }
     }
 
diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index 49f3a00d9e..87969e0411 100644
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -319,9 +319,7 @@ wxString wxAcceleratorEntry::ToString() const
 
     const int code = GetKeyCode();
 
-    if ( wxIsalnum(code) )
-        text << (wxChar)code;
-    else if ( code >= WXK_F1 && code <= WXK_F12 )
+    if ( code >= WXK_F1 && code <= WXK_F12 )
         text << _("F") << code - WXK_F1 + 1;
     else if ( code >= WXK_NUMPAD0 && code <= WXK_NUMPAD9 )
         text << _("KP_") << code - WXK_NUMPAD0;
@@ -340,8 +338,22 @@ wxString wxAcceleratorEntry::ToString() const
             }
         }
 
-        wxASSERT_MSG( n != WXSIZEOF(wxKeyNames),
-                      wxT("unknown keyboard accelerator code") );
+        if ( n == WXSIZEOF(wxKeyNames) )
+        {
+            // must be a simple key
+            if (
+#if !wxUSE_UNICODE
+                 isascii(code) &&
+#endif // ANSI
+                    wxIsalnum(code) )
+            {
+                text << (wxChar)code;
+            }
+            else
+            {
+                wxFAIL_MSG( wxT("unknown keyboard accelerator code") );
+            }
+        }
     }
 
     return text;
diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index d4ac29a517..6cc1207d8e 100644
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -460,6 +460,11 @@ bool wxSizerItem::IsShown() const
             // shown, so are we (this arbitrariness is the reason for
             // deprecating this function)
             {
+                // Some apps (such as dialog editors) depend on an empty sizer still
+                // being laid out correctly and reporting the correct size and position.
+                if (m_sizer->GetChildren().GetCount() == 0)
+                    return true;
+
                 for ( wxSizerItemList::compatibility_iterator
                         node = m_sizer->GetChildren().GetFirst();
                       node;
@@ -1469,7 +1474,9 @@ void wxFlexGridSizer::AdjustForFlexDirection()
         // and now fill it with the largest value
         for ( n = 0; n < count; ++n )
         {
-            array[n] = largest;
+            // don't touch hidden rows
+            if ( array[n] != -1 )
+                array[n] = largest;
         }
     }
 }
@@ -1509,9 +1516,7 @@ void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz, const wxSize& minsz,
             {
                 if (m_growableRows[idx] >= nrows )
                     continue;
-                if (m_rowHeights[ m_growableRows[idx] ] == -1)
-                    m_rowHeights[ m_growableRows[idx] ] = 0;
-                else
+                if (m_rowHeights[ m_growableRows[idx] ] != -1)
                 {
                     int delta = (sz.y - minsz.y);
                     if (sum_proportions == 0)
@@ -1561,9 +1566,7 @@ void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz, const wxSize& minsz,
             {
                 if (m_growableCols[idx] >= ncols )
                     continue;
-                if (m_colWidths[ m_growableCols[idx] ] == -1)
-                    m_colWidths[ m_growableCols[idx] ] = 0;
-                else
+                if (m_colWidths[ m_growableCols[idx] ] != -1)
                 {
                     int delta = (sz.x - minsz.x);
                     if (sum_proportions == 0)
@@ -2020,7 +2023,8 @@ void wxStdDialogButtonSizer::Realize()
             if (m_buttonAffirmative->GetId() == wxID_SAVE){
                 // these buttons have set labels under Mac so we should use them
                 m_buttonAffirmative->SetLabel(_("Save"));
-                m_buttonNegative->SetLabel(_("Don't Save"));
+                if (m_buttonNegative)
+                    m_buttonNegative->SetLabel(_("Don't Save"));
             }
         }
 
diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 28a929198c..e36bfe9768 100644
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -1344,14 +1344,18 @@ wxDatagramSocket::wxDatagramSocket( const wxSockAddress& addr,
     // Create the socket
     m_socket = GSocket_new();
 
-    if(!m_socket)
+    if (!m_socket)
     {
         wxFAIL_MSG( _T("datagram socket not new'd") );
         return;
     }
     // Setup the socket as non connection oriented
     m_socket->SetLocal(addr.GetAddress());
-    if( m_socket->SetNonOriented() != GSOCK_NOERROR )
+    if (flags & wxSOCKET_REUSEADDR)
+    {
+        m_socket->SetReusable();
+    }
+    if ( m_socket->SetNonOriented() != GSOCK_NOERROR )
     {
         delete m_socket;
         m_socket = NULL;
diff --git a/src/common/sstream.cpp b/src/common/sstream.cpp
index 8033dff28c..3fbbc3fdf3 100644
--- a/src/common/sstream.cpp
+++ b/src/common/sstream.cpp
@@ -37,8 +37,8 @@
 // ----------------------------------------------------------------------------
 
 // TODO:  Do we want to include the null char in the stream?  If so then
-// just add +1 to m_len in the ctor 
-wxStringInputStream::wxStringInputStream(const wxString& s) 
+// just add +1 to m_len in the ctor
+wxStringInputStream::wxStringInputStream(const wxString& s)
 #if wxUSE_UNICODE
     : m_str(s), m_buf(wxMBConvUTF8().cWX2MB(s).release()), m_len(strlen(m_buf))
 #else
@@ -63,9 +63,9 @@ wxStringInputStream::~wxStringInputStream()
 // getlength
 // ----------------------------------------------------------------------------
 
-wxFileOffset wxStringInputStream::GetLength() const 
-{ 
-    return m_len; 
+wxFileOffset wxStringInputStream::GetLength() const
+{
+    return m_len;
 }
 
 // ----------------------------------------------------------------------------
@@ -149,13 +149,76 @@ wxFileOffset wxStringOutputStream::OnSysTell() const
 // actual IO
 // ----------------------------------------------------------------------------
 
+#if wxUSE_UNICODE
+
+// we can't add a member to wxStringOutputStream in 2.8 branch without breaking
+// backwards binary compatibility, so we emulate it by using a hash indexed by
+// wxStringOutputStream pointers
+
+// can't use wxCharBuffer as it has incorrect copying semantics and doesn't
+// store the length which we need here
+WX_DECLARE_VOIDPTR_HASH_MAP(wxMemoryBuffer, wxStringStreamUnconvBuffers);
+
+static wxStringStreamUnconvBuffers gs_unconverted;
+
+wxStringOutputStream::~wxStringOutputStream()
+{
+    // TODO: check that nothing remains (i.e. the unconverted buffer is empty)?
+    gs_unconverted.erase(this);
+}
+
+#endif // wxUSE_UNICODE
+
 size_t wxStringOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
     const char *p = wx_static_cast(const char *, buffer);
 
-    // append the input buffer (may not be null terminated - thus 
-    // the literal length
-    m_str->Append(wxString(p, m_conv, size));
+#if wxUSE_UNICODE
+    // the part of the string we have here may be incomplete, i.e. it can stop
+    // in the middle of an UTF-8 character and so converting it would fail; if
+    // this is the case, accumulate the part which we failed to convert until
+    // we get the rest (and also take into account the part which we might have
+    // left unconverted before)
+    const char *src;
+    size_t srcLen;
+    wxMemoryBuffer& unconv = gs_unconverted[this];
+    if ( unconv.GetDataLen() )
+    {
+        // append the new data to the data remaining since the last time
+        unconv.AppendData(p, size);
+        src = unconv;
+        srcLen = unconv.GetDataLen();
+    }
+    else // no unconverted data left, avoid extra copy
+    {
+        src = p;
+        srcLen = size;
+    }
+
+    wxWCharBuffer wbuf(m_conv.cMB2WC(src, srcLen, NULL /* out len */));
+    if ( wbuf )
+    {
+        // conversion succeeded, clear the unconverted buffer
+        unconv = wxMemoryBuffer(0);
+
+        *m_str += wbuf;
+    }
+    else // conversion failed
+    {
+        // remember unconverted data if there had been none before (otherwise
+        // we've already got it in the buffer)
+        if ( src == p )
+            unconv.AppendData(src, srcLen);
+
+        // pretend that we wrote the data anyhow, otherwise the caller would
+        // believe there was an error and this might not be the case, but do
+        // not update m_pos as m_str hasn't changed
+        return size;
+    }
+#else // !wxUSE_UNICODE
+    // append directly, no conversion necessary
+    m_str->Append(wxString(p, size));
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
 
     // update position
     m_pos += size;
diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index bd0a0926c3..b9a288345a 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -481,7 +481,7 @@ wxConvBrokenFileNames::wxConvBrokenFileNames(const wxChar *charset)
 {
     if ( !charset || wxStricmp(charset, _T("UTF-8")) == 0
                   || wxStricmp(charset, _T("UTF8")) == 0  )
-        m_conv = new wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL);
+        m_conv = new wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_PUA);
     else
         m_conv = new wxCSConv(charset);
 }
@@ -3650,9 +3650,39 @@ WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvFileName = &
 #else
                                     wxConvUTF8Obj;
 #endif
-#else
+#else // !__WXOSX__
                                     wxConvLibcObj;
-#endif
+#endif // __WXOSX__/!__WXOSX__
+
+#if wxUSE_UNICODE
+
+wxWCharBuffer wxSafeConvertMB2WX(const char *s)
+{
+    if ( !s )
+        return wxWCharBuffer();
+
+    wxWCharBuffer wbuf(wxConvLibc.cMB2WX(s));
+    if ( !wbuf )
+        wbuf = wxConvUTF8.cMB2WX(s);
+    if ( !wbuf )
+        wbuf = wxConvISO8859_1.cMB2WX(s);
+
+    return wbuf;
+}
+
+wxCharBuffer wxSafeConvertWX2MB(const wchar_t *ws)
+{
+    if ( !ws )
+        return wxCharBuffer();
+
+    wxCharBuffer buf(wxConvLibc.cWX2MB(ws));
+    if ( !buf )
+        buf = wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL).cWX2MB(ws);
+
+    return buf;
+}
+
+#endif // wxUSE_UNICODE
 
 #else // !wxUSE_WCHAR_T
 
diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index 8ae48e1605..4765ea03f6 100644
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -869,6 +869,7 @@ char wxInputStream::Peek()
 
 wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)
 {
+    size_t lastcount = 0;
     char buf[BUF_TEMP_SIZE];
 
     for ( ;; )
@@ -879,8 +880,12 @@ wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)
 
         if ( stream_out.Write(buf, bytes_read).LastWrite() != bytes_read )
             break;
+
+        lastcount += bytes_read;
     }
 
+    m_lastcount = lastcount;
+
     return *this;
 }
 
diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index 2b20827bc1..7ac617ddf2 100644
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -204,8 +204,10 @@ void wxTopLevelWindowBase::DoCentre(int dir)
     if(IsAlwaysMaximized())
         return;
 
-    // we need the display rect anyhow so store it first
-    int nDisplay = wxDisplay::GetFromWindow(this);
+    // we need the display rect anyhow so store it first: notice that we should
+    // be centered on the same display as our parent window, the display of
+    // this window itself is not really defined yet
+    int nDisplay = wxDisplay::GetFromWindow(GetParent() ? GetParent() : this);
     wxDisplay dpy(nDisplay == wxNOT_FOUND ? 0 : nDisplay);
     const wxRect rectDisplay(dpy.GetClientArea());
 
@@ -246,30 +248,27 @@ void wxTopLevelWindowBase::DoCentre(int dir)
     // we don't want to place the window off screen if Centre() is called as
     // this is (almost?) never wanted and it would be very difficult to prevent
     // it from happening from the user code if we didn't check for it here
-    if ( rectDisplay.Contains(rect.GetTopLeft()) )
+    if ( !rectDisplay.Contains(rect.GetTopLeft()) )
     {
-        if ( !rectDisplay.Contains(rect.GetBottomRight()) )
-        {
-            // check if we can move the window so that the bottom right corner
-            // is visible without hiding the top left one
-            int dx = rectDisplay.GetRight() - rect.GetRight();
-            int dy = rectDisplay.GetBottom() - rect.GetBottom();
-            rect.Offset(dx, dy);
-        }
-        //else: the window top left and bottom right corner are both visible,
-        //      although the window might still be not entirely on screen (with
-        //      2 staggered displays for example) we wouldn't be able to
-        //      improve the layout much in such case, so just leave it as is
+        // move the window just enough to make the corner visible
+        int dx = rectDisplay.GetLeft() - rect.GetLeft();
+        int dy = rectDisplay.GetTop() - rect.GetTop();
+        rect.Offset(dx > 0 ? dx : 0, dy > 0 ? dy : 0);
     }
-    else // make top left corner visible
-    {
-        if ( rect.x < rectDisplay.x )
-            rect.x = rectDisplay.x;
 
-        if ( rect.y < rectDisplay.y )
-            rect.y = rectDisplay.y;
+    if ( !rectDisplay.Contains(rect.GetBottomRight()) )
+    {
+        // do the same for this corner too
+        int dx = rectDisplay.GetRight() - rect.GetRight();
+        int dy = rectDisplay.GetBottom() - rect.GetBottom();
+        rect.Offset(dx < 0 ? dx : 0, dy < 0 ? dy : 0);
     }
 
+    // the window top left and bottom right corner are both visible now and
+    // although the window might still be not entirely on screen (with 2
+    // staggered displays for example) we wouldn't be able to improve the
+    // layout much in such case, so we stop here
+
     // -1 could be valid coordinate here if there are several displays
     SetSize(rect, wxSIZE_ALLOW_MINUS_ONE);
 }
diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 7cf1062a5f..732b244072 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -647,24 +647,27 @@ static bool ReadAll(wxInputStream *is, wxArrayString& output)
 
     wxTextInputStream tis(*is);
 
-    bool cont = true;
-    while ( cont )
+    for ( ;; )
     {
         wxString line = tis.ReadLine();
-        if ( is->Eof() )
-            break;
 
+        // check for EOF before other errors as it's not really an error
+        if ( is->Eof() )
+        {
+            // add the last, possibly incomplete, line
+            if ( !line.empty() )
+                output.Add(line);
+            break;
+        }
+
+        // any other error is fatal
         if ( !*is )
-        {
-            cont = false;
-        }
-        else
-        {
-            output.Add(line);
-        }
+            return false;
+
+        output.Add(line);
     }
 
-    return cont;
+    return true;
 }
 #endif // wxUSE_STREAMS
 
diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 870938c773..b2702591f2 100644
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -226,7 +226,7 @@ public:
     virtual bool Write(wxOutputStream &str) const;
 #endif // wxUSE_STREAMS
 
-    virtual wxString GetType() const { return wxT("long"); };
+    virtual wxString GetType() const { return wxT("long"); }
 
 protected:
     long m_value;
@@ -377,7 +377,7 @@ public:
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream &str) const;
 #endif // wxUSE_STREAMS
-    virtual wxString GetType() const { return wxT("double"); };
+    virtual wxString GetType() const { return wxT("double"); }
 
 protected:
     double m_value;
@@ -517,7 +517,7 @@ public:
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
-    virtual wxString GetType() const { return wxT("bool"); };
+    virtual wxString GetType() const { return wxT("bool"); }
 
 protected:
     bool m_value;
@@ -658,7 +658,7 @@ public:
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
-    virtual wxString GetType() const { return wxT("char"); };
+    virtual wxString GetType() const { return wxT("char"); }
 
 protected:
     wxChar m_value;
@@ -793,13 +793,13 @@ public:
     virtual bool Read(wxString& str);
     virtual bool Write(wxString& str) const;
 #if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& WXUNUSED(str)) { return false; };
+    virtual bool Read(wxSTD istream& WXUNUSED(str)) { return false; }
 #endif
 #if wxUSE_STREAMS
     virtual bool Read(wxInputStream& str);
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
-    virtual wxString GetType() const { return wxT("string"); };
+    virtual wxString GetType() const { return wxT("string"); }
 
 protected:
     wxString m_value;
@@ -1066,7 +1066,7 @@ public:
     virtual bool Read(wxSTD istream& str);
 #endif
     virtual bool Read(wxString& str);
-    virtual wxString GetType() const { return wxT("void*"); };
+    virtual wxString GetType() const { return wxT("void*"); }
     virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; }
 
 protected:
@@ -1190,7 +1190,7 @@ public:
     virtual bool Read(wxSTD istream& str);
 #endif
     virtual bool Read(wxString& str);
-    virtual wxString GetType() const { return wxT("datetime"); };
+    virtual wxString GetType() const { return wxT("datetime"); }
     virtual wxVariantData* Clone() { return new wxVariantDataDateTime; }
 
 protected:
@@ -1356,7 +1356,7 @@ public:
     virtual bool Read(wxSTD istream& str);
 #endif
     virtual bool Read(wxString& str);
-    virtual wxString GetType() const { return wxT("arrstring"); };
+    virtual wxString GetType() const { return wxT("arrstring"); }
     virtual wxVariantData* Clone() { return new wxVariantDataArrayString; }
 
 protected:
@@ -1485,7 +1485,7 @@ public:
     virtual bool Read(wxSTD istream& str);
 #endif
     virtual bool Read(wxString& str);
-    virtual wxString GetType() const { return wxT("list"); };
+    virtual wxString GetType() const { return wxT("list"); }
 
     void Clear();
 
diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 7b0bb3c81b..41c8a455bd 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -497,7 +497,18 @@ wxSize wxWindowBase::DoGetBestSize() const
 
     if ( m_windowSizer )
     {
-        best = GetWindowSizeForVirtualSize(m_windowSizer->GetMinSize());
+        // Adjust to window size, since the return value of GetWindowSizeForVirtualSize is
+        // expressed in window and not client size
+        wxSize minSize = m_windowSizer->GetMinSize();
+        wxSize size(GetSize());
+        wxSize clientSize(GetClientSize());
+
+        wxSize minWindowSize(minSize.x + size.x - clientSize.x,
+                             minSize.y + size.y - clientSize.y);
+
+        best = GetWindowSizeForVirtualSize(minWindowSize);
+
+        return best;
     }
 #if wxUSE_CONSTRAINTS
     else if ( m_constraints )
diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index 52fc61910b..cf4e0a5be5 100644
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -1199,7 +1199,11 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
         return lenMax+1;     // not enough space in the output buffer !
     }
 
-    wxASSERT(lenCur == wxStrlen(buf));
+    // Don't do:
+    //      wxASSERT(lenCur == wxStrlen(buf));
+    // in fact if we embedded NULLs in the output buffer (using %c with a '\0')
+    // such check would fail
+
     return lenCur;
 }
 
diff --git a/src/generic/animateg.cpp b/src/generic/animateg.cpp
index c957313fad..3c026ef61b 100644
--- a/src/generic/animateg.cpp
+++ b/src/generic/animateg.cpp
@@ -254,8 +254,8 @@ class wxAnimationModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxAnimationModule)
 public:
     wxAnimationModule() {}
-    bool OnInit() { wxAnimation::InitStandardHandlers(); return true; };
-    void OnExit() { wxAnimation::CleanUpHandlers(); };
+    bool OnInit() { wxAnimation::InitStandardHandlers(); return true; }
+    void OnExit() { wxAnimation::CleanUpHandlers(); }
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxAnimationModule, wxModule)
diff --git a/src/generic/bmpcboxg.cpp b/src/generic/bmpcboxg.cpp
index 3432680bd6..211e94dd30 100644
--- a/src/generic/bmpcboxg.cpp
+++ b/src/generic/bmpcboxg.cpp
@@ -146,6 +146,9 @@ bool wxBitmapComboBox::Create(wxWindow *parent,
 void wxBitmapComboBox::PostCreate()
 {
     m_fontHeight = GetCharHeight() + EXTRA_FONT_HEIGHT;
+
+    while ( m_bitmaps.GetCount() < GetCount() )
+        m_bitmaps.Add( new wxBitmap() );
 }
 
 wxBitmapComboBox::~wxBitmapComboBox()
@@ -159,7 +162,7 @@ wxBitmapComboBox::~wxBitmapComboBox()
 
 void wxBitmapComboBox::SetItemBitmap(unsigned int n, const wxBitmap& bitmap)
 {
-    wxCHECK_RET( n < m_bitmaps.size(), wxT("invalid item index") );
+    wxCHECK_RET( n < GetCount(), wxT("invalid item index") );
     OnAddBitmap(bitmap);
     *GetBitmapPtr(n) = bitmap;
 
@@ -169,7 +172,7 @@ void wxBitmapComboBox::SetItemBitmap(unsigned int n, const wxBitmap& bitmap)
 
 wxBitmap wxBitmapComboBox::GetItemBitmap(unsigned int n) const
 {
-    wxCHECK_MSG( n < m_bitmaps.size(), wxNullBitmap, wxT("invalid item index") );
+    wxCHECK_MSG( n < GetCount(), wxNullBitmap, wxT("invalid item index") );
     return *GetBitmapPtr(n);
 }
 
diff --git a/src/generic/busyinfo.cpp b/src/generic/busyinfo.cpp
index 4d527e1555..ca53631e33 100644
--- a/src/generic/busyinfo.cpp
+++ b/src/generic/busyinfo.cpp
@@ -115,6 +115,12 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
 wxBusyInfo::wxBusyInfo(const wxString& message, wxWindow *parent)
 {
     m_InfoFrame = new wxInfoFrame( parent, message);
+    if ( parent && parent->HasFlag(wxSTAY_ON_TOP) )
+    {
+        // we must have this flag to be in front of our parent if it has it
+        m_InfoFrame->SetWindowStyleFlag(wxSTAY_ON_TOP);
+    }
+
     m_InfoFrame->Show(true);
     m_InfoFrame->Refresh();
     m_InfoFrame->Update();
diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index f36e0b2b75..d037f6255d 100644
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -40,6 +40,7 @@
 #endif
 
 #include "wx/statline.h"
+#include "wx/settings.h"
 #include "wx/generic/choicdgg.h"
 
 // ----------------------------------------------------------------------------
@@ -263,7 +264,7 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
         m_listbox->SetSelection(0);
 
     topsizer->
-        Add(m_listbox, wxSizerFlags().Expand().TripleBorder(wxLEFT | wxRIGHT));
+        Add(m_listbox, wxSizerFlags().Expand().Proportion(1).TripleBorder(wxLEFT | wxRIGHT));
 
     // 3) buttons if any
     wxSizer *
@@ -301,8 +302,11 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
 
 wxListBoxBase *wxAnyChoiceDialog::CreateList(int n, const wxString *choices, long styleLbox)
 {
+	wxSize size = wxDefaultSize;
+	if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_PDA)
+		size = wxSize(300, 200);
     return new wxListBox( this, wxID_LISTBOX,
-                          wxDefaultPosition, wxDefaultSize,
+                          wxDefaultPosition, size,
                           n, choices,
                           styleLbox );
 }
@@ -441,7 +445,7 @@ bool wxMultiChoiceDialog::Create( wxWindow *parent,
 #else
     styleLbox = wxLB_ALWAYS_SB | wxLB_EXTENDED;
 #endif
-    
+
     if ( !wxAnyChoiceDialog::Create(parent, message, caption,
                                     n, choices,
                                     style, pos,
@@ -484,11 +488,11 @@ void wxMultiChoiceDialog::SetSelections(const wxArrayInt& selections)
         {
             checkListBox->Check(selections[n]);
         }
-        
+
         return;
     }
 #endif
-    
+
     // first clear all currently selected items
     size_t n,
            count = m_listbox->GetCount();
@@ -537,8 +541,12 @@ bool wxMultiChoiceDialog::TransferDataFromWindow()
 
 wxListBoxBase *wxMultiChoiceDialog::CreateList(int n, const wxString *choices, long styleLbox)
 {
+	wxSize size = wxDefaultSize;
+	if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_PDA)
+		size = wxSize(300, 200);
+
     return new wxCheckListBox( this, wxID_LISTBOX,
-                               wxDefaultPosition, wxDefaultSize,
+                               wxDefaultPosition, size,
                                n, choices,
                                styleLbox );
 }
diff --git a/src/generic/combog.cpp b/src/generic/combog.cpp
index 674e5f1806..23bec7bba6 100644
--- a/src/generic/combog.cpp
+++ b/src/generic/combog.cpp
@@ -391,6 +391,7 @@ void wxGenericComboCtrl::SetCustomPaintWidth( int width )
             tc->RemoveEventHandler(m_textEvtHandler);
             delete m_textEvtHandler;
 
+#if wxUSE_VALIDATORS
             wxValidator* pValidator = tc->GetValidator();
             if ( pValidator )
             {
@@ -399,6 +400,7 @@ void wxGenericComboCtrl::SetCustomPaintWidth( int width )
                 delete pValidator;
             }
             else
+#endif
             {
                 CreateTextCtrl( tcCreateStyle, wxDefaultValidator );
             }
diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index f1bcc09c3c..8ec8fa65d7 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -176,7 +176,7 @@ public:
     bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; }
     void ChangeCurrentRow( unsigned int row );
 
-    bool IsSingleSel() const { return !GetParent()->HasFlag(wxDV_MULTIPLE); };
+    bool IsSingleSel() const { return !GetParent()->HasFlag(wxDV_MULTIPLE); }
     bool IsEmpty() { return GetRowCount() == 0; }
 
     int GetCountPerPage();
diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index 7ab1b5cdaf..f40b1c5845 100755
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -37,6 +37,7 @@
 #endif
 
 #include "wx/graphics.h"
+#include "wx/rawbmp.h"
 
 #if wxUSE_GRAPHICS_CONTEXT
 
@@ -757,7 +758,9 @@ void wxCairoPathData::AddLineToPoint( wxDouble x , wxDouble y )
 
 void wxCairoPathData::AddPath( const wxGraphicsPathData* path )
 {
-    // TODO
+    cairo_path_t* p = (cairo_path_t*)path->GetNativePath();
+    cairo_append_path(m_pathContext, p);
+    UnGetNativePath(p);
 }
 
 void wxCairoPathData::CloseSubpath()
@@ -1028,19 +1031,44 @@ wxCairoContext::~wxCairoContext()
 }
 
 
-void wxCairoContext::Clip( const wxRegion & WXUNUSED(region) )
+void wxCairoContext::Clip( const wxRegion& region )
 {
-// TODO
+    // Create a path with all the rectangles in the region
+    wxGraphicsPath path = GetRenderer()->CreatePath();
+    wxRegionIterator ri(region);
+    while (ri)
+    {
+        path.AddRectangle(ri.GetX(), ri.GetY(), ri.GetW(), ri.GetH());
+        ri++;
+    }
+    
+    // Put it in the context
+    cairo_path_t* cp = (cairo_path_t*) path.GetNativePath() ;
+    cairo_append_path(m_context, cp);
+
+    // clip to that path
+    cairo_clip(m_context);
+    path.UnGetNativePath(cp);  
 }
 
 void wxCairoContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
 {
-// TODO
+    // Create a path with this rectangle
+    wxGraphicsPath path = GetRenderer()->CreatePath();
+    path.AddRectangle(x,y,w,h);
+
+    // Put it in the context
+    cairo_path_t* cp = (cairo_path_t*) path.GetNativePath() ;
+    cairo_append_path(m_context, cp);
+
+    // clip to that path
+    cairo_clip(m_context);
+    path.UnGetNativePath(cp);  
 }
 
 void wxCairoContext::ResetClip()
 {
-// TODO
+    cairo_reset_clip(m_context);
 }
 
 
@@ -1118,37 +1146,156 @@ void wxCairoContext::PopState()
 
 void wxCairoContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h )
 {
-    /*
-        Bitmap* image = Bitmap::FromHBITMAP((HBITMAP)bmp.GetHBITMAP(),(HPALETTE)bmp.GetPalette()->GetHPALETTE());
-        m_context->DrawImage(image,(REAL) x,(REAL) y,(REAL) w,(REAL) h) ;
-        delete image ;
-    */
+    wxCHECK_RET( bmp.IsOk(), wxT("Invalid bitmap in wxCairoContext::DrawBitmap"));
+
+    cairo_surface_t* surface;
+    int bw = bmp.GetWidth();
+    int bh = bmp.GetHeight();
+    wxBitmap bmpSource = bmp;  // we need a non-const instance
+    unsigned char* buffer = new unsigned char[bw*bh*4];
+    wxUint32* data = (wxUint32*)buffer;
+    
+    // Create a surface object and copy the bitmap pixel data to it.  if the
+    // image has alpha (or a mask represented as alpha) then we'll use a
+    // different format and iterator than if it doesn't...
+    if (bmpSource.HasAlpha() || bmpSource.GetMask())
+    {
+        surface = cairo_image_surface_create_for_data(
+            buffer, CAIRO_FORMAT_ARGB32, bw, bh, bw*4);
+        wxAlphaPixelData pixData(bmpSource, wxPoint(0,0), wxSize(bw, bh));
+        wxCHECK_RET( pixData, wxT("Failed to gain raw access to bitmap data."));
+        
+        wxAlphaPixelData::Iterator p(pixData);
+        for (int y=0; y<bh; y++)
+        {
+            wxAlphaPixelData::Iterator rowStart = p;
+            for (int x=0; x<bw; x++)
+            {
+                // Each pixel in CAIRO_FORMAT_ARGB32 is a 32-bit quantity,
+                // with alpha in the upper 8 bits, then red, then green, then
+                // blue. The 32-bit quantities are stored native-endian.
+                // Pre-multiplied alpha is used.
+                unsigned char alpha = p.Alpha();
+                if (alpha == 0)
+                    *data = 0;
+                else
+                    *data = ( alpha                      << 24 
+                              | (p.Red() * alpha/255)    << 16 
+                              | (p.Green() * alpha/255)  <<  8 
+                              | (p.Blue() * alpha/255) );
+                ++data;
+                ++p;
+            }
+            p = rowStart;
+            p.OffsetY(pixData, 1);
+        }        
+    }
+    else  // no alpha
+    {
+        surface = cairo_image_surface_create_for_data(
+            buffer, CAIRO_FORMAT_RGB24, bw, bh, bw*4);
+        wxNativePixelData pixData(bmpSource, wxPoint(0,0), wxSize(bw, bh));
+        wxCHECK_RET( pixData, wxT("Failed to gain raw access to bitmap data."));
+        
+        wxNativePixelData::Iterator p(pixData);
+        for (int y=0; y<bh; y++)
+        {
+            wxNativePixelData::Iterator rowStart = p;
+            for (int x=0; x<bw; x++)
+            {
+                // Each pixel in CAIRO_FORMAT_RGB24 is a 32-bit quantity, with
+                // the upper 8 bits unused. Red, Green, and Blue are stored in
+                // the remaining 24 bits in that order.  The 32-bit quantities
+                // are stored native-endian.
+                *data = ( p.Red() << 16 | p.Green() << 8 | p.Blue() );
+                ++data;
+                ++p;
+            }
+            p = rowStart;
+            p.OffsetY(pixData, 1);
+        }        
+    }
+
+    
+    PushState();
+    
+    // In case we're scaling the image by using a width and height different
+    // than the bitmap's size create a pattern transformation on the surface and
+    // draw the transformed pattern.
+    cairo_pattern_t* pattern = cairo_pattern_create_for_surface(surface);
+    wxDouble scaleX = w / bw;
+    wxDouble scaleY = h / bh;
+    cairo_scale(m_context, scaleX, scaleY);
+
+    // prepare to draw the image
+    cairo_translate(m_context, x, y);
+    cairo_set_source(m_context, pattern);
+    // use the original size here since the context is scaled already...
+    cairo_rectangle(m_context, 0, 0, bw, bh);
+    // fill the rectangle using the pattern
+    cairo_fill(m_context);
+
+    // clean up
+    cairo_pattern_destroy(pattern);
+    cairo_surface_destroy(surface);
+    delete [] buffer;
+    PopState();
 }
 
 void wxCairoContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h )
 {
-    /*
-        Bitmap* image = Bitmap::FromHICON((HICON)icon.GetHICON());
-        m_context->DrawImage(image,(REAL) x,(REAL) y,(REAL) w,(REAL) h) ;
-        delete image ;
-    */
+    // An icon is a bitmap on wxGTK, so do this the easy way.  When we want to
+    // start using the Cairo backend on other platforms then we may need to
+    // fiddle with this...
+    DrawBitmap(icon, x, y, w, h);
 }
 
 
 void wxCairoContext::DrawText( const wxString &str, wxDouble x, wxDouble y )
 {
-    if ( m_font.IsNull() || str.IsEmpty())
-        return ;
-    cairo_move_to(m_context,x,y);
-    const wxWX2MBbuf buf(str.mb_str(wxConvUTF8));
+    if ( m_font.IsNull() || str.empty())
+        return;
+    
     ((wxCairoFontData*)m_font.GetRefData())->Apply(this);
+
+    // Cairo's x,y for drawing text is at the baseline, so we need to adjust
+    // the position we move to by the ascent.
+    cairo_font_extents_t fe;
+    cairo_font_extents(m_context, &fe);
+    cairo_move_to(m_context, x, y+fe.ascent);
+    
+    const wxWX2MBbuf buf(str.mb_str(wxConvUTF8));
     cairo_show_text(m_context,buf);
 }
 
 void wxCairoContext::GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height,
                                     wxDouble *descent, wxDouble *externalLeading ) const
 {
-    // TODO
+    if ( m_font.IsNull() || str.empty())
+        return;
+
+    ((wxCairoFontData*)m_font.GetRefData())->Apply((wxCairoContext*)this);
+
+    if (width)
+    {
+        const wxWX2MBbuf buf(str.mb_str(wxConvUTF8));
+        cairo_text_extents_t te;
+        cairo_text_extents(m_context, buf, &te);
+        *width = te.width;
+    }
+
+    if (height || descent || externalLeading)
+    {
+        cairo_font_extents_t fe;
+        cairo_font_extents(m_context, &fe);
+    
+        if (height)
+            *height = fe.height;
+        if ( descent )
+            *descent = fe.descent;
+        if ( externalLeading )
+            *externalLeading = wxMax(0, fe.height - (fe.ascent + fe.descent));
+    }
 }
 
 void wxCairoContext::GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 2fab29c85c..27e49d3253 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -3648,7 +3648,12 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
 
     if ( !m_colLabels.IsEmpty() )
     {
-        m_colLabels.RemoveAt( colID, numCols );
+        // m_colLabels stores just as many elements as it needs, e.g. if only
+        // the label of the first column had been set it would have only one
+        // element and not numCols, so account for it
+        int nToRm = m_colLabels.size() - colID;
+        if ( nToRm > 0 )
+            m_colLabels.RemoveAt( colID, nToRm );
     }
 
     for ( row = 0; row < curNumRows; row++ )
@@ -4357,24 +4362,33 @@ wxGrid::wxGridSelectionModes wxGrid::GetSelectionMode() const
 bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
                        wxGrid::wxGridSelectionModes selmode )
 {
+    bool checkSelection = false;
     if ( m_created )
     {
         // stop all processing
         m_created = false;
 
-        if (m_ownTable)
+        if (m_table) 
         {
-            wxGridTableBase *t = m_table;
+            m_table->SetView(0);
+            if( m_ownTable )
+                delete m_table;
             m_table = NULL;
-            delete t;
         }
 
         delete m_selection;
-
-        m_table = NULL;
         m_selection = NULL;
+
+        m_ownTable = false;
         m_numRows = 0;
         m_numCols = 0;
+        checkSelection = true;
+
+        // kill row and column size arrays
+        m_colWidths.Empty();
+        m_colRights.Empty();
+        m_rowHeights.Empty();
+        m_rowBottoms.Empty();
     }
 
     if (table)
@@ -4386,7 +4400,28 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
         m_table->SetView( this );
         m_ownTable = takeOwnership;
         m_selection = new wxGridSelection( this, selmode );
-
+        if (checkSelection)
+        {
+            // If the newly set table is smaller than the
+            // original one current cell and selection regions
+            // might be invalid,
+            m_selectingKeyboard = wxGridNoCellCoords;
+            m_currentCellCoords = 
+              wxGridCellCoords(wxMin(m_numRows, m_currentCellCoords.GetRow()),
+                               wxMin(m_numCols, m_currentCellCoords.GetCol()));
+            if (m_selectingTopLeft.GetRow() >= m_numRows ||
+                m_selectingTopLeft.GetCol() >= m_numCols)
+            {
+                m_selectingTopLeft = wxGridNoCellCoords;
+                m_selectingBottomRight = wxGridNoCellCoords;
+            }
+            else
+                m_selectingBottomRight =
+                  wxGridCellCoords(wxMin(m_numRows,
+                                         m_selectingBottomRight.GetRow()),
+                                   wxMin(m_numCols,
+                                         m_selectingBottomRight.GetCol()));
+        }
         CalcDimensions();
 
         m_created = true;
@@ -5891,13 +5926,6 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                 SaveEditControlValue();
             }
 
-            // Have we captured the mouse yet?
-            if (! m_winCapture)
-            {
-                m_winCapture = m_gridWin;
-                m_winCapture->CaptureMouse();
-            }
-
             if ( coords != wxGridNoCellCoords )
             {
                 if ( event.CmdDown() )
@@ -5917,6 +5945,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                                    coords.GetRow(),
                                    coords.GetCol(),
                                    event );
+                        return;
                     }
                 }
                 else
@@ -5938,6 +5967,14 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
                     // scrolling is way to fast, at least on MSW - also on GTK.
                 }
             }
+            // Have we captured the mouse yet?
+            if (! m_winCapture)
+            {
+                m_winCapture = m_gridWin;
+                m_winCapture->CaptureMouse();
+            }
+
+            
         }
         else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
         {
@@ -6866,14 +6903,10 @@ void wxGrid::Refresh(bool eraseb, const wxRect* rect)
     }
 }
 
-void wxGrid::OnSize( wxSizeEvent& event )
+void wxGrid::OnSize( wxSizeEvent& WXUNUSED(event) )
 {
-    // position the child windows
-    CalcWindowSizes();
-
-    // don't call CalcDimensions() from here, the base class handles the size
-    // changes itself
-    event.Skip();
+    // update our children window positions and scrollbars
+    CalcDimensions();
 }
 
 void wxGrid::OnKeyDown( wxKeyEvent& event )
@@ -9578,7 +9611,7 @@ void wxGrid::SetCellHighlightPenWidth(int width)
         // make any visible change if the the thickness is getting smaller.
         int row = m_currentCellCoords.GetRow();
         int col = m_currentCellCoords.GetCol();
-        if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+        if ( row == -1 || col == -1 || GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
             return;
 
         wxRect rect = CellToRect(row, col);
diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index c485403edb..97c78dfd42 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -98,6 +98,9 @@ static const int WIDTH_COL_DEFAULT = 80;
 // the space between the image and the text in the report mode
 static const int IMAGE_MARGIN_IN_REPORT_MODE = 5;
 
+// the space between the image and the text in the report mode in header
+static const int HEADER_IMAGE_MARGIN_IN_REPORT_MODE = 2;
+
 // ============================================================================
 // private classes
 // ============================================================================
@@ -1590,12 +1593,17 @@ void wxListLineData::DrawInReportMode( wxDC *dc,
 }
 
 void wxListLineData::DrawTextFormatted(wxDC *dc,
-                                       const wxString &text,
+                                       const wxString& textOrig,
                                        int col,
                                        int x,
                                        int yMid,
                                        int width)
 {
+    // we don't support displaying multiple lines currently (and neither does
+    // wxMSW FWIW) so just merge all the lines
+    wxString text(textOrig);
+    text.Replace(_T("\n"), _T(" "));
+
     wxCoord w, h;
     dc->GetTextExtent(text, &w, &h);
 
@@ -1841,7 +1849,6 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         wLabel += 2 * EXTRA_WIDTH;
 
         // and the width of the icon, if any
-        static const int MARGIN_BETWEEN_TEXT_AND_ICON = 2;
         int ix = 0, iy = 0;    // init them just to suppress the compiler warnings
         const int image = item.m_image;
         wxImageList *imageList;
@@ -1851,7 +1858,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             if ( imageList )
             {
                 imageList->GetSize(image, ix, iy);
-                wLabel += ix + MARGIN_BETWEEN_TEXT_AND_ICON;
+                wLabel += ix + HEADER_IMAGE_MARGIN_IN_REPORT_MODE;
             }
         }
         else
@@ -1880,6 +1887,10 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
                 break;
         }
 
+        // draw the text and image clipping them so that they
+        // don't overwrite the column boundary
+        wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw, h - 4 );
+
         // if we have an image, draw it on the right of the label
         if ( imageList )
         {
@@ -1887,18 +1898,12 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
                        (
                         image,
                         dc,
-                        xAligned + wLabel - ix - MARGIN_BETWEEN_TEXT_AND_ICON,
+                        xAligned + wLabel - ix - HEADER_IMAGE_MARGIN_IN_REPORT_MODE,
                         HEADER_OFFSET_Y + (h - 4 - iy)/2,
                         wxIMAGELIST_DRAW_TRANSPARENT
                        );
-
-            cw -= ix + MARGIN_BETWEEN_TEXT_AND_ICON;
         }
 
-        // draw the text clipping it so that it doesn't overwrite the column
-        // boundary
-        wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw, h - 4 );
-
         dc.DrawText( item.GetText(),
                      xAligned + EXTRA_WIDTH, h / 2 - hLabel / 2 ); //HEADER_OFFSET_Y + EXTRA_HEIGHT );
 
@@ -3699,6 +3704,19 @@ void wxListMainWindow::SetColumnWidth( int col, int width )
     if (width == wxLIST_AUTOSIZE_USEHEADER)
     {
         width = GetTextLength(column->GetText());
+        width += 2*EXTRA_WIDTH;
+
+        // check for column header's image availability
+        const int image = column->GetImage();
+        if ( image != -1 )
+        {
+            if ( m_small_image_list )
+            {
+                int ix = 0, iy = 0;
+                m_small_image_list->GetSize(image, ix, iy);
+                width += ix + HEADER_IMAGE_MARGIN_IN_REPORT_MODE;
+            }
+        }
     }
     else if ( width == wxLIST_AUTOSIZE )
     {
diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index 7541a816bb..ec7f57c951 100644
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -261,7 +261,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
         sizeDlg.y += 2*LAYOUT_MARGIN;
 
         // try to make the dialog not square but rectangular of reasonable width
-        sizeDlg.x = (wxCoord)wxMax(widthText, 4*sizeDlg.y/3);
+        sizeDlg.x = (wxCoord)wxMax(widthText*2, 4*sizeDlg.y/3);
         sizeDlg.x *= 3;
         sizeDlg.x /= 2;
         SetClientSize(sizeDlg);
diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index 2991a11d95..38348c5543 100644
--- a/src/generic/renderg.cpp
+++ b/src/generic/renderg.cpp
@@ -671,8 +671,8 @@ class wxGenericRendererModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxGenericRendererModule)
 public:
     wxGenericRendererModule() {}
-    bool OnInit() { return true; };
-    void OnExit() { wxRendererGeneric::Cleanup(); };
+    bool OnInit() { return true; }
+    void OnExit() { wxRendererGeneric::Cleanup(); }
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericRendererModule, wxModule)
diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 99e9a43640..4c1c5ab1d9 100644
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -41,6 +41,10 @@
     #include "wx/sizer.h"
 #endif
 
+#ifdef __WXMAC__
+#include "wx/scrolbar.h"
+#endif
+
 #include "wx/recguard.h"
 
 #ifdef __WXMSW__
@@ -447,6 +451,22 @@ wxWindow *wxScrollHelper::GetTargetWindow() const
     return m_targetWindow;
 }
 
+#ifdef __WXMAC__
+static bool wxScrolledWindowHasChildren(wxWindow* win)
+{
+    wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
+    while ( node )
+    {
+        wxWindow* child = node->GetData();
+        if ( !child->IsKindOf(CLASSINFO(wxScrollBar)) )
+            return true;
+
+        node = node->GetNext();
+    }
+    return false;
+}
+#endif
+
 // ----------------------------------------------------------------------------
 // scrolling implementation itself
 // ----------------------------------------------------------------------------
@@ -463,6 +483,7 @@ void wxScrollHelper::HandleOnScroll(wxScrollWinEvent& event)
     }
 
     bool needsRefresh = false;
+
     int dx = 0,
         dy = 0;
     int orient = event.GetOrientation();
@@ -494,7 +515,12 @@ void wxScrollHelper::HandleOnScroll(wxScrollWinEvent& event)
         // flush all pending repaints before we change m_{x,y}ScrollPosition, as
         // otherwise invalidated area could be updated incorrectly later when
         // ScrollWindow() makes sure they're repainted before scrolling them
+#ifdef __WXMAC__
+        // wxWindowMac is taking care of making sure the update area is correctly
+        // set up, while not forcing an immediate redraw
+#else
         m_targetWindow->Update();
+#endif
     }
 
     if (orient == wxHORIZONTAL)
diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index 75f9391892..b111b0de8f 100644
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -123,7 +123,7 @@ public:
     {
         if ( GetValue() == m_descriptiveText )
         {
-            SetValue(wxEmptyString);
+            ChangeValue(wxEmptyString);
         }
         
         m_descriptiveText = text;
@@ -163,7 +163,7 @@ protected:
     {
         if ( IsEmpty() && !(wxWindow::FindFocus() == this) )
         {
-            SetValue(m_descriptiveText);
+            ChangeValue(m_descriptiveText);
             SetInsertionPoint(0);
             SetForegroundColour(wxStepColour(m_defaultFG, LIGHT_STEP));
         }
@@ -174,7 +174,7 @@ protected:
         event.Skip();
         if ( GetValue() == m_descriptiveText )
         {
-            SetValue(wxEmptyString);
+            ChangeValue(wxEmptyString);
             SetForegroundColour(m_defaultFG);
         }
     }
diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 98097d6a8e..8cb7bf9a79 100644
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -1445,6 +1445,7 @@ wxTreeItemId wxGenericTreeCtrl::DoInsertItem(const wxTreeItemId& parentId,
     parent->Insert( item, previous == (size_t)-1 ? parent->GetChildren().size()
                                                  : previous );
 
+    InvalidateBestSize();
     return item;
 }
 
@@ -1479,6 +1480,7 @@ wxTreeItemId wxGenericTreeCtrl::AddRoot(const wxString& text,
         m_current->SetHilight( true );
     }
 
+    InvalidateBestSize();
     return m_anchor;
 }
 
@@ -1539,6 +1541,7 @@ void wxGenericTreeCtrl::DeleteChildren(const wxTreeItemId& itemId)
     wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem;
     ChildrenClosing(item);
     item->DeleteChildren(this);
+    InvalidateBestSize();
 }
 
 void wxGenericTreeCtrl::Delete(const wxTreeItemId& itemId)
@@ -1603,6 +1606,8 @@ void wxGenericTreeCtrl::Delete(const wxTreeItemId& itemId)
         m_select_me = NULL;
 
     delete item;
+
+    InvalidateBestSize();        
 }
 
 void wxGenericTreeCtrl::DeleteAllItems()
diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index 385a10d8b8..01eed934a5 100644
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -326,6 +326,15 @@ bool wxWizard::Create(wxWindow *parent,
     return result;
 }
 
+wxWizard::~wxWizard()
+{
+    // normally we don't have to delete this sizer as it's deleted by the
+    // associated window but if we never used it or didn't set it as the window
+    // sizer yet, do delete it manually
+    if ( !m_usingSizer || !m_started )
+        delete m_sizerPage;
+}
+
 void wxWizard::AddBitmapRow(wxBoxSizer *mainColumn)
 {
     m_sizerBmpAndPage = new wxBoxSizer(wxHORIZONTAL);
diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 1aee54439b..010ee269a7 100644
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -478,7 +478,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         {
             while ( strcmp(wxConvUTF8.cWX2MB(argv[i]), argvGTK[i]) != 0 )
             {
-                memmove(argv + i, argv + i + 1, argc - i);
+                memmove(argv + i, argv + i + 1, (argc - i)*sizeof(*argv));
             }
         }
 
@@ -504,6 +504,10 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         return false;
     }
 
+    // update internal arg[cv] as GTK+ may have removed processed options:
+    this->argc = argc;
+    this->argv = argv;
+
     // we can not enter threads before gtk_init is done
     gdk_threads_enter();
 
diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 8dc1c7a820..ba38afe937 100644
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -954,9 +954,11 @@ void wxComboBox::SetValue( const wxString& value )
 #endif
         entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
 
+    DisableEvents();
     wxString tmp;
     if (!value.IsNull()) tmp = value;
     gtk_entry_set_text( entry, wxGTK_CONV( tmp ) );
+    EnableEvents();
 
     InvalidateBestSize();
 }
diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index f940e07bdb..7af2a52fc8 100644
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -252,9 +252,6 @@ wxVisualAttributes wxControl::GetDefaultAttributes() const
                                              UseGTKStyleBase());
 }
 
-
-#define SHIFT (8*(sizeof(short int)-sizeof(char)))
-
 // static
 wxVisualAttributes
 wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
@@ -277,17 +274,11 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
         state = GTK_STATE_NORMAL;
 
     // get the style's colours
-    attr.colFg = wxColour(style->fg[state].red   >> SHIFT,
-                          style->fg[state].green >> SHIFT,
-                          style->fg[state].blue  >> SHIFT);
+    attr.colFg = wxColour(style->fg[state]);
     if (useBase)
-        attr.colBg = wxColour(style->base[state].red   >> SHIFT,
-                              style->base[state].green >> SHIFT,
-                              style->base[state].blue  >> SHIFT);
+        attr.colBg = wxColour(style->base[state]);
     else
-        attr.colBg = wxColour(style->bg[state].red   >> SHIFT,
-                              style->bg[state].green >> SHIFT,
-                              style->bg[state].blue  >> SHIFT);
+        attr.colBg = wxColour(style->bg[state]);
 
     // get the style's font
     if ( !style->font_desc )
diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 37a761a59f..3284452806 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -810,7 +810,8 @@ bool wxGtkDataViewListModelNotifier::RowChanged( unsigned int row )
 bool wxGtkDataViewListModelNotifier::ValueChanged( unsigned int model_col, unsigned int model_row )
 {
     // This adds GTK+'s missing MVC logic for ValueChanged
-    wxNode *node = GetOwner()->m_viewingColumns.GetFirst();
+    wxObjectList::compatibility_iterator
+        node = GetOwner()->m_viewingColumns.GetFirst();
     while (node)
     {
         wxDataViewViewingColumn* viewing_column = (wxDataViewViewingColumn*) node->GetData();
@@ -847,7 +848,8 @@ bool wxGtkDataViewListModelNotifier::RowsReordered( unsigned int *new_order )
     gtk_tree_path_free (path);
 
     // This adds GTK+'s missing MVC logic for RowsReordered
-    wxNode *node = GetOwner()->m_viewingColumns.GetFirst();
+    wxObjectList::compatibility_iterator
+        node = GetOwner()->m_viewingColumns.GetFirst();
     while (node)
     {
         wxDataViewViewingColumn* viewing_column = (wxDataViewViewingColumn*) node->GetData();
diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index c79e4175d6..a3681ed4d0 100644
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1830,7 +1830,12 @@ wxCoord wxWindowDC::GetCharWidth() const
 wxCoord wxWindowDC::GetCharHeight() const
 {
     PangoFontMetrics *metrics = pango_context_get_metrics (m_context, m_fontdesc, pango_context_get_language(m_context));
-    return PANGO_PIXELS (pango_font_metrics_get_descent (metrics) + pango_font_metrics_get_ascent (metrics));
+    wxCHECK_MSG( metrics, -1, _T("failed to get pango font metrics") );
+
+    wxCoord h = PANGO_PIXELS (pango_font_metrics_get_descent (metrics) +
+                pango_font_metrics_get_ascent (metrics));
+    pango_font_metrics_unref (metrics);
+    return h;
 }
 
 void wxWindowDC::Clear()
diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 75b82b7303..5196121dc1 100644
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -115,14 +115,20 @@ int wxDialog::ShowModal()
     // forbidden
     if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
     {
-        wxWindow *parent = wxTheApp->GetTopWindow();
+        extern WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete;
+
+        wxWindow * const parent = wxTheApp->GetTopWindow();
+
         if ( parent &&
                 parent != this &&
-                    !parent->IsBeingDeleted() &&
-                        !(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) )
+                    parent->IsShownOnScreen() &&
+                        !parent->IsBeingDeleted() &&
+                            !wxPendingDelete.Member(parent) &&
+                                !(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) )
         {
             m_parent = parent;
-            gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(parent->m_widget) );
+            gtk_window_set_transient_for( GTK_WINDOW(m_widget),
+                                          GTK_WINDOW(parent->m_widget) );
         }
     }
 
diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 25a5ceba64..65cf3a2de6 100644
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -234,17 +234,14 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
         fn.AssignDir(defaultDir);
 
     // set the initial file name and/or directory
-    wxString fname = fn.GetFullName();
-    if ( fname.empty() )
+    const wxString dir = fn.GetPath();
+    if ( !dir.empty() )
     {
-        wxString dir = fn.GetPath();
-        if ( !dir.empty() )
-        {
-            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
-                                                dir.fn_str());
-        }
+        gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
+                                            dir.fn_str());
     }
 
+    const wxString fname = fn.GetFullName();
     if ( style & wxFD_SAVE )
     {
         if ( !fname.empty() )
diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 6c63afc9a5..95636a79d5 100644
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -552,12 +552,50 @@ void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
 
 int wxListBox::DoAppend( const wxString& item )
 {
-    // Call DoInsertItems
-    unsigned int nWhere = wxListBox::GetCount();
-    wxArrayString aItems;
-    aItems.Add(item);
-    wxListBox::DoInsertItems(aItems, nWhere);
-    return nWhere;
+    wxCHECK_MSG( m_treeview != NULL, -1, wxT("invalid listbox") );
+
+    InvalidateBestSize();
+
+    GtkTreeEntry* entry = gtk_tree_entry_new();
+    gtk_tree_entry_set_label( entry, wxGTK_CONV(item) );
+    gtk_tree_entry_set_destroy_func(entry,
+                (GtkTreeEntryDestroy)gtk_tree_entry_destroy_cb,
+                            this);
+
+    GtkTreeIter itercur;
+    gtk_list_store_insert_before( m_liststore, &itercur, NULL );
+
+#if wxUSE_CHECKLISTBOX
+    if (m_hasCheckBoxes)
+    {
+            gtk_list_store_set(  m_liststore, &itercur,
+                                 0, FALSE, //FALSE == not toggled
+                                 1, entry, -1);
+    }
+    else
+#endif
+        gtk_list_store_set(m_liststore, &itercur,
+                                 0, entry, -1);
+
+    g_object_unref (entry); //liststore always refs :)
+
+    GtkTreePath* path = gtk_tree_model_get_path(
+                                GTK_TREE_MODEL(m_liststore),
+                                &itercur);
+
+    gint* pIntPath = gtk_tree_path_get_indices(path);
+
+    if (pIntPath == NULL)
+    {
+        wxLogSysError(wxT("internal wxListBox error in insertion"));
+        return wxNOT_FOUND;
+    }
+
+    int index = pIntPath[0];
+
+    gtk_tree_path_free( path );
+
+    return index;
 }
 
 void wxListBox::DoSetItems( const wxArrayString& items,
diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 7f4d87855d..232d301ff7 100644
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -1362,10 +1362,10 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
                 hotkey << wxT("Down" );
                 break;
             case WXK_PAGEUP:
-                hotkey << wxT("PgUp" );
+                hotkey << wxT("Page_Up" );
                 break;
             case WXK_PAGEDOWN:
-                hotkey << wxT("PgDn" );
+                hotkey << wxT("Page_Down" );
                 break;
             case WXK_LEFT:
                 hotkey << wxT("Left" );
@@ -1483,10 +1483,10 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
                 hotkey << wxT("KP_Down" );
                 break;
             case WXK_NUMPAD_PAGEUP:
-                hotkey << wxT("KP_PgUp" );
+                hotkey << wxT("KP_Page_Up" );
                 break;
             case WXK_NUMPAD_PAGEDOWN:
-                hotkey << wxT("KP_PgDn" );
+                hotkey << wxT("KP_Page_Down" );
                 break;
             case WXK_NUMPAD_END:
                 hotkey << wxT("KP_End" );
diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 938fe515ca..e84d215469 100644
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -253,6 +253,12 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
     m_widget = GTKCreateFrame(title);
     wxControl::SetLabel(title);
+    if ( HasFlag(wxNO_BORDER) )
+    {
+        // If we don't do this here, the wxNO_BORDER style is ignored in Show()
+        gtk_frame_set_shadow_type(GTK_FRAME(m_widget), GTK_SHADOW_NONE);
+    }
+
 
     // majorDim may be 0 if all trailing parameters were omitted, so don't
     // assert here but just use the correct value for it
diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp
index 2f0bea636a..2808986822 100644
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -108,15 +108,15 @@ void wxScrollHelperNative::DoAdjustScrollbar(GtkRange* range,
         *linesPerPage = 0;
     }
 
-    // ensure that the scroll position is always in valid range
-    if ( *pos > *lines )
-        *pos = *lines;
-
     GtkAdjustment* adj = range->adjustment;
     adj->step_increment = 1;
     adj->page_increment =
     adj->page_size = page_size;
     gtk_range_set_range(range, 0, upper);
+
+    // ensure that the scroll position is always in valid range
+    if (*pos > *lines)
+        *pos = *lines;
 }
 
 void wxScrollHelperNative::AdjustScrollbars()
diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index dc964e0153..269d2c4921 100644
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -182,7 +182,6 @@ gtk_value_changed(GtkRange* range, wxSlider* win)
     // If integral position has changed
     if (wxRound(oldPos) != pos)
     {
-        wxCHECK_RET(eventType != wxEVT_NULL, _T("Unknown slider scroll event type"));
         ProcessScrollEvent(win, eventType);
         win->m_needThumbRelease = eventType == wxEVT_SCROLL_THUMBTRACK;
     }
diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index bb499a7cda..a5314ce4df 100644
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -18,6 +18,49 @@
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// constants taken from GTK sources
+#define LABEL_PAD 1
+#define LABEL_SIDE_PAD 2
+
+//-----------------------------------------------------------------------------
+// "gtk_frame_size_allocate" signal
+//-----------------------------------------------------------------------------
+
+extern "C" {
+
+static void
+gtk_frame_size_allocate (GtkWidget     *widget,
+                         GtkAllocation *allocation,
+                         wxStaticBox *p)
+{
+    GtkFrame *frame = GTK_FRAME (widget);
+
+    // this handler gets called _after_ the GTK+'s own signal handler; thus we
+    // need to fix only the width of the GtkLabel
+    // (everything else has already been handled by the GTK+ signal handler).
+
+    if (frame->label_widget && GTK_WIDGET_VISIBLE (frame->label_widget))
+    {
+        GtkAllocation ca = frame->label_widget->allocation;
+
+        // we want the GtkLabel to not exceed maxWidth:
+        int maxWidth = allocation->width - 2*LABEL_SIDE_PAD - 2*LABEL_PAD;
+        maxWidth = wxMax(2, maxWidth);      // maxWidth must always be positive!
+
+        // truncate the label to the GtkFrame width...
+        ca.width = wxMin(ca.width, maxWidth);
+        gtk_widget_size_allocate(frame->label_widget, &ca);
+    }
+}
+
+}
+
+
 //-----------------------------------------------------------------------------
 // wxStaticBox
 //-----------------------------------------------------------------------------
@@ -75,6 +118,11 @@ bool wxStaticBox::Create( wxWindow *parent,
     if ( style & (wxALIGN_RIGHT | wxALIGN_CENTER) ) // left alignment is default
         gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.5);
 
+    // in order to clip the label widget, we must connect to the size allocate
+    // signal of this GtkFrame after the default GTK+'s allocate size function
+    g_signal_connect_after (m_widget, "size_allocate",
+                            G_CALLBACK (gtk_frame_size_allocate), this);
+
     return TRUE;
 }
 
diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 8d2c1e01b4..b3de46da61 100644
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -152,8 +152,11 @@ wxSize wxStaticText::DoGetBestSize() const
     // Do not return any arbitrary default value...
     wxASSERT_MSG( m_widget, wxT("wxStaticText::DoGetBestSize called before creation") );
 
-    // GetBestSize is supposed to return unwrapped size
-    gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
+    // GetBestSize is supposed to return unwrapped size but calling
+    // gtk_label_set_line_wrap() from here is a bad idea as it queues another
+    // size request by calling gtk_widget_queue_resize() and we end up in
+    // infinite loop sometimes (notably when the control is in a toolbar)
+    GTK_LABEL(m_widget)->wrap = FALSE;
 
     GtkRequisition req;
     req.width = -1;
@@ -161,7 +164,7 @@ wxSize wxStaticText::DoGetBestSize() const
     (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
         (m_widget, &req );
 
-    gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
+    GTK_LABEL(m_widget)->wrap = TRUE; // restore old value
 
     // Adding 1 to width to workaround GTK sometimes wrapping the text needlessly
     return wxSize (req.width+1, req.height);
diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index 3ce3d74f7d..f1e0bcc9ad 100644
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -597,6 +597,30 @@ void wxToolBar::SetToolShortHelp( int id, const wxString& helpString )
     }
 }
 
+void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )
+{
+    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+    if ( tool )
+    {
+        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
+
+        tool->SetNormalBitmap(bitmap);
+        tool->SetImage(tool->GetBitmap());
+    }    
+}
+
+void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
+{
+    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+    if ( tool )
+    {
+        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
+
+        tool->SetDisabledBitmap(bitmap);
+        tool->SetImage(tool->GetBitmap());
+    }    
+}
+
 // ----------------------------------------------------------------------------
 // wxToolBar idle handling
 // ----------------------------------------------------------------------------
diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 558d9064e5..f17fa1ff1a 100644
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -1119,8 +1119,12 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const
     {
         GtkTextIter line;
         gtk_text_buffer_get_iter_at_line(m_buffer,&line,lineNo);
+
         GtkTextIter end = line;
-        gtk_text_iter_forward_to_line_end(&end);
+        // avoid skipping to the next line end if this one is empty
+        if ( !gtk_text_iter_ends_line(&line) )
+            gtk_text_iter_forward_to_line_end(&end);
+
         wxGtkString text(gtk_text_buffer_get_text(m_buffer, &line, &end, true));
         result = wxGTK_CONV_BACK(text);
     }
diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index fc5605303f..91d58f39b1 100644
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -343,12 +343,13 @@ gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget),
 //-----------------------------------------------------------------------------
 
 extern "C" {
-static void
+static gboolean
 gtk_frame_map_callback( GtkWidget * WXUNUSED(widget),
                         GdkEvent * WXUNUSED(event),
                         wxTopLevelWindow *win )
 {
     win->SetIconizeState(false);
+    return false;
 }
 }
 
@@ -357,12 +358,13 @@ gtk_frame_map_callback( GtkWidget * WXUNUSED(widget),
 //-----------------------------------------------------------------------------
 
 extern "C" {
-static void
+static gboolean
 gtk_frame_unmap_callback( GtkWidget * WXUNUSED(widget),
                           GdkEvent * WXUNUSED(event),
                           wxTopLevelWindow *win )
 {
     win->SetIconizeState(true);
+    return false;
 }
 }
 
@@ -814,7 +816,7 @@ bool wxTopLevelWindowGTK::Show( bool show )
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
     if (show == IsShown())
-        return true;
+        return false;
 
     if (show && !m_sizeSet)
     {
@@ -826,13 +828,17 @@ bool wxTopLevelWindowGTK::Show( bool show )
         GtkOnSize();
     }
 
-    // This seems no longer to be needed and the call
-    // itself is deprecated.
-    //
-    //if (show)
-    //    gtk_widget_set_uposition( m_widget, m_x, m_y );
+    wxTopLevelWindowBase::Show(show);
 
-    return wxWindow::Show( show );
+    if (!show)
+    {
+        // make sure window has a non-default position, so when it is shown
+        // again, it won't be repositioned by WM as if it were a new window
+        // Note that this must be done _after_ the window is hidden.
+        gtk_window_move((GtkWindow*)m_widget, m_x, m_y);
+    }
+
+    return true;
 }
 
 void wxTopLevelWindowGTK::Raise()
diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index f9c83e3166..72757f441b 100644
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -185,50 +185,28 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 
 wxCharBuffer wxConvertToGTK(const wxString& s, wxFontEncoding enc)
 {
-    wxCharBuffer buf;
-    if ( enc == wxFONTENCODING_UTF8 )
+    wxWCharBuffer wbuf;
+    if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT )
     {
-        // no need for conversion at all, but do check that we have a valid
-        // UTF-8 string because passing invalid UTF-8 to GTK+ is going to
-        // result in a GTK+ error message and, especially, loss of data which
-        // was supposed to be shown in the GUI
-        if ( wxConvUTF8.ToWChar(NULL, 0, s, s.length()) == wxCONV_FAILED )
-        {
-            // warn the programmer that something is probably wrong in his code
-            //
-            // NB: don't include the string in output because chances are that
-            //     this invalid UTF-8 string could result in more errors itself
-            //     if the application shows logs in the GUI and so we get into
-            //     an infinite loop
-            wxLogDebug(_T("Invalid UTF-8 string in wxConvertToGTK()"));
-
-            // but still try to show at least something on the screen
-            wxMBConvUTF8 utf8permissive(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL);
-            wxWCharBuffer wbuf(utf8permissive.cMB2WC(s));
-            buf = wxConvUTF8.cWC2MB(wbuf);
-        }
-        else // valid UTF-8 string, no need to convert
-        {
-            buf = wxCharBuffer(s);
-        }
+        wbuf = wxConvUI->cMB2WC(s);
     }
-    else // !UTF-8
+    else // another encoding, use generic conversion class
     {
-        wxWCharBuffer wbuf;
-        if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT )
-        {
-            wbuf = wxConvUI->cMB2WC(s);
-        }
-        else // another encoding, use generic conversion class
-        {
-            wbuf = wxCSConv(enc).cMB2WC(s);
-        }
-
-        if ( wbuf )
-            buf = wxConvUTF8.cWC2MB(wbuf);
+        wbuf = wxCSConv(enc).cMB2WC(s);
     }
 
-    return buf;
+    if ( !wbuf && !s.empty() )
+    {
+        // conversion failed, but we still want to show something to the user
+        // even if it's going to be wrong it is better than nothing
+        //
+        // we choose ISO8859-1 here arbitrarily, it's just the most common
+        // encoding probably and, also importantly here, conversion from it
+        // never fails as it's done internally by wxCSConv
+        wbuf = wxCSConv(wxFONTENCODING_ISO8859_1).cMB2WC(s);
+    }
+
+    return wxConvUTF8.cWC2MB(wbuf);
 }
 
 #endif // !wxUSE_UNICODE
diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index 09bd29432c..d64a8352c1 100644
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -340,8 +340,12 @@ gtk_pizza_set_size (GtkPizza   *pizza,
 
         if (child->widget == widget)
         {
-            child->x = x;
-            child->y = y;
+            if (child->x != x || child->y != y)
+            {
+                child->x = x;
+                child->y = y;
+                gtk_widget_queue_resize(widget);
+            }
 
             gtk_widget_set_size_request (widget, width, height);
 
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 4d3c7dafe9..683944f6b2 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -1682,7 +1682,11 @@ gtk_window_button_release_callback( GtkWidget *widget,
     event.SetEventObject( win );
     event.SetId( win->GetId() );
 
-    return win->GTKProcessEvent(event);
+    bool ret = win->GTKProcessEvent(event);
+    
+    g_lastMouseEvent = NULL;
+    
+    return ret;
 }
 
 //-----------------------------------------------------------------------------
@@ -1900,12 +1904,14 @@ gtk_window_focus_out_callback( GtkWidget *widget,
     }
 #endif // wxUSE_CARET
 
-    gboolean ret = FALSE;
-
     // don't send the window a kill focus event if it thinks that it doesn't
     // have focus already
     if ( win->m_hasFocus )
     {
+        // the event handler might delete the window when it loses focus, so
+        // check whether this is a custom window before calling it
+        const bool has_wxwindow = win->m_wxwindow != NULL;
+
         win->m_hasFocus = false;
 
         wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() );
@@ -1913,14 +1919,13 @@ gtk_window_focus_out_callback( GtkWidget *widget,
 
         (void)win->GTKProcessEvent( event );
 
-        ret = TRUE;
+        // Disable default focus handling for custom windows
+        // since the default GTK+ handler issues a repaint
+        if ( has_wxwindow )
+            return TRUE;
     }
 
-    // Disable default focus handling for custom windows
-    // since the default GTK+ handler issues a repaint
-    if (win->m_wxwindow)
-        return ret;
-
+    // continue with normal processing
     return FALSE;
 }
 
@@ -2133,16 +2138,11 @@ void gtk_window_size_callback( GtkWidget *WXUNUSED(widget),
     if ((client_width == win->m_oldClientWidth) && (client_height == win->m_oldClientHeight))
         return;
 
-#if 0
-        wxPrintf( wxT("size_allocate ") );
-        if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-            wxPrintf( win->GetClassInfo()->GetClassName() );
-        wxPrintf( wxT(" %d %d %d %d\n"),
-                alloc->x,
-                alloc->y,
-                alloc->width,
-                alloc->height );
-#endif
+    if ( !client_width && !client_height )
+    {
+        // the window is currently unmapped, don't generate size events
+        return;
+    }
 
     win->m_oldClientWidth = client_width;
     win->m_oldClientHeight = client_height;
diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index fa3f149dd0..32295957b9 100644
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -1244,10 +1244,10 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
                 hotkey << wxT("Down" );
                 break;
             case WXK_PAGEUP:
-                hotkey << wxT("PgUp" );
+                hotkey << wxT("Page_Up" );
                 break;
             case WXK_PAGEDOWN:
-                hotkey << wxT("PgDn" );
+                hotkey << wxT("Page_Down" );
                 break;
             case WXK_LEFT:
                 hotkey << wxT("Left" );
@@ -1365,10 +1365,10 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
                 hotkey << wxT("KP_Down" );
                 break;
             case WXK_NUMPAD_PAGEUP:
-                hotkey << wxT("KP_PgUp" );
+                hotkey << wxT("KP_Page_Up" );
                 break;
             case WXK_NUMPAD_PAGEDOWN:
-                hotkey << wxT("KP_PgDn" );
+                hotkey << wxT("KP_Page_Down" );
                 break;
             case WXK_NUMPAD_END:
                 hotkey << wxT("KP_End" );
diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index f969e6e4d1..2f760c38cf 100644
--- a/src/gtk1/radiobox.cpp
+++ b/src/gtk1/radiobox.cpp
@@ -202,6 +202,11 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
     m_widget = gtk_frame_new(NULL);
     SetLabel(title);
+    if ( HasFlag(wxNO_BORDER) )
+    {
+        // If we don't do this here, the wxNO_BORDER style is ignored in Show()
+        gtk_frame_set_shadow_type(GTK_FRAME(m_widget), GTK_SHADOW_NONE);
+    }
 
     // majorDim may be 0 if all trailing parameters were omitted, so don't
     // assert here but just use the correct value for it
diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp
index 9215711601..17a376198b 100644
--- a/src/html/helpwnd.cpp
+++ b/src/html/helpwnd.cpp
@@ -1199,8 +1199,8 @@ public:
                       wxSize(200, wxDefaultCoord),
                       0, NULL, wxCB_DROPDOWN | wxCB_READONLY));
 
-        sizer->Add(FontSize = new wxSpinCtrl(this, wxID_ANY));
-        FontSize->SetRange(2, 100);
+        sizer->Add(FontSize = new wxSpinCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition,
+                      wxDefaultSize, wxSP_ARROW_KEYS, 2, 100, 2, _T("wxSpinCtrl")));
 
         topsizer->Add(sizer, 0, wxLEFT|wxRIGHT|wxTOP, 10);
 
diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index 95d81d6abc..3244eb577f 100644
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -884,12 +884,12 @@ void wxHtmlContainerCell::Layout(int w)
                 if ( step > 0 )
                 {
                     // first count the cells which will get extra space
-                    int total = 0;
+                    int total = -1;
 
                     const wxHtmlCell *c;
                     if ( line != cell )
                     {
-                        for ( c = line->GetNext(); c != cell; c = c->GetNext() )
+                        for ( c = line; c != cell; c = c->GetNext() )
                         {
                             if ( c->IsLinebreakAllowed() )
                             {
@@ -901,11 +901,22 @@ void wxHtmlContainerCell::Layout(int w)
                     // and now extra space to those cells which merit it
                     if ( total )
                     {
-                        // first cell on line is not moved:
-                        line->SetPos(line->GetPosX() + s_indent,
-                                     line->GetPosY() + ypos);
+                        // first visible cell on line is not moved:
+                        while (line !=cell && !line->IsLinebreakAllowed())
+                        {
+                            line->SetPos(line->GetPosX() + s_indent,
+                                         line->GetPosY() + ypos);
+                            line = line->GetNext();
+                        }
+
+                        if (line != cell)
+                        {
+                            line->SetPos(line->GetPosX() + s_indent,
+                                         line->GetPosY() + ypos);
+
+                            line = line->GetNext();
+                        }
 
-                        line = line->GetNext();
                         for ( int n = 0; line != cell; line = line->GetNext() )
                         {
                             if ( line->IsLinebreakAllowed() )
diff --git a/src/html/htmlfilter.cpp b/src/html/htmlfilter.cpp
deleted file mode 100644
index 57508b1069..0000000000
--- a/src/html/htmlfilter.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        filter.cpp
-// Purpose:     wxHtmlFilter - input filter for translating into HTML format
-// Author:      Vaclav Slavik
-// Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
-/////////////////////////////////////////////////////////////////////////////
-
-
-#ifdef __GNUG__
-#pragma implementation "htmlfilter.h"
-#endif
-
-#include "wx/wxprec.h"
-
-#if wxUSE_HTML
-
-#ifdef __BORDLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WXPRECOMP
-#endif
-
-#include "wx/html/htmlfilter.h"
-#include "wx/html/htmlwin.h"
-
-
-/*
-
-There is code for several default filters:
-
-*/
-
-IMPLEMENT_ABSTRACT_CLASS(wxHtmlFilter, wxObject)
-
-//--------------------------------------------------------------------------------
-// wxHtmlFilterPlainText
-//          filter for text/plain or uknown
-//--------------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterPlainText, wxHtmlFilter)
-
-bool wxHtmlFilterPlainText::CanRead(const wxFSFile& WXUNUSED(file)) const
-{
-    return TRUE;
-}
-
-
-
-wxString wxHtmlFilterPlainText::ReadFile(const wxFSFile& file) const
-{
-    wxInputStream *s = file.GetStream();
-    char *src;
-    wxString doc, doc2;
-
-    if (s == NULL) return wxEmptyString;
-    src = new char[s -> GetSize()+1];
-    src[s -> GetSize()] = 0;
-    s -> Read(src, s -> GetSize());
-    doc = src;
-    delete [] src;
-
-    doc.Replace(_T("<"), _T("&lt;"), TRUE);
-    doc.Replace(_T(">"), _T("&gt;"), TRUE);
-    doc2 = _T("<HTML><BODY><PRE>\n") + doc + _T("\n</PRE></BODY></HTML>");
-    return doc2;
-}
-
-
-
-
-
-//--------------------------------------------------------------------------------
-// wxHtmlFilterImage
-//          filter for image/*
-//--------------------------------------------------------------------------------
-
-class wxHtmlFilterImage : public wxHtmlFilter
-{
-    DECLARE_DYNAMIC_CLASS(wxHtmlFilterImage)
-
-    public:
-        virtual bool CanRead(const wxFSFile& file) const;
-        virtual wxString ReadFile(const wxFSFile& file) const;
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterImage, wxHtmlFilter)
-
-
-
-bool wxHtmlFilterImage::CanRead(const wxFSFile& file) const
-{
-    return (file.GetMimeType().Left(6) == "image/");
-}
-
-
-
-wxString wxHtmlFilterImage::ReadFile(const wxFSFile& file) const
-{
-    return ("<HTML><BODY><IMG SRC=\"" + file.GetLocation() + "\"></BODY></HTML>");
-}
-
-
-
-
-//--------------------------------------------------------------------------------
-// wxHtmlFilterPlainText
-//          filter for text/plain or uknown
-//--------------------------------------------------------------------------------
-
-class wxHtmlFilterHTML : public wxHtmlFilter
-{
-    DECLARE_DYNAMIC_CLASS(wxHtmlFilterHTML)
-
-    public:
-        virtual bool CanRead(const wxFSFile& file) const;
-        virtual wxString ReadFile(const wxFSFile& file) const;
-};
-
-
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterHTML, wxHtmlFilter)
-
-bool wxHtmlFilterHTML::CanRead(const wxFSFile& file) const
-{
-//    return (file.GetMimeType() == "text/html");
-// This is true in most case but some page can return:
-// "text/html; char-encoding=...."
-// So we use Find instead
-  return (file.GetMimeType().Find(_T("text/html")) == 0);
-}
-
-
-
-wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
-{
-    wxInputStream *s = file.GetStream();
-    char *src;
-    wxString doc;
-
-    if (s == NULL) return wxEmptyString;
-    src = new char[s -> GetSize() + 1];
-    src[s -> GetSize()] = 0;
-    s -> Read(src, s -> GetSize());
-    doc = src;
-    delete[] src;
-
-    return doc;
-}
-
-
-
-
-///// Module:
-
-class wxHtmlFilterModule : public wxModule
-{
-    DECLARE_DYNAMIC_CLASS(wxHtmlFilterModule)
-
-    public:
-        virtual bool OnInit()
-        {
-            wxHtmlWindow::AddFilter(new wxHtmlFilterHTML);
-            wxHtmlWindow::AddFilter(new wxHtmlFilterImage);
-            return TRUE;
-        }
-        virtual void OnExit() {}
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterModule, wxModule)
-
-#endif
diff --git a/src/html/htmlhelp.cpp b/src/html/htmlhelp.cpp
deleted file mode 100644
index 8ea6466640..0000000000
--- a/src/html/htmlhelp.cpp
+++ /dev/null
@@ -1,839 +0,0 @@
-// Name:        htmlhelp.cpp
-// Purpose:     Help controller
-// Author:      Vaclav Slavik
-// Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
-/////////////////////////////////////////////////////////////////////////////
-
-#error This file should not be compiled! Update your build system! \
-(configure users, rerun configure to get a new Makefile) \
-Instead of htmlhelp[_io], use helpdata, helpfrm and helpctrl. This \
-file is only left to point out the problem and will be removed r.s.n.
-
-#ifdef __GNUG__
-#pragma implementation "htmlhelp.h"
-#endif
-
-#include "wx/wxprec.h"
-
-#if wxUSE_HTML
-
-#ifdef __BORDLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WXPRECOMP
-#endif
-
-#include <wx/notebook.h>
-#include <wx/imaglist.h>
-#include <wx/treectrl.h>
-#include <wx/tokenzr.h>
-#include <wx/wfstream.h>
-#include <wx/html/htmlwin.h>
-#include <wx/html/htmlhelp.h>
-#include <wx/busyinfo.h>
-
-#if !((wxVERSION_NUMBER < 2100) || ((wxVERSION_NUMBER == 2100) && (wxBETA_NUMBER < 7)))
-#include <wx/progdlg.h>
-#endif
-
-
-// Bitmaps:
-
-#ifndef __WXMSW__
-    // XPM hack: make the arrays const
-    #define static static const
-
-    #include "bitmaps/panel.xpm"
-    #include "bitmaps/back.xpm"
-    #include "bitmaps/forward.xpm"
-    #include "bitmaps/book.xpm"
-    #include "bitmaps/folder.xpm"
-    #include "bitmaps/page.xpm"
-
-    #undef static
-#endif
-
-#include "search.h"
-
-
-
-
-#include <wx/arrimpl.cpp>
-WX_DEFINE_OBJARRAY(HtmlBookRecArray)
-
-
-
-
-
-
-
-
-
-//-----------------------------------------------------------------------------
-// wxHtmlHelpController
-//-----------------------------------------------------------------------------
-
-
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxEvtHandler)
-
-
-wxHtmlHelpController::wxHtmlHelpController() : wxEvtHandler()
-{
-    m_Frame = NULL;
-    m_Config = NULL;
-    m_ConfigRoot = wxEmptyString;
-    m_TitleFormat = _("Help : %s");
-    m_TempPath = wxEmptyString;
-
-    m_Cfg.x = m_Cfg.y = 0;
-    m_Cfg.w = 700; m_Cfg.h = 480;
-    m_Cfg.sashpos = 240;
-    m_Cfg.navig_on = TRUE;
-
-    m_ContentsImageList = new wxImageList(12, 12);
-    m_ContentsImageList -> Add(wxICON(book));
-    m_ContentsImageList -> Add(wxICON(folder));
-    m_ContentsImageList -> Add(wxICON(page));
-
-    m_Contents = NULL;
-    m_ContentsCnt = 0;
-    m_Index = NULL;
-    m_IndexCnt = 0;
-
-    m_IndexBox = NULL;
-    m_ContentsBox = NULL;
-    m_SearchList = NULL;
-    m_SearchText = NULL;
-    m_SearchButton = NULL;
-    m_HtmlWin = NULL;
-    m_Splitter = NULL;
-    m_NavigPan = NULL;
-}
-
-
-
-wxHtmlHelpController::~wxHtmlHelpController()
-{
-    int i;
-
-    m_BookRecords.Empty();
-    delete m_ContentsImageList;
-    if (m_Contents) {
-        for (i = 0; i < m_ContentsCnt; i++) {
-            delete[] m_Contents[i].m_Page;
-            delete[] m_Contents[i].m_Name;
-        }
-        free(m_Contents);
-    }
-    if (m_Index) {
-        for (i = 0; i < m_IndexCnt; i++) {
-            delete[] m_Index[i].m_Page;
-            delete[] m_Index[i].m_Name;
-        }
-        free(m_Index);
-    }
-}
-
-
-
-void wxHtmlHelpController::SetTempDir(const wxString& path)
-{
-    if (path == wxEmptyString) m_TempPath = path;
-    else {
-	if (wxIsAbsolutePath(path)) m_TempPath = path;
-	else m_TempPath = wxGetCwd() + "/" + path;
-
-	if (m_TempPath[m_TempPath.Length() - 1] != '/')
-            m_TempPath << "/";
-    }
-}
-
-
-
-
-// Reads one line, stores it into buf and returns pointer to new line or NULL.
-static char* ReadLine(char *line, char *buf)
-{
-    char *writeptr = buf, *readptr = line;
-
-    while (*readptr != 0 && *readptr != '\r' && *readptr != '\n') *(writeptr++) = *(readptr++);
-    *writeptr = 0;
-    while (*readptr == '\r' || *readptr == '\n') readptr++;
-    if (*readptr == 0) return NULL;
-    else return readptr;
-}
-
-
-static wxString SafeFileName(const wxString& s)
-{
-    wxString res = s;
-    res.Replace(_T(":"), _T("_"), TRUE);
-    res.Replace(_T(" "), _T("_"), TRUE);
-    res.Replace(_T("/"), _T("_"), TRUE);
-    res.Replace(_T("\\"), _T("_"), TRUE);
-    res.Replace(_T("#"), _T("_"), TRUE);
-    res.Replace(_T("."), _T("_"), TRUE);
-    return res;
-}
-
-
-static int IndexCompareFunc(const void *a, const void *b)
-{
-    return strcmp(((HtmlContentsItem*)a) -> m_Name, ((HtmlContentsItem*)b) -> m_Name);
-}
-
-
-
-bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg)
-{
-    wxFSFile *fi;
-    wxFileSystem fsys;
-    wxInputStream *s;
-    HtmlBookRecord *bookr;
-    wxString bookFull;
-
-    int sz;
-    char *buff, *lineptr;
-    char linebuf[300];
-
-    wxString title = _("noname"),
-             safetitle,
-             start = wxEmptyString,
-             contents = wxEmptyString, index = wxEmptyString;
-
-    if (wxIsAbsolutePath(book)) bookFull = book;
-    else bookFull = wxGetCwd() + "/" + book;
-
-    fi = fsys.OpenFile(bookFull);
-    if (fi == NULL) return FALSE;
-    fsys.ChangePathTo(bookFull);
-    s = fi -> GetStream();
-    sz = s -> GetSize();
-    buff = new char[sz+1];
-    buff[sz] = 0;
-    s -> Read(buff, sz);
-    lineptr = buff;
-    delete fi;
-
-    while ((lineptr = ReadLine(lineptr, linebuf)) != NULL) {
-        if (strstr(linebuf, "Title=") == linebuf)
-            title = linebuf + strlen("Title=");
-        if (strstr(linebuf, "Default topic=") == linebuf)
-            start = linebuf + strlen("Default topic=");
-        if (strstr(linebuf, "Index file=") == linebuf)
-            index = linebuf + strlen("Index file=");
-        if (strstr(linebuf, "Contents file=") == linebuf)
-            contents = linebuf + strlen("Contents file=");
-    }
-    delete[] buff;
-
-    bookr = new HtmlBookRecord(fsys.GetPath(), title, start);
-
-    if (m_ContentsCnt % HTML_REALLOC_STEP == 0)
-        m_Contents = (HtmlContentsItem*) realloc(m_Contents, (m_ContentsCnt + HTML_REALLOC_STEP) * sizeof(HtmlContentsItem));
-    m_Contents[m_ContentsCnt].m_Level = 0;
-    m_Contents[m_ContentsCnt].m_ID = 0;
-    m_Contents[m_ContentsCnt].m_Page = new char[start.Length() + 1];
-    strcpy(m_Contents[m_ContentsCnt].m_Page, start.c_str());
-    m_Contents[m_ContentsCnt].m_Name = new char [title.Length() + 1];
-    strcpy(m_Contents[m_ContentsCnt].m_Name, title.c_str());
-    m_Contents[m_ContentsCnt].m_Book = bookr;
-    m_ContentsCnt++;
-
-    // Try to find cached binary versions:
-    safetitle = SafeFileName(title);
-    fi = fsys.OpenFile(safetitle + ".cached");
-    if (fi == NULL) fi = fsys.OpenFile(m_TempPath + safetitle + ".cached");
-    if ((fi == NULL) || (m_TempPath == wxEmptyString)) {
-        LoadMSProject(bookr, fsys, index, contents, show_wait_msg);
-        if (m_TempPath != wxEmptyString) {
-	        wxFileOutputStream *outs = new wxFileOutputStream(m_TempPath + safetitle + ".cached");
-            SaveCachedBook(bookr, outs);
-            delete outs;
-	}
-    }
-    else {
-        LoadCachedBook(bookr, fi -> GetStream());
-        delete fi;
-    }
-
-    m_BookRecords.Add(bookr);
-    if (m_IndexCnt > 0)
-        qsort(m_Index, m_IndexCnt, sizeof(HtmlContentsItem), IndexCompareFunc);
-
-    return TRUE;
-}
-
-
-
-
-void wxHtmlHelpController::Display(const wxString& x)
-{
-    int cnt;
-    int i;
-    wxFileSystem fsys;
-    wxFSFile *f;
-
-    CreateHelpWindow();
-
-    /* 1. try to open given file: */
-
-    cnt = m_BookRecords.GetCount();
-    for (i = 0; i < cnt; i++) {
-        f = fsys.OpenFile(m_BookRecords[i].GetBasePath() + x);
-        if (f) {
-            m_HtmlWin -> LoadPage(m_BookRecords[i].GetBasePath() + x);
-            delete f;
-            return;
-        }
-    }
-
-
-    /* 2. try to find a book: */
-
-    for (i = 0; i < cnt; i++) {
-        if (m_BookRecords[i].GetTitle() == x) {
-            m_HtmlWin -> LoadPage(m_BookRecords[i].GetBasePath() + m_BookRecords[i].GetStart());
-            return;
-        }
-    }
-
-    /* 3. try to find in contents: */
-
-    cnt = m_ContentsCnt;
-    for (i = 0; i < cnt; i++) {
-        if (strcmp(m_Contents[i].m_Name, x) == 0) {
-            m_HtmlWin -> LoadPage(m_Contents[i].m_Book -> GetBasePath() + m_Contents[i].m_Page);
-            return;
-        }
-    }
-
-
-    /* 4. try to find in index: */
-
-    cnt = m_IndexCnt;
-    for (i = 0; i < cnt; i++) {
-        if (strcmp(m_Index[i].m_Name, x) == 0) {
-            m_HtmlWin -> LoadPage(m_Index[i].m_Book -> GetBasePath() + m_Index[i].m_Page);
-            return;
-        }
-    }
-
-
-    /* 5. if everything failed, search the documents: */
-
-    KeywordSearch(x);
-}
-
-
-
-void wxHtmlHelpController::Display(const int id)
-{
-    CreateHelpWindow();
-
-    for (int i = 0; i < m_ContentsCnt; i++) {
-        if (m_Contents[i].m_ID == id) {
-            m_HtmlWin -> LoadPage(m_Contents[i].m_Book -> GetBasePath() + m_Contents[i].m_Page);
-            return;
-        }
-    }
-}
-
-
-
-void wxHtmlHelpController::DisplayContents()
-{
-    CreateHelpWindow();
-    m_Frame -> Raise();
-    if (!m_Splitter -> IsSplit()) {
-       m_NavigPan -> Show(TRUE);
-       m_HtmlWin -> Show(TRUE);
-       m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
-    }
-    m_NavigPan -> SetSelection(0);
-}
-
-
-
-void wxHtmlHelpController::DisplayIndex()
-{
-    CreateHelpWindow();
-    m_Frame -> Raise();
-    if (!m_Splitter -> IsSplit()) {
-       m_NavigPan -> Show(TRUE);
-       m_HtmlWin -> Show(TRUE);
-       m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
-    }
-    m_NavigPan -> SetSelection(1);
-}
-
-
-
-
-#if (wxVERSION_NUMBER < 2100) || ((wxVERSION_NUMBER == 2100) && (wxBETA_NUMBER < 7))
-
-class MyProgressDlg : public wxDialog
-{
-    public:
-        bool m_Canceled;
-
-        MyProgressDlg(wxWindow *parent) : wxDialog(parent, -1,
-	              _("Searching..."),
-	              wxPoint(0, 0),
-#ifdef __WXGTK__
-		      wxSize(300, 110)
-#else
-		      wxSize(300, 130)
-#endif
-              )
-		      {m_Canceled = FALSE;}
-        void OnCancel(wxCommandEvent& event) {m_Canceled = TRUE;}
-        DECLARE_EVENT_TABLE()
-};
-BEGIN_EVENT_TABLE(MyProgressDlg, wxDialog)
-    EVT_BUTTON(wxID_CANCEL, MyProgressDlg::OnCancel)
-END_EVENT_TABLE()
-
-#endif
-
-
-bool wxHtmlHelpController::KeywordSearch(const wxString& keyword)
-{
-    int foundcnt = 0;
-    CreateHelpWindow();
-    // if these are not set, we can't continue
-    if (! (m_SearchList && m_HtmlWin))
-       return FALSE;
-    m_Frame -> Raise();
-    if (m_Splitter && m_NavigPan && m_SearchButton) {
-       if (!m_Splitter -> IsSplit()) {
-          m_NavigPan -> Show(TRUE);
-          m_HtmlWin -> Show(TRUE);
-          m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
-       }
-       m_NavigPan -> SetSelection(2);
-       m_SearchList -> Clear();
-       m_SearchText -> SetValue(keyword);
-       m_SearchButton -> Enable(FALSE);
-    }
-    {
-        int cnt = m_ContentsCnt;
-        wxSearchEngine engine;
-        wxFileSystem fsys;
-        wxFSFile *file;
-        wxString lastpage = wxEmptyString;
-        wxString foundstr;
-
-#if (wxVERSION_NUMBER < 2100) || ((wxVERSION_NUMBER == 2100) && (wxBETA_NUMBER < 7))
-        MyProgressDlg progress(m_Frame);
-
-        wxStaticText *prompt = new wxStaticText(&progress, -1, "", wxPoint(20, 50), wxSize(260, 25), wxALIGN_CENTER);
-        wxGauge *gauge = new wxGauge(&progress, -1, cnt, wxPoint(20, 20), wxSize(260, 25));
-        wxButton *btn = new wxButton(&progress, wxID_CANCEL, _("Cancel"), wxPoint(110, 70), wxSize(80, 25));
-        btn = btn; /* fool compiler :-) */
-        prompt -> SetLabel(_("No matching page found yet"));
-
-	progress.Centre(wxBOTH);
-        progress.Show(TRUE);
-#else
-	wxProgressDialog progress(_("Searching..."), _("No matching page found yet"), cnt, m_Frame, wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_AUTO_HIDE);
-#endif
-
-        engine.LookFor(keyword);
-
-        for (int i = 0; i < cnt; i++) {
-#if (wxVERSION_NUMBER < 2100) || ((wxVERSION_NUMBER == 2100) && (wxBETA_NUMBER < 7))
-            gauge -> SetValue(i);
-            if (progress.m_Canceled) break;
-#else
-    	    if (progress.Update(i) == FALSE) break;
-#endif
-	    wxYield();
-
-            file = fsys.OpenFile(m_Contents[i].m_Book -> GetBasePath() + m_Contents[i].m_Page);
-            if (file) {
-                if (lastpage != file -> GetLocation()) {
-                    lastpage = file -> GetLocation();
-                    if (engine.Scan(file -> GetStream())) {
-                        foundstr.Printf(_("Found %i matches"), ++foundcnt);
-#if (wxVERSION_NUMBER < 2100) || ((wxVERSION_NUMBER == 2100) && (wxBETA_NUMBER < 7))
-                        prompt -> SetLabel(foundstr);
-#else
-    	    	    	progress.Update(i, foundstr);
-#endif
-                        wxYield();
-                        m_SearchList -> Append(m_Contents[i].m_Name, (char*)(m_Contents + i));
-                    }
-                }
-                delete file;
-            }
-        }
-
-#if (wxVERSION_NUMBER < 2100) || ((wxVERSION_NUMBER == 2100) && (wxBETA_NUMBER < 7))
-        progress.Close(TRUE);
-#endif
-    }
-    if (m_SearchButton)
-	m_SearchButton -> Enable(TRUE);
-    if (m_SearchText) {
-	m_SearchText -> SetSelection(0, keyword.Length());
-	m_SearchText -> SetFocus();
-    }
-    if (foundcnt) {
-        HtmlContentsItem *it = (HtmlContentsItem*) m_SearchList -> GetClientData(0);
-        if (it) m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
-    }
-    return (foundcnt > 0);
-}
-
-
-
-
-
-
-void wxHtmlHelpController::CreateHelpWindow()
-{
-    wxBusyCursor cur;
-    wxString oldpath;
-    wxStatusBar *sbar;
-
-    if (m_Frame) {
-        m_Frame -> Raise();
-    	m_Frame -> Show(TRUE);
-        return;
-    }
-
-#if wxUSE_BUSYINFO
-    wxBusyInfo busyinfo(_("Preparing help window..."));
-#endif
-
-    if (m_Config) ReadCustomization(m_Config, m_ConfigRoot);
-
-    m_Frame = new wxFrame(NULL, -1, "", wxPoint(m_Cfg.x, m_Cfg.y), wxSize(m_Cfg.w, m_Cfg.h));
-    m_Frame -> PushEventHandler(this);
-    sbar = m_Frame -> CreateStatusBar();
-
-    {
-        wxToolBar *toolBar;
-        toolBar = m_Frame -> CreateToolBar(wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT | wxTB_DOCKABLE);
-        toolBar -> SetMargins(2, 2);
-        wxBitmap* toolBarBitmaps[3];
-
-#ifdef __WXMSW__
-        toolBarBitmaps[0] = new wxBitmap("panel");
-        toolBarBitmaps[1] = new wxBitmap("back");
-        toolBarBitmaps[2] = new wxBitmap("forward");
-        int width = 24;
-#else
-        toolBarBitmaps[0] = new wxBitmap(panel_xpm);
-        toolBarBitmaps[1] = new wxBitmap(back_xpm);
-        toolBarBitmaps[2] = new wxBitmap(forward_xpm);
-        int width = 16;
-#endif
-
-        int currentX = 5;
-
-        toolBar -> AddTool(wxID_HTML_PANEL, *(toolBarBitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _("Show/hide navigation panel"));
-        currentX += width + 5;
-        toolBar -> AddSeparator();
-        toolBar -> AddTool(wxID_HTML_BACK, *(toolBarBitmaps[1]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _("Go back to the previous HTML page"));
-        currentX += width + 5;
-        toolBar -> AddTool(wxID_HTML_FORWARD, *(toolBarBitmaps[2]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _("Go forward to the next HTML page"));
-        currentX += width + 5;
-
-        toolBar -> Realize();
-
-        // Can delete the bitmaps since they're reference counted
-        for (int i = 0; i < 3; i++) delete toolBarBitmaps[i];
-    }
-
-
-    {
-        m_Splitter = new wxSplitterWindow(m_Frame);
-
-        m_HtmlWin = new wxHtmlWindow(m_Splitter);
-        m_HtmlWin -> SetRelatedFrame(m_Frame, m_TitleFormat);
-        m_HtmlWin -> SetRelatedStatusBar(0);
-        if (m_Config) m_HtmlWin -> ReadCustomization(m_Config, m_ConfigRoot);
-
-        m_NavigPan = new wxNotebook(m_Splitter, wxID_HTML_NOTEBOOK, wxDefaultPosition, wxDefaultSize);
-        {
-            m_ContentsBox = new wxTreeCtrl(m_NavigPan, wxID_HTML_TREECTRL, wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS | wxSUNKEN_BORDER);
-            m_ContentsBox -> SetImageList(m_ContentsImageList);
-            m_NavigPan -> AddPage(m_ContentsBox, _("Contents"));
-        }
-
-        {
-            wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_INDEXPAGE);
-            wxLayoutConstraints *b1 = new wxLayoutConstraints;
-            b1 -> top.SameAs        (dummy, wxTop, 0);
-            b1 -> left.SameAs       (dummy, wxLeft, 0);
-            b1 -> width.PercentOf   (dummy, wxWidth, 100);
-            b1 -> bottom.SameAs     (dummy, wxBottom, 0);
-            m_IndexBox = new wxListBox(dummy, wxID_HTML_INDEXLIST, wxDefaultPosition, wxDefaultSize, 0);
-            m_IndexBox -> SetConstraints(b1);
-            dummy -> SetAutoLayout(TRUE);
-            m_NavigPan -> AddPage(dummy, _("Index"));
-        }
-
-        {
-            wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_SEARCHPAGE);
-
-            wxLayoutConstraints *b1 = new wxLayoutConstraints;
-            m_SearchText = new wxTextCtrl(dummy, wxID_HTML_SEARCHTEXT);
-            b1 -> top.SameAs        (dummy, wxTop, 0);
-            b1 -> left.SameAs       (dummy, wxLeft, 0);
-            b1 -> right.SameAs      (dummy, wxRight, 0);
-            b1 -> height.AsIs();
-            m_SearchText -> SetConstraints(b1);
-
-            wxLayoutConstraints *b2 = new wxLayoutConstraints;
-            m_SearchButton = new wxButton(dummy, wxID_HTML_SEARCHBUTTON, _("Search!"));
-            b2 -> top.Below         (m_SearchText, 10);
-            b2 -> right.SameAs      (dummy, wxRight, 10);
-            b2 -> width.AsIs();
-            b2 -> height.AsIs();
-            m_SearchButton -> SetConstraints(b2);
-
-            wxLayoutConstraints *b3 = new wxLayoutConstraints;
-            m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST, wxDefaultPosition, wxDefaultSize, 0);
-            b3 -> top.Below         (m_SearchButton, 10);
-            b3 -> left.SameAs       (dummy, wxLeft, 0);
-            b3 -> right.SameAs      (dummy, wxRight, 0);
-            b3 -> bottom.SameAs     (dummy, wxBottom, 0);
-            m_SearchList -> SetConstraints(b3);
-
-            dummy -> SetAutoLayout(TRUE);
-            dummy -> Layout();
-            m_NavigPan -> AddPage(dummy, _("Search"));
-        }
-
-        RefreshLists();
-        m_NavigPan -> Show(TRUE);
-        m_HtmlWin -> Show(TRUE);
-        m_Splitter -> SetMinimumPaneSize(20);
-        m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
-        if (!m_Cfg.navig_on) m_Splitter -> Unsplit(m_NavigPan);
-        wxYield();
-    }
-
-    m_Frame -> Show(TRUE);
-    wxYield();
-}
-
-
-
-#define MAX_ROOTS 64
-
-void wxHtmlHelpController::CreateContents()
-{
-    HtmlContentsItem *it;
-    wxTreeItemId roots[MAX_ROOTS];
-    bool imaged[MAX_ROOTS];
-    int count = m_ContentsCnt;
-
-    m_ContentsBox -> DeleteAllItems();
-    roots[0] = m_ContentsBox -> AddRoot(_("(Help)"));
-    imaged[0] = TRUE;
-
-    for (int i = 0; i < count; i++) {
-        it = m_Contents + i;
-        roots[it -> m_Level + 1] = m_ContentsBox -> AppendItem(roots[it -> m_Level], it -> m_Name, IMG_Page, -1, new wxHtmlHelpTreeItemData(it));
-        if (it -> m_Level == 0) {
-            m_ContentsBox -> SetItemBold(roots[1], TRUE);
-            m_ContentsBox -> SetItemImage(roots[1], IMG_Book);
-            m_ContentsBox -> SetItemSelectedImage(roots[1], IMG_Book);
-            imaged[1] = TRUE;
-        }
-        else imaged[it -> m_Level + 1] = FALSE;
-
-        if (!imaged[it -> m_Level]) {
-            m_ContentsBox -> SetItemImage(roots[it -> m_Level], IMG_Folder);
-            m_ContentsBox -> SetItemSelectedImage(roots[it -> m_Level], IMG_Folder);
-            imaged[it -> m_Level] = TRUE;
-        }
-    }
-
-    m_ContentsBox -> Expand(roots[0]);
-}
-
-
-
-
-void wxHtmlHelpController::CreateIndex()
-{
-    m_IndexBox -> Clear();
-
-    for (int i = 0; i < m_IndexCnt; i++)
-        m_IndexBox -> Append(m_Index[i].m_Name, (char*)(m_Index + i));
-}
-
-
-
-void wxHtmlHelpController::RefreshLists()
-{
-    if (m_Frame) {
-        CreateContents();
-        CreateIndex();
-        m_SearchList -> Clear();
-    }
-}
-
-
-
-
-
-
-
-void wxHtmlHelpController::ReadCustomization(wxConfigBase *cfg, wxString path)
-{
-    wxString oldpath;
-    wxString tmp;
-
-    if (path != wxEmptyString) {
-        oldpath = cfg -> GetPath();
-        cfg -> SetPath(path);
-    }
-
-    m_Cfg.navig_on = cfg -> Read("hcNavigPanel", m_Cfg.navig_on) != 0;
-    m_Cfg.sashpos = cfg -> Read("hcSashPos", m_Cfg.sashpos);
-    m_Cfg.x = cfg -> Read("hcX", m_Cfg.x);
-    m_Cfg.y = cfg -> Read("hcY", m_Cfg.y);
-    m_Cfg.w = cfg -> Read("hcW", m_Cfg.w);
-    m_Cfg.h = cfg -> Read("hcH", m_Cfg.h);
-
-    if (path != wxEmptyString)
-        cfg -> SetPath(oldpath);
-}
-
-
-
-void wxHtmlHelpController::WriteCustomization(wxConfigBase *cfg, wxString path)
-{
-    wxString oldpath;
-    wxString tmp;
-
-    if (path != wxEmptyString) {
-        oldpath = cfg -> GetPath();
-        cfg -> SetPath(path);
-    }
-
-    cfg -> Write("hcNavigPanel", m_Cfg.navig_on);
-    cfg -> Write("hcSashPos", (long)m_Cfg.sashpos);
-    cfg -> Write("hcX", (long)m_Cfg.x);
-    cfg -> Write("hcY", (long)m_Cfg.y);
-    cfg -> Write("hcW", (long)m_Cfg.w);
-    cfg -> Write("hcH", (long)m_Cfg.h);
-
-    if (path != wxEmptyString)
-        cfg -> SetPath(oldpath);
-}
-
-
-
-
-
-/*
-EVENT HANDLING :
-*/
-
-
-void wxHtmlHelpController::OnToolbar(wxCommandEvent& event)
-{
-    switch (event.GetId()) {
-        case wxID_HTML_BACK :
-            m_HtmlWin -> HistoryBack();
-            break;
-        case wxID_HTML_FORWARD :
-            m_HtmlWin -> HistoryForward();
-            break;
-        case wxID_HTML_PANEL :
-            if (m_Splitter -> IsSplit()) {
-                m_Cfg.sashpos = m_Splitter -> GetSashPosition();
-                m_Splitter -> Unsplit(m_NavigPan);
-            }
-            else {
-                m_NavigPan -> Show(TRUE);
-                m_HtmlWin -> Show(TRUE);
-                m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
-            }
-            break;
-    }
-}
-
-
-
-void wxHtmlHelpController::OnContentsSel(wxTreeEvent& event)
-{
-    wxHtmlHelpTreeItemData *pg;
-
-    pg = (wxHtmlHelpTreeItemData*) m_ContentsBox -> GetItemData(event.GetItem());
-    if (pg) m_HtmlWin -> LoadPage(pg -> GetPage());
-}
-
-
-
-void wxHtmlHelpController::OnIndexSel(wxCommandEvent& event)
-{
-    HtmlContentsItem *it = (HtmlContentsItem*) m_IndexBox -> GetClientData(m_IndexBox -> GetSelection());
-    if (it) m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
-}
-
-
-
-void wxHtmlHelpController::OnSearchSel(wxCommandEvent& event)
-{
-    HtmlContentsItem *it = (HtmlContentsItem*) m_SearchList -> GetClientData(m_SearchList -> GetSelection());
-    if (it) m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
-}
-
-
-
-void wxHtmlHelpController::OnCloseWindow(wxCloseEvent& event)
-{
-    int a, b;
-
-    m_Cfg.navig_on = m_Splitter -> IsSplit();
-    if (m_Cfg.navig_on)
-        m_Cfg.sashpos = m_Splitter -> GetSashPosition();
-    m_Frame -> GetPosition(&a, &b);
-    m_Cfg.x = a, m_Cfg.y = b;
-    m_Frame -> GetSize(&a, &b);
-    m_Cfg.w = a, m_Cfg.h = b;
-
-    if (m_Config) {
-        WriteCustomization(m_Config, m_ConfigRoot);
-        m_HtmlWin -> WriteCustomization(m_Config, m_ConfigRoot);
-    }
-    m_Frame = NULL;
-
-    event.Skip();
-}
-
-
-
-void wxHtmlHelpController::OnSearch(wxCommandEvent& event)
-{
-    wxString sr = m_SearchText -> GetLineText(0);
-
-    if (sr != wxEmptyString) KeywordSearch(sr);
-}
-
-
-
-BEGIN_EVENT_TABLE(wxHtmlHelpController, wxEvtHandler)
-    EVT_TOOL_RANGE(wxID_HTML_PANEL, wxID_HTML_FORWARD, wxHtmlHelpController::OnToolbar)
-    EVT_TREE_SEL_CHANGED(wxID_HTML_TREECTRL, wxHtmlHelpController::OnContentsSel)
-    EVT_LISTBOX(wxID_HTML_INDEXLIST, wxHtmlHelpController::OnIndexSel)
-    EVT_LISTBOX(wxID_HTML_SEARCHLIST, wxHtmlHelpController::OnSearchSel)
-    EVT_CLOSE(wxHtmlHelpController::OnCloseWindow)
-    EVT_BUTTON(wxID_HTML_SEARCHBUTTON, wxHtmlHelpController::OnSearch)
-    EVT_TEXT_ENTER(wxID_HTML_SEARCHTEXT, wxHtmlHelpController::OnSearch)
-END_EVENT_TABLE()
-
-
-
-#endif
-
diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 9478914c41..75e39a8ba7 100644
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -953,6 +953,7 @@ bool wxHtmlWindow::CopySelection(ClipboardType t)
 void wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link)
 {
     wxHtmlLinkEvent event(GetId(), link);
+    event.SetEventObject(this);
     if (!GetEventHandler()->ProcessEvent(event))
     {
         // the default behaviour is to load the URL in this window
diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index 4986a9f649..9073ffc9ec 100644
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -352,6 +352,8 @@ TAG_HANDLER_BEGIN(BODY, "BODY")
                         winIface->SetHTMLBackgroundImage(image);
 #endif
                 }
+
+                delete fileBgImage;
             }
         }
 
diff --git a/src/html/search.cpp b/src/html/search.cpp
deleted file mode 100644
index 85a59a2b2e..0000000000
--- a/src/html/search.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        search.cpp
-// Purpose:     search engine
-// Author:      Vaclav Slavik
-// RCS-ID:      $Id$
-// Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "wx/wxprec.h"
-
-#include "wx/defs.h"
-#if wxUSE_HTML
-
-#ifdef __BORDLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WXPRECOMP
-#endif
-
-#include "wx/html/helpdata.h"
-
-
-//--------------------------------------------------------------------------------
-// wxSearchEngine
-//--------------------------------------------------------------------------------
-
-void wxSearchEngine::LookFor(const wxString& keyword)
-{
-    if (m_Keyword) delete[] m_Keyword;
-    m_Keyword = new wxChar[keyword.Length() + 1];
-    wxStrcpy(m_Keyword, keyword.c_str());
-    for (int i = wxStrlen(m_Keyword) - 1; i >= 0; i--)
-        if ((m_Keyword[i] >= wxT('A')) && (m_Keyword[i] <= wxT('Z')))
-            m_Keyword[i] += wxT('a') - wxT('A');
-}
-
-
-
-bool wxSearchEngine::Scan(wxInputStream *stream)
-{
-    wxASSERT_MSG(m_Keyword != NULL, _("wxSearchEngine::LookFor must be called before scanning!"));
-
-    int i, j;
-    int lng = stream ->GetSize();
-    int wrd = wxStrlen(m_Keyword);
-    bool found = FALSE;
-    char *buf = new char[lng + 1];
-    stream -> Read(buf, lng);
-    buf[lng] = 0;
-
-    for (i = 0; i < lng; i++)
-        if ((buf[i] >= 'A') && (buf[i] <= 'Z')) buf[i] += 'a' - 'A';
-
-    for (i = 0; i < lng - wrd; i++) {
-        j = 0;
-        while ((j < wrd) && (buf[i + j] == m_Keyword[j])) j++;
-        if (j == wrd) {found = TRUE; break;}
-    }
-
-    delete[] buf;
-    return found;
-}
-
-#endif
diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 8c52e9f221..96582a326f 100644
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -460,7 +460,8 @@ wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item )
 
         // is it part of the application or the Help menu, then look for the id directly
         if ( ( GetMenuHandle( kwxMacAppleMenuId ) != NULL && command.menu.menuRef == GetMenuHandle( kwxMacAppleMenuId ) ) ||
-             ( mh != NULL && command.menu.menuRef == mh ) )
+             ( mh != NULL && command.menu.menuRef == mh ) || 
+             wxMenuBar::MacGetWindowMenuHMenu() != NULL && command.menu.menuRef == wxMenuBar::MacGetWindowMenuHMenu() )
         {
             wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
             if ( mbar )
@@ -1586,7 +1587,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
         wxWindow* focus = wxFindWinFromMacWindow( FrontWindow() ) ;
         if ( focus )
         {
-            if ( keyval == WXK_RETURN )
+            if ( keyval == WXK_RETURN || keyval == WXK_NUMPAD_ENTER )
             {
                 wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(focus), wxTopLevelWindow);
                 if ( tlw && tlw->GetDefaultItem() )
diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp
index c914add38b..e43aaa6dba 100644
--- a/src/mac/carbon/checkbox.cpp
+++ b/src/mac/carbon/checkbox.cpp
@@ -136,11 +136,13 @@ bool wxBitmapCheckBox::Create(wxWindow *parent,
     const wxPoint& pos,
     const wxSize& size,
     long style,
-    const wxValidator& validator,
+    const wxValidator& wxVALIDATOR_PARAM(validator),
     const wxString& name)
 {
     SetName(name);
+#if wxUSE_VALIDATORS
     SetValidator(validator);
+#endif
     m_windowStyle = style;
 
     if (parent)
diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 6a155d9636..bf360cb425 100644
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -576,7 +576,7 @@ void wxComboBox::SetSelection(int n)
     m_choice->SetSelection( n );
 
     if ( m_text != NULL )
-        m_text->SetValue(GetString(n));
+        m_text->SetValue(n != wxNOT_FOUND ? GetString(n) : wxString(wxEmptyString));
 }
 
 int wxComboBox::FindString(const wxString& s, bool bCase) const
diff --git a/src/mac/carbon/display.cpp b/src/mac/carbon/display.cpp
index a69b111ae8..3e9d8d50a1 100644
--- a/src/mac/carbon/display.cpp
+++ b/src/mac/carbon/display.cpp
@@ -63,6 +63,7 @@ public:
     }
 
     virtual wxRect GetGeometry() const;
+    virtual wxRect GetClientArea() const;
     virtual wxString GetName() const { return wxString(); }
 
     virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const;
@@ -173,6 +174,17 @@ wxRect wxDisplayImplMacOSX::GetGeometry() const
                    (int)theRect.size.height ); //floats
 }
 
+wxRect wxDisplayImplMacOSX::GetClientArea() const
+{
+    // VZ: I don't know how to get client area for arbitrary display but
+    //     wxGetClientDisplayRect() does work correctly for at least the main
+    //     one (TODO: do it correctly for the other displays too)
+    if ( IsPrimary() )
+        return wxGetClientDisplayRect();
+
+    return wxDisplayImpl::GetClientArea();
+}
+
 static int wxCFDictKeyToInt( CFDictionaryRef desc, CFStringRef key )
 {
     CFNumberRef value = (CFNumberRef) CFDictionaryGetValue( desc, key );
diff --git a/src/mac/carbon/dnd.cpp b/src/mac/carbon/dnd.cpp
index 29c7ff768b..6f5a325730 100644
--- a/src/mac/carbon/dnd.cpp
+++ b/src/mac/carbon/dnd.cpp
@@ -37,6 +37,8 @@ typedef struct
     wxWindow *m_currentTargetWindow;
     wxDropTarget *m_currentTarget;
     wxDropSource *m_currentSource;
+    wxDragResult m_result;
+    int m_flags;
 } MacTrackingGlobals;
 
 MacTrackingGlobals gTrackingGlobals;
@@ -455,18 +457,15 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
     // only when drag was successfully completed
 
     gTrackingGlobals.m_currentSource = this;
+    gTrackingGlobals.m_result = wxDragNone;
+    gTrackingGlobals.m_flags = flags;
+
     TrackDrag( theDrag, ev, dragRegion );
     DisposeRgn( dragRegion );
     DisposeDrag( theDrag );
     gTrackingGlobals.m_currentSource = NULL;
 
-    bool optionDown = GetCurrentKeyModifiers() & optionKey;
-    wxDragResult dndresult = wxDragCopy;
-    if ( flags != wxDrag_CopyOnly )
-        // on mac the option key is always the indication for copy
-        dndresult = optionDown ? wxDragCopy : wxDragMove;
-
-    return dndresult;
+    return gTrackingGlobals.m_result;
 }
 
 bool wxDropSource::MacInstallDefaultCursor(wxDragResult effect)
@@ -704,13 +703,20 @@ pascal OSErr wxMacWindowDragReceiveHandler(
             trackingGlobals->m_currentTargetWindow->MacRootWindowToWindow( &localx, &localy );
         if ( trackingGlobals->m_currentTarget->OnDrop( localx, localy ) )
         {
-            bool optionDown = GetCurrentKeyModifiers() & optionKey;
-            wxDragResult result = optionDown ? wxDragCopy : wxDragMove;
-            trackingGlobals->m_currentTarget->OnData( localx, localy, result );
+            // the option key indicates copy in Mac UI, if it's not pressed do
+            // move by default if it's allowed at all
+            wxDragResult
+                result = !(trackingGlobals->m_flags & wxDrag_AllowMove) ||
+                            (GetCurrentKeyModifiers() & optionKey)
+                            ? wxDragCopy
+                            : wxDragMove;
+            trackingGlobals->m_result =
+                trackingGlobals->m_currentTarget->OnData( localx, localy, result );
         }
     }
 
     return noErr;
 }
 
-#endif
+#endif // wxUSE_DRAG_AND_DROP
+
diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index 1eee666aae..482891f49a 100644
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -102,7 +102,6 @@ static pascal void NavEventProc(
             {
                 int i = menu->menuType ;
                 wxString extension =  data->extensions[i].AfterLast('.') ;
-                extension.MakeLower() ;
                 wxString sfilename ;
 
                 wxMacCFStringHolder cfString( NavDialogGetSaveFileName( ioParams->context ) , false  );
@@ -143,7 +142,7 @@ void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter )
                 }
                 else
                 {
-                    myData->extensions.Add( current.MakeUpper() ) ;
+                    myData->extensions.Add( current ) ;
                     ++filterIndex ;
                 }
 
@@ -162,9 +161,9 @@ void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter )
         if ( current.empty() )
             myData->extensions.Add( myData->name[filterIndex] ) ;
         else
-            myData->extensions.Add( current.MakeUpper() ) ;
+            myData->extensions.Add( current ) ;
         if ( filterIndex == 0 || isName )
-            myData->name.Add( current.MakeUpper() ) ;
+            myData->name.Add( current ) ;
 
         ++filterIndex ;
 
@@ -212,6 +211,7 @@ static Boolean CheckFile( const wxString &filename , OSType type , OpenUserDataR
                 wxString extension = tokenizer.GetNextToken() ;
                 if ( extension.GetChar(0) == '*' )
                     extension = extension.Mid(1) ;
+                extension.MakeUpper();
 
                 if ( file.length() >= extension.length() && extension == file.Right(extension.length() ) )
                     return true ;
diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 7766ff4e53..52dbecd1ba 100644
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -22,6 +22,7 @@
 
 #include "wx/fontutil.h"
 #include "wx/graphics.h"
+#include "wx/log.h"
 
 #include "wx/mac/private.h"
 
@@ -253,6 +254,7 @@ void wxFontRefData::MacFindFont()
                         break ;
 
                     case wxMODERN :
+                    case wxTELETYPE:
                         m_faceName =  wxT("Monaco");
                         break ;
 
@@ -263,6 +265,11 @@ void wxFontRefData::MacFindFont()
 #ifndef __LP64__
                 wxMacStringToPascal( m_faceName , qdFontName );
                 m_macFontFamily = FMGetFontFamilyFromName( qdFontName );
+                if ( m_macFontFamily == kInvalidFontFamily )
+                {
+                    wxLogDebug( wxT("ATSFontFamilyFindFromName failed for %s"), m_faceName );
+                    m_macFontFamily = GetAppFont();
+                }
 #endif
             }
         }
@@ -283,8 +290,13 @@ void wxFontRefData::MacFindFont()
             {
                 wxMacCFStringHolder cf( m_faceName, wxLocale::GetSystemEncoding() );
                 ATSFontFamilyRef atsfamily = ATSFontFamilyFindFromName( cf , kATSOptionFlagsDefault );
-                wxASSERT_MSG( atsfamily != (ATSFontFamilyRef) -1 , wxT("ATSFontFamilyFindFromName failed") );
-                m_macFontFamily = FMGetFontFamilyFromATSFontFamilyRef( atsfamily );
+                if ( atsfamily == (ATSFontFamilyRef) -1 )
+                {
+                    wxLogDebug( wxT("ATSFontFamilyFindFromName failed for %s"), m_faceName );
+                    m_macFontFamily = GetAppFont();
+                }
+                else
+                    m_macFontFamily = FMGetFontFamilyFromATSFontFamilyRef( atsfamily );
             }
         }
 
diff --git a/src/mac/carbon/graphics.cpp b/src/mac/carbon/graphics.cpp
index 0a22635202..b2bcb0788a 100755
--- a/src/mac/carbon/graphics.cpp
+++ b/src/mac/carbon/graphics.cpp
@@ -17,6 +17,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
+    #include "wx/dcmemory.h"
     #include "wx/log.h"
     #include "wx/region.h"
 #endif
@@ -2013,7 +2014,16 @@ wxGraphicsRenderer* wxGraphicsRenderer::GetDefaultRenderer()
 
 wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContext( const wxWindowDC& dc)
 {
-   return new wxMacCoreGraphicsContext(this,(CGContextRef)dc.GetWindow()->MacGetCGContextRef() );
+    wxMemoryDC* mdc = wxDynamicCast(&dc, wxMemoryDC);
+    if ( mdc )
+    {
+        return new wxMacCoreGraphicsContext(this, 
+            (CGContextRef)mdc->GetGraphicsContext()->GetNativeContext());
+    }
+    else
+    {
+        return new wxMacCoreGraphicsContext(this,(CGContextRef)dc.GetWindow()->MacGetCGContextRef() );
+    }
 }
 
 wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContextFromNativeContext( void * context )
diff --git a/src/mac/carbon/listctrl_mac.cpp b/src/mac/carbon/listctrl_mac.cpp
index 3b4941dc08..4e80407df1 100644
--- a/src/mac/carbon/listctrl_mac.cpp
+++ b/src/mac/carbon/listctrl_mac.cpp
@@ -654,6 +654,8 @@ void wxListCtrl::FireMouseEvent(wxEventType eventType, wxPoint position)
 
 void wxListCtrl::OnChar(wxKeyEvent& event)
 {
+
+    
     if (m_dbImpl)
     {
         wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetId() );
@@ -661,6 +663,35 @@ void wxListCtrl::OnChar(wxKeyEvent& event)
         le.m_code = event.GetKeyCode();
         le.m_itemIndex = -1;
         
+        if (m_current == -1)
+        {
+            // if m_current isn't set, check if there's been a selection
+            // made before continuing
+            m_current = GetNextItem(-1, wxLIST_NEXT_BELOW, wxLIST_STATE_SELECTED);
+        }
+        
+        // We need to determine m_current ourselves when navigation keys
+        // are used. Note that PAGEUP and PAGEDOWN do not alter the current
+        // item on native Mac ListCtrl, so we only handle up and down keys.
+        switch ( event.GetKeyCode() )
+        {
+            case WXK_UP:
+                if ( m_current > 0 )
+                    m_current -= 1;
+                else
+                    m_current = 0;
+                    
+                break;
+
+            case WXK_DOWN:
+                if ( m_current < GetItemCount() - 1 )
+                    m_current += 1;
+                else
+                    m_current = GetItemCount() - 1;
+                    
+                break;
+        }
+
         if (m_current != -1)
         {
             le.m_itemIndex = m_current;
@@ -1174,7 +1205,7 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask)
     if (m_dbImpl)
     {
         DataBrowserSetOption option = kDataBrowserItemsAdd;
-        if ( stateMask == wxLIST_STATE_SELECTED && state == 0 )
+        if ( (stateMask & wxLIST_STATE_SELECTED) && state == 0 )
             option = kDataBrowserItemsRemove;
 
         if (item == -1)
@@ -1202,8 +1233,15 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask)
             if ( HasFlag(wxLC_VIRTUAL) )
             {
                 long itemID = item+1;
+                bool isSelected = IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), (DataBrowserItemID)itemID );
+                bool isSelectedState = (state == wxLIST_STATE_SELECTED);
+
+                // toggle the selection state if wxListInfo state and actual state don't match.
+                if ( (stateMask & wxLIST_STATE_SELECTED) && isSelected != isSelectedState )
+                {
                 SetDataBrowserSelectedItems(m_dbImpl->GetControlRef(), 1, (DataBrowserItemID*)&itemID, option);
             }
+            }
             else
             {
                 wxListItem info;
@@ -1578,8 +1616,8 @@ long wxListCtrl::GetNextItem(long item, int geom, int state) const
                     return line;
             }
         }
-        
-        if ( geom == wxLIST_NEXT_ALL || geom == wxLIST_NEXT_ABOVE )
+
+        if ( geom == wxLIST_NEXT_ABOVE )
         {
             int item2 = item;
             if ( item2 == -1 )
diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index 108e0371d8..ef630d2fc8 100644
--- a/src/mac/carbon/mdi.cpp
+++ b/src/mac/carbon/mdi.cpp
@@ -123,6 +123,9 @@ void wxMDIParentFrame::GetRectForTopLevelChildren(int *x, int *y, int *w, int *h
 
 void wxMDIParentFrame::AddChild(wxWindowBase *child)
 {
+    // moved this to front, so that we don't run into unset m_parent problems later
+    wxFrame::AddChild(child);
+
     if ( !m_currentChild )
     {
         m_currentChild = wxDynamicCast(child, wxMDIChildFrame);
@@ -134,8 +137,6 @@ void wxMDIParentFrame::AddChild(wxWindowBase *child)
             m_shouldBeShown = true;
         }
     }
-
-    wxFrame::AddChild(child);
 }
 
 void wxMDIParentFrame::RemoveChild(wxWindowBase *child)
diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index 09cf4450c1..84ed8d9634 100644
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -81,6 +81,54 @@ void wxRemoveMacMenuAssociation(wxMenu *menu)
     }
 }
 
+void wxInsertMenuItemsInMenu(wxMenu* menu, MenuRef wm, MenuItemIndex insertAfter)
+{
+    wxMenuItemList::compatibility_iterator node;
+    wxMenuItem *item;
+    wxMenu *subMenu = NULL ;
+    bool newItems = false;
+
+    for (node = menu->GetMenuItems().GetFirst(); node; node = node->GetNext())
+    {
+        item = (wxMenuItem *)node->GetData();
+        subMenu = item->GetSubMenu() ;
+        if (subMenu)
+        {
+            wxInsertMenuItemsInMenu(subMenu, (MenuRef)subMenu->GetHMenu(), 0); 
+        }
+        if ( item->IsSeparator() )
+        {
+            if ( wm && newItems)
+                InsertMenuItemTextWithCFString( wm,
+                    CFSTR(""), insertAfter, kMenuItemAttrSeparator, 0); 
+        
+            newItems = false;
+        }
+        else
+        {
+            wxAcceleratorEntry*
+                entry = wxAcceleratorEntry::Create( item->GetText() ) ;
+
+            MenuItemIndex winListPos = (MenuItemIndex)-1;
+            OSStatus err = GetIndMenuItemWithCommandID(wm, 
+                        wxIdToMacCommand ( item->GetId() ), 1, NULL, &winListPos);
+            
+            if ( wm && err == menuItemNotFoundErr )
+            {
+                // NB: the only way to determine whether or not we should add
+                // a separator is to know if we've added menu items to the menu
+                // before the separator.
+                newItems = true;
+                UMAInsertMenuItem(wm, wxStripMenuCodes(item->GetText()) , wxFont::GetDefaultEncoding(), insertAfter, entry);
+                SetMenuItemCommandID( wm , insertAfter+1 , wxIdToMacCommand ( item->GetId() ) ) ;
+                SetMenuItemRefCon( wm , insertAfter+1 , (URefCon) item ) ;
+            }
+
+            delete entry ;
+        }
+    }  
+}
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -716,10 +764,42 @@ void wxMenuBar::MacInstallMenuBar()
                 }
             }
         }
+        
+        else if ( ( m_titles[i] == wxT("Window") || m_titles[i] == wxT("&Window") ) 
+                && GetAutoWindowMenu() )
+        {           
+            if ( MacGetWindowMenuHMenu() == NULL )
+            {
+                CreateStandardWindowMenu( 0 , (MenuHandle*) &s_macWindowMenuHandle ) ;
+            }
+            
+            MenuRef wm = (MenuRef)MacGetWindowMenuHMenu();
+            if ( wm == NULL )
+                break;
+            
+            // get the insertion point in the standard menu
+            MenuItemIndex winListStart;
+            GetIndMenuItemWithCommandID(wm, 
+                        kHICommandWindowListSeparator, 1, NULL, &winListStart);
+            
+            // add a separator so that the standard items and the custom items
+            // aren't mixed together, but only if this is the first run
+            OSStatus err = GetIndMenuItemWithCommandID(wm, 
+                        'WXWM', 1, NULL, NULL);
+            
+            if ( err == menuItemNotFoundErr )
+            {
+                InsertMenuItemTextWithCFString( wm,
+                        CFSTR(""), winListStart-1, kMenuItemAttrSeparator, 'WXWM');
+            }
+            
+            wxInsertMenuItemsInMenu(menu, wm, winListStart);    
+        }
         else
         {
             UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , m_titles[i], m_font.GetEncoding()  ) ;
             menu->MacBeforeDisplay(false) ;
+            
             ::InsertMenu(MAC_WXHMENU(_wxMenuAt(m_menus, i)->GetHMenu()), 0);
         }
     }
diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp
index a99899b188..07a905760f 100644
--- a/src/mac/carbon/metafile.cpp
+++ b/src/mac/carbon/metafile.cpp
@@ -215,7 +215,7 @@ wxMetaFileDC::wxMetaFileDC(
     int width, int height,
     const wxString& WXUNUSED(description) )
 {
-    wxASSERT_MSG( width <= 0 || height <= 0, wxT("no arbitration of metafile size supported") );
+    wxASSERT_MSG( width != 0 || height != 0, wxT("no arbitration of metafile size supported") );
     wxASSERT_MSG( filename.empty(), wxT("no file based metafile support yet"));
 
     m_metaFile = new wxMetaFile( filename );
diff --git a/src/mac/carbon/renderer.cpp b/src/mac/carbon/renderer.cpp
index 15d9ef20b1..37cc0e311b 100644
--- a/src/mac/carbon/renderer.cpp
+++ b/src/mac/carbon/renderer.cpp
@@ -42,7 +42,7 @@ public:
         wxHeaderButtonParams* params = NULL );
 
     virtual int GetHeaderButtonHeight(wxWindow *win);
-    
+
     // draw the expanded/collapsed icon for a tree control item
     virtual void DrawTreeItemButton( wxWindow *win,
         wxDC& dc,
@@ -61,12 +61,12 @@ public:
                                         wxDC& dc,
                                         const wxRect& rect,
                                         int flags = 0);
-    
+
     virtual void DrawPushButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,
                                 int flags = 0);
-    
+
     virtual void DrawItemSelectionRect(wxWindow *win,
                                        wxDC& dc,
                                        const wxRect& rect,
@@ -79,7 +79,7 @@ private:
                             int flags,
                             int kind,
                             int adornment);
-        
+
     // the tree buttons
     wxBitmap m_bmpTreeExpanded;
     wxBitmap m_bmpTreeCollapsed;
@@ -168,7 +168,7 @@ int wxRendererMac::DrawHeaderButton( wxWindow *win,
             // The down arrow is drawn automatically, change it to an up arrow if needed.
             if ( sortArrow == wxHDR_SORT_ICON_UP )
                 drawInfo.adornment = kThemeAdornmentHeaderButtonSortUp;
-                
+
             HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
 
             // If we don't want any arrows we need to draw over the one already there
@@ -181,7 +181,7 @@ int wxRendererMac::DrawHeaderButton( wxWindow *win,
                 headerRect.size.width += 25;
                 HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
                 CGContextRestoreGState( cgContext );
-            }                
+            }
         }
 
 #if wxMAC_USE_CORE_GRAPHICS
@@ -233,7 +233,7 @@ void wxRendererMac::DrawTreeItemButton( wxWindow *win,
     const wxCoord y = rect.y;
     const wxCoord w = rect.width;
     const wxCoord h = rect.height;
-#endif    
+#endif
 
     dc.SetBrush( *wxTRANSPARENT_BRUSH );
 
@@ -283,10 +283,10 @@ void wxRendererMac::DrawTreeItemButton( wxWindow *win,
             // Apple mailing list posts say to use the arrow adornment constants, but those don't work.
             // We need to set the value using the 'old' DrawThemeButton constants instead.
             drawInfo.value = (flags & wxCONTROL_EXPANDED) ? kThemeDisclosureDown : kThemeDisclosureRight;
-            drawInfo.adornment = kThemeAdornmentNone; 
+            drawInfo.adornment = kThemeAdornmentNone;
 
             HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
-            
+
         }
 
 #if wxMAC_USE_CORE_GRAPHICS
@@ -370,7 +370,7 @@ wxRendererMac::DrawItemSelectionRect(wxWindow *win,
                                      const wxRect& rect,
                                      int flags )
 {
-    RGBColor selColor; 
+    RGBColor selColor;
     if (flags & wxCONTROL_SELECTED)
     {
         if (flags & wxCONTROL_FOCUSED)
@@ -378,8 +378,8 @@ wxRendererMac::DrawItemSelectionRect(wxWindow *win,
         else
             GetThemeBrushAsColor(kThemeBrushSecondaryHighlightColor, 32, true, &selColor);
     }
-    
-    wxBrush selBrush = wxBrush( wxColour( selColor.red, selColor.green, selColor.blue ), wxSOLID );
+
+    wxBrush selBrush = wxBrush( wxColour( selColor.red >> 8, selColor.green >> 8, selColor.blue >> 8 ), wxSOLID );
 
     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.SetBrush( selBrush );
@@ -473,17 +473,36 @@ wxRendererMac::DrawComboBoxDropButton(wxWindow *win,
                               const wxRect& rect,
                               int flags)
 {
+    int kind;
+    if (win->GetWindowVariant() == wxWINDOW_VARIANT_SMALL || (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL))
+        kind = kThemeArrowButtonSmall;
+    else if (win->GetWindowVariant() == wxWINDOW_VARIANT_MINI || (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_MINI))
+        kind = kThemeArrowButtonMini;
+    else
+        kind = kThemeArrowButton;
+
     DrawMacThemeButton(win, dc, rect, flags,
-                       kThemeArrowButton, kThemeAdornmentArrowDownArrow);
+                       kind, kThemeAdornmentArrowDownArrow);
 }
-    
+
 void
 wxRendererMac::DrawPushButton(wxWindow *win,
                               wxDC& dc,
                               const wxRect& rect,
                               int flags)
 {
+    int kind;
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3
+    if (win->GetWindowVariant() == wxWINDOW_VARIANT_SMALL || (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL))
+        kind = kThemeBevelButtonSmall;
+    // There is no kThemeBevelButtonMini, but in this case, use Small
+    else if (win->GetWindowVariant() == wxWINDOW_VARIANT_MINI || (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_MINI))
+        kind = kThemeBevelButtonSmall;
+    else
+#endif
+        kind = kThemeBevelButton;
+
     DrawMacThemeButton(win, dc, rect, flags,
-                       kThemeBevelButton, kThemeAdornmentNone);
+                       kind, kThemeAdornmentNone);
 }
-    
+
diff --git a/src/mac/carbon/statbox.cpp b/src/mac/carbon/statbox.cpp
index cb3b47de90..53dfd54635 100644
--- a/src/mac/carbon/statbox.cpp
+++ b/src/mac/carbon/statbox.cpp
@@ -68,7 +68,10 @@ void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
         }
     }
 
-    *borderTop = extraTop + GetCharHeight();
+    *borderTop = extraTop;
+    if ( !m_label.empty() )
+        *borderTop += GetCharHeight();
+
     *borderOther = other;
 }
 
diff --git a/src/mac/carbon/thread.cpp b/src/mac/carbon/thread.cpp
index b747d70922..e5fad666e6 100644
--- a/src/mac/carbon/thread.cpp
+++ b/src/mac/carbon/thread.cpp
@@ -829,7 +829,7 @@ wxCondError wxConditionInternal::WaitTimeout( unsigned long milliseconds )
 
     wxSemaError err = m_semaphore.WaitTimeout(milliseconds);
 
-    if ( err == wxSEMA_BUSY )
+    if ( err == wxSEMA_TIMEOUT )
     {
         // another potential race condition exists here it is caused when a
         // 'waiting' thread timesout, and returns from WaitForSingleObject, but
diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index 60e0a5cf9f..0d750fd7e4 100644
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -58,6 +58,17 @@ END_EVENT_TABLE()
 
 // We have a dual implementation for each tool, ControlRef and HIToolbarItemRef
 
+// when embedding native controls in the native toolbar we must make sure the
+// control does not get deleted behind our backs, so the retain count gets increased
+// (after creation it is 1), first be the creation of the custom HIToolbarItem wrapper 
+// object, and second by the code 'creating' the custom HIView (which is the same as the
+// already existing native control, therefore we just increase the ref count)
+// when this view is removed from the native toolbar its count gets decremented again
+// and when the HITooolbarItem wrapper object gets destroyed it is decremented as well
+// so in the end the control lives with a refcount of one and can be disposed of by the
+// wxControl code. For embedded controls on a non-native toolbar this ref count is less
+// so we can only test against a range, not a specific value of the refcount.
+
 class wxToolBarTool : public wxToolBarToolBase
 {
 public:
@@ -99,18 +110,20 @@ public:
 
     void ClearControl()
     {
-        m_control = NULL;
         if ( m_controlHandle )
         {
             if ( !IsControl() )
                 DisposeControl( m_controlHandle );
             else
             {
-                // the embedded control is not under the responsibility of the tool
+                // the embedded control is not under the responsibility of the tool, it will be disposed of in the
+                // proper wxControl destructor
+                wxASSERT( IsValidControlHandle(GetControl()->GetPeer()->GetControlRef() )) ;
             }
             m_controlHandle = NULL ;
         }
-
+        m_control = NULL;
+        
 #if wxMAC_USE_NATIVE_TOOLBAR
         if ( m_toolbarItemRef )
         {
@@ -168,10 +181,19 @@ public:
         m_toolbarItemRef = ref;
         if ( m_toolbarItemRef )
         {
+            wxFont f;
+            wxFontEncoding enc;
+            if ( GetToolBar() )
+                f = GetToolBar()->GetFont();
+            if ( f.IsOk() )
+                enc = f.GetEncoding();
+            else
+                enc = wxFont::GetDefaultEncoding();
+            
             HIToolbarItemSetHelpText(
                 m_toolbarItemRef,
-                wxMacCFStringHolder( GetShortHelp(), GetToolBar()->GetFont().GetEncoding() ),
-                wxMacCFStringHolder( GetLongHelp(), GetToolBar()->GetFont().GetEncoding() ) );
+                wxMacCFStringHolder( GetShortHelp(), enc ),
+                wxMacCFStringHolder( GetLongHelp(), enc ) );
         }
     }
 
@@ -585,6 +607,7 @@ static pascal OSStatus ControlToolbarItemHandler( EventHandlerCallRef inCallRef,
                         
                         item = (ControlToolbarItem*) malloc(sizeof(ControlToolbarItem)) ;
                         item->toolbarItem = toolbarItem ;
+                        item->lastValidSize = wxSize(-1,-1);
                         item->viewRef = NULL ;
                         
                         SetEventParameter( inEvent, kEventParamHIObjectInstance, typeVoidPtr, sizeof( void * ), &item );
@@ -607,19 +630,24 @@ static pascal OSStatus ControlToolbarItemHandler( EventHandlerCallRef inCallRef,
                         memcpy( &viewRef , CFDataGetBytePtr( data ) , sizeof( viewRef ) ) ;
                     
                         object->viewRef = (HIViewRef) viewRef ;
+                        // make sure we keep that control during our lifetime
+                        CFRetain( object->viewRef ) ;
 
+                        verify_noerr(InstallEventHandler( GetControlEventTarget( viewRef ), ControlToolbarItemHandler,
+                                            GetEventTypeCount( kViewEvents ), kViewEvents, object, NULL ));
                         result = noErr ;
                     }
                     break;
 
                 case kEventHIObjectDestruct:
                     {
-                        // we've increased the ref count when creating this, so we decrease manually again in case
-                        // it was never really installed and deinstalled
                         HIViewRef viewRef = object->viewRef ;
                         if( viewRef && IsValidControlHandle( viewRef)  )
                         {
+                            // depending whether the wxControl corresponding to this HIView has already been destroyed or
+                            // not, ref counts differ, so we cannot assert a special value
                             CFIndex count =  CFGetRetainCount( viewRef ) ; 
+                            wxASSERT_MSG( count >=1 , wxT("Reference Count of native tool was illegal before removal") );
                             if ( count >= 1 )
                                 CFRelease( viewRef ) ;
                         }
@@ -636,12 +664,9 @@ static pascal OSStatus ControlToolbarItemHandler( EventHandlerCallRef inCallRef,
                 case kEventToolbarItemCreateCustomView:
                 {
                     HIViewRef viewRef = object->viewRef ;
-
-                    HIViewRemoveFromSuperview( viewRef ) ;
+               		HIViewRemoveFromSuperview( viewRef ) ;
                     HIViewSetVisible(viewRef, true) ;
-                    InstallEventHandler( GetControlEventTarget( viewRef ), ControlToolbarItemHandler,
-                                            GetEventTypeCount( kViewEvents ), kViewEvents, object, NULL );
-                    
+                    CFRetain( viewRef ) ;
                     result = SetEventParameter( inEvent, kEventParamControlRef, typeControlRef, sizeof( HIViewRef ), &viewRef );
                 }
                 break;
@@ -656,16 +681,21 @@ static pascal OSStatus ControlToolbarItemHandler( EventHandlerCallRef inCallRef,
                     wxWindow* wxwindow = wxFindControlFromMacControl(object->viewRef ) ;
                     if ( wxwindow )
                     {
-                        wxSize sz = wxwindow->GetSize() ;
-                        sz.x -= wxwindow->MacGetLeftBorderSize() + wxwindow->MacGetRightBorderSize();
-                        sz.y -= wxwindow->MacGetTopBorderSize() + wxwindow->MacGetBottomBorderSize();
-                        // during toolbar layout the native window sometimes gets negative sizes
-                        // so we always keep the last valid size here, to make sure we survive the
-                        // shuffle ...
-                        if ( sz.x > 0 && sz.y > 0 )
-                            object->lastValidSize = sz ;
-                        else
-                            sz = object->lastValidSize ;
+                        // during toolbar layout the native window sometimes gets negative sizes,
+                        // sometimes it just gets shrunk behind our back, so in order to avoid
+                        // ever shrinking more, once a valid size is captured, we keep it
+
+                        wxSize sz = object->lastValidSize;
+                        if ( sz.x <= 0 || sz.y <= 0 )
+                        {
+                            sz = wxwindow->GetSize() ;
+                            sz.x -= wxwindow->MacGetLeftBorderSize() + wxwindow->MacGetRightBorderSize();
+                            sz.y -= wxwindow->MacGetTopBorderSize() + wxwindow->MacGetBottomBorderSize();
+                            if ( sz.x > 0 && sz.y > 0 )
+                                object->lastValidSize = sz ;
+                            else
+                                sz = wxSize(0,0) ;
+                        }
                             
                         HISize min, max;
                         min.width = max.width = sz.x ;
@@ -1146,17 +1176,37 @@ bool wxToolBar::Realize()
 
                         // if this is the first tool that gets newly inserted or repositioned
                         // first remove all 'old' tools from here to the right, because of this
-                        // all following tools will have to be reinserted (insertAll). i = 100 because there's
-                        // no way to determine how many there are in a toolbar, so just a high number :-(
-                        for ( CFIndex i = 100; i >= currentPosition; --i )
+                        // all following tools will have to be reinserted (insertAll).
+                       for ( wxToolBarToolsList::compatibility_iterator node2 = m_tools.GetLast();
+                              node2 != node;
+                              node2 = node2->GetPrevious() )
                         {
-                            err = HIToolbarRemoveItemAtIndex( (HIToolbarRef) m_macHIToolbarRef, i );
-                        }
+                            wxToolBarTool *tool2 = (wxToolBarTool*) node2->GetData();
 
-                        if (err != noErr)
-                        {
-                            wxString errMsg = wxString::Format( wxT("HIToolbarRemoveItemAtIndex failed [%ld]"), (long)err );
-                            wxFAIL_MSG( errMsg.c_str() );
+                            const long idx = tool2->GetIndex();
+                            if ( idx != -1 )
+                            {
+                                if ( tool2->IsControl() )
+                                {
+                                    CFIndex count = CFGetRetainCount( tool2->GetControl()->GetPeer()->GetControlRef() ) ;
+                                    wxASSERT_MSG( count == 3 || count == 2 , wxT("Reference Count of native tool was illegal before removal") );
+                                    wxASSERT( IsValidControlHandle(tool2->GetControl()->GetPeer()->GetControlRef() )) ;
+                                }
+                                err = HIToolbarRemoveItemAtIndex((HIToolbarRef) m_macHIToolbarRef, idx);
+                                if ( err != noErr )
+                                {
+                                    wxLogDebug(wxT("HIToolbarRemoveItemAtIndex(%ld) failed [%ld]"),
+                                               idx, (long)err);
+                                }
+                                if ( tool2->IsControl() )
+                                {
+                                    CFIndex count = CFGetRetainCount( tool2->GetControl()->GetPeer()->GetControlRef() ) ;
+                                    wxASSERT_MSG( count == 2 , wxT("Reference Count of native tool was not 2 after removal") );
+                                    wxASSERT( IsValidControlHandle(tool2->GetControl()->GetPeer()->GetControlRef() )) ;
+                                }
+
+                                tool2->SetIndex(-1);
+                            }
                         }
                     }
 
@@ -1168,6 +1218,12 @@ bool wxToolBar::Realize()
                     }
 
                     tool->SetIndex( currentPosition );
+                    if ( tool->IsControl() )
+                    {
+                        CFIndex count = CFGetRetainCount( tool->GetControl()->GetPeer()->GetControlRef() ) ;
+                        wxASSERT_MSG( count == 3 || count == 2, wxT("Reference Count of native tool was illegal after insertion") );
+                        wxASSERT( IsValidControlHandle(tool->GetControl()->GetPeer()->GetControlRef() )) ;
+                    }
                 }
 
                 currentPosition++;
@@ -1312,6 +1368,33 @@ void wxToolBar::MacSuperChangedPosition()
 #endif
 }
 
+void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )
+{
+    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+    if ( tool )
+    {
+        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
+
+        tool->SetNormalBitmap(bitmap);
+
+        // a side-effect of the UpdateToggleImage function is that it always changes the bitmap used on the button.
+        tool->UpdateToggleImage( tool->CanBeToggled() && tool->IsToggled() );
+    }    
+}
+
+void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
+{
+    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+    if ( tool )
+    {
+        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
+
+        tool->SetDisabledBitmap(bitmap);
+        
+        // TODO:  what to do for this one?
+    }    
+}
+
 wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
 {
     wxToolBarTool *tool;
@@ -1365,6 +1448,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
     Rect toolrect = { 0, 0, toolSize.y, toolSize.x };
     ControlRef controlHandle = NULL;
     OSStatus err = 0;
+    tool->Attach( this );
 
     switch (tool->GetStyle())
     {
@@ -1456,9 +1540,6 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
                 wxASSERT( tool->GetControl() != NULL );
                 HIToolbarItemRef    item;
                 HIViewRef viewRef = (HIViewRef) tool->GetControl()->GetHandle() ;
-                // as this control now is part of both the wxToolBar children and the native toolbar, we have to increase the
-                // reference count to make sure we are not dealing with zombie controls after the native toolbar has released its views
-                CFRetain( viewRef ) ;
                 CFDataRef data = CFDataCreate( kCFAllocatorDefault , (UInt8*) &viewRef , sizeof(viewRef) ) ;
                  err = HIToolbarCreateItemWithIdentifier((HIToolbarRef) m_macHIToolbarRef,kControlToolbarItemClassID,
                    data , &item ) ;
@@ -1494,7 +1575,6 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
             tool->UpdateToggleImage( true );
 
         // nothing special to do here - we relayout in Realize() later
-        tool->Attach( this );
         InvalidateBestSize();
     }
     else
diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index bdd38645a1..d091cb7b86 100644
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -249,7 +249,8 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
 wxWindow* g_MacLastWindow = NULL ;
 
 EventMouseButton g_lastButton = 0 ;
-
+bool g_lastButtonWasFakeRight = false ;
+ 
 void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
 {
     UInt32 modifiers = cEvent.GetParameter<UInt32>(kEventParamKeyModifiers, typeUInt32) ;
@@ -269,9 +270,13 @@ void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
     wxevent.m_metaDown = modifiers & cmdKey;
     wxevent.SetTimestamp( cEvent.GetTicks() ) ;
 
-   // a control click is interpreted as a right click
+    // a control click is interpreted as a right click
+    bool thisButtonIsFakeRight = false ;
     if ( button == kEventMouseButtonPrimary && (modifiers & controlKey) )
+    {
         button = kEventMouseButtonSecondary ;
+        thisButtonIsFakeRight = true ;
+    }
 
     // otherwise we report double clicks by connecting a left click with a ctrl-left click
     if ( clickCount > 1 && button != g_lastButton )
@@ -281,11 +286,17 @@ void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
     // mouse down, moved and mouse up, and does not deliver a right down and left up
 
     if ( cEvent.GetKind() == kEventMouseDown )
+    {
         g_lastButton = button ;
+        g_lastButtonWasFakeRight = thisButtonIsFakeRight ;
+    }
 
     if ( button == 0 )
+    {
         g_lastButton = 0 ;
-    else if ( g_lastButton )
+        g_lastButtonWasFakeRight = false ;
+    }
+    else if ( g_lastButton == kEventMouseButtonSecondary && g_lastButtonWasFakeRight )
         button = g_lastButton ;
 
     // determine the correct down state, wx does not want a 'down' for a mouseUp event,
@@ -968,6 +979,10 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac()
     FullScreenData *data = (FullScreenData *) m_macFullScreenData ;
     delete data ;
     m_macFullScreenData = NULL ;
+
+    // avoid dangling refs
+    if ( s_macDeactivateWindow == this )
+        s_macDeactivateWindow = NULL;
 }
 
 
diff --git a/src/mac/carbon/treectrl.cpp b/src/mac/carbon/treectrl.cpp
index 164b37af75..7977dabef9 100644
--- a/src/mac/carbon/treectrl.cpp
+++ b/src/mac/carbon/treectrl.cpp
@@ -29,14 +29,17 @@ wxTreeCtrl::wxTreeCtrl()
 
 bool wxTreeCtrl::Create(wxWindow *parent,
     wxWindowID id, const wxPoint& pos, const wxSize& size,
-    long style, const wxValidator& validator, const wxString& name)
+    long style, const wxValidator& wxVALIDATOR_PARAM(validator),
+    const wxString& name)
 {
     m_imageListNormal = NULL;
     m_imageListState = NULL;
     m_textCtrl = NULL;
 
     SetName(name);
+#if wxUSE_VALIDATORS
     SetValidator(validator);
+#endif
     SetParent(parent);
 
     m_windowStyle = style;
diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 85a38d0b49..197cacdb3c 100644
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -863,10 +863,14 @@ void wxMacControl::Init()
 
 void wxMacControl::Dispose()
 {
+    wxASSERT_MSG( m_controlRef != NULL , wxT("Control Handle already NULL, Dispose called twice ?") );
     wxASSERT_MSG( IsValidControlHandle(m_controlRef) , wxT("Invalid Control Handle (maybe already released) in Dispose") );
 
     // we cannot check the ref count here anymore, as autorelease objects might delete their refs later
-    CFRelease(m_controlRef);
+    // we can have situations when being embedded, where the control gets deleted behind our back, so only
+    // CFRelease if we are safe
+    if ( IsValidControlHandle(m_controlRef) )
+        CFRelease(m_controlRef);
     m_controlRef = NULL;
 }
 
diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 2a6f6dfd9c..7e2e2c7fae 100644
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -334,6 +334,9 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                 }
 #endif
 
+                if ( thisWindow->MacIsUserPane() )
+                    result = noErr ;
+
                 if ( controlPart == kControlFocusNoPart )
                 {
 #if wxUSE_CARET
@@ -367,9 +370,6 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                     event.SetEventObject(thisWindow);
                     thisWindow->GetEventHandler()->ProcessEvent(event) ;
                 }
-
-                if ( thisWindow->MacIsUserPane() )
-                    result = noErr ;
             }
             break ;
 
@@ -511,7 +511,7 @@ pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , Even
         charBuf[ numChars - 1 ] = 0;
 #if SIZEOF_WCHAR_T == 2
         uniChars = (wchar_t*) charBuf ;
-        memcpy( uniChars , charBuf , numChars * 2 ) ;
+/*        memcpy( uniChars , charBuf , numChars * 2 ) ;*/	// is there any point in copying charBuf over itself? (in fact, memcpy isn't even guaranteed to work correctly if the source and destination ranges overlap...)
 #else
         // the resulting string will never have more chars than the utf16 version, so this is safe
         wxMBConvUTF16 converter ;
@@ -531,7 +531,32 @@ pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , Even
                     WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ;
                     wxTheApp->MacSetCurrentEvent( event , handler ) ;
 
+                    UInt32 message = uniChars[pos] < 128 ? (char)uniChars[pos] : '?';
+/*
+	NB: faking a charcode here is problematic. The kEventTextInputUpdateActiveInputArea event is sent
+	multiple times to update the active range during inline input, so this handler will often receive
+	uncommited text, which should usually not trigger side effects. It might be a good idea to check the
+	kEventParamTextInputSendFixLen parameter and verify if input is being confirmed (see CarbonEvents.h).
+	On the other hand, it can be useful for some applications to react to uncommitted text (for example,
+	to update a status display), as long as it does not disrupt the inline input session. Ideally, wx
+	should add new event types to support advanced text input. For now, I would keep things as they are.
+	
+	However, the code that was being used caused additional problems:
                     UInt32 message = (0  << 8) + ((char)uniChars[pos] );
+	Since it simply truncated the unichar to the last byte, it ended up causing weird bugs with inline
+	input, such as switching to another field when one attempted to insert the character U+4E09 (the kanji
+	for "three"), because it was truncated to 09 (kTabCharCode), which was later "converted" to WXK_TAB
+	(still 09) in wxMacTranslateKey; or triggering the default button when one attempted to insert U+840D
+	(the kanji for "name"), which got truncated to 0D and interpreted as a carriage return keypress.
+	Note that even single-byte characters could have been misinterpreted, since MacRoman charcodes only
+	overlap with Unicode within the (7-bit) ASCII range.
+	But simply passing a NUL charcode would disable text updated events, because wxTextCtrl::OnChar checks
+	for codes within a specific range. Therefore I went for the solution seen above, which keeps ASCII
+	characters as they are and replaces the rest with '?', ensuring that update events are triggered.
+	It would be better to change wxTextCtrl::OnChar to look at the actual unicode character instead, but
+	I don't have time to look into that right now.
+		-- CL
+*/
                     if ( wxTheApp->MacSendCharEvent(
                                                     focus , message , 0 , when , 0 , 0 , uniChars[pos] ) )
                     {
@@ -2609,7 +2634,8 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
 
         if ( m_peer->GetNeedsDisplay() )
         {
-            // because HIViewScrollRect does not scroll the already invalidated area we have two options:
+            // because HIViewScrollRect does not scroll the already invalidated area we have two options
+            // in case there is already a pending redraw on that area
             // either immediate redraw or full invalidate
 #if 1
             // is the better overall solution, as it does not slow down scrolling
@@ -2630,14 +2656,8 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
         scrollrect.Offset( -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ;
         m_peer->ScrollRect( &scrollrect , dx , dy ) ;
 
-        // becuase HIViewScrollRect does not scroll the already invalidated area we have two options
-        // either immediate redraw or full invalidate
 #if 0
-        // is the better overall solution, as it does not slow down scrolling
-        m_peer->SetNeedsDisplay() ;
-#else
         // this would be the preferred version for fast drawing controls
-
         HIViewRender(m_peer->GetControlRef()) ;
 #endif
     }
diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index 8fc25f779d..63c8c66967 100644
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -720,6 +720,13 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
             // need to reset the selection back to it if it's eventually
             // cancelled by user
             m_lastAcceptedSelection = GetCurrentSelection();
+            if ( m_lastAcceptedSelection == -1 )
+            {
+                // no current selection so no need to restore it later (this
+                // happens when opening a combobox containing text not from its
+                // list of items and we shouldn't erase this text)
+                m_lastAcceptedSelection = wxID_NONE;
+            }
             break;
 
         case CBN_CLOSEUP:
diff --git a/src/msw/datectrl.cpp b/src/msw/datectrl.cpp
index 438f347694..d6a4315352 100644
--- a/src/msw/datectrl.cpp
+++ b/src/msw/datectrl.cpp
@@ -259,7 +259,8 @@ void wxDatePickerCtrl::SetValue(const wxDateTime& dt)
     // we need to keep only the date part, times don't make sense for this
     // control (in particular, comparisons with other dates would fail)
     m_date = dt;
-    m_date.ResetTime();
+    if ( m_date.IsValid() )
+        m_date.ResetTime();
 }
 
 wxDateTime wxDatePickerCtrl::GetValue() const
diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index dd4750f6a0..90ed5d53a0 100644
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -209,7 +209,7 @@ public:
     wxOnceOnlyDLLLoader(const wxChar *dllName)
         : m_dllName(dllName)
     {
-    };
+    }
 
 
     // return the symbol with the given name or NULL if the DLL not loaded
diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp
index ff3313993a..31d4860294 100644
--- a/src/msw/graphics.cpp
+++ b/src/msw/graphics.cpp
@@ -315,6 +315,7 @@ public:
     virtual void GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height,
         wxDouble *descent, wxDouble *externalLeading ) const;
     virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const;
+    virtual bool ShouldOffset() const;
 
 private:
     void    Init();
@@ -1196,6 +1197,18 @@ void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble
     }
 }
 
+bool wxGDIPlusContext::ShouldOffset() const
+{     
+    int penwidth = 0 ;
+    if ( !m_pen.IsNull() )
+    {
+        penwidth = (int)((wxGDIPlusPenData*)m_pen.GetRefData())->GetWidth();
+        if ( penwidth == 0 )
+            penwidth = 1;
+    }
+    return ( penwidth % 2 ) == 1;
+}
+
 void* wxGDIPlusContext::GetNativeContext()
 {
     return m_context;
diff --git a/src/msw/gsocket.cpp b/src/msw/gsocket.cpp
index 0bbfea6275..62f3bfb076 100644
--- a/src/msw/gsocket.cpp
+++ b/src/msw/gsocket.cpp
@@ -222,7 +222,7 @@ void GSocket::Shutdown()
   /* If socket has been created, shutdown it */
   if (m_fd != INVALID_SOCKET)
   {
-    shutdown(m_fd, 2);
+    shutdown(m_fd, 1 /* SD_SEND */);
     Close();
   }
 
@@ -399,8 +399,9 @@ GSocketError GSocket::SetServer()
   /* allow a socket to re-bind if the socket is in the TIME_WAIT
      state after being previously closed.
    */
-  if (m_reusable) {
-    setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(u_long));
+  if (m_reusable)
+  {
+    setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(arg));
   }
 
   /* Bind to the local address,
@@ -596,7 +597,7 @@ GSocketError GSocket::Connect(GSocketStream stream)
   // If the reuse flag is set, use the applicable socket reuse flag
   if (m_reusable)
   {
-     setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(u_long));
+     setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(arg));
   }
 
   // If a local address has been set, then we need to bind to it before calling connect
@@ -701,6 +702,11 @@ GSocketError GSocket::SetNonOriented()
   ioctlsocket(m_fd, FIONBIO, (u_long FAR *) &arg);
   gs_gui_functions->Enable_Events(this);
 
+  if (m_reusable)
+  {
+    setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(arg));
+  }
+
   /* Bind to the local address,
    * and retrieve the actual address bound.
    */
diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 9870353bca..9037c43b71 100644
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -205,7 +205,7 @@ public:
    {
        if (attr)
            delete attr;
-   };
+   }
 
     DECLARE_NO_COPY_CLASS(wxListItemInternalData)
 };
@@ -2418,22 +2418,22 @@ static RECT GetCustomDrawnItemRect(const NMCUSTOMDRAW& nmcd)
     return rc;
 }
 
-static void HandleSubItemPrepaint(LPNMLVCUSTOMDRAW pLVCD, HFONT hfont)
+static bool HandleSubItemPrepaint(LPNMLVCUSTOMDRAW pLVCD, HFONT hfont)
 {
     NMCUSTOMDRAW& nmcd = pLVCD->nmcd;
 
     HDC hdc = nmcd.hdc;
     HWND hwndList = nmcd.hdr.hwndFrom;
+    const int col = pLVCD->iSubItem;
     const DWORD item = nmcd.dwItemSpec;
 
-
     // the font must be valid, otherwise we wouldn't be painting the item at all
     SelectInHDC selFont(hdc, hfont);
 
     // get the rectangle to paint
     RECT rc;
-    ListView_GetSubItemRect(hwndList, item, pLVCD->iSubItem, LVIR_BOUNDS, &rc);
-    if ( !pLVCD->iSubItem )
+    ListView_GetSubItemRect(hwndList, item, col, LVIR_BOUNDS, &rc);
+    if ( !col )
     {
         // broken ListView_GetSubItemRect() returns the entire item rect for
         // 0th subitem while we really need just the part for this column
@@ -2454,7 +2454,7 @@ static void HandleSubItemPrepaint(LPNMLVCUSTOMDRAW pLVCD, HFONT hfont)
     wxZeroMemory(it);
     it.mask = LVIF_TEXT | LVIF_IMAGE;
     it.iItem = item;
-    it.iSubItem = pLVCD->iSubItem;
+    it.iSubItem = col;
     it.pszText = text;
     it.cchTextMax = WXSIZEOF(text);
     ListView_GetItem(hwndList, &it);
@@ -2484,12 +2484,38 @@ static void HandleSubItemPrepaint(LPNMLVCUSTOMDRAW pLVCD, HFONT hfont)
 
     ::SetBkMode(hdc, TRANSPARENT);
 
-    // TODO: support for centred/right aligned columns
-    ::DrawText(hdc, text, -1, &rc,
+    UINT fmt = DT_SINGLELINE |
 #ifndef __WXWINCE__
                DT_WORD_ELLIPSIS |
 #endif // __WXWINCE__
-               DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER);
+               DT_NOPREFIX |
+               DT_VCENTER;
+
+    LV_COLUMN lvCol;
+    wxZeroMemory(lvCol);
+    lvCol.mask = LVCF_FMT;
+    if ( ListView_GetColumn(hwndList, col, &lvCol) )
+    {
+        switch ( lvCol.fmt & LVCFMT_JUSTIFYMASK )
+        {
+            case LVCFMT_LEFT:
+                fmt |= DT_LEFT;
+                break;
+
+            case LVCFMT_CENTER:
+                fmt |= DT_CENTER;
+                break;
+
+            case LVCFMT_RIGHT:
+                fmt |= DT_RIGHT;
+                break;
+        }
+    }
+    //else: failed to get alignment, assume it's DT_LEFT (default)
+
+    DrawText(hdc, text, -1, &rc, fmt);
+
+    return true;
 }
 
 static void HandleItemPostpaint(NMCUSTOMDRAW nmcd)
diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 4676a2d241..7abc2842de 100644
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -27,6 +27,7 @@
 #ifndef WX_PRECOMP
     #include "wx/event.h"
     #include "wx/app.h"
+    #include "wx/utils.h"
 #endif //WX_PRECOMP
 
 #include "wx/cmdline.h"
diff --git a/src/msw/mediactrl_qt.cpp b/src/msw/mediactrl_qt.cpp
index 406f514e48..172e259b28 100644
--- a/src/msw/mediactrl_qt.cpp
+++ b/src/msw/mediactrl_qt.cpp
@@ -205,94 +205,94 @@ protected:
     bool m_ok;
 
 public:
-    wxDL_VOIDMETHOD_DEFINE( StartMovie, (Movie m), (m) );
-    wxDL_VOIDMETHOD_DEFINE( StopMovie, (Movie m), (m) );
-    wxDL_METHOD_DEFINE( bool, IsMovieDone, (Movie m), (m), false);
-    wxDL_VOIDMETHOD_DEFINE( GoToBeginningOfMovie, (Movie m), (m) );
-    wxDL_METHOD_DEFINE( OSErr, GetMoviesError, (), (), -1);
-    wxDL_METHOD_DEFINE( OSErr, EnterMovies, (), (), -1);
-    wxDL_VOIDMETHOD_DEFINE( ExitMovies, (), () );
-    wxDL_METHOD_DEFINE( OSErr, InitializeQTML, (long flags), (flags), -1);
-    wxDL_VOIDMETHOD_DEFINE( TerminateQTML, (), () );
+    wxDL_VOIDMETHOD_DEFINE( StartMovie, (Movie m), (m) )
+    wxDL_VOIDMETHOD_DEFINE( StopMovie, (Movie m), (m) )
+    wxDL_METHOD_DEFINE( bool, IsMovieDone, (Movie m), (m), false)
+    wxDL_VOIDMETHOD_DEFINE( GoToBeginningOfMovie, (Movie m), (m) )
+    wxDL_METHOD_DEFINE( OSErr, GetMoviesError, (), (), -1)
+    wxDL_METHOD_DEFINE( OSErr, EnterMovies, (), (), -1)
+    wxDL_VOIDMETHOD_DEFINE( ExitMovies, (), () )
+    wxDL_METHOD_DEFINE( OSErr, InitializeQTML, (long flags), (flags), -1)
+    wxDL_VOIDMETHOD_DEFINE( TerminateQTML, (), () )
 
     wxDL_METHOD_DEFINE( OSErr, NativePathNameToFSSpec,
                         (char* inName, FSSpec* outFile, long flags),
-                        (inName, outFile, flags), -1);
+                        (inName, outFile, flags), -1)
 
     wxDL_METHOD_DEFINE( OSErr, OpenMovieFile,
                         (const FSSpec * fileSpec, short * resRefNum, wxInt8 permission),
-                        (fileSpec, resRefNum, permission), -1 );
+                        (fileSpec, resRefNum, permission), -1 )
 
     wxDL_METHOD_DEFINE( OSErr, CloseMovieFile,
-                        (short resRefNum), (resRefNum), -1);
+                        (short resRefNum), (resRefNum), -1)
 
     wxDL_METHOD_DEFINE( OSErr, NewMovieFromFile,
                             (Movie * theMovie, short resRefNum, short *  resId,
                              StringPtr resName, short newMovieFlags,
                              bool * dataRefWasChanged),
                              (theMovie, resRefNum, resId, resName, newMovieFlags,
-                              dataRefWasChanged), -1);
+                              dataRefWasChanged), -1)
 
-    wxDL_VOIDMETHOD_DEFINE( SetMovieRate, (Movie m, Fixed rate), (m, rate) );
-    wxDL_METHOD_DEFINE( Fixed, GetMovieRate, (Movie m), (m), 0);
-    wxDL_VOIDMETHOD_DEFINE( MoviesTask, (Movie m, long maxms), (m, maxms) );
+    wxDL_VOIDMETHOD_DEFINE( SetMovieRate, (Movie m, Fixed rate), (m, rate) )
+    wxDL_METHOD_DEFINE( Fixed, GetMovieRate, (Movie m), (m), 0)
+    wxDL_VOIDMETHOD_DEFINE( MoviesTask, (Movie m, long maxms), (m, maxms) )
     wxDL_VOIDMETHOD_DEFINE( BlockMove,
-        (const char* p1, const char* p2, long s), (p1,p2,s) );
-    wxDL_METHOD_DEFINE( Handle, NewHandleClear, (long s), (s), NULL );
+        (const char* p1, const char* p2, long s), (p1,p2,s) )
+    wxDL_METHOD_DEFINE( Handle, NewHandleClear, (long s), (s), NULL )
 
     wxDL_METHOD_DEFINE( OSErr, NewMovieFromDataRef,
                            (Movie * m, short flags, short * id,
                             Handle  dataRef, OSType  dataRefType),
-                            (m,flags,id,dataRef,dataRefType), -1 );
+                            (m,flags,id,dataRef,dataRefType), -1 )
 
-    wxDL_VOIDMETHOD_DEFINE( DisposeHandle, (Handle h), (h) );
-    wxDL_VOIDMETHOD_DEFINE( GetMovieNaturalBoundsRect, (Movie m, Rect* r), (m,r) );
+    wxDL_VOIDMETHOD_DEFINE( DisposeHandle, (Handle h), (h) )
+    wxDL_VOIDMETHOD_DEFINE( GetMovieNaturalBoundsRect, (Movie m, Rect* r), (m,r) )
     wxDL_METHOD_DEFINE( void*, GetMovieIndTrackType,
                         (Movie m, long index, OSType type, long flags),
-                        (m,index,type,flags), NULL );
+                        (m,index,type,flags), NULL )
     wxDL_VOIDMETHOD_DEFINE( CreatePortAssociation,
-            (void* hWnd, void* junk, long morejunk), (hWnd, junk, morejunk) );
-    wxDL_METHOD_DEFINE(void*, GetNativeWindowPort, (void* hWnd), (hWnd), NULL);
+            (void* hWnd, void* junk, long morejunk), (hWnd, junk, morejunk) )
+    wxDL_METHOD_DEFINE(void*, GetNativeWindowPort, (void* hWnd), (hWnd), NULL)
     wxDL_VOIDMETHOD_DEFINE(SetMovieGWorld, (Movie m, CGrafPtr port, void* whatever),
-                            (m, port, whatever) );
-    wxDL_VOIDMETHOD_DEFINE(DisposeMovie, (Movie m), (m) );
-    wxDL_VOIDMETHOD_DEFINE(SetMovieBox, (Movie m, Rect* r), (m,r));
-    wxDL_VOIDMETHOD_DEFINE(SetMovieTimeScale, (Movie m, long s), (m,s));
-    wxDL_METHOD_DEFINE(long, GetMovieDuration, (Movie m), (m), 0);
-    wxDL_METHOD_DEFINE(TimeBase, GetMovieTimeBase, (Movie m), (m), 0);
-    wxDL_METHOD_DEFINE(TimeScale, GetMovieTimeScale, (Movie m), (m), 0);
-    wxDL_METHOD_DEFINE(long, GetMovieTime, (Movie m, void* cruft), (m,cruft), 0);
-    wxDL_VOIDMETHOD_DEFINE(SetMovieTime, (Movie m, TimeRecord* tr), (m,tr) );
-    wxDL_METHOD_DEFINE(short, GetMovieVolume, (Movie m), (m), 0);
-    wxDL_VOIDMETHOD_DEFINE(SetMovieVolume, (Movie m, short sVolume), (m,sVolume) );
-    wxDL_VOIDMETHOD_DEFINE(SetMovieTimeValue, (Movie m, long s), (m,s));
-    wxDL_METHOD_DEFINE(ComponentInstance, NewMovieController, (Movie m, const Rect* mr, long fl), (m,mr,fl), 0);
-    wxDL_VOIDMETHOD_DEFINE(DisposeMovieController, (ComponentInstance ci), (ci));
-    wxDL_METHOD_DEFINE(int, MCSetVisible, (ComponentInstance m, int b), (m, b), 0);
+                            (m, port, whatever) )
+    wxDL_VOIDMETHOD_DEFINE(DisposeMovie, (Movie m), (m) )
+    wxDL_VOIDMETHOD_DEFINE(SetMovieBox, (Movie m, Rect* r), (m,r))
+    wxDL_VOIDMETHOD_DEFINE(SetMovieTimeScale, (Movie m, long s), (m,s))
+    wxDL_METHOD_DEFINE(long, GetMovieDuration, (Movie m), (m), 0)
+    wxDL_METHOD_DEFINE(TimeBase, GetMovieTimeBase, (Movie m), (m), 0)
+    wxDL_METHOD_DEFINE(TimeScale, GetMovieTimeScale, (Movie m), (m), 0)
+    wxDL_METHOD_DEFINE(long, GetMovieTime, (Movie m, void* cruft), (m,cruft), 0)
+    wxDL_VOIDMETHOD_DEFINE(SetMovieTime, (Movie m, TimeRecord* tr), (m,tr) )
+    wxDL_METHOD_DEFINE(short, GetMovieVolume, (Movie m), (m), 0)
+    wxDL_VOIDMETHOD_DEFINE(SetMovieVolume, (Movie m, short sVolume), (m,sVolume) )
+    wxDL_VOIDMETHOD_DEFINE(SetMovieTimeValue, (Movie m, long s), (m,s))
+    wxDL_METHOD_DEFINE(ComponentInstance, NewMovieController, (Movie m, const Rect* mr, long fl), (m,mr,fl), 0)
+    wxDL_VOIDMETHOD_DEFINE(DisposeMovieController, (ComponentInstance ci), (ci))
+    wxDL_METHOD_DEFINE(int, MCSetVisible, (ComponentInstance m, int b), (m, b), 0)
 
-    wxDL_VOIDMETHOD_DEFINE(PrePrerollMovie, (Movie m, long t, Fixed r, WXFARPROC p1, void* p2), (m,t,r,p1,p2) );
-    wxDL_VOIDMETHOD_DEFINE(PrerollMovie, (Movie m, long t, Fixed r), (m,t,r) );
-    wxDL_METHOD_DEFINE(Fixed, GetMoviePreferredRate, (Movie m), (m), 0);
-    wxDL_METHOD_DEFINE(long, GetMovieLoadState, (Movie m), (m), 0);
-    wxDL_METHOD_DEFINE(void*, NewRoutineDescriptor, (WXFARPROC f, int l, void* junk), (f, l, junk), 0);
-    wxDL_VOIDMETHOD_DEFINE(DisposeRoutineDescriptor, (void* f), (f));
-    wxDL_METHOD_DEFINE(void*, GetCurrentArchitecture, (), (), 0);
-    wxDL_METHOD_DEFINE(int, MCDoAction, (ComponentInstance ci, long f, void* p), (ci,f,p), 0);
-    wxDL_VOIDMETHOD_DEFINE(MCSetControllerBoundsRect, (ComponentInstance ci, Rect* r), (ci,r));
-    wxDL_VOIDMETHOD_DEFINE(DestroyPortAssociation, (CGrafPtr g), (g));
-    wxDL_VOIDMETHOD_DEFINE(NativeEventToMacEvent, (MSG* p1, EventRecord* p2), (p1,p2));
-    wxDL_VOIDMETHOD_DEFINE(MCIsPlayerEvent, (ComponentInstance ci, EventRecord* p2), (ci, p2));
+    wxDL_VOIDMETHOD_DEFINE(PrePrerollMovie, (Movie m, long t, Fixed r, WXFARPROC p1, void* p2), (m,t,r,p1,p2) )
+    wxDL_VOIDMETHOD_DEFINE(PrerollMovie, (Movie m, long t, Fixed r), (m,t,r) )
+    wxDL_METHOD_DEFINE(Fixed, GetMoviePreferredRate, (Movie m), (m), 0)
+    wxDL_METHOD_DEFINE(long, GetMovieLoadState, (Movie m), (m), 0)
+    wxDL_METHOD_DEFINE(void*, NewRoutineDescriptor, (WXFARPROC f, int l, void* junk), (f, l, junk), 0)
+    wxDL_VOIDMETHOD_DEFINE(DisposeRoutineDescriptor, (void* f), (f))
+    wxDL_METHOD_DEFINE(void*, GetCurrentArchitecture, (), (), 0)
+    wxDL_METHOD_DEFINE(int, MCDoAction, (ComponentInstance ci, long f, void* p), (ci,f,p), 0)
+    wxDL_VOIDMETHOD_DEFINE(MCSetControllerBoundsRect, (ComponentInstance ci, Rect* r), (ci,r))
+    wxDL_VOIDMETHOD_DEFINE(DestroyPortAssociation, (CGrafPtr g), (g))
+    wxDL_VOIDMETHOD_DEFINE(NativeEventToMacEvent, (MSG* p1, EventRecord* p2), (p1,p2))
+    wxDL_VOIDMETHOD_DEFINE(MCIsPlayerEvent, (ComponentInstance ci, EventRecord* p2), (ci, p2))
     wxDL_METHOD_DEFINE(int, MCSetMovie, (ComponentInstance ci, Movie m, void* p1, Point w),
-                          (ci,m,p1,w),0);
+                          (ci,m,p1,w),0)
     wxDL_VOIDMETHOD_DEFINE(MCPositionController,
-        (ComponentInstance ci, Rect* r, void* junk, void* morejunk), (ci,r,junk,morejunk));
+        (ComponentInstance ci, Rect* r, void* junk, void* morejunk), (ci,r,junk,morejunk))
     wxDL_VOIDMETHOD_DEFINE(MCSetActionFilterWithRefCon,
-        (ComponentInstance ci, WXFARPROC cb, void* ref), (ci,cb,ref));
-    wxDL_VOIDMETHOD_DEFINE(MCGetControllerInfo, (MovieController mc, long* flags), (mc,flags));
-    wxDL_VOIDMETHOD_DEFINE(BeginUpdate, (CGrafPtr port), (port));
-    wxDL_VOIDMETHOD_DEFINE(UpdateMovie, (Movie m), (m));
-    wxDL_VOIDMETHOD_DEFINE(EndUpdate, (CGrafPtr port), (port));
-    wxDL_METHOD_DEFINE( OSErr, GetMoviesStickyError, (), (), -1);
+        (ComponentInstance ci, WXFARPROC cb, void* ref), (ci,cb,ref))
+    wxDL_VOIDMETHOD_DEFINE(MCGetControllerInfo, (MovieController mc, long* flags), (mc,flags))
+    wxDL_VOIDMETHOD_DEFINE(BeginUpdate, (CGrafPtr port), (port))
+    wxDL_VOIDMETHOD_DEFINE(UpdateMovie, (Movie m), (m))
+    wxDL_VOIDMETHOD_DEFINE(EndUpdate, (CGrafPtr port), (port))
+    wxDL_METHOD_DEFINE( OSErr, GetMoviesStickyError, (), (), -1)
 };
 
 bool wxQuickTimeLibrary::Initialize()
diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 94e9827cdb..46ec935638 100644
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -59,7 +59,25 @@
 // other standard headers
 #include <string.h>
 
-#if wxUSE_OWNER_DRAWN && defined(MIIM_BITMAP)
+//VC6 needs these defining, though they are in winuser.h
+#ifndef MIIM_BITMAP
+#define MIIM_STRING      0x00000040
+#define MIIM_BITMAP      0x00000080
+#define MIIM_FTYPE       0x00000100
+#define HBMMENU_CALLBACK            ((HBITMAP) -1)
+typedef struct tagMENUINFO
+{
+    DWORD   cbSize;
+    DWORD   fMask;
+    DWORD   dwStyle;
+    UINT    cyMax;
+    HBRUSH  hbrBack;
+    DWORD   dwContextHelpID;
+    DWORD   dwMenuData;
+}   MENUINFO, FAR *LPMENUINFO;
+#endif
+
+#if wxUSE_OWNER_DRAWN 
     #include "wx/dynlib.h"
 #endif
 
@@ -433,16 +451,14 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
                     !pItem->GetBackgroundColour().Ok() &&
                         !pItem->GetFont().Ok() )
         {
-            // try to use InsertMenuItem() as it's guaranteed to look correct
+            // try to use InsertMenuItem() as it's guaranteed to look correct      
             // while our owner-drawn code is not
-
-            // first compile-time check
-#if defined(MIIM_BITMAP) && (_WIN32_WINNT >= 0x0500)
+#ifndef __DMC__      
+            // DMC at march 2007 doesn't have HBITMAP hbmpItem tagMENUITEMINFOA /W
+            // MIIM_BITMAP only works under WinME/2000+
             WinStruct<MENUITEMINFO> mii;
-
-            // now run-time one: MIIM_BITMAP only works under WinME/2000+
             if ( wxGetWinVersion() >= wxWinVersion_98 )
-            {
+            { 
                 mii.fMask = MIIM_STRING | MIIM_DATA | MIIM_BITMAP;
                 if ( pItem->IsCheckable() )
                 {
@@ -512,7 +528,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
                     pItem->ResetOwnerDrawn();
                 }
             }
-#endif // MIIM_BITMAP
+#endif // __DMC__
         }
 
         if ( !ok )
@@ -777,10 +793,15 @@ bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id)
     // ignore commands from the menu title
     if ( id != (WXWORD)idMenuTitle )
     {
-        // get the checked status of the command: notice that menuState is the
-        // old state of the menu, so the test for MF_CHECKED must be inverted
+        // update the check item when it's clicked
+        wxMenuItem * const item = FindItem(id);
+        if ( item && item->IsCheckable() )
+            item->Toggle();
+
+        // get the status of the menu item: note that it has been just changed
+        // by Toggle() above so here we already get the new state of the item
         UINT menuState = ::GetMenuState(GetHmenu(), id, MF_BYCOMMAND);
-        SendEvent(id, !(menuState & MF_CHECKED));
+        SendEvent(id, menuState & MF_CHECKED);
     }
 
     return true;
diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index d5d1725835..a0937bdfdb 100644
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -688,7 +688,7 @@ WXDLLEXPORT bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant&
             unsigned short dosTime = 0;
             VariantTimeToDosDateTime(oleVariant.date, & dosDate, & dosTime);
 
-            long dosDateTime = (dosDate << 16) || dosTime;
+            long dosDateTime = (dosDate << 16) | dosTime;
             wxDateTime date;
             date.SetFromDOS(dosDateTime);
             variant = date;
diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index 6651f614ac..bf56006ade 100644
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -87,7 +87,7 @@ wxEND_FLAGS( wxSpinCtrlStyle )
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinCtrl, wxControl,"wx/spinbut.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxSpinCtrl)
-    wxEVENT_RANGE_PROPERTY( Spin , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , wxSpinEvent )
+    wxEVENT_RANGE_PROPERTY( Spin , wxEVT_SCROLL_TOP , wxEVT_SCROLL_CHANGED , wxSpinEvent )
     wxEVENT_PROPERTY( Updated , wxEVT_COMMAND_SPINCTRL_UPDATED , wxCommandEvent )
     wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
     wxEVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent )
@@ -372,10 +372,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
         return false;
     }
 
-    SetRange(min, max);
-    SetValue(initial);
-
-    m_oldValue = initial;
+    wxSpinButtonBase::SetRange(min, max);
 
     // subclass the text ctrl to be able to intercept some events
     wxSetWindowUserData(GetBuddyHwnd(), this);
@@ -404,9 +401,20 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     // associate the text window with the spin button
     (void)::SendMessage(GetHwnd(), UDM_SETBUDDY, (WPARAM)m_hwndBuddy, 0);
 
+    SetValue(initial);
+
+    // Set the range in the native control
+    SetRange(min, max);
+
     if ( !value.empty() )
     {
         SetValue(value);
+        m_oldValue = (int) wxAtol(value);
+    }
+    else
+    {
+        SetValue(wxString::Format(wxT("%d"), initial));
+        m_oldValue = initial;
     }
 
     // do it after finishing with m_hwndBuddy creation to avoid generating
diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 40b841f56a..692e8a10ca 100644
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -402,37 +402,6 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc)
 
         // Get dimensions of the label
         const wxString label = GetLabel();
-        int width, height;
-        dc.GetTextExtent(wxStripMenuCodes(label, wxStrip_Mnemonics),
-                         &width, &height);
-
-        int x;
-        int y = height;
-
-        // first we need to correctly paint the background of the label
-        // as Windows ignores the brush offset when doing it
-        //
-        // FIXME: value of x is hardcoded as this is what it is on my system,
-        //        no idea if it's true everywhere
-        RECT dimensions = {0, 0, 0, y};
-        if ( !rtl )
-        {
-            x = 9;
-            dimensions.left = x;
-            dimensions.right = x + width;
-        }
-        else
-        {
-            x = rc.right - 7;
-            dimensions.left = x - width;
-            dimensions.right = x;
-        }
-
-        // need to adjust the rectangle to cover all the label background
-        dimensions.left -= 2;
-        dimensions.right += 2;
-        dimensions.bottom += 2;
-        PaintBackground(dc, dimensions);
 
         // choose the correct font
         AutoHFONT font;
@@ -482,6 +451,51 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc)
             }
         }
 
+        // Get the font extent
+        int width, height;
+        dc.GetTextExtent(wxStripMenuCodes(label, wxStrip_Mnemonics),
+                         &width, &height);
+
+        int x;
+        int y = height;
+
+        // first we need to correctly paint the background of the label
+        // as Windows ignores the brush offset when doing it
+        //
+        // FIXME: value of x is hardcoded as this is what it is on my system,
+        //        no idea if it's true everywhere
+        RECT dimensions = {0, 0, 0, y};
+        if ( !rtl )
+        {
+            x = 9;
+            dimensions.left = x;
+            dimensions.right = x + width;
+        }
+        else
+        {
+            x = rc.right - 7;
+            dimensions.left = x - width;
+            dimensions.right = x;
+        }
+
+        // need to adjust the rectangle to cover all the label background
+        dimensions.left -= 2;
+        dimensions.right += 2;
+        dimensions.bottom += 2;
+
+        if ( UseBgCol() )
+        {
+            // our own background colour should be used for the background of
+            // the label: this is consistent with the behaviour under pre-XP
+            // systems (i.e. without visual themes) and generally makes sense
+            wxBrush brush = wxBrush(GetBackgroundColour());
+            ::FillRect(GetHdcOf(dc), &dimensions, GetHbrushOf(brush));
+        }
+        else // paint parent background
+        {
+            PaintBackground(dc, dimensions);
+        }
+
         // now draw the text
         if ( !rtl )
         {
diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index c17ff4cc57..52d64680ee 100644
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -189,6 +189,12 @@ void wxStatusBar95::SetStatusText(const wxString& strText, int nField)
     wxCHECK_RET( (nField >= 0) && (nField < m_nFields),
                  _T("invalid statusbar field index") );
 
+    if ( strText == GetStatusText(nField) )
+    {
+       // don't call StatusBar_SetText() to avoid flicker
+       return;
+    }
+
     // Get field style, if any
     int style;
     if (m_statusStyles)
diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 8d5ad8a0c7..a276d1834c 100644
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -362,6 +362,9 @@ wxSize wxToolBar::DoGetBestSize() const
         sizeBest.y = size.cy;
     }
 
+    if (!IsVertical() && !(GetWindowStyle() & wxTB_NODIVIDER))
+        sizeBest.y += 1;
+
     CacheBestSize(sizeBest);
 
     return sizeBest;
@@ -1073,7 +1076,7 @@ bool wxToolBar::Realize()
     {
         // if not set yet, have one column
         m_maxRows = 1;
-        SetRows(m_nButtons);        
+        SetRows(m_nButtons);
     }
 
     InvalidateBestSize();
@@ -1331,6 +1334,30 @@ void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(tog
     wxFAIL_MSG( _T("not implemented") );
 }
 
+void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )
+{
+    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+    if ( tool )
+    {
+        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
+
+        tool->SetNormalBitmap(bitmap);
+        Realize();
+    }
+}
+
+void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
+{
+    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+    if ( tool )
+    {
+        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
+
+        tool->SetDisabledBitmap(bitmap);
+        Realize();
+    }
+}
+
 // ----------------------------------------------------------------------------
 // event handlers
 // ----------------------------------------------------------------------------
diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 02f25eabc3..31cc2f55c9 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -608,10 +608,12 @@ WXDWORD wxTextCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
 
 void wxTextCtrl::SetWindowStyleFlag(long style)
 {
-    // changing the alignment of the control dynamically only works under XP
-    // (but not older Windows version) and only for plain EDIT controls (not
-    // RICH ones) and we have to recreate the control to make it always work
-    if ( IsRich() || wxGetWinVersion() < wxWinVersion_XP )
+    // changing the alignment of the control dynamically works under Win2003
+    // (but not older Windows version: it seems to work under some versions of
+    // XP but not other ones, and we have no way to determine it so be
+    // conservative here) and only for plain EDIT controls (not RICH ones) and
+    // we have to recreate the control to make it always work
+    if ( IsRich() || wxGetWinVersion() < wxWinVersion_2003 )
     {
         const long alignMask = wxTE_LEFT | wxTE_CENTRE | wxTE_RIGHT;
         if ( (style & alignMask) != (GetWindowStyle() & alignMask) )
diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index ee7fec670d..23462b2f02 100644
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -86,6 +86,16 @@
     #define THREAD_CALLCONV WINAPI
 #endif
 
+// this is a hack to allow the code here to know whether wxEventLoop is
+// currently running: as wxBase doesn't have event loop at all, we can't simple
+// use "wxEventLoop::GetActive() != NULL" test, so instead wxEventLoop uses
+// this variable to indicate whether it is active
+//
+// the proper solution is to use wxAppTraits to abstract the base/GUI-dependent
+// operation of waiting for the thread to terminate and is already implemented
+// in cvs HEAD, this is just a backwards compatible hack for 2.8
+WXDLLIMPEXP_DATA_BASE(int) wxRunningEventLoopCount = 0;
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -755,15 +765,26 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
 #if !defined(QS_ALLPOSTMESSAGE)
 #define QS_ALLPOSTMESSAGE 0
 #endif
-
-        result = ::MsgWaitForMultipleObjects
-                 (
-                   1,              // number of objects to wait for
-                   &m_hThread,     // the objects
-                   false,          // don't wait for all objects
-                   INFINITE,       // no timeout
-                   QS_ALLINPUT|QS_ALLPOSTMESSAGE   // return as soon as there are any events
-                 );
+        if ( !wxRunningEventLoopCount )
+        {
+            // don't ask for Windows messages if we don't have a running event
+            // loop to process them as otherwise we'd enter an infinite loop
+            // with MsgWaitForMultipleObjects() always returning WAIT_OBJECT_0
+            // + 1 because the message would remain forever in the queue
+            result = ::WaitForSingleObject(m_hThread, INFINITE);
+        }
+        else // wait for thread termination without blocking the GUI
+        {
+            result = ::MsgWaitForMultipleObjects
+                     (
+                       1,              // number of objects to wait for
+                       &m_hThread,     // the objects
+                       false,          // don't wait for all objects
+                       INFINITE,       // no timeout
+                       QS_ALLINPUT |   // return as soon as there are any events
+                       QS_ALLPOSTMESSAGE
+                     );
+        }
 
         switch ( result )
         {
diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 0643a209e2..865ba6d9e5 100644
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -1165,7 +1165,7 @@ void wxTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font)
     // Reset the item's text to ensure that the bounding rect will be adjusted
     // for the new font.
     SetItemText(item, GetItemText(item));
-    
+
     RefreshItem(item);
 }
 
@@ -1725,6 +1725,8 @@ void wxTreeCtrl::UnselectAll()
 
 void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
 {
+    wxCHECK_RET( !IsHiddenRoot(item), _T("can't select hidden root item") );
+
     if ( m_windowStyle & wxTR_MULTIPLE )
     {
         ::SelectItem(GetHwnd(), HITEM(item), select);
@@ -2132,6 +2134,14 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
                             ::SetFocus(GetHwnd(), htItem);
                             processed = true;
                         }
+                        else // click on a single selected item
+                        {
+                            // don't interfere with the default processing in
+                            // WM_MOUSEMOVE handler below as the default window
+                            // proc will start the drag itself if we let have
+                            // WM_LBUTTONDOWN
+                            m_htClickedItem.Unset();
+                        }
 
                         // reset on any click without Shift
                         m_htSelStart.Unset();
@@ -2146,35 +2156,44 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
                     int cx = abs(m_ptClick.x - x);
                     int cy = abs(m_ptClick.y - y);
 
-                    if ( cx > GetSystemMetrics( SM_CXDRAG ) || cy > GetSystemMetrics( SM_CYDRAG ) )
+                    if ( cx > ::GetSystemMetrics(SM_CXDRAG) ||
+                            cy > ::GetSystemMetrics(SM_CYDRAG) )
                     {
-                        HWND pWnd = ::GetParent( GetHwnd() );
-                        if ( pWnd )
-                        {
-                            NM_TREEVIEW tv;
+                        NM_TREEVIEW tv;
+                        wxZeroMemory(tv);
 
-                            tv.hdr.hwndFrom = GetHwnd();
-                            tv.hdr.idFrom = ::GetWindowLong( GetHwnd(), GWL_ID );
-                            tv.hdr.code = TVN_BEGINDRAG;
+                        tv.hdr.hwndFrom = GetHwnd();
+                        tv.hdr.idFrom = ::GetWindowLong(GetHwnd(), GWL_ID);
+                        tv.hdr.code = TVN_BEGINDRAG;
 
-                            tv.itemNew.hItem = HITEM(m_htClickedItem);
+                        tv.itemNew.hItem = HITEM(m_htClickedItem);
 
-                            TVITEM tviAux;
-                            ZeroMemory(&tviAux, sizeof(tviAux));
-                            tviAux.hItem = HITEM(m_htClickedItem);
-                            tviAux.mask = TVIF_STATE | TVIF_PARAM;
-                            tviAux.stateMask = 0xffffffff;
-                            TreeView_GetItem( GetHwnd(), &tviAux );
 
-                            tv.itemNew.state = tviAux.state;
-                            tv.itemNew.lParam = tviAux.lParam;
+                        TVITEM tviAux;
+                        wxZeroMemory(tviAux);
 
-                            tv.ptDrag.x = x;
-                            tv.ptDrag.y = y;
+                        tviAux.hItem = HITEM(m_htClickedItem);
+                        tviAux.mask = TVIF_STATE | TVIF_PARAM;
+                        tviAux.stateMask = 0xffffffff;
+                        TreeView_GetItem(GetHwnd(), &tviAux);
 
-                            ::SendMessage( pWnd, WM_NOTIFY, tv.hdr.idFrom, (LPARAM)&tv );
-                        }
+                        tv.itemNew.state = tviAux.state;
+                        tv.itemNew.lParam = tviAux.lParam;
+
+                        tv.ptDrag.x = x;
+                        tv.ptDrag.y = y;
+
+                        // do it before SendMessage() call below to avoid
+                        // reentrancies here if there is another WM_MOUSEMOVE
+                        // in the queue already
                         m_htClickedItem.Unset();
+
+                        ::SendMessage(GetHwndOf(GetParent()), WM_NOTIFY,
+                                      tv.hdr.idFrom, (LPARAM)&tv );
+
+                        // don't pass it to the default window proc, it would
+                        // start dragging again
+                        processed = true;
                     }
                 }
 #endif // __WXWINCE__
@@ -2224,6 +2243,7 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
 
                     // generate the drag end event
                     wxTreeEvent event(wxEVT_COMMAND_TREE_END_DRAG, this, htItem);
+                    event.m_pointDrag = wxPoint(x, y);
                     (void)GetEventHandler()->ProcessEvent(event);
 
                     // if we don't do it, the tree seems to think that 2 items
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 4dff286ca2..50250464a4 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2104,10 +2104,22 @@ bool wxWindowMSW::DoPopupMenu(wxMenu *menu, int x, int y)
     ::ClientToScreen(hWnd, &point);
     wxCurrentPopupMenu = menu;
 #if defined(__WXWINCE__)
-    UINT flags = 0;
-#else
-    UINT flags = TPM_RIGHTBUTTON | TPM_RECURSE;
-#endif
+    static const UINT flags = 0;
+#else // !__WXWINCE__
+    UINT flags = TPM_RIGHTBUTTON;
+    // NT4 doesn't support TPM_RECURSE and simply doesn't show the menu at all
+    // when it's use, I'm not sure about Win95/98 but prefer to err on the safe
+    // side and not to use it there neither -- modify the test if it does work
+    // on these systems
+    if ( wxGetWinVersion() >= wxWinVersion_5 )
+    {
+        // using TPM_RECURSE allows us to show a popup menu while another menu
+        // is opened which can be useful and is supported by the other
+        // platforms, so allow it under Windows too
+        flags |= TPM_RECURSE;
+    }
+#endif // __WXWINCE__/!__WXWINCE__
+
     ::TrackPopupMenu(hMenu, flags, point.x, point.y, 0, hWnd, NULL);
 
     // we need to do it right now as otherwise the events are never going to be
@@ -2864,12 +2876,12 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
 #endif // defined(WM_DRAWITEM)
 
         case WM_GETDLGCODE:
-            if ( !IsOfStandardClass() )
+            if ( !IsOfStandardClass() || HasFlag(wxWANTS_CHARS) )
             {
                 // we always want to get the char events
                 rc.result = DLGC_WANTCHARS;
 
-                if ( GetWindowStyleFlag() & wxWANTS_CHARS )
+                if ( HasFlag(wxWANTS_CHARS) )
                 {
                     // in fact, we want everything
                     rc.result |= DLGC_WANTARROWS |
@@ -5769,13 +5781,26 @@ WXWORD wxCharCodeWXToMSW(int wxk, bool *isVirtual)
     return vk;
 }
 
+#ifndef SM_SWAPBUTTON
+    #define SM_SWAPBUTTON 23
+#endif
+
 // small helper for wxGetKeyState() and wxGetMouseState()
 static inline bool wxIsKeyDown(WXWORD vk)
 {
+    switch (vk)
+    {
+        case VK_LBUTTON:
+            if (GetSystemMetrics(SM_SWAPBUTTON)) vk = VK_RBUTTON; 
+            break;
+        case VK_RBUTTON:
+            if (GetSystemMetrics(SM_SWAPBUTTON)) vk = VK_LBUTTON;
+            break;
+    }
     // the low order bit indicates whether the key was pressed since the last
     // call and the high order one indicates whether it is down right now and
     // we only want that one
-    return (::GetAsyncKeyState(vk) & (1<<15)) != 0;
+    return (GetAsyncKeyState(vk) & (1<<15)) != 0;
 }
 
 bool wxGetKeyState(wxKeyCode key)
@@ -5795,7 +5820,7 @@ bool wxGetKeyState(wxKeyCode key)
         // low order bit means LED is highlighted and high order one means the
         // key is down; for compatibility with the other ports return true if
         // either one is set
-        return ::GetKeyState(vk) != 0;
+        return GetKeyState(vk) != 0;
 
     }
     else // normal key
@@ -6580,7 +6605,7 @@ public:
         }
 
         return CallNextHookEx(ms_hMsgHookProc, nCode, wParam, lParam);
-    };
+    }
 
 private:
     static HHOOK ms_hMsgHookProc;
diff --git a/src/os2/gdiimage.cpp b/src/os2/gdiimage.cpp
index 0d21c81be0..dc502871f8 100644
--- a/src/os2/gdiimage.cpp
+++ b/src/os2/gdiimage.cpp
@@ -300,7 +300,7 @@ wxGDIImageHandler* wxGDIImage::FindHandler(
     {
         wxGDIImageHandler*          pHandler = pNode->GetData();
 
-        if ( (pHandler->GetExtension() = rExtension) &&
+        if ( (pHandler->GetExtension() == rExtension) &&
              (lType == -1 || pHandler->GetType() == lType) )
         {
             return pHandler;
diff --git a/src/png/makefile.nt b/src/png/makefile.nt
deleted file mode 100644
index ab823c8fc9..0000000000
--- a/src/png/makefile.nt
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# File:		makefile.nt
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile : Builds winpng.lib library for Windows 3.1
-
-# Change WXDIR or WXWIN to wherever wxWindows is found
-WXDIR = $(WXWIN)
-WXLIB = $(WXDIR)\lib\wx.lib
-WXINC = $(WXDIR)\include
-
-WINPNGDIR = ..\png
-WINPNGINC = $(WINPNGDIR)
-WINPNGLIB = ..\..\lib\winpng.lib
-
-INC = /I..\zlib
-
-FINAL=1
-
-# Set this to nothing if your compiler is MS C++ 7
-ZOPTION=
-
-!ifndef FINAL
-FINAL=0
-!endif
-
-PRECOMP=/YuWX.H 
-
-!if "$(FINAL)" == "0"
-OPT = /Od
-CPPFLAGS= /W4 /Zi /MD /GX- $(ZOPTION) $(OPT) /Dwx_msw $(INC) # $(PRECOMP) /Fp$(WXDIR)\src\msw\wx.pch
-CFLAGS= /W4 /Zi /MD /GX- /Od /Dwx_msw $(INC)
-LINKFLAGS=/NOD /CO /ONERROR:NOEXE
-!else
-# /Ox for real FINAL version
-OPT = /O2
-CPPFLAGS= /W4 /MD /GX- /Dwx_msw $(INC) # $(PRECOMP) /Fp$(WXDIR)\src\msw\wx.pch
-CFLAGS= /W4 /MD /GX- /Dwx_msw $(INC)
-LINKFLAGS=/NOD /ONERROR:NOEXE
-!endif
-
-OBJECTS = png.obj pngread.obj pngrtran.obj pngrutil.obj \
- pngpread.obj pngtrans.obj pngwrite.obj pngwtran.obj pngwutil.obj \
- pngerror.obj pngmem.obj pngwio.obj pngrio.obj pngget.obj pngset.obj
-
-all:    $(WINPNGLIB)
-
-$(WINPNGLIB):      $(OBJECTS)
-        erase $(WINPNGLIB)
-        lib @<<
--out:$(WINPNGLIB)
-$(OBJECTS)
-<<
-
-.c.obj:
-  cl -DWIN32 $(OPT) $(CFLAGS) /c $*.c
-
-clean:
-        erase *.obj
-        erase *.exe
-        erase *.lib
-
-cleanall:	clean
diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index dc91157cc3..03bc0f7205 100644
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -906,7 +906,7 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text,
     // Don't use the base style, just the default style, and the base style will
     // be combined at display time.
     // Divide into paragraph and character styles.
-    
+
     wxTextAttrEx defaultCharStyle;
     wxTextAttrEx defaultParaStyle;
 
@@ -930,7 +930,7 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text
     // Don't use the base style, just the default style, and the base style will
     // be combined at display time.
     // Divide into paragraph and character styles.
-    
+
     wxTextAttrEx defaultCharStyle;
     wxTextAttrEx defaultParaStyle;
     wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);
@@ -993,7 +993,7 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image, wxT
     // Don't use the base style, just the default style, and the base style will
     // be combined at display time.
     // Divide into paragraph and character styles.
-    
+
     wxTextAttrEx defaultCharStyle;
     wxTextAttrEx defaultParaStyle;
     wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);
@@ -1561,11 +1561,12 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
     bool parasOnly = ((flags & wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY) != 0);
     bool charactersOnly = ((flags & wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY) != 0);
     bool resetExistingStyle = ((flags & wxRICHTEXT_SETSTYLE_RESET) != 0);
+    bool removeStyle = ((flags & wxRICHTEXT_SETSTYLE_REMOVE) != 0);
 
     // Apply paragraph style first, if any
     wxRichTextAttr wholeStyle(style);
 
-    if (wholeStyle.HasParagraphStyleName() && GetStyleSheet())
+    if (!removeStyle && wholeStyle.HasParagraphStyleName() && GetStyleSheet())
     {
         wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(wholeStyle.GetParagraphStyleName());
         if (def)
@@ -1576,7 +1577,7 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
     wxRichTextAttr characterAttributes(wholeStyle);
     characterAttributes.SetFlags(characterAttributes.GetFlags() & (wxTEXT_ATTR_CHARACTER));
 
-    if (characterAttributes.HasCharacterStyleName() && GetStyleSheet())
+    if (!removeStyle && characterAttributes.HasCharacterStyleName() && GetStyleSheet())
     {
         wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterAttributes.GetCharacterStyleName());
         if (def)
@@ -1630,6 +1631,11 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
                 // to be included in the paragraph style
                 if ((paragraphStyle || parasOnly) && !charactersOnly)
                 {
+                    if (removeStyle)
+                    {
+                        // Removes the given style from the paragraph
+                        wxRichTextRemoveStyle(newPara->GetAttributes(), style);
+                    }
                     if (resetExistingStyle)
                         newPara->GetAttributes() = wholeStyle;
                     else
@@ -1705,6 +1711,11 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
                     {
                         wxRichTextObject* child = node2->GetData();
 
+                        if (removeStyle)
+                        {
+                            // Removes the given style from the paragraph
+                            wxRichTextRemoveStyle(child->GetAttributes(), style);
+                        }
                         if (resetExistingStyle)
                             child->GetAttributes() = characterAttributes;
                         else
@@ -2221,7 +2232,7 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, cons
         {
             // We need to find the bits in the new style that are different:
             // just look at those bits that are specified by the new style.
-                
+
             int currentRelevantTextEffects = currentStyle.GetTextEffects() & style.GetTextEffectFlags();
             int newRelevantTextEffects = style.GetTextEffects() & style.GetTextEffectFlags();
 
@@ -2229,7 +2240,7 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, cons
             {
                 // Find the text effects that were different, using XOR
                 int differentEffects = currentRelevantTextEffects ^ newRelevantTextEffects;
-                    
+
                 // Clash of style - mark as such
                 multipleTextEffectAttributes |= differentEffects;
                 currentStyle.SetTextEffectFlags(currentStyle.GetTextEffectFlags() & ~differentEffects);
@@ -2271,7 +2282,7 @@ bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range
     // The attributes that aren't valid because of multiple styles within the range
     long multipleStyleAttributes = 0;
     int multipleTextEffectAttributes = 0;
-    
+
     wxRichTextObjectList::compatibility_iterator node = GetChildren().GetFirst();
     while (node)
     {
@@ -2433,7 +2444,7 @@ void wxRichTextParagraphLayoutBox::Reset()
     Clear();
 
     AddParagraph(wxEmptyString);
-    
+
     Invalidate(wxRICHTEXT_ALL);
 }
 
@@ -2565,7 +2576,7 @@ bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSh
 bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
 {
     wxRichTextStyleSheet* styleSheet = GetStyleSheet();
-    
+
     bool withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0);
     // bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0);
     bool specifyLevel = ((flags & wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL) != 0);
@@ -2923,7 +2934,7 @@ bool wxRichTextParagraphLayoutBox::FindNextParagraphNumber(wxRichTextParagraph*
 {
     if (!previousParagraph->GetAttributes().HasFlag(wxTEXT_ATTR_BULLET_STYLE) || previousParagraph->GetAttributes().GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_NONE)
         return false;
-    
+
     wxRichTextStyleSheet* styleSheet = GetStyleSheet();
     if (styleSheet && !previousParagraph->GetAttributes().GetListStyleName().IsEmpty())
     {
@@ -2932,7 +2943,7 @@ bool wxRichTextParagraphLayoutBox::FindNextParagraphNumber(wxRichTextParagraph*
         {
             // int thisIndent = previousParagraph->GetAttributes().GetLeftIndent();
             // int thisLevel = def->FindLevelForIndent(thisIndent);
-            
+
             bool isOutline = (previousParagraph->GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE) != 0;
 
             attr.SetFlags(previousParagraph->GetAttributes().GetFlags() & (wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_NUMBER|wxTEXT_ATTR_BULLET_TEXT|wxTEXT_ATTR_BULLET_NAME));
@@ -2940,10 +2951,10 @@ bool wxRichTextParagraphLayoutBox::FindNextParagraphNumber(wxRichTextParagraph*
                 attr.SetBulletName(previousParagraph->GetAttributes().GetBulletName());
             attr.SetBulletStyle(previousParagraph->GetAttributes().GetBulletStyle());
             attr.SetListStyleName(previousParagraph->GetAttributes().GetListStyleName());
-            
+
             int nextNumber = previousParagraph->GetAttributes().GetBulletNumber() + 1;
             attr.SetBulletNumber(nextNumber);
-            
+
             if (isOutline)
             {
                 wxString text = previousParagraph->GetAttributes().GetBulletText();
@@ -2962,7 +2973,7 @@ bool wxRichTextParagraphLayoutBox::FindNextParagraphNumber(wxRichTextParagraph*
                     attr.SetBulletText(text);
                 }
             }
-            
+
             return true;
         }
         else
@@ -3059,15 +3070,15 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
                 if (wxRichTextBuffer::GetRenderer())
                     wxRichTextBuffer::GetRenderer()->DrawBitmapBullet(this, dc, bulletAttr, bulletRect);
             }
-            else if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_STANDARD)                
-            {                
+            else if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_STANDARD)
+            {
                 if (wxRichTextBuffer::GetRenderer())
                     wxRichTextBuffer::GetRenderer()->DrawStandardBullet(this, dc, bulletAttr, bulletRect);
             }
             else
             {
                 wxString bulletText = GetBulletText();
-                
+
                 if (!bulletText.empty() && wxRichTextBuffer::GetRenderer())
                     wxRichTextBuffer::GetRenderer()->DrawTextBullet(this, dc, bulletAttr, bulletRect, bulletText);
             }
@@ -3094,7 +3105,7 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
         while (node2)
         {
             wxRichTextObject* child = node2->GetData();
-            
+
             if (!child->GetRange().IsOutside(lineRange) && !lineRange.IsOutside(range))
             {
                 // Draw this part of the line at the correct position
@@ -3207,17 +3218,17 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
         // We may only be looking at part of a child, if we searched back for wrapping
         // and found a suitable point some way into the child. So get the size for the fragment
         // if necessary.
-        
+
         long nextBreakPos = GetFirstLineBreakPosition(lastEndPos+1);
         long lastPosToUse = child->GetRange().GetEnd();
         bool lineBreakInThisObject = (nextBreakPos > -1 && nextBreakPos <= child->GetRange().GetEnd());
-        
+
         if (lineBreakInThisObject)
             lastPosToUse = nextBreakPos;
 
         wxSize childSize;
         int childDescent = 0;
-        
+
         if ((nextBreakPos == -1) && (lastEndPos == child->GetRange().GetStart() - 1)) // i.e. we want to get the whole thing
         {
             childSize = child->GetCachedSize();
@@ -3489,7 +3500,7 @@ bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& siz
                 rangeToUse.LimitTo(child->GetRange());
                 int childDescent = 0;
 
-                if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, position))
+                if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, wxPoint(position.x + sz.x, position.y)))
                 {
                     sz.y = wxMax(sz.y, childSize.y);
                     sz.x += childSize.x;
@@ -3534,7 +3545,7 @@ bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& siz
 
                         wxSize childSize;
                         int childDescent = 0;
-                        if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, position))
+                        if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, wxPoint(position.x + sz.x, position.y)))
                         {
                             lineSize.y = wxMax(lineSize.y, childSize.y);
                             lineSize.x += childSize.x;
@@ -3668,12 +3679,12 @@ int wxRichTextParagraph::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition
             if (pt.x < linePos.x)
             {
                 textPosition = lineRange.GetStart();
-                return wxRICHTEXT_HITTEST_BEFORE;
+                return wxRICHTEXT_HITTEST_BEFORE|wxRICHTEXT_HITTEST_OUTSIDE;
             }
             else if (pt.x >= (linePos.x + lineSize.x))
             {
                 textPosition = lineRange.GetEnd();
-                return wxRICHTEXT_HITTEST_AFTER;
+                return wxRICHTEXT_HITTEST_AFTER|wxRICHTEXT_HITTEST_OUTSIDE;
             }
             else
             {
@@ -3910,9 +3921,11 @@ bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& d
         else
         {
             int spacePos = plainText.Find(wxT(' '), true);
-            if (spacePos != wxNOT_FOUND)
+            int tabPos = plainText.Find(wxT('\t'), true);
+            int pos = wxMax(spacePos, tabPos);
+            if (pos != wxNOT_FOUND)
             {
-                int positionsFromEndOfString = plainText.length() - spacePos - 1;
+                int positionsFromEndOfString = plainText.length() - pos - 1;
                 breakPosition = breakPosition - positionsFromEndOfString;
             }
         }
@@ -3960,7 +3973,7 @@ wxString wxRichTextParagraph::GetBulletText()
     {
         text = GetAttributes().GetBulletText();
     }
-    
+
     if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE)
     {
         // The outline style relies on the text being computed statically,
@@ -4154,6 +4167,9 @@ wxRichTextPlainText::wxRichTextPlainText(const wxString& text, wxRichTextObject*
 
 #define USE_KERNING_FIX 1
 
+// If insufficient tabs are defined, this is the tab width used
+#define WIDTH_FOR_DEFAULT_TABS 50
+
 /// Draw the item
 bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int WXUNUSED(style))
 {
@@ -4168,7 +4184,7 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
     wxString str = m_text;
     wxString toRemove = wxRichTextLineBreakChar;
     str.Replace(toRemove, wxT(" "));
-    
+
     long len = range.GetLength();
     wxString stringChunk = str.Mid(range.GetStart() - offset, (size_t) len);
     if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS))
@@ -4320,7 +4336,14 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& attr, c
     else
     {
         dc.SetTextForeground(attr.GetTextColour());
-        dc.SetBackgroundMode(wxTRANSPARENT);
+
+        if (attr.HasFlag(wxTEXT_ATTR_BACKGROUND_COLOUR) && attr.GetBackgroundColour().IsOk())
+        {
+            dc.SetBackgroundMode(wxSOLID);
+            dc.SetTextBackground(attr.GetBackgroundColour());
+        }
+        else
+            dc.SetBackgroundMode(wxTRANSPARENT);
     }
 
     while (hasTabs)
@@ -4335,8 +4358,17 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& attr, c
         for (int i = 0; i < tabCount && not_found; ++i)
         {
             nextTabPos = tabArray.Item(i);
-            if (nextTabPos > tabPos)
+            // Find the next tab position.
+            // Even if we're at the end of the tab array, we must still draw the chunk.
+
+            if (nextTabPos > tabPos || (i == (tabCount - 1)))
             {
+                if (nextTabPos <= tabPos)
+                {
+                    int defaultTabWidth = ConvertTenthsMMToPixels(dc, WIDTH_FOR_DEFAULT_TABS);
+                    nextTabPos = tabPos + defaultTabWidth;
+                }
+
                 not_found = false;
                 if (selected)
                 {
@@ -4387,24 +4419,7 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& attr, c
 /// Lay the item out
 bool wxRichTextPlainText::Layout(wxDC& dc, const wxRect& WXUNUSED(rect), int WXUNUSED(style))
 {
-    wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
-    wxASSERT (para != NULL);
-
-    wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());
-
-    if (textAttr.GetFont().Ok())
-        dc.SetFont(textAttr.GetFont());
-
-    wxString str = m_text;    
-    if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS))
-        str.MakeUpper();
-
-    wxString toReplace = wxRichTextLineBreakChar;
-    str.Replace(toReplace, wxT(" "));
-
-    wxCoord w, h;
-    dc.GetTextExtent(str, & w, & h, & m_descent);
-    m_size = wxSize(w, dc.GetCharHeight());
+    GetRangeSize(GetRange(), m_size, m_descent, dc, 0, wxPoint(0, 0));
 
     return true;
 }
@@ -4438,7 +4453,7 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz
 
     int startPos = range.GetStart() - GetRange().GetStart();
     long len = range.GetLength();
-    
+
     wxString str(m_text);
     wxString toReplace = wxRichTextLineBreakChar;
     str.Replace(toReplace, wxT(" "));
@@ -4483,8 +4498,18 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz
             for (int i = 0; i < tabCount && notFound; ++i)
             {
                 nextTabPos = tabArray.Item(i);
-                if (nextTabPos > absoluteWidth)
+
+                // Find the next tab position.
+                // Even if we're at the end of the tab array, we must still process the chunk.
+
+                if (nextTabPos > absoluteWidth || (i == (tabCount - 1)))
                 {
+                    if (nextTabPos <= absoluteWidth)
+                    {
+                        int defaultTabWidth = ((wxRichTextPlainText*) this)->ConvertTenthsMMToPixels(dc, WIDTH_FOR_DEFAULT_TABS);
+                        nextTabPos = absoluteWidth + defaultTabWidth;
+                    }
+
                     notFound = false;
                     width = nextTabPos - position.x;
                 }
@@ -4503,7 +4528,7 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz
 wxRichTextObject* wxRichTextPlainText::DoSplit(long pos)
 {
     long index = pos - GetRange().GetStart();
-    
+
     if (index < 0 || index >= (int) m_text.length())
         return NULL;
 
@@ -4517,7 +4542,7 @@ wxRichTextObject* wxRichTextPlainText::DoSplit(long pos)
 
     newObject->SetRange(wxRichTextRange(pos, GetRange().GetEnd()));
     GetRange().SetEnd(pos-1);
-    
+
     return newObject;
 }
 
@@ -4646,7 +4671,7 @@ wxRichTextBuffer::~wxRichTextBuffer()
 void wxRichTextBuffer::ResetAndClearCommands()
 {
     Reset();
-    
+
     GetCommandProcessor()->ClearCommands();
 
     Modify(false);
@@ -4849,7 +4874,7 @@ wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPos
     {
         wxRichTextAttr attr;
         bool foundAttributes = false;
-        
+
         // Look for a matching paragraph style
         if (lookUpNewParaStyle && !para->GetAttributes().GetParagraphStyleName().IsEmpty() && GetStyleSheet())
         {
@@ -4865,7 +4890,7 @@ wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPos
                         attr = nextParaDef->GetStyleMergedWithBase(GetStyleSheet());
                     }
                 }
-                
+
                 // If we didn't find the 'next style', use this style instead.
                 if (!foundAttributes)
                 {
@@ -4885,7 +4910,7 @@ wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPos
                     (~ wxTEXT_ATTR_BACKGROUND_COLOUR) );
             attr.SetFlags(flags);
         }
-        
+
         // Now see if we need to number the paragraph.
         if (attr.HasBulletStyle())
         {
@@ -5650,7 +5675,7 @@ bool wxRichTextBuffer::RemoveEventHandler(wxEvtHandler* handler, bool deleteHand
         m_eventHandlers.Erase(node);
         if (deleteHandler)
             delete handler;
-        
+
         return true;
     }
     else
@@ -5685,17 +5710,17 @@ bool wxRichTextBuffer::SendEvent(wxEvent& event, bool sendToAll)
 bool wxRichTextBuffer::SetStyleSheetAndNotify(wxRichTextStyleSheet* sheet)
 {
     wxRichTextStyleSheet* oldSheet = GetStyleSheet();
-    
+
     wxWindowID id = wxID_ANY;
     if (GetRichTextCtrl())
         id = GetRichTextCtrl()->GetId();
-    
+
     wxRichTextEvent event(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING, id);
     event.SetEventObject(GetRichTextCtrl());
     event.SetOldStyleSheet(oldSheet);
     event.SetNewStyleSheet(sheet);
     event.Allow();
-    
+
     if (SendEvent(event) && !event.IsAllowed())
     {
         if (sheet != oldSheet)
@@ -5746,26 +5771,26 @@ bool wxRichTextStdRenderer::DrawStandardBullet(wxRichTextParagraph* paragraph, w
     dc.SetFont(font);
 
     int charHeight = dc.GetCharHeight();
-                
+
     int bulletWidth = (int) (((float) charHeight) * wxRichTextBuffer::GetBulletProportion());
     int bulletHeight = bulletWidth;
 
     int x = rect.x;
-    
+
     // Calculate the top position of the character (as opposed to the whole line height)
     int y = rect.y + (rect.height - charHeight);
-    
+
     // Calculate where the bullet should be positioned
     y = y + (charHeight+1)/2 - (bulletHeight+1)/2;
-                
+
     // The margin between a bullet and text.
     int margin = paragraph->ConvertTenthsMMToPixels(dc, wxRichTextBuffer::GetBulletRightMargin());
-                
+
     if (bulletAttr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_RIGHT)
         x = rect.x + rect.width - bulletWidth - margin;
     else if (bulletAttr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE)
         x = x + (rect.width)/2 - bulletWidth/2;
-                
+
     if (bulletAttr.GetBulletName() == wxT("standard/square"))
     {
         dc.DrawRectangle(x, y, bulletWidth, bulletHeight);
@@ -5777,7 +5802,7 @@ bool wxRichTextStdRenderer::DrawStandardBullet(wxRichTextParagraph* paragraph, w
         pts[1].x = x + bulletWidth/2;   pts[1].y = y;
         pts[2].x = x + bulletWidth;     pts[2].y = y + bulletHeight/2;
         pts[3].x = x + bulletWidth/2;   pts[3].y = y + bulletHeight;
-                    
+
         dc.DrawPolygon(4, pts);
     }
     else if (bulletAttr.GetBulletName() == wxT("standard/triangle"))
@@ -5786,14 +5811,14 @@ bool wxRichTextStdRenderer::DrawStandardBullet(wxRichTextParagraph* paragraph, w
         pts[0].x = x;                   pts[0].y = y;
         pts[1].x = x + bulletWidth;     pts[1].y = y + bulletHeight/2;
         pts[2].x = x;                   pts[2].y = y + bulletHeight;
-                    
+
         dc.DrawPolygon(3, pts);
     }
     else // "standard/circle", and catch-all
     {
         dc.DrawEllipse(x, y, bulletWidth, bulletHeight);
-    }                
- 
+    }
+
     return true;
 }
 
@@ -5827,18 +5852,18 @@ bool wxRichTextStdRenderer::DrawTextBullet(wxRichTextParagraph* paragraph, wxDC&
         int x = rect.x;
 
         // Calculate the top position of the character (as opposed to the whole line height)
-        int y = rect.y + (rect.height - charHeight);    
+        int y = rect.y + (rect.height - charHeight);
 
         // The margin between a bullet and text.
         int margin = paragraph->ConvertTenthsMMToPixels(dc, wxRichTextBuffer::GetBulletRightMargin());
-                
+
         if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_RIGHT)
             x = (rect.x + rect.width) - tw - margin;
         else if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE)
             x = x + (rect.width)/2 - tw/2;
 
         dc.DrawText(text, x, y);
-        
+
         return true;
     }
     else
@@ -5878,7 +5903,7 @@ public:
         wxRichTextBuffer::InitStandardHandlers();
         wxRichTextParagraph::InitDefaultTabs();
         return true;
-    };
+    }
     void OnExit()
     {
         wxRichTextBuffer::CleanUpHandlers();
@@ -5886,7 +5911,7 @@ public:
         wxRichTextParagraph::ClearDefaultTabs();
         wxRichTextCtrl::ClearAvailableFontNames();
         wxRichTextBuffer::SetRenderer(NULL);
-    };
+    }
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextModule, wxModule)
@@ -6005,7 +6030,7 @@ bool wxRichTextAction::Do()
                 wxSize clientSize = m_ctrl->GetClientSize();
                 wxPoint firstVisiblePt = m_ctrl->GetFirstVisiblePoint();
                 int lastY = firstVisiblePt.y + clientSize.y;
-                
+
                 wxRichTextParagraph* para = m_buffer->GetParagraphAtPosition(GetPosition());
                 wxRichTextObjectList::compatibility_iterator node = m_buffer->GetChildren().Find(para);
                 while (node)
@@ -6017,14 +6042,14 @@ bool wxRichTextAction::Do()
                         wxRichTextLine* line = node2->GetData();
                         wxPoint pt = line->GetAbsolutePosition();
                         wxRichTextRange range = line->GetAbsoluteRange();
-                        
+
                         if (pt.y > lastY)
                         {
                             node2 = wxRichTextLineList::compatibility_iterator();
                             node = wxRichTextObjectList::compatibility_iterator();
                         }
                         else if (range.GetStart() > GetPosition() && pt.y >= firstVisiblePt.y)
-                        {                    
+                        {
                             optimizationLineCharPositions.Add(range.GetStart());
                             optimizationLineYPositions.Add(pt.y);
                         }
@@ -6032,11 +6057,11 @@ bool wxRichTextAction::Do()
                         if (node2)
                             node2 = node2->GetNext();
                     }
-                
+
                     if (node)
                         node = node->GetNext();
                 }
-            }            
+            }
 #endif
 
             m_buffer->InsertFragment(GetPosition(), m_newParagraphs);
@@ -6059,20 +6084,20 @@ bool wxRichTextAction::Do()
                         newCaretPosition --;
                 }
 
-            newCaretPosition = wxMin(newCaretPosition, (m_buffer->GetRange().GetEnd()-1));            
+            newCaretPosition = wxMin(newCaretPosition, (m_buffer->GetRange().GetEnd()-1));
 
             if (optimizationLineCharPositions.GetCount() > 0)
                 UpdateAppearance(newCaretPosition, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions);
             else
                 UpdateAppearance(newCaretPosition, true /* send update event */);
-            
+
             wxRichTextEvent cmdEvent(
                 wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED,
                 m_ctrl ? m_ctrl->GetId() : -1);
             cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
             cmdEvent.SetRange(GetRange());
             cmdEvent.SetPosition(GetRange().GetStart());
-            
+
             m_buffer->SendEvent(cmdEvent);
 
             break;
@@ -6091,7 +6116,7 @@ bool wxRichTextAction::Do()
             cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
             cmdEvent.SetRange(GetRange());
             cmdEvent.SetPosition(GetRange().GetStart());
-            
+
             m_buffer->SendEvent(cmdEvent);
 
             break;
@@ -6109,7 +6134,7 @@ bool wxRichTextAction::Do()
             cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
             cmdEvent.SetRange(GetRange());
             cmdEvent.SetPosition(GetRange().GetStart());
-            
+
             m_buffer->SendEvent(cmdEvent);
 
             break;
@@ -6134,7 +6159,7 @@ bool wxRichTextAction::Undo()
             m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart()));
 
             long newCaretPosition = GetPosition() - 1;
-            
+
             UpdateAppearance(newCaretPosition, true /* send update event */);
 
             wxRichTextEvent cmdEvent(
@@ -6143,7 +6168,7 @@ bool wxRichTextAction::Undo()
             cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
             cmdEvent.SetRange(GetRange());
             cmdEvent.SetPosition(GetRange().GetStart());
-            
+
             m_buffer->SendEvent(cmdEvent);
 
             break;
@@ -6162,7 +6187,7 @@ bool wxRichTextAction::Undo()
             cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
             cmdEvent.SetRange(GetRange());
             cmdEvent.SetPosition(GetRange().GetStart());
-            
+
             m_buffer->SendEvent(cmdEvent);
 
             break;
@@ -6180,7 +6205,7 @@ bool wxRichTextAction::Undo()
             cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
             cmdEvent.SetRange(GetRange());
             cmdEvent.SetPosition(GetRange().GetStart());
-            
+
             m_buffer->SendEvent(cmdEvent);
 
             break;
@@ -6202,30 +6227,30 @@ void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent
         {
             m_ctrl->LayoutContent();
             m_ctrl->PositionCaret();
-            
+
 #if wxRICHTEXT_USE_OPTIMIZED_DRAWING
             // Find refresh rectangle if we are in a position to optimise refresh
             if (m_cmdId == wxRICHTEXT_INSERT && optimizationLineCharPositions && optimizationLineCharPositions->GetCount() > 0)
             {
                 size_t i;
-                
+
                 wxSize clientSize = m_ctrl->GetClientSize();
                 wxPoint firstVisiblePt = m_ctrl->GetFirstVisiblePoint();
-                
+
                 // Start/end positions
                 int firstY = 0;
                 int lastY = firstVisiblePt.y + clientSize.y;
-                
+
                 bool foundStart = false;
                 bool foundEnd = false;
-                
+
                 // position offset - how many characters were inserted
                 int positionOffset = GetRange().GetLength();
 
                 // find the first line which is being drawn at the same position as it was
                 // before. Since we're talking about a simple insertion, we can assume
                 // that the rest of the window does not need to be redrawn.
-                
+
                 wxRichTextParagraph* para = m_buffer->GetParagraphAtPosition(GetPosition());
                 wxRichTextObjectList::compatibility_iterator node = m_buffer->GetChildren().Find(para);
                 while (node)
@@ -6237,10 +6262,10 @@ void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent
                         wxRichTextLine* line = node2->GetData();
                         wxPoint pt = line->GetAbsolutePosition();
                         wxRichTextRange range = line->GetAbsoluteRange();
-                        
+
                         // we want to find the first line that is in the same position
                         // as before. This will mean we're at the end of the changed text.
-                        
+
                         if (pt.y > lastY) // going past the end of the window, no more info
                         {
                             node2 = wxRichTextLineList::compatibility_iterator();
@@ -6254,7 +6279,7 @@ void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent
                                 foundStart = true;
                             }
 
-                            // search for this line being at the same position as before                            
+                            // search for this line being at the same position as before
                             for (i = 0; i < optimizationLineCharPositions->GetCount(); i++)
                             {
                                 if (((*optimizationLineCharPositions)[i] + positionOffset == range.GetStart()) &&
@@ -6268,18 +6293,18 @@ void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent
                                     node = wxRichTextObjectList::compatibility_iterator();
 
                                     break;
-                                }                    
+                                }
                             }
                         }
 
                         if (node2)
                             node2 = node2->GetNext();
                     }
-                
+
                     if (node)
                         node = node->GetNext();
                 }
-                
+
                 if (!foundStart)
                     firstY = firstVisiblePt.y;
                 if (!foundEnd)
@@ -6287,12 +6312,12 @@ void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent
 
                 wxRect rect(firstVisiblePt.x, firstY, firstVisiblePt.x + clientSize.x, lastY - firstY);
                 m_ctrl->RefreshRect(rect);
-                
+
                 // TODO: we need to make sure that lines are only drawn if in the update region. The rect
                 // passed to Draw is currently used in different ways (to pass the position the content should
                 // be drawn at as well as the relevant region).
             }
-            else            
+            else
 #endif
                 m_ctrl->Refresh(false);
 
@@ -6846,9 +6871,9 @@ bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxTextAttrEx& style)
 
         int srcBits = style.GetTextEffects();
         int srcFlags = style.GetTextEffectFlags();
-            
+
         wxRichTextCombineBitlists(destBits, srcBits, destFlags, srcFlags);
-            
+
         destStyle.SetTextEffects(destBits);
         destStyle.SetTextEffectFlags(destFlags);
     }
@@ -7082,9 +7107,9 @@ bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style,
 
             int srcBits = style.GetTextEffects();
             int srcFlags = style.GetTextEffectFlags();
-            
+
             wxRichTextCombineBitlists(destBits, srcBits, destFlags, srcFlags);
-            
+
             destStyle.SetTextEffects(destBits);
             destStyle.SetTextEffectFlags(destFlags);
         }
@@ -7099,23 +7124,34 @@ bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style,
     return true;
 }
 
+// Remove attributes
+bool wxRichTextRemoveStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style)
+{
+    int flags = style.GetFlags();
+    int destFlags = destStyle.GetFlags();
+
+    destStyle.SetFlags(destFlags & ~flags);
+
+    return true;
+}
+
 /// Combine two bitlists, specifying the bits of interest with separate flags.
 bool wxRichTextCombineBitlists(int& valueA, int valueB, int& flagsA, int flagsB)
 {
     // We want to apply B's bits to A, taking into account each's flags which indicate which bits
     // are to be taken into account. A zero in B's bits should reset that bit in A but only if B's flags
     // indicate it.
-    
+
     // First, reset the 0 bits from B. We make a mask so we're only dealing with B's zero
     // bits at this point, ignoring any 1 bits in B or 0 bits in B that are not relevant.
     int valueA2 = ~(~valueB & flagsB) & valueA;
-    
+
     // Now combine the 1 bits.
     int valueA3 = (valueB & flagsB) | valueA2;
-    
+
     valueA = valueA3;
     flagsA = (flagsA | flagsB);
-    
+
     return true;
 }
 
@@ -7137,7 +7173,7 @@ bool wxRichTextSplitParaCharStyles(const wxTextAttrEx& style, wxTextAttrEx& parS
 
     wxRichTextApplyStyle(charStyle, defaultCharStyle1);
     wxRichTextApplyStyle(parStyle, defaultParaStyle1);
-    
+
     return true;
 }
 
@@ -7293,7 +7329,7 @@ void wxRichTextAttr::Copy(const wxRichTextAttr& attr)
 
 // operators
 void wxRichTextAttr::operator= (const wxRichTextAttr& attr)
-{    
+{
     Copy(attr);
 }
 
@@ -7401,7 +7437,7 @@ bool wxRichTextAttr::operator== (const wxRichTextAttr& attr) const
             GetFontWeight() == attr.GetFontWeight() &&
             GetFontUnderlined() == attr.GetFontUnderlined() &&
             GetFontFaceName() == attr.GetFontFaceName() &&
-            
+
             GetURL() == attr.GetURL();
 }
 
@@ -7434,14 +7470,14 @@ wxRichTextAttr wxRichTextAttr::Combine(const wxRichTextAttr& style, const wxRich
 {
     wxRichTextAttr destStyle = (*this);
     destStyle.Apply(style, compareWith);
-    
+
     return destStyle;
 }
 
 bool wxRichTextAttr::Apply(const wxRichTextAttr& style, const wxRichTextAttr* compareWith)
 {
     wxRichTextAttr& destStyle = (*this);
-    
+
     if (style.HasFontWeight())
     {
         if (!(compareWith && compareWith->HasFontWeight() && compareWith->GetFontWeight() == style.GetFontWeight()))
@@ -7593,9 +7629,9 @@ bool wxRichTextAttr::Apply(const wxRichTextAttr& style, const wxRichTextAttr* co
 
             int srcBits = style.GetTextEffects();
             int srcFlags = style.GetTextEffectFlags();
-            
+
             wxRichTextCombineBitlists(destBits, srcBits, destFlags, srcFlags);
-            
+
             destStyle.SetTextEffects(destBits);
             destStyle.SetTextEffectFlags(destFlags);
         }
@@ -7942,7 +7978,7 @@ bool wxRichTextPlainTextHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputSt
 
     wxString newLine = wxRichTextLineBreakChar;
     text.Replace(newLine, wxT("\n"));
-    
+
     wxCharBuffer buf = text.ToAscii();
 
     stream.Write((const char*) buf, text.length());
diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index 5995b29fb8..952dc4baa2 100644
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -141,7 +141,7 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va
 
     GetBuffer().Reset();
     GetBuffer().SetRichTextCtrl(this);
-    
+
     SetCaret(new wxCaret(this, wxRICHTEXT_DEFAULT_CARET_WIDTH, 16));
     GetCaret()->Show();
 
@@ -152,7 +152,6 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va
     wxTextAttrEx attributes;
     attributes.SetFont(GetFont());
     attributes.SetTextColour(*wxBLACK);
-    attributes.SetBackgroundColour(*wxWHITE);
     attributes.SetAlignment(wxTEXT_ALIGNMENT_LEFT);
     attributes.SetLineSpacing(10);
     attributes.SetParagraphSpacingAfter(10);
@@ -194,7 +193,7 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va
 wxRichTextCtrl::~wxRichTextCtrl()
 {
     GetBuffer().RemoveEventHandler(this);
-    
+
     delete m_contextMenu;
 }
 
@@ -328,7 +327,7 @@ void wxRichTextCtrl::OnKillFocus(wxFocusEvent& WXUNUSED(event))
 
 void wxRichTextCtrl::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
 {
-    m_dragging = false;    
+    m_dragging = false;
 }
 
 /// Left-click
@@ -390,7 +389,7 @@ void wxRichTextCtrl::OnLeftUp(wxMouseEvent& event)
         long position = 0;
         wxPoint logicalPt = event.GetLogicalPosition(dc);
         int hit = GetBuffer().HitTest(dc, logicalPt, position);
-    
+
         if (hit != wxRICHTEXT_HITTEST_NONE)
         {
             wxTextAttrEx attr;
@@ -402,20 +401,20 @@ void wxRichTextCtrl::OnLeftUp(wxMouseEvent& event)
                     if (!urlTarget.IsEmpty())
                     {
                         wxMouseEvent mouseEvent(event);
-                        
+
                         long startPos = 0, endPos = 0;
                         wxRichTextObject* obj = GetBuffer().GetLeafObjectAtPosition(position);
                         if (obj)
                         {
                             startPos = obj->GetRange().GetStart();
                             endPos = obj->GetRange().GetEnd();
-                        }                        
-                        
+                        }
+
                         wxTextUrlEvent urlEvent(GetId(), mouseEvent, startPos, endPos);
                         InitCommandEvent(urlEvent);
 
                         urlEvent.SetString(urlTarget);
-                        
+
                         GetEventHandler()->ProcessEvent(urlEvent);
                     }
                 }
@@ -434,11 +433,11 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event)
     long position = 0;
     wxPoint logicalPt = event.GetLogicalPosition(dc);
     int hit = GetBuffer().HitTest(dc, logicalPt, position);
-    
+
     // See if we need to change the cursor
-    
+
     {
-        if (hit != wxRICHTEXT_HITTEST_NONE)
+        if (hit != wxRICHTEXT_HITTEST_NONE && !(hit & wxRICHTEXT_HITTEST_OUTSIDE))
         {
             wxTextAttrEx attr;
             if (GetStyle(position, attr))
@@ -453,6 +452,8 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event)
                 }
             }
         }
+        else
+            SetCursor(m_textCursor);
     }
 
     if (!event.Dragging())
@@ -588,7 +589,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
             // Generate conventional event
             wxCommandEvent textEvent(wxEVT_COMMAND_TEXT_ENTER, GetId());
             InitCommandEvent(textEvent);
-            
+
             GetEventHandler()->ProcessEvent(textEvent);
         }
         Update();
@@ -596,7 +597,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
     else if (event.GetKeyCode() == WXK_BACK)
     {
         BeginBatchUndo(_("Delete Text"));
-        
+
         // Submit range in character positions, which are greater than caret positions,
         // so subtract 1 for deleted character and add 1 for conversion to character position.
         if (m_caretPosition > -1 && !HasSelection())
@@ -668,7 +669,6 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
         switch ( keycode )
         {
             case WXK_ESCAPE:
-            // case WXK_SPACE:
             case WXK_DELETE:
             case WXK_START:
             case WXK_LBUTTON:
@@ -762,6 +762,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
             case WXK_NUMPAD_SEPARATOR:
             case WXK_NUMPAD_SUBTRACT:
             case WXK_NUMPAD_DECIMAL:
+            case WXK_WINDOWS_LEFT:
             {
                 event.Skip();
                 return;
@@ -780,9 +781,13 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
                     GetId());
                 cmdEvent.SetEventObject(this);
                 cmdEvent.SetFlags(flags);
+#if wxUSE_UNICODE
+                cmdEvent.SetCharacter(event.GetUnicodeKey());
+#else
                 cmdEvent.SetCharacter((wxChar) keycode);
+#endif
                 cmdEvent.SetPosition(m_caretPosition+1);
-                
+
                 if (keycode == wxT('\t'))
                 {
                     // See if we need to promote or demote the selection or paragraph at the cursor
@@ -812,14 +817,18 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
                 long newPos = m_caretPosition;
                 DeleteSelectedContent(& newPos);
 
+#if wxUSE_UNICODE
+                wxString str = event.GetUnicodeKey();
+#else
                 wxString str = (wxChar) event.GetKeyCode();
+#endif
                 GetBuffer().InsertTextWithUndo(newPos+1, str, this, 0);
 
                 EndBatchUndo();
 
                 SetDefaultStyleToCursorStyle();
                 ScrollIntoView(m_caretPosition, WXK_RIGHT);
-                
+
                 GetEventHandler()->ProcessEvent(cmdEvent);
 
                 Update();
@@ -1331,7 +1340,7 @@ bool wxRichTextCtrl::MoveDown(int noLines, int flags)
         // we want to be at the end of the last line but with m_caretAtLineStart set to true,
         // so we view the caret at the start of the line.
         bool caretLineStart = false;
-        if (hitTest == wxRICHTEXT_HITTEST_BEFORE)
+        if (hitTest & wxRICHTEXT_HITTEST_BEFORE)
         {
             wxRichTextLine* thisLine = GetBuffer().GetLineAtPosition(newPos-1);
             wxRichTextRange lineRange;
@@ -1554,6 +1563,11 @@ bool wxRichTextCtrl::PageDown(int noPages, int flags)
     return false;
 }
 
+static bool wxRichTextCtrlIsWhitespace(const wxString& str)
+{
+    return str == wxT(" ") || str == wxT("\t");
+}
+
 // Finds the caret position for the next word
 long wxRichTextCtrl::FindNextWordPosition(int direction) const
 {
@@ -1568,7 +1582,12 @@ long wxRichTextCtrl::FindNextWordPosition(int direction) const
         {
             // i is in character, not caret positions
             wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
-            if (text != wxT(" ") && !text.empty())
+            wxRichTextLine* line = GetBuffer().GetLineAtPosition(i, false);
+            if (line && (i == line->GetAbsoluteRange().GetEnd()))
+            {
+                break;
+            }
+            else if (!wxRichTextCtrlIsWhitespace(text) && !text.empty())
                 i += direction;
             else
             {
@@ -1579,9 +1598,13 @@ long wxRichTextCtrl::FindNextWordPosition(int direction) const
         {
             // i is in character, not caret positions
             wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
+            wxRichTextLine* line = GetBuffer().GetLineAtPosition(i, false);
+            if (line && (i == line->GetAbsoluteRange().GetEnd()))
+                return wxMax(-1, i);
+
             if (text.empty()) // End of paragraph, or maybe an image
                 return wxMax(-1, i - 1);
-            else if (text == wxT(" ") || text.empty())
+            else if (wxRichTextCtrlIsWhitespace(text) || text.empty())
                 i += direction;
             else
             {
@@ -1602,9 +1625,11 @@ long wxRichTextCtrl::FindNextWordPosition(int direction) const
         {
             // i is in character, not caret positions
             wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
-            if (text.empty()) // End of paragraph, or maybe an image
+            wxRichTextLine* line = GetBuffer().GetLineAtPosition(i, false);
+
+            if (text.empty() || (line && (i == line->GetAbsoluteRange().GetStart()))) // End of paragraph, or maybe an image
                 break;
-            else if (text == wxT(" ") || text.empty())
+            else if (wxRichTextCtrlIsWhitespace(text) || text.empty())
                 i += direction;
             else
                 break;
@@ -1614,7 +1639,11 @@ long wxRichTextCtrl::FindNextWordPosition(int direction) const
         {
             // i is in character, not caret positions
             wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
-            if (text != wxT(" ") /* && !text.empty() */)
+            wxRichTextLine* line = GetBuffer().GetLineAtPosition(i, false);
+            if (line && line->GetAbsoluteRange().GetStart() == i)
+                return i-1;
+
+            if (!wxRichTextCtrlIsWhitespace(text) /* && !text.empty() */)
                 i += direction;
             else
             {
@@ -1975,17 +2004,14 @@ wxRichTextCtrl::HitTest(const wxPoint& pt,
 
     int hit = ((wxRichTextCtrl*)this)->GetBuffer().HitTest(dc, pt2, *pos);
 
-    switch ( hit )
-    {
-        case wxRICHTEXT_HITTEST_BEFORE:
-            return wxTE_HT_BEFORE;
-
-        case wxRICHTEXT_HITTEST_AFTER:
-            return wxTE_HT_BEYOND;
-
-        case wxRICHTEXT_HITTEST_ON:
-            return wxTE_HT_ON_TEXT;
-    }
+    if ((hit & wxRICHTEXT_HITTEST_BEFORE) && (hit & wxRICHTEXT_HITTEST_OUTSIDE))
+        return wxTE_HT_BEFORE;
+    else if ((hit & wxRICHTEXT_HITTEST_AFTER) && (hit & wxRICHTEXT_HITTEST_OUTSIDE))
+        return wxTE_HT_BEYOND;
+    else if (hit & wxRICHTEXT_HITTEST_BEFORE|wxRICHTEXT_HITTEST_AFTER)
+        return wxTE_HT_ON_TEXT;
+    else
+        return wxTE_HT_UNKNOWN;
 
     return wxTE_HT_UNKNOWN;
 }
@@ -2684,6 +2710,10 @@ bool wxRichTextCtrl::GetCaretPositionForIndex(long position, wxRect& rect)
 
     if (GetBuffer().FindPosition(dc, position, pt, & height, m_caretAtLineStart))
     {
+        // Caret height can't be zero
+        if (height == 0)
+            height = dc.GetCharHeight();
+
         rect = wxRect(pt, wxSize(wxRICHTEXT_DEFAULT_CARET_WIDTH, height));
         return true;
     }
diff --git a/src/richtext/richtextformatdlg.cpp b/src/richtext/richtextformatdlg.cpp
index 018bbb7760..cd462d23e6 100644
--- a/src/richtext/richtextformatdlg.cpp
+++ b/src/richtext/richtextformatdlg.cpp
@@ -380,8 +380,8 @@ class wxRichTextFormattingDialogModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxRichTextFormattingDialogModule)
 public:
     wxRichTextFormattingDialogModule() {}
-    bool OnInit() { wxRichTextFormattingDialog::SetFormattingDialogFactory(new wxRichTextFormattingDialogFactory); return true; };
-    void OnExit() { wxRichTextFormattingDialog::SetFormattingDialogFactory(NULL); };
+    bool OnInit() { wxRichTextFormattingDialog::SetFormattingDialogFactory(new wxRichTextFormattingDialogFactory); return true; }
+    void OnExit() { wxRichTextFormattingDialog::SetFormattingDialogFactory(NULL); }
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextFormattingDialogModule, wxModule)
diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp
index 3e03c70559..fe16bfaca7 100644
--- a/src/richtext/richtextxml.cpp
+++ b/src/richtext/richtextxml.cpp
@@ -161,7 +161,7 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node)
                     }
                     textChild = textChild->GetNext();
                 }
-                
+
                 wxString actualText;
                 actualText << (wxChar) wxAtoi(text);
 
@@ -221,15 +221,15 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node)
             wxString sheetDescription = node->GetPropVal(wxT("description"), wxEmptyString);
             sheet->SetName(sheetName);
             sheet->SetDescription(sheetDescription);
-            
+
             wxXmlNode* child = node->GetChildren();
             while (child)
             {
                 ImportStyleDefinition(sheet, child);
-                
+
                 child = child->GetNext();
             }
-            
+
             // Notify that styles have changed. If this is vetoed by the app,
             // the new sheet will be deleted. If it is not vetoed, the
             // old sheet will be deleted and replaced with the new one.
@@ -253,13 +253,13 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node)
 
 bool wxRichTextXMLHandler::ImportStyleDefinition(wxRichTextStyleSheet* sheet, wxXmlNode* node)
 {
-    wxString styleType = node->GetName();    
+    wxString styleType = node->GetName();
     wxString styleName = node->GetPropVal(wxT("name"), wxEmptyString);
     wxString baseStyleName = node->GetPropVal(wxT("basestyle"), wxEmptyString);
-    
+
     if (styleName.IsEmpty())
         return false;
-    
+
     if (styleType == wxT("characterstyle"))
     {
         wxRichTextCharacterStyleDefinition* def = new wxRichTextCharacterStyleDefinition(styleName);
@@ -276,7 +276,7 @@ bool wxRichTextXMLHandler::ImportStyleDefinition(wxRichTextStyleSheet* sheet, wx
             }
             child = child->GetNext();
         }
-        
+
         sheet->AddCharacterStyle(def);
     }
     else if (styleType == wxT("paragraphstyle"))
@@ -319,7 +319,7 @@ bool wxRichTextXMLHandler::ImportStyleDefinition(wxRichTextStyleSheet* sheet, wx
 
                 wxString styleLevel = child->GetPropVal(wxT("level"), wxEmptyString);
                 if (styleLevel.IsEmpty())
-                {                
+                {
                     def->SetStyle(attr);
                 }
                 else
@@ -336,7 +336,7 @@ bool wxRichTextXMLHandler::ImportStyleDefinition(wxRichTextStyleSheet* sheet, wx
 
         sheet->AddListStyle(def);
     }
-    
+
     return true;
 }
 
@@ -544,7 +544,9 @@ bool wxRichTextXMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
     {
         if (m_encoding == wxT("<System>"))
         {
+#if wxUSE_INTL
             fileEncoding = wxLocale::GetSystemEncodingName();
+#endif // wxUSE_INTL
         }
         else
         {
@@ -612,7 +614,7 @@ bool wxRichTextXMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
 
 
     bool success = ExportXML(stream, convMem, convFile, *buffer, level);
-    
+
     OutputString(stream, wxT("\n</richtext>") , NULL, NULL);
     OutputString(stream, wxT("\n"), NULL, NULL);
 
@@ -636,15 +638,15 @@ bool wxRichTextXMLHandler::ExportXML(wxOutputStream& stream, wxMBConv* convMem,
         objectName = wxT("image");
     else
         objectName = wxT("object");
-    
+
     bool terminateTag = true;
 
     if (obj.IsKindOf(CLASSINFO(wxRichTextPlainText)))
     {
         wxRichTextPlainText& textObj = (wxRichTextPlainText&) obj;
-        
+
         wxString style = CreateStyle(obj.GetAttributes(), false);
-                
+
         int i;
         int last = 0;
         const wxString& text = textObj.GetText();
@@ -672,22 +674,22 @@ bool wxRichTextXMLHandler::ExportXML(wxOutputStream& stream, wxMBConv* convMem,
                         OutputStringEnt(stream, fragment, convMem, convFile);
 
                     OutputString(stream, wxT("</text>"), convMem, convFile);
-                }                
-                
+                }
+
 
                 // Output this character as a number in a separate tag, because XML can't cope
-                // with entities below 32 except for 9, 10 and 13                
+                // with entities below 32 except for 9, 10 and 13
                 last = i + 1;
                 OutputIndentation(stream, indent);
                 OutputString(stream, wxT("<symbol"), convMem, convFile);
 
                 OutputString(stream, style + wxT(">"), convMem, convFile);
-                OutputString(stream, wxString::Format(wxT("%d"), c), convMem, convFile);                
+                OutputString(stream, wxString::Format(wxT("%d"), c), convMem, convFile);
 
                 OutputString(stream, wxT("</symbol>"), convMem, convFile);
             }
         }
-        
+
         wxString fragment;
         if (last == 0)
             fragment = text;
@@ -749,7 +751,7 @@ bool wxRichTextXMLHandler::ExportXML(wxOutputStream& stream, wxMBConv* convMem,
             isPara = true;
 
         wxString style = CreateStyle(obj.GetAttributes(), isPara);
-        
+
         if (objectName == wxT("paragraphlayout") && ((wxRichTextParagraphLayoutBox&) obj).GetPartialParagraph())
             style << wxT(" partialparagraph=\"true\"");
 
@@ -775,32 +777,32 @@ bool wxRichTextXMLHandler::ExportXML(wxOutputStream& stream, wxMBConv* convMem,
 
 bool wxRichTextXMLHandler::ExportStyleDefinition(wxOutputStream& stream, wxMBConv* convMem, wxMBConv* convFile, wxRichTextStyleDefinition* def, int level)
 {
-    wxRichTextCharacterStyleDefinition* charDef = wxDynamicCast(def, wxRichTextCharacterStyleDefinition);    
+    wxRichTextCharacterStyleDefinition* charDef = wxDynamicCast(def, wxRichTextCharacterStyleDefinition);
     wxRichTextParagraphStyleDefinition* paraDef = wxDynamicCast(def, wxRichTextParagraphStyleDefinition);
     wxRichTextListStyleDefinition* listDef = wxDynamicCast(def, wxRichTextListStyleDefinition);
-    
+
     wxString baseStyle = def->GetBaseStyle();
     wxString baseStyleProp;
     if (!baseStyle.IsEmpty())
         baseStyleProp = wxT(" basestyle=\"") + baseStyle + wxT("\"");
-    
+
     wxString descr = def->GetDescription();
     wxString descrProp;
     if (!descr.IsEmpty())
         descrProp = wxT(" description=\"") + descr + wxT("\"");
-    
+
     if (charDef)
     {
         OutputIndentation(stream, level);
         OutputString(stream, wxT("<characterstyle") + baseStyleProp + descrProp + wxT(">"), convMem, convFile);
-        
+
         level ++;
 
         wxString style = CreateStyle(def->GetStyle(), false);
 
         OutputIndentation(stream, level);
         OutputString(stream, wxT("<style ") + style + wxT(">"), convMem, convFile);
-        
+
         OutputIndentation(stream, level);
         OutputString(stream, wxT("</style>"), convMem, convFile);
 
@@ -812,19 +814,19 @@ bool wxRichTextXMLHandler::ExportStyleDefinition(wxOutputStream& stream, wxMBCon
     else if (listDef)
     {
         OutputIndentation(stream, level);
-        
+
         if (!listDef->GetNextStyle().IsEmpty())
             baseStyleProp << wxT(" basestyle=\"") << listDef->GetNextStyle() << wxT("\"");
-        
+
         OutputString(stream, wxT("<liststyle") + baseStyleProp + descrProp + wxT(">"), convMem, convFile);
-        
+
         level ++;
 
         wxString style = CreateStyle(def->GetStyle(), false);
 
         OutputIndentation(stream, level);
         OutputString(stream, wxT("<style ") + style + wxT(">"), convMem, convFile);
-        
+
         OutputIndentation(stream, level);
         OutputString(stream, wxT("</style>"), convMem, convFile);
 
@@ -839,7 +841,7 @@ bool wxRichTextXMLHandler::ExportStyleDefinition(wxOutputStream& stream, wxMBCon
 
                 OutputIndentation(stream, level);
                 OutputString(stream, wxT("<style ") + levelStr + style + wxT(">"), convMem, convFile);
-        
+
                 OutputIndentation(stream, level);
                 OutputString(stream, wxT("</style>"), convMem, convFile);
             }
@@ -853,22 +855,22 @@ bool wxRichTextXMLHandler::ExportStyleDefinition(wxOutputStream& stream, wxMBCon
     else if (paraDef)
     {
         OutputIndentation(stream, level);
-        
-        if (!listDef->GetNextStyle().IsEmpty())
-            baseStyleProp << wxT(" basestyle=\"") << listDef->GetNextStyle() << wxT("\"");
-        
+
+        if (!paraDef->GetNextStyle().IsEmpty())
+            baseStyleProp << wxT(" basestyle=\"") << paraDef->GetNextStyle() << wxT("\"");
+
         OutputString(stream, wxT("<paragraphstyle") + baseStyleProp + descrProp + wxT(">"), convMem, convFile);
-        
+
         level ++;
 
         wxString style = CreateStyle(def->GetStyle(), false);
 
         OutputIndentation(stream, level);
         OutputString(stream, wxT("<style ") + style + wxT(">"), convMem, convFile);
-        
+
         OutputIndentation(stream, level);
         OutputString(stream, wxT("</style>"), convMem, convFile);
-        
+
         level --;
 
         OutputIndentation(stream, level);
@@ -895,7 +897,7 @@ wxString wxRichTextXMLHandler::CreateStyle(const wxTextAttrEx& attr, bool isPara
     {
         if (attr.HasFontSize())
             str << wxT(" fontsize=\"") << attr.GetFont().GetPointSize() << wxT("\"");
-        
+
         //if (attr.HasFontFamily())
         //    str << wxT(" fontfamily=\"") << attr.GetFont().GetFamily() << wxT("\"");
 
@@ -963,7 +965,7 @@ wxString wxRichTextXMLHandler::CreateStyle(const wxTextAttrEx& attr, bool isPara
                 str << wxT(" bulletsymbol=\"") << (int) (attr.GetBulletText()[0]) << wxT("\"");
             else
                 str << wxT(" bullettext=\"") << attr.GetBulletText() << wxT("\"");
-                
+
             str << wxT(" bulletfont=\"") << attr.GetBulletFont() << wxT("\"");
         }
 
@@ -972,13 +974,13 @@ wxString wxRichTextXMLHandler::CreateStyle(const wxTextAttrEx& attr, bool isPara
 
         if (attr.HasURL())
             str << wxT(" url=\"") << attr.GetURL() << wxT("\"");
-        
+
         if (!attr.GetParagraphStyleName().empty())
             str << wxT(" parstyle=\"") << wxString(attr.GetParagraphStyleName()) << wxT("\"");
-        
+
         if (!attr.GetListStyleName().empty())
             str << wxT(" liststyle=\"") << wxString(attr.GetListStyleName()) << wxT("\"");
-        
+
         if (attr.HasTabs())
         {
             str << wxT(" tabs=\"");
@@ -989,9 +991,9 @@ wxString wxRichTextXMLHandler::CreateStyle(const wxTextAttrEx& attr, bool isPara
                     str << wxT(",");
                 str << attr.GetTabs()[i];
             }
-            str << wxT("\"");            
+            str << wxT("\"");
         }
-        
+
         if (attr.HasPageBreak())
         {
             str << wxT(" pagebreak=\"1\"");
@@ -1014,7 +1016,7 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool is
     int fontWeight = wxNORMAL;
     int fontStyle = wxNORMAL;
     bool fontUnderlined = false;
-    
+
     int fontFlags = 0;
 
     fontFacename = node->GetPropVal(wxT("fontface"), wxEmptyString);
@@ -1053,15 +1055,15 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool is
         fontUnderlined = wxAtoi(value) != 0;
         fontFlags |= wxTEXT_ATTR_FONT_UNDERLINE;
     }
-    
+
     attr.SetFlags(fontFlags);
-    
+
     if (attr.HasFlag(wxTEXT_ATTR_FONT))
         attr.SetFont(* wxTheFontList->FindOrCreateFont(fontSize, fontFamily, fontStyle, fontWeight, fontUnderlined, fontFacename));
 
     // Restore correct font flags
     attr.SetFlags(fontFlags);
-    
+
     value = node->GetPropVal(wxT("textcolor"), wxEmptyString);
     if (!value.empty())
     {
@@ -1106,7 +1108,7 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool is
         int leftSubIndent = 0;
         int leftIndent = 0;
         bool hasLeftIndent = false;
-        
+
         value = node->GetPropVal(wxT("leftindent"), wxEmptyString);
         if (!value.empty())
         {
@@ -1176,11 +1178,11 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool is
         value = node->GetPropVal(wxT("parstyle"), wxEmptyString);
         if (!value.empty())
             attr.SetParagraphStyleName(value);
-        
+
         value = node->GetPropVal(wxT("liststyle"), wxEmptyString);
         if (!value.empty())
             attr.SetListStyleName(value);
-        
+
         value = node->GetPropVal(wxT("tabs"), wxEmptyString);
         if (!value.empty())
         {
@@ -1193,7 +1195,7 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool is
             }
             attr.SetTabs(tabs);
         }
-        
+
         value = node->GetPropVal(wxT("pagebreak"), wxEmptyString);
         if (!value.IsEmpty())
         {
diff --git a/src/stc/Makefile.in b/src/stc/Makefile.in
deleted file mode 100644
index 2daee2cd00..0000000000
--- a/src/stc/Makefile.in
+++ /dev/null
@@ -1,937 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-@MAKE_SET@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-INSTALL = @INSTALL@
-SHARED_LD_CXX = @SHARED_LD_CXX@
-LIBEXT = @LIBEXT@
-LIBPREFIX = @LIBPREFIX@
-SO_SUFFIX = @SO_SUFFIX@
-DLLIMP_SUFFIX = @DLLIMP_SUFFIX@
-LN_S = @LN_S@
-WINDRES = @WINDRES@
-PIC_FLAG = @PIC_FLAG@
-SONAME_FLAG = @SONAME_FLAG@
-STRIP = @STRIP@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_DIR = @INSTALL_DIR@
-BK_DEPS = @BK_DEPS@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-libdir = @libdir@
-includedir = @includedir@
-DLLPREFIX = @DLLPREFIX@
-LIBS = @LIBS@
-AR = @AR@
-AROPTIONS = @AROPTIONS@
-RANLIB = @RANLIB@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-VENDOR = @VENDOR@
-WX_FLAVOUR = @WX_FLAVOUR@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR = 
-WX_RELEASE = 2.8
-WX_RELEASE_NODOT = 28
-LIBDIRNAME = $(wx_top_builddir)/lib
-STCDLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-	-I$(srcdir)/../../include -I$(srcdir)/scintilla/include \
-	-I$(srcdir)/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL \
-	-DWXMAKINGDLL_STC $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
-STCDLL_OBJECTS =  \
-	$(__stcdll___win32rc) \
-	stcdll_PlatWX.o \
-	stcdll_ScintillaWX.o \
-	stcdll_stc.o \
-	stcdll_AutoComplete.o \
-	stcdll_CallTip.o \
-	stcdll_CellBuffer.o \
-	stcdll_CharClassify.o \
-	stcdll_ContractionState.o \
-	stcdll_Document.o \
-	stcdll_DocumentAccessor.o \
-	stcdll_Editor.o \
-	stcdll_ExternalLexer.o \
-	stcdll_Indicator.o \
-	stcdll_KeyMap.o \
-	stcdll_KeyWords.o \
-	stcdll_LexAPDL.o \
-	stcdll_LexAU3.o \
-	stcdll_LexAVE.o \
-	stcdll_LexAda.o \
-	stcdll_LexAsm.o \
-	stcdll_LexAsn1.o \
-	stcdll_LexBaan.o \
-	stcdll_LexBash.o \
-	stcdll_LexBasic.o \
-	stcdll_LexBullant.o \
-	stcdll_LexCLW.o \
-	stcdll_LexCPP.o \
-	stcdll_LexCSS.o \
-	stcdll_LexCaml.o \
-	stcdll_LexCsound.o \
-	stcdll_LexConf.o \
-	stcdll_LexCrontab.o \
-	stcdll_LexEScript.o \
-	stcdll_LexEiffel.o \
-	stcdll_LexErlang.o \
-	stcdll_LexFlagship.o \
-	stcdll_LexForth.o \
-	stcdll_LexFortran.o \
-	stcdll_LexGui4Cli.o \
-	stcdll_LexHTML.o \
-	stcdll_LexHaskell.o \
-	stcdll_LexInno.o \
-	stcdll_LexKix.o \
-	stcdll_LexLisp.o \
-	stcdll_LexLout.o \
-	stcdll_LexLua.o \
-	stcdll_LexMMIXAL.o \
-	stcdll_LexMPT.o \
-	stcdll_LexMSSQL.o \
-	stcdll_LexMatlab.o \
-	stcdll_LexMetapost.o \
-	stcdll_LexNsis.o \
-	stcdll_LexOpal.o \
-	stcdll_LexOthers.o \
-	stcdll_LexPB.o \
-	stcdll_LexPOV.o \
-	stcdll_LexPS.o \
-	stcdll_LexPascal.o \
-	stcdll_LexPerl.o \
-	stcdll_LexPython.o \
-	stcdll_LexRebol.o \
-	stcdll_LexRuby.o \
-	stcdll_LexSQL.o \
-	stcdll_LexSmalltalk.o \
-	stcdll_LexTADS3.o \
-	stcdll_LexScriptol.o \
-	stcdll_LexSpecman.o \
-	stcdll_LexSpice.o \
-	stcdll_LexTCL.o \
-	stcdll_LexTeX.o \
-	stcdll_LexVB.o \
-	stcdll_LexVHDL.o \
-	stcdll_LexVerilog.o \
-	stcdll_LexYAML.o \
-	stcdll_LineMarker.o \
-	stcdll_PropSet.o \
-	stcdll_RESearch.o \
-	stcdll_ScintillaBase.o \
-	stcdll_Style.o \
-	stcdll_StyleContext.o \
-	stcdll_UniConversion.o \
-	stcdll_ViewStyle.o \
-	stcdll_WindowAccessor.o \
-	stcdll_XPM.o
-STCLIB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-	-I$(srcdir)/../../include -I$(srcdir)/scintilla/include \
-	-I$(srcdir)/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CPPFLAGS) \
-	$(CXXFLAGS)
-STCLIB_OBJECTS =  \
-	stclib_PlatWX.o \
-	stclib_ScintillaWX.o \
-	stclib_stc.o \
-	stclib_AutoComplete.o \
-	stclib_CallTip.o \
-	stclib_CellBuffer.o \
-	stclib_CharClassify.o \
-	stclib_ContractionState.o \
-	stclib_Document.o \
-	stclib_DocumentAccessor.o \
-	stclib_Editor.o \
-	stclib_ExternalLexer.o \
-	stclib_Indicator.o \
-	stclib_KeyMap.o \
-	stclib_KeyWords.o \
-	stclib_LexAPDL.o \
-	stclib_LexAU3.o \
-	stclib_LexAVE.o \
-	stclib_LexAda.o \
-	stclib_LexAsm.o \
-	stclib_LexAsn1.o \
-	stclib_LexBaan.o \
-	stclib_LexBash.o \
-	stclib_LexBasic.o \
-	stclib_LexBullant.o \
-	stclib_LexCLW.o \
-	stclib_LexCPP.o \
-	stclib_LexCSS.o \
-	stclib_LexCaml.o \
-	stclib_LexCsound.o \
-	stclib_LexConf.o \
-	stclib_LexCrontab.o \
-	stclib_LexEScript.o \
-	stclib_LexEiffel.o \
-	stclib_LexErlang.o \
-	stclib_LexFlagship.o \
-	stclib_LexForth.o \
-	stclib_LexFortran.o \
-	stclib_LexGui4Cli.o \
-	stclib_LexHTML.o \
-	stclib_LexHaskell.o \
-	stclib_LexInno.o \
-	stclib_LexKix.o \
-	stclib_LexLisp.o \
-	stclib_LexLout.o \
-	stclib_LexLua.o \
-	stclib_LexMMIXAL.o \
-	stclib_LexMPT.o \
-	stclib_LexMSSQL.o \
-	stclib_LexMatlab.o \
-	stclib_LexMetapost.o \
-	stclib_LexNsis.o \
-	stclib_LexOpal.o \
-	stclib_LexOthers.o \
-	stclib_LexPB.o \
-	stclib_LexPOV.o \
-	stclib_LexPS.o \
-	stclib_LexPascal.o \
-	stclib_LexPerl.o \
-	stclib_LexPython.o \
-	stclib_LexRebol.o \
-	stclib_LexRuby.o \
-	stclib_LexSQL.o \
-	stclib_LexSmalltalk.o \
-	stclib_LexTADS3.o \
-	stclib_LexScriptol.o \
-	stclib_LexSpecman.o \
-	stclib_LexSpice.o \
-	stclib_LexTCL.o \
-	stclib_LexTeX.o \
-	stclib_LexVB.o \
-	stclib_LexVHDL.o \
-	stclib_LexVerilog.o \
-	stclib_LexYAML.o \
-	stclib_LineMarker.o \
-	stclib_PropSet.o \
-	stclib_RESearch.o \
-	stclib_ScintillaBase.o \
-	stclib_Style.o \
-	stclib_StyleContext.o \
-	stclib_UniConversion.o \
-	stclib_ViewStyle.o \
-	stclib_WindowAccessor.o \
-	stclib_XPM.o
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
-@COND_PLATFORM_MACOSX_1@	-compatibility_version 1.0 -current_version 1.0
-@COND_USE_GUI_0@PORTNAME = base
-@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
-@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
-@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = 
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
-@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
-@COND_PLATFORM_WIN32_1@	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
-@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
-COND_SHARED_1___stcdll___depname = \
-	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
-@COND_SHARED_1@__stcdll___depname = $(COND_SHARED_1___stcdll___depname)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
-@COND_SHARED_1@__install_stcdll___depname = install_stcdll
-@COND_SHARED_1@__uninstall_stcdll___depname = uninstall_stcdll
-COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd = -install_name \
-	$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__stcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd)
-COND_PLATFORM_OS2_1___stcdll___importlib = -import \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__stcdll___importlib = $(COND_PLATFORM_OS2_1___stcdll___importlib)
-COND_WINDOWS_IMPLIB_1___stcdll___importlib = \
-	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_WINDOWS_IMPLIB_1@__stcdll___importlib = $(COND_WINDOWS_IMPLIB_1___stcdll___importlib)
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__stcdll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__stcdll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.$(SO_SUFFIX)
-@COND_USE_SOVERSION_0@__stcdll___targetsuf2 = .$(SO_SUFFIX)
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__stcdll___targetsuf3 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	= \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.0.0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__stcdll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.0.$(SO_SUFFIX)
-@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__stcdll___targetsuf3 \
-@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@	= -0.$(SO_SUFFIX)
-@COND_USE_SOVERSION_0@__stcdll___targetsuf3 = .$(SO_SUFFIX)
-COND_USE_SOVERLINUX_1___stcdll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__stcdll___soname_flags = $(COND_USE_SOVERLINUX_1___stcdll___soname_flags)
-COND_USE_SOVERSOLARIS_1___stcdll___soname_flags = \
-	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__stcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___stcdll___soname_flags)
-COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd = rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \
-	$(LN_S) \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_uninst_cmd = rm -f \
-	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_uninst_cmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
-@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_PLATFORM_WIN32_1@__stcdll___win32rc = stcdll_version_rc.o
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
-	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_BASE_p = \
-	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-COND_SHARED_0___stclib___depname = \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_SHARED_0@__stclib___depname = $(COND_SHARED_0___stclib___depname)
-@COND_SHARED_0@__install_stclib___depname = install_stclib
-@COND_SHARED_0@__uninstall_stclib___depname = uninstall_stclib
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-
-### Targets: ###
-
-all: $(__stcdll___depname) $(__stclib___depname)
-
-install: all $(__install_stcdll___depname) $(__install_stclib___depname)
-	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
-	for f in wx/stc/stc.h; do \
-	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
-	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
-	fi; \
-	$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
-	done
-
-uninstall: $(__uninstall_stcdll___depname) $(__uninstall_stclib___depname)
-	for f in wx/stc/stc.h; do \
-	rm -f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
-	done
-
-install-strip: install
-	$(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
-
-clean: 
-	rm -rf ./.deps ./.pch
-	rm -f ./*.o
-	rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-distclean: clean
-	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): $(STCDLL_OBJECTS) $(__stcdll___win32rc)
-@COND_SHARED_1@	$(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
-@COND_SHARED_1@	
-@COND_SHARED_1@	$(__stcdll___so_symlinks_cmd)
-
-@COND_SHARED_1@install_stcdll: 
-@COND_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	$(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__stcdll___so_symlinks_inst_cmd))
-
-@COND_SHARED_1@uninstall_stcdll: 
-@COND_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
-@COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__stcdll___so_symlinks_uninst_cmd))
-
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(STCLIB_OBJECTS)
-@COND_SHARED_0@	rm -f $@
-@COND_SHARED_0@	$(AR) $(AROPTIONS) $@ $(STCLIB_OBJECTS)
-@COND_SHARED_0@	$(RANLIB) $@
-
-@COND_SHARED_0@install_stclib: 
-@COND_SHARED_0@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-
-@COND_SHARED_0@uninstall_stclib: 
-@COND_SHARED_0@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-stcdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc
-	$(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-
-stcdll_PlatWX.o: $(srcdir)/PlatWX.cpp
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/PlatWX.cpp
-
-stcdll_ScintillaWX.o: $(srcdir)/ScintillaWX.cpp
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/ScintillaWX.cpp
-
-stcdll_stc.o: $(srcdir)/stc.cpp
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/stc.cpp
-
-stcdll_AutoComplete.o: $(srcdir)/scintilla/src/AutoComplete.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/AutoComplete.cxx
-
-stcdll_CallTip.o: $(srcdir)/scintilla/src/CallTip.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/CallTip.cxx
-
-stcdll_CellBuffer.o: $(srcdir)/scintilla/src/CellBuffer.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/CellBuffer.cxx
-
-stcdll_CharClassify.o: $(srcdir)/scintilla/src/CharClassify.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/CharClassify.cxx
-
-stcdll_ContractionState.o: $(srcdir)/scintilla/src/ContractionState.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/ContractionState.cxx
-
-stcdll_Document.o: $(srcdir)/scintilla/src/Document.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/Document.cxx
-
-stcdll_DocumentAccessor.o: $(srcdir)/scintilla/src/DocumentAccessor.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/DocumentAccessor.cxx
-
-stcdll_Editor.o: $(srcdir)/scintilla/src/Editor.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/Editor.cxx
-
-stcdll_ExternalLexer.o: $(srcdir)/scintilla/src/ExternalLexer.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/ExternalLexer.cxx
-
-stcdll_Indicator.o: $(srcdir)/scintilla/src/Indicator.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/Indicator.cxx
-
-stcdll_KeyMap.o: $(srcdir)/scintilla/src/KeyMap.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/KeyMap.cxx
-
-stcdll_KeyWords.o: $(srcdir)/scintilla/src/KeyWords.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/KeyWords.cxx
-
-stcdll_LexAPDL.o: $(srcdir)/scintilla/src/LexAPDL.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexAPDL.cxx
-
-stcdll_LexAU3.o: $(srcdir)/scintilla/src/LexAU3.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexAU3.cxx
-
-stcdll_LexAVE.o: $(srcdir)/scintilla/src/LexAVE.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexAVE.cxx
-
-stcdll_LexAda.o: $(srcdir)/scintilla/src/LexAda.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexAda.cxx
-
-stcdll_LexAsm.o: $(srcdir)/scintilla/src/LexAsm.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexAsm.cxx
-
-stcdll_LexAsn1.o: $(srcdir)/scintilla/src/LexAsn1.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexAsn1.cxx
-
-stcdll_LexBaan.o: $(srcdir)/scintilla/src/LexBaan.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexBaan.cxx
-
-stcdll_LexBash.o: $(srcdir)/scintilla/src/LexBash.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexBash.cxx
-
-stcdll_LexBasic.o: $(srcdir)/scintilla/src/LexBasic.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexBasic.cxx
-
-stcdll_LexBullant.o: $(srcdir)/scintilla/src/LexBullant.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexBullant.cxx
-
-stcdll_LexCLW.o: $(srcdir)/scintilla/src/LexCLW.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexCLW.cxx
-
-stcdll_LexCPP.o: $(srcdir)/scintilla/src/LexCPP.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexCPP.cxx
-
-stcdll_LexCSS.o: $(srcdir)/scintilla/src/LexCSS.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexCSS.cxx
-
-stcdll_LexCaml.o: $(srcdir)/scintilla/src/LexCaml.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexCaml.cxx
-
-stcdll_LexCsound.o: $(srcdir)/scintilla/src/LexCsound.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexCsound.cxx
-
-stcdll_LexConf.o: $(srcdir)/scintilla/src/LexConf.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexConf.cxx
-
-stcdll_LexCrontab.o: $(srcdir)/scintilla/src/LexCrontab.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexCrontab.cxx
-
-stcdll_LexEScript.o: $(srcdir)/scintilla/src/LexEScript.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexEScript.cxx
-
-stcdll_LexEiffel.o: $(srcdir)/scintilla/src/LexEiffel.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexEiffel.cxx
-
-stcdll_LexErlang.o: $(srcdir)/scintilla/src/LexErlang.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexErlang.cxx
-
-stcdll_LexFlagship.o: $(srcdir)/scintilla/src/LexFlagship.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexFlagship.cxx
-
-stcdll_LexForth.o: $(srcdir)/scintilla/src/LexForth.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexForth.cxx
-
-stcdll_LexFortran.o: $(srcdir)/scintilla/src/LexFortran.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexFortran.cxx
-
-stcdll_LexGui4Cli.o: $(srcdir)/scintilla/src/LexGui4Cli.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexGui4Cli.cxx
-
-stcdll_LexHTML.o: $(srcdir)/scintilla/src/LexHTML.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexHTML.cxx
-
-stcdll_LexHaskell.o: $(srcdir)/scintilla/src/LexHaskell.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexHaskell.cxx
-
-stcdll_LexInno.o: $(srcdir)/scintilla/src/LexInno.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexInno.cxx
-
-stcdll_LexKix.o: $(srcdir)/scintilla/src/LexKix.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexKix.cxx
-
-stcdll_LexLisp.o: $(srcdir)/scintilla/src/LexLisp.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexLisp.cxx
-
-stcdll_LexLout.o: $(srcdir)/scintilla/src/LexLout.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexLout.cxx
-
-stcdll_LexLua.o: $(srcdir)/scintilla/src/LexLua.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexLua.cxx
-
-stcdll_LexMMIXAL.o: $(srcdir)/scintilla/src/LexMMIXAL.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexMMIXAL.cxx
-
-stcdll_LexMPT.o: $(srcdir)/scintilla/src/LexMPT.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexMPT.cxx
-
-stcdll_LexMSSQL.o: $(srcdir)/scintilla/src/LexMSSQL.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexMSSQL.cxx
-
-stcdll_LexMatlab.o: $(srcdir)/scintilla/src/LexMatlab.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexMatlab.cxx
-
-stcdll_LexMetapost.o: $(srcdir)/scintilla/src/LexMetapost.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexMetapost.cxx
-
-stcdll_LexNsis.o: $(srcdir)/scintilla/src/LexNsis.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexNsis.cxx
-
-stcdll_LexOpal.o: $(srcdir)/scintilla/src/LexOpal.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexOpal.cxx
-
-stcdll_LexOthers.o: $(srcdir)/scintilla/src/LexOthers.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexOthers.cxx
-
-stcdll_LexPB.o: $(srcdir)/scintilla/src/LexPB.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexPB.cxx
-
-stcdll_LexPOV.o: $(srcdir)/scintilla/src/LexPOV.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexPOV.cxx
-
-stcdll_LexPS.o: $(srcdir)/scintilla/src/LexPS.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexPS.cxx
-
-stcdll_LexPascal.o: $(srcdir)/scintilla/src/LexPascal.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexPascal.cxx
-
-stcdll_LexPerl.o: $(srcdir)/scintilla/src/LexPerl.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexPerl.cxx
-
-stcdll_LexPython.o: $(srcdir)/scintilla/src/LexPython.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexPython.cxx
-
-stcdll_LexRebol.o: $(srcdir)/scintilla/src/LexRebol.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexRebol.cxx
-
-stcdll_LexRuby.o: $(srcdir)/scintilla/src/LexRuby.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexRuby.cxx
-
-stcdll_LexSQL.o: $(srcdir)/scintilla/src/LexSQL.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexSQL.cxx
-
-stcdll_LexSmalltalk.o: $(srcdir)/scintilla/src/LexSmalltalk.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexSmalltalk.cxx
-
-stcdll_LexTADS3.o: $(srcdir)/scintilla/src/LexTADS3.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexTADS3.cxx
-
-stcdll_LexScriptol.o: $(srcdir)/scintilla/src/LexScriptol.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexScriptol.cxx
-
-stcdll_LexSpecman.o: $(srcdir)/scintilla/src/LexSpecman.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexSpecman.cxx
-
-stcdll_LexSpice.o: $(srcdir)/scintilla/src/LexSpice.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexSpice.cxx
-
-stcdll_LexTCL.o: $(srcdir)/scintilla/src/LexTCL.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexTCL.cxx
-
-stcdll_LexTeX.o: $(srcdir)/scintilla/src/LexTeX.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexTeX.cxx
-
-stcdll_LexVB.o: $(srcdir)/scintilla/src/LexVB.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexVB.cxx
-
-stcdll_LexVHDL.o: $(srcdir)/scintilla/src/LexVHDL.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexVHDL.cxx
-
-stcdll_LexVerilog.o: $(srcdir)/scintilla/src/LexVerilog.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexVerilog.cxx
-
-stcdll_LexYAML.o: $(srcdir)/scintilla/src/LexYAML.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexYAML.cxx
-
-stcdll_LineMarker.o: $(srcdir)/scintilla/src/LineMarker.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LineMarker.cxx
-
-stcdll_PropSet.o: $(srcdir)/scintilla/src/PropSet.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/PropSet.cxx
-
-stcdll_RESearch.o: $(srcdir)/scintilla/src/RESearch.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/RESearch.cxx
-
-stcdll_ScintillaBase.o: $(srcdir)/scintilla/src/ScintillaBase.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/ScintillaBase.cxx
-
-stcdll_Style.o: $(srcdir)/scintilla/src/Style.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/Style.cxx
-
-stcdll_StyleContext.o: $(srcdir)/scintilla/src/StyleContext.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/StyleContext.cxx
-
-stcdll_UniConversion.o: $(srcdir)/scintilla/src/UniConversion.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/UniConversion.cxx
-
-stcdll_ViewStyle.o: $(srcdir)/scintilla/src/ViewStyle.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/ViewStyle.cxx
-
-stcdll_WindowAccessor.o: $(srcdir)/scintilla/src/WindowAccessor.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/WindowAccessor.cxx
-
-stcdll_XPM.o: $(srcdir)/scintilla/src/XPM.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/XPM.cxx
-
-stclib_PlatWX.o: $(srcdir)/PlatWX.cpp
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/PlatWX.cpp
-
-stclib_ScintillaWX.o: $(srcdir)/ScintillaWX.cpp
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/ScintillaWX.cpp
-
-stclib_stc.o: $(srcdir)/stc.cpp
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/stc.cpp
-
-stclib_AutoComplete.o: $(srcdir)/scintilla/src/AutoComplete.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/AutoComplete.cxx
-
-stclib_CallTip.o: $(srcdir)/scintilla/src/CallTip.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/CallTip.cxx
-
-stclib_CellBuffer.o: $(srcdir)/scintilla/src/CellBuffer.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/CellBuffer.cxx
-
-stclib_CharClassify.o: $(srcdir)/scintilla/src/CharClassify.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/CharClassify.cxx
-
-stclib_ContractionState.o: $(srcdir)/scintilla/src/ContractionState.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/ContractionState.cxx
-
-stclib_Document.o: $(srcdir)/scintilla/src/Document.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/Document.cxx
-
-stclib_DocumentAccessor.o: $(srcdir)/scintilla/src/DocumentAccessor.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/DocumentAccessor.cxx
-
-stclib_Editor.o: $(srcdir)/scintilla/src/Editor.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/Editor.cxx
-
-stclib_ExternalLexer.o: $(srcdir)/scintilla/src/ExternalLexer.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/ExternalLexer.cxx
-
-stclib_Indicator.o: $(srcdir)/scintilla/src/Indicator.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/Indicator.cxx
-
-stclib_KeyMap.o: $(srcdir)/scintilla/src/KeyMap.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/KeyMap.cxx
-
-stclib_KeyWords.o: $(srcdir)/scintilla/src/KeyWords.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/KeyWords.cxx
-
-stclib_LexAPDL.o: $(srcdir)/scintilla/src/LexAPDL.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexAPDL.cxx
-
-stclib_LexAU3.o: $(srcdir)/scintilla/src/LexAU3.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexAU3.cxx
-
-stclib_LexAVE.o: $(srcdir)/scintilla/src/LexAVE.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexAVE.cxx
-
-stclib_LexAda.o: $(srcdir)/scintilla/src/LexAda.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexAda.cxx
-
-stclib_LexAsm.o: $(srcdir)/scintilla/src/LexAsm.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexAsm.cxx
-
-stclib_LexAsn1.o: $(srcdir)/scintilla/src/LexAsn1.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexAsn1.cxx
-
-stclib_LexBaan.o: $(srcdir)/scintilla/src/LexBaan.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexBaan.cxx
-
-stclib_LexBash.o: $(srcdir)/scintilla/src/LexBash.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexBash.cxx
-
-stclib_LexBasic.o: $(srcdir)/scintilla/src/LexBasic.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexBasic.cxx
-
-stclib_LexBullant.o: $(srcdir)/scintilla/src/LexBullant.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexBullant.cxx
-
-stclib_LexCLW.o: $(srcdir)/scintilla/src/LexCLW.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexCLW.cxx
-
-stclib_LexCPP.o: $(srcdir)/scintilla/src/LexCPP.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexCPP.cxx
-
-stclib_LexCSS.o: $(srcdir)/scintilla/src/LexCSS.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexCSS.cxx
-
-stclib_LexCaml.o: $(srcdir)/scintilla/src/LexCaml.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexCaml.cxx
-
-stclib_LexCsound.o: $(srcdir)/scintilla/src/LexCsound.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexCsound.cxx
-
-stclib_LexConf.o: $(srcdir)/scintilla/src/LexConf.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexConf.cxx
-
-stclib_LexCrontab.o: $(srcdir)/scintilla/src/LexCrontab.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexCrontab.cxx
-
-stclib_LexEScript.o: $(srcdir)/scintilla/src/LexEScript.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexEScript.cxx
-
-stclib_LexEiffel.o: $(srcdir)/scintilla/src/LexEiffel.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexEiffel.cxx
-
-stclib_LexErlang.o: $(srcdir)/scintilla/src/LexErlang.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexErlang.cxx
-
-stclib_LexFlagship.o: $(srcdir)/scintilla/src/LexFlagship.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexFlagship.cxx
-
-stclib_LexForth.o: $(srcdir)/scintilla/src/LexForth.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexForth.cxx
-
-stclib_LexFortran.o: $(srcdir)/scintilla/src/LexFortran.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexFortran.cxx
-
-stclib_LexGui4Cli.o: $(srcdir)/scintilla/src/LexGui4Cli.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexGui4Cli.cxx
-
-stclib_LexHTML.o: $(srcdir)/scintilla/src/LexHTML.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexHTML.cxx
-
-stclib_LexHaskell.o: $(srcdir)/scintilla/src/LexHaskell.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexHaskell.cxx
-
-stclib_LexInno.o: $(srcdir)/scintilla/src/LexInno.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexInno.cxx
-
-stclib_LexKix.o: $(srcdir)/scintilla/src/LexKix.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexKix.cxx
-
-stclib_LexLisp.o: $(srcdir)/scintilla/src/LexLisp.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexLisp.cxx
-
-stclib_LexLout.o: $(srcdir)/scintilla/src/LexLout.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexLout.cxx
-
-stclib_LexLua.o: $(srcdir)/scintilla/src/LexLua.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexLua.cxx
-
-stclib_LexMMIXAL.o: $(srcdir)/scintilla/src/LexMMIXAL.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexMMIXAL.cxx
-
-stclib_LexMPT.o: $(srcdir)/scintilla/src/LexMPT.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexMPT.cxx
-
-stclib_LexMSSQL.o: $(srcdir)/scintilla/src/LexMSSQL.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexMSSQL.cxx
-
-stclib_LexMatlab.o: $(srcdir)/scintilla/src/LexMatlab.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexMatlab.cxx
-
-stclib_LexMetapost.o: $(srcdir)/scintilla/src/LexMetapost.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexMetapost.cxx
-
-stclib_LexNsis.o: $(srcdir)/scintilla/src/LexNsis.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexNsis.cxx
-
-stclib_LexOpal.o: $(srcdir)/scintilla/src/LexOpal.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexOpal.cxx
-
-stclib_LexOthers.o: $(srcdir)/scintilla/src/LexOthers.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexOthers.cxx
-
-stclib_LexPB.o: $(srcdir)/scintilla/src/LexPB.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexPB.cxx
-
-stclib_LexPOV.o: $(srcdir)/scintilla/src/LexPOV.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexPOV.cxx
-
-stclib_LexPS.o: $(srcdir)/scintilla/src/LexPS.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexPS.cxx
-
-stclib_LexPascal.o: $(srcdir)/scintilla/src/LexPascal.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexPascal.cxx
-
-stclib_LexPerl.o: $(srcdir)/scintilla/src/LexPerl.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexPerl.cxx
-
-stclib_LexPython.o: $(srcdir)/scintilla/src/LexPython.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexPython.cxx
-
-stclib_LexRebol.o: $(srcdir)/scintilla/src/LexRebol.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexRebol.cxx
-
-stclib_LexRuby.o: $(srcdir)/scintilla/src/LexRuby.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexRuby.cxx
-
-stclib_LexSQL.o: $(srcdir)/scintilla/src/LexSQL.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexSQL.cxx
-
-stclib_LexSmalltalk.o: $(srcdir)/scintilla/src/LexSmalltalk.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexSmalltalk.cxx
-
-stclib_LexTADS3.o: $(srcdir)/scintilla/src/LexTADS3.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexTADS3.cxx
-
-stclib_LexScriptol.o: $(srcdir)/scintilla/src/LexScriptol.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexScriptol.cxx
-
-stclib_LexSpecman.o: $(srcdir)/scintilla/src/LexSpecman.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexSpecman.cxx
-
-stclib_LexSpice.o: $(srcdir)/scintilla/src/LexSpice.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexSpice.cxx
-
-stclib_LexTCL.o: $(srcdir)/scintilla/src/LexTCL.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexTCL.cxx
-
-stclib_LexTeX.o: $(srcdir)/scintilla/src/LexTeX.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexTeX.cxx
-
-stclib_LexVB.o: $(srcdir)/scintilla/src/LexVB.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexVB.cxx
-
-stclib_LexVHDL.o: $(srcdir)/scintilla/src/LexVHDL.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexVHDL.cxx
-
-stclib_LexVerilog.o: $(srcdir)/scintilla/src/LexVerilog.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexVerilog.cxx
-
-stclib_LexYAML.o: $(srcdir)/scintilla/src/LexYAML.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexYAML.cxx
-
-stclib_LineMarker.o: $(srcdir)/scintilla/src/LineMarker.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LineMarker.cxx
-
-stclib_PropSet.o: $(srcdir)/scintilla/src/PropSet.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/PropSet.cxx
-
-stclib_RESearch.o: $(srcdir)/scintilla/src/RESearch.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/RESearch.cxx
-
-stclib_ScintillaBase.o: $(srcdir)/scintilla/src/ScintillaBase.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/ScintillaBase.cxx
-
-stclib_Style.o: $(srcdir)/scintilla/src/Style.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/Style.cxx
-
-stclib_StyleContext.o: $(srcdir)/scintilla/src/StyleContext.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/StyleContext.cxx
-
-stclib_UniConversion.o: $(srcdir)/scintilla/src/UniConversion.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/UniConversion.cxx
-
-stclib_ViewStyle.o: $(srcdir)/scintilla/src/ViewStyle.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/ViewStyle.cxx
-
-stclib_WindowAccessor.o: $(srcdir)/scintilla/src/WindowAccessor.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/WindowAccessor.cxx
-
-stclib_XPM.o: $(srcdir)/scintilla/src/XPM.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/XPM.cxx
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean install_stcdll uninstall_stcdll install_stclib uninstall_stclib
diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
deleted file mode 100644
index ab2cb5c06a..0000000000
--- a/src/stc/PlatWX.cpp
+++ /dev/null
@@ -1,1558 +0,0 @@
-// Scintilla source code edit control
-// PlatWX.cxx - implementation of platform facilities on wxWidgets
-// Copyright 1998-1999 by Neil Hodgson <neilh@scintilla.org>
-//                        Robin Dunn <robin@aldunn.com>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <ctype.h>
-
-#include "wx/wx.h"
-#include "wx/encconv.h"
-#include "wx/listctrl.h"
-#include "wx/mstream.h"
-#include "wx/image.h"
-#include "wx/imaglist.h"
-#include "wx/tokenzr.h"
-
-#ifdef wxHAVE_RAW_BITMAP
-#include "wx/rawbmp.h"
-#endif
-
-#include "Platform.h"
-#include "PlatWX.h"
-#include "wx/stc/stc.h"
-
-
-
-Point Point::FromLong(long lpoint) {
-    return Point(lpoint & 0xFFFF, lpoint >> 16);
-}
-
-wxRect wxRectFromPRectangle(PRectangle prc) {
-    wxRect r(prc.left, prc.top,
-             prc.Width(), prc.Height());
-    return r;
-}
-
-PRectangle PRectangleFromwxRect(wxRect rc) {
-    return PRectangle(rc.GetLeft(), rc.GetTop(),
-                      rc.GetRight()+1, rc.GetBottom()+1);
-}
-
-wxColour wxColourFromCA(const ColourAllocated& ca) {
-    ColourDesired cd(ca.AsLong());
-    return wxColour((unsigned char)cd.GetRed(),
-                    (unsigned char)cd.GetGreen(),
-                    (unsigned char)cd.GetBlue());
-}
-
-//----------------------------------------------------------------------
-
-Palette::Palette() {
-    used = 0;
-    allowRealization = false;
-    size = 100;
-    entries = new ColourPair[size];
-}
-
-Palette::~Palette() {
-    Release();
-    delete [] entries;
-    entries = 0;
-}
-
-void Palette::Release() {
-    used = 0;
-    delete [] entries;
-    size = 100;
-    entries = new ColourPair[size];
-}
-
-// This method either adds a colour to the list of wanted colours (want==true)
-// or retrieves the allocated colour back to the ColourPair.
-// This is one method to make it easier to keep the code for wanting and retrieving in sync.
-void Palette::WantFind(ColourPair &cp, bool want) {
-    if (want) {
-        for (int i=0; i < used; i++) {
-            if (entries[i].desired == cp.desired)
-                return;
-        }
-
-        if (used >= size) {
-            int sizeNew = size * 2;
-            ColourPair *entriesNew = new ColourPair[sizeNew];
-            for (int j=0; j<size; j++) {
-                entriesNew[j] = entries[j];
-            }
-            delete []entries;
-            entries = entriesNew;
-            size = sizeNew;
-        }
-
-        entries[used].desired = cp.desired;
-        entries[used].allocated.Set(cp.desired.AsLong());
-        used++;
-    } else {
-        for (int i=0; i < used; i++) {
-            if (entries[i].desired == cp.desired) {
-                cp.allocated = entries[i].allocated;
-                return;
-            }
-        }
-        cp.allocated.Set(cp.desired.AsLong());
-    }
-}
-
-void Palette::Allocate(Window &) {
-    if (allowRealization) {
-    }
-}
-
-
-//----------------------------------------------------------------------
-
-Font::Font() {
-    id = 0;
-    ascent = 0;
-}
-
-Font::~Font() {
-}
-
-void Font::Create(const char *faceName, int characterSet, int size, bool bold, bool italic, bool extraFontFlag) {
-
-    Release();
-
-    // The minus one is done because since Scintilla uses SC_SHARSET_DEFAULT
-    // internally and we need to have wxFONENCODING_DEFAULT == SC_SHARSET_DEFAULT
-    // so we adjust the encoding before passing it to Scintilla.  See also
-    // wxStyledTextCtrl::StyleSetCharacterSet
-    wxFontEncoding encoding = (wxFontEncoding)(characterSet-1);
-
-    wxFontEncodingArray ea = wxEncodingConverter::GetPlatformEquivalents(encoding);
-    if (ea.GetCount())
-        encoding = ea[0];
-
-    wxFont* font = new wxFont(size,
-                    wxDEFAULT,
-                    italic ? wxITALIC :  wxNORMAL,
-                    bold ? wxBOLD : wxNORMAL,
-                    false,
-                    stc2wx(faceName),
-                    encoding);
-    font->SetNoAntiAliasing(!extraFontFlag);
-    id = font;
-}
-
-
-void Font::Release() {
-    if (id)
-        delete (wxFont*)id;
-    id = 0;
-}
-
-//----------------------------------------------------------------------
-
-class SurfaceImpl : public Surface {
-private:
-    wxDC*       hdc;
-    bool        hdcOwned;
-    wxBitmap*   bitmap;
-    int         x;
-    int         y;
-    bool        unicodeMode;
-
-public:
-    SurfaceImpl();
-    ~SurfaceImpl();
-
-    virtual void Init(WindowID wid);
-    virtual void Init(SurfaceID sid, WindowID wid);
-    virtual void InitPixMap(int width, int height, Surface *surface_, WindowID wid);
-
-    virtual void Release();
-    virtual bool Initialised();
-    virtual void PenColour(ColourAllocated fore);
-    virtual int LogPixelsY();
-    virtual int DeviceHeightFont(int points);
-    virtual void MoveTo(int x_, int y_);
-    virtual void LineTo(int x_, int y_);
-    virtual void Polygon(Point *pts, int npts, ColourAllocated fore, ColourAllocated back);
-    virtual void RectangleDraw(PRectangle rc, ColourAllocated fore, ColourAllocated back);
-    virtual void FillRectangle(PRectangle rc, ColourAllocated back);
-    virtual void FillRectangle(PRectangle rc, Surface &surfacePattern);
-    virtual void RoundedRectangle(PRectangle rc, ColourAllocated fore, ColourAllocated back);
-    virtual void AlphaRectangle(PRectangle rc, int cornerSize, ColourAllocated fill, int alphaFill,
-                                ColourAllocated outline, int alphaOutline, int flags);
-    virtual void Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back);
-    virtual void Copy(PRectangle rc, Point from, Surface &surfaceSource);
-
-    virtual void DrawTextNoClip(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore, ColourAllocated back);
-    virtual void DrawTextClipped(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore, ColourAllocated back);
-    virtual void DrawTextTransparent(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore);
-    virtual void MeasureWidths(Font &font_, const char *s, int len, int *positions);
-    virtual int WidthText(Font &font_, const char *s, int len);
-    virtual int WidthChar(Font &font_, char ch);
-    virtual int Ascent(Font &font_);
-    virtual int Descent(Font &font_);
-    virtual int InternalLeading(Font &font_);
-    virtual int ExternalLeading(Font &font_);
-    virtual int Height(Font &font_);
-    virtual int AverageCharWidth(Font &font_);
-
-    virtual int SetPalette(Palette *pal, bool inBackGround);
-    virtual void SetClip(PRectangle rc);
-    virtual void FlushCachedState();
-
-    virtual void SetUnicodeMode(bool unicodeMode_);
-    virtual void SetDBCSMode(int codePage);
-
-    void BrushColour(ColourAllocated back);
-    void SetFont(Font &font_);
-};
-
-
-
-SurfaceImpl::SurfaceImpl() :
-    hdc(0), hdcOwned(0), bitmap(0),
-    x(0), y(0), unicodeMode(0)
-{}
-
-SurfaceImpl::~SurfaceImpl() {
-    Release();
-}
-
-void SurfaceImpl::Init(WindowID wid) {
-#if 0
-    Release();
-    hdc = new wxMemoryDC();
-    hdcOwned = true;
-#else
-    // On Mac and GTK the DC is not really valid until it has a bitmap
-    // selected into it.  So instead of just creating the DC with no bitmap,
-    // go ahead and give it one.
-    InitPixMap(1,1,NULL,wid);
-#endif
-}
-
-void SurfaceImpl::Init(SurfaceID hdc_, WindowID) {
-    Release();
-    hdc = (wxDC*)hdc_;
-}
-
-void SurfaceImpl::InitPixMap(int width, int height, Surface *WXUNUSED(surface_), WindowID) {
-    Release();
-    hdc = new wxMemoryDC();
-    hdcOwned = true;
-    if (width < 1) width = 1;
-    if (height < 1) height = 1;
-    bitmap = new wxBitmap(width, height);
-    ((wxMemoryDC*)hdc)->SelectObject(*bitmap);
-}
-
-
-void SurfaceImpl::Release() {
-    if (bitmap) {
-        ((wxMemoryDC*)hdc)->SelectObject(wxNullBitmap);
-        delete bitmap;
-        bitmap = 0;
-    }
-    if (hdcOwned) {
-        delete hdc;
-        hdc = 0;
-        hdcOwned = false;
-    }
-}
-
-
-bool SurfaceImpl::Initialised() {
-    return hdc != 0;
-}
-
-
-void SurfaceImpl::PenColour(ColourAllocated fore) {
-    hdc->SetPen(wxPen(wxColourFromCA(fore), 1, wxSOLID));
-}
-
-void SurfaceImpl::BrushColour(ColourAllocated back) {
-    hdc->SetBrush(wxBrush(wxColourFromCA(back), wxSOLID));
-}
-
-void SurfaceImpl::SetFont(Font &font_) {
-  if (font_.GetID()) {
-      hdc->SetFont(*((wxFont*)font_.GetID()));
-    }
-}
-
-int SurfaceImpl::LogPixelsY() {
-    return hdc->GetPPI().y;
-}
-
-int SurfaceImpl::DeviceHeightFont(int points) {
-    return points;
-}
-
-void SurfaceImpl::MoveTo(int x_, int y_) {
-    x = x_;
-    y = y_;
-}
-
-void SurfaceImpl::LineTo(int x_, int y_) {
-    hdc->DrawLine(x,y, x_,y_);
-    x = x_;
-    y = y_;
-}
-
-void SurfaceImpl::Polygon(Point *pts, int npts, ColourAllocated fore, ColourAllocated back) {
-    PenColour(fore);
-    BrushColour(back);
-    hdc->DrawPolygon(npts, (wxPoint*)pts);
-}
-
-void SurfaceImpl::RectangleDraw(PRectangle rc, ColourAllocated fore, ColourAllocated back) {
-    PenColour(fore);
-    BrushColour(back);
-    hdc->DrawRectangle(wxRectFromPRectangle(rc));
-}
-
-void SurfaceImpl::FillRectangle(PRectangle rc, ColourAllocated back) {
-    BrushColour(back);
-    hdc->SetPen(*wxTRANSPARENT_PEN);
-    hdc->DrawRectangle(wxRectFromPRectangle(rc));
-}
-
-void SurfaceImpl::FillRectangle(PRectangle rc, Surface &surfacePattern) {
-    wxBrush br;
-    if (((SurfaceImpl&)surfacePattern).bitmap)
-        br = wxBrush(*((SurfaceImpl&)surfacePattern).bitmap);
-    else    // Something is wrong so display in red
-        br = wxBrush(*wxRED, wxSOLID);
-    hdc->SetPen(*wxTRANSPARENT_PEN);
-    hdc->SetBrush(br);
-    hdc->DrawRectangle(wxRectFromPRectangle(rc));
-}
-
-void SurfaceImpl::RoundedRectangle(PRectangle rc, ColourAllocated fore, ColourAllocated back) {
-    PenColour(fore);
-    BrushColour(back);
-    hdc->DrawRoundedRectangle(wxRectFromPRectangle(rc), 4);
-}
-
-#ifdef __WXMSW__
-#define wxPy_premultiply(p, a)   ((p) * (a) / 0xff)
-#else
-#define wxPy_premultiply(p, a)   (p)
-#endif
-
-void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize,
-                                 ColourAllocated fill, int alphaFill,
-                                 ColourAllocated outline, int alphaOutline,
-                                 int /*flags*/) {
-#ifdef wxHAVE_RAW_BITMAP
-
-    // TODO:  do something with cornerSize
-    wxUnusedVar(cornerSize);
-    
-    int x, y;
-    wxRect r = wxRectFromPRectangle(rc);
-    wxBitmap bmp(r.width, r.height, 32);
-    wxAlphaPixelData pixData(bmp);
-    pixData.UseAlpha();
-
-    // Set the fill pixels
-    ColourDesired cdf(fill.AsLong());
-    int red   = cdf.GetRed();
-    int green = cdf.GetGreen();
-    int blue  = cdf.GetBlue();
-
-    wxAlphaPixelData::Iterator p(pixData);
-    for (y=0; y<r.height; y++) {
-        p.MoveTo(pixData, 0, y);
-        for (x=0; x<r.width; x++) {
-            p.Red()   = wxPy_premultiply(red,   alphaFill);
-            p.Green() = wxPy_premultiply(green, alphaFill);
-            p.Blue()  = wxPy_premultiply(blue,  alphaFill);
-            p.Alpha() = alphaFill;
-            ++p; 
-        }
-    }
-
-    // Set the outline pixels
-    ColourDesired cdo(outline.AsLong());
-    red   = cdo.GetRed();
-    green = cdo.GetGreen();
-    blue  = cdo.GetBlue();
-    for (x=0; x<r.width; x++) {
-        p.MoveTo(pixData, x, 0);
-        p.Red()   = wxPy_premultiply(red,   alphaOutline);
-        p.Green() = wxPy_premultiply(green, alphaOutline);
-        p.Blue()  = wxPy_premultiply(blue,  alphaOutline);
-        p.Alpha() = alphaOutline;        
-        p.MoveTo(pixData, x, r.height-1);
-        p.Red()   = wxPy_premultiply(red,   alphaOutline);
-        p.Green() = wxPy_premultiply(green, alphaOutline);
-        p.Blue()  = wxPy_premultiply(blue,  alphaOutline);
-        p.Alpha() = alphaOutline;        
-    }
-
-    for (y=0; y<r.height; y++) {
-        p.MoveTo(pixData, 0, y);
-        p.Red()   = wxPy_premultiply(red,   alphaOutline);
-        p.Green() = wxPy_premultiply(green, alphaOutline);
-        p.Blue()  = wxPy_premultiply(blue,  alphaOutline);
-        p.Alpha() = alphaOutline;        
-        p.MoveTo(pixData, r.width-1, y);
-        p.Red()   = wxPy_premultiply(red,   alphaOutline);
-        p.Green() = wxPy_premultiply(green, alphaOutline);
-        p.Blue()  = wxPy_premultiply(blue,  alphaOutline);
-        p.Alpha() = alphaOutline;        
-    }
-    
-    // Draw the bitmap
-    hdc->DrawBitmap(bmp, r.x, r.y, true);
-
-#else
-    wxUnusedVar(cornerSize);
-    wxUnusedVar(alphaFill);
-    wxUnusedVar(alphaOutline);
-    RectangleDraw(rc, outline, fill);
-#endif
-}
-
-void SurfaceImpl::Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back) {
-    PenColour(fore);
-    BrushColour(back);
-    hdc->DrawEllipse(wxRectFromPRectangle(rc));
-}
-
-void SurfaceImpl::Copy(PRectangle rc, Point from, Surface &surfaceSource) {
-    wxRect r = wxRectFromPRectangle(rc);
-    hdc->Blit(r.x, r.y, r.width, r.height,
-              ((SurfaceImpl&)surfaceSource).hdc,
-              from.x, from.y, wxCOPY);
-}
-
-void SurfaceImpl::DrawTextNoClip(PRectangle rc, Font &font, int ybase,
-                                 const char *s, int len,
-                                 ColourAllocated fore, ColourAllocated back) {
-    SetFont(font);
-    hdc->SetTextForeground(wxColourFromCA(fore));
-    hdc->SetTextBackground(wxColourFromCA(back));
-    FillRectangle(rc, back);
-
-    // ybase is where the baseline should be, but wxWin uses the upper left
-    // corner, so I need to calculate the real position for the text...
-    hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent);
-}
-
-void SurfaceImpl::DrawTextClipped(PRectangle rc, Font &font, int ybase,
-                                  const char *s, int len,
-                                  ColourAllocated fore, ColourAllocated back) {
-    SetFont(font);
-    hdc->SetTextForeground(wxColourFromCA(fore));
-    hdc->SetTextBackground(wxColourFromCA(back));
-    FillRectangle(rc, back);
-    hdc->SetClippingRegion(wxRectFromPRectangle(rc));
-
-    // see comments above
-    hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent);
-    hdc->DestroyClippingRegion();
-}
-
-
-void SurfaceImpl::DrawTextTransparent(PRectangle rc, Font &font, int ybase,
-                                      const char *s, int len,
-                                      ColourAllocated fore) {
-
-    SetFont(font);
-    hdc->SetTextForeground(wxColourFromCA(fore));
-    hdc->SetBackgroundMode(wxTRANSPARENT);
-
-    // ybase is where the baseline should be, but wxWin uses the upper left
-    // corner, so I need to calculate the real position for the text...
-    hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent);
-
-    hdc->SetBackgroundMode(wxSOLID);
-}
-
-
-void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, int *positions) {
-
-    wxString   str = stc2wx(s, len);
-    wxArrayInt tpos;
-
-    SetFont(font);
-
-    hdc->GetPartialTextExtents(str, tpos);
-
-#if wxUSE_UNICODE
-    // Map the widths for UCS-2 characters back to the UTF-8 input string
-    // NOTE:  I don't think this is right for when sizeof(wxChar) > 2, ie wxGTK2
-    // so figure it out and fix it!
-    size_t i = 0;
-    size_t ui = 0;
-    while ((int)i < len) {
-        unsigned char uch = (unsigned char)s[i];
-        positions[i++] = tpos[ui];
-        if (uch >= 0x80) {
-            if (uch < (0x80 + 0x40 + 0x20)) {
-                positions[i++] = tpos[ui];
-            } else {
-                positions[i++] = tpos[ui];
-                positions[i++] = tpos[ui];
-            }
-        }
-        ui++;
-    }
-#else
-
-    // If not unicode then just use the widths we have
-#if wxUSE_STL
-    std::copy(tpos.begin(), tpos.end(), positions);
-#else
-    memcpy(positions, tpos.begin(), len * sizeof(int));
-#endif
-#endif
-}
-
-
-int SurfaceImpl::WidthText(Font &font, const char *s, int len) {
-    SetFont(font);
-    int w;
-    int h;
-
-    hdc->GetTextExtent(stc2wx(s, len), &w, &h);
-    return w;
-}
-
-
-int SurfaceImpl::WidthChar(Font &font, char ch) {
-    SetFont(font);
-    int w;
-    int h;
-    char s[2] = { ch, 0 };
-
-    hdc->GetTextExtent(stc2wx(s, 1), &w, &h);
-    return w;
-}
-
-#define EXTENT_TEST wxT(" `~!@#$%^&*()-_=+\\|[]{};:\"\'<,>.?/1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
-
-int SurfaceImpl::Ascent(Font &font) {
-    SetFont(font);
-    int w, h, d, e;
-    hdc->GetTextExtent(EXTENT_TEST, &w, &h, &d, &e);
-    font.ascent = h - d;
-    return font.ascent;
-}
-
-int SurfaceImpl::Descent(Font &font) {
-    SetFont(font);
-    int w, h, d, e;
-    hdc->GetTextExtent(EXTENT_TEST, &w, &h, &d, &e);
-    return d;
-}
-
-int SurfaceImpl::InternalLeading(Font &WXUNUSED(font)) {
-    return 0;
-}
-
-int SurfaceImpl::ExternalLeading(Font &font) {
-    SetFont(font);
-    int w, h, d, e;
-    hdc->GetTextExtent(EXTENT_TEST, &w, &h, &d, &e);
-    return e;
-}
-
-int SurfaceImpl::Height(Font &font) {
-    SetFont(font);
-    return hdc->GetCharHeight() + 1;
-}
-
-int SurfaceImpl::AverageCharWidth(Font &font) {
-    SetFont(font);
-    return hdc->GetCharWidth();
-}
-
-int SurfaceImpl::SetPalette(Palette *WXUNUSED(pal), bool WXUNUSED(inBackGround)) {
-    return 0;
-}
-
-void SurfaceImpl::SetClip(PRectangle rc) {
-    hdc->SetClippingRegion(wxRectFromPRectangle(rc));
-}
-
-void SurfaceImpl::FlushCachedState() {
-}
-
-void SurfaceImpl::SetUnicodeMode(bool unicodeMode_) {
-    unicodeMode=unicodeMode_;
-}
-
-void SurfaceImpl::SetDBCSMode(int WXUNUSED(codePage)) {
-    // dbcsMode = codePage == SC_CP_DBCS;
-}
-
-
-Surface *Surface::Allocate() {
-    return new SurfaceImpl;
-}
-
-
-//----------------------------------------------------------------------
-
-
-inline wxWindow* GETWIN(WindowID id) { return (wxWindow*)id; }
-
-Window::~Window() {
-}
-
-void Window::Destroy() {
-    if (id) {
-        Show(false);
-        GETWIN(id)->Destroy();
-    }
-    id = 0;
-}
-
-bool Window::HasFocus() {
-    return wxWindow::FindFocus() == GETWIN(id);
-}
-
-PRectangle Window::GetPosition() {
-    if (! id) return PRectangle();
-    wxRect rc(GETWIN(id)->GetPosition(), GETWIN(id)->GetSize());
-    return PRectangleFromwxRect(rc);
-}
-
-void Window::SetPosition(PRectangle rc) {
-    wxRect r = wxRectFromPRectangle(rc);
-    GETWIN(id)->SetSize(r);
-}
-
-void Window::SetPositionRelative(PRectangle rc, Window) {
-    SetPosition(rc);  // ????
-}
-
-PRectangle Window::GetClientPosition() {
-    if (! id) return PRectangle();
-    wxSize sz = GETWIN(id)->GetClientSize();
-    return  PRectangle(0, 0, sz.x, sz.y);
-}
-
-void Window::Show(bool show) {
-    GETWIN(id)->Show(show);
-}
-
-void Window::InvalidateAll() {
-    GETWIN(id)->Refresh(false);
-}
-
-void Window::InvalidateRectangle(PRectangle rc) {
-    wxRect r = wxRectFromPRectangle(rc);
-    GETWIN(id)->Refresh(false, &r);
-}
-
-void Window::SetFont(Font &font) {
-    GETWIN(id)->SetFont(*((wxFont*)font.GetID()));
-}
-
-void Window::SetCursor(Cursor curs) {
-    int cursorId;
-
-    switch (curs) {
-    case cursorText:
-        cursorId = wxCURSOR_IBEAM;
-        break;
-    case cursorArrow:
-        cursorId = wxCURSOR_ARROW;
-        break;
-    case cursorUp:
-        cursorId = wxCURSOR_ARROW; // ** no up arrow...  wxCURSOR_UPARROW;
-        break;
-    case cursorWait:
-        cursorId = wxCURSOR_WAIT;
-        break;
-    case cursorHoriz:
-        cursorId = wxCURSOR_SIZEWE;
-        break;
-    case cursorVert:
-        cursorId = wxCURSOR_SIZENS;
-        break;
-    case cursorReverseArrow:
-        cursorId = wxCURSOR_RIGHT_ARROW;
-        break;
-    case cursorHand:
-        cursorId = wxCURSOR_HAND;
-        break;
-    default:
-        cursorId = wxCURSOR_ARROW;
-        break;
-    }
-#ifdef __WXMOTIF__
-       wxCursor wc = wxStockCursor(cursorId) ;
-#else
-       wxCursor wc = wxCursor(cursorId) ;
-#endif
-       if(curs != cursorLast)
-       {
-           GETWIN(id)->SetCursor(wc);
-           cursorLast = curs;
-       }
-}
-
-
-void Window::SetTitle(const char *s) {
-    GETWIN(id)->SetLabel(stc2wx(s));
-}
-
-
-//----------------------------------------------------------------------
-// Helper classes for ListBox
-
-
-// This is a simple subclass of wxListView that just resets focus to the
-// parent when it gets it.
-class wxSTCListBox : public wxListView {
-public:
-    wxSTCListBox(wxWindow* parent, wxWindowID id,
-                 const wxPoint& pos, const wxSize& size,
-                 long style)
-        : wxListView()
-    {
-#ifdef __WXMSW__
-        Hide(); // don't flicker as we move it around...
-#endif
-        Create(parent, id, pos, size, style);
-    }
-
-
-    void OnFocus(wxFocusEvent& event) {
-        GetParent()->SetFocus();
-        event.Skip();
-    }
-
-    void OnKillFocus(wxFocusEvent& WXUNUSED(event)) {
-        // Do nothing.  Prevents base class from resetting the colors...
-    }
-
-#ifdef __WXMAC__
-    // For some reason I don't understand yet the focus doesn't really leave
-    // the listbox like it should, so if we get any events feed them back to
-    // the wxSTC
-    void OnKeyDown(wxKeyEvent& event) {
-        GetGrandParent()->GetEventHandler()->ProcessEvent(event);
-    }
-    void OnChar(wxKeyEvent& event) {
-        GetGrandParent()->GetEventHandler()->ProcessEvent(event);
-    }
-
-    // And we need to force the focus back when being destroyed
-    ~wxSTCListBox() {
-        GetGrandParent()->SetFocus();
-    }
-#endif
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-BEGIN_EVENT_TABLE(wxSTCListBox, wxListView)
-    EVT_SET_FOCUS( wxSTCListBox::OnFocus)
-    EVT_KILL_FOCUS(wxSTCListBox::OnKillFocus)
-#ifdef __WXMAC__
-    EVT_KEY_DOWN(  wxSTCListBox::OnKeyDown)
-    EVT_CHAR(      wxSTCListBox::OnChar)
-#endif
-END_EVENT_TABLE()
-
-
-
-#if wxUSE_POPUPWIN //-----------------------------------
-#include <wx/popupwin.h>
-
-
-//
-// TODO: Refactor these two classes to have a common base (or a mix-in) to get
-// rid of the code duplication.  (Either that or convince somebody to
-// implement wxPopupWindow for the Mac!!)
-//
-// In the meantime, be careful to duplicate any changes as needed...
-//
-
-// A popup window to place the wxSTCListBox upon
-class wxSTCListBoxWin : public wxPopupWindow
-{
-private:
-    wxListView*         lv;
-    CallBackAction      doubleClickAction;
-    void*               doubleClickActionData;
-public:
-    wxSTCListBoxWin(wxWindow* parent, wxWindowID id, Point WXUNUSED(location)) :
-        wxPopupWindow(parent, wxBORDER_NONE)
-    {
-        
-        SetBackgroundColour(*wxBLACK);  // for our simple border
-
-        lv = new wxSTCListBox(parent, id, wxPoint(-50,-50), wxDefaultSize,
-                              wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxBORDER_NONE);
-        lv->SetCursor(wxCursor(wxCURSOR_ARROW));
-        lv->InsertColumn(0, wxEmptyString);
-        lv->InsertColumn(1, wxEmptyString);
-
-        // NOTE: We need to fool the wxListView into thinking that it has the
-        // focus so it will use the normal selection colour and will look
-        // "right" to the user.  But since the wxPopupWindow or its children
-        // can't receive focus then we have to pull a fast one and temporarily
-        // parent the listctrl on the STC window and then call SetFocus and
-        // then reparent it back to the popup.
-        lv->SetFocus();
-        lv->Reparent(this);
-#ifdef __WXMSW__
-        lv->Show();
-#endif
-    }
-
-
-    // Set position in client coords
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO) {
-        if (x != wxDefaultCoord) {
-            GetParent()->ClientToScreen(&x, NULL);
-        }
-        if (y != wxDefaultCoord) {
-            GetParent()->ClientToScreen(NULL, &y);
-        }
-        wxPopupWindow::DoSetSize(x, y, width, height, sizeFlags);
-    }
-
-    // return position as if it were in client coords
-    virtual void DoGetPosition( int *x, int *y ) const {
-        int sx, sy;
-        wxPopupWindow::DoGetPosition(&sx, &sy);
-        GetParent()->ScreenToClient(&sx, &sy);
-        if (x) *x = sx;
-        if (y) *y = sy;
-    }
-
-
-    bool Destroy() {
-        if ( !wxPendingDelete.Member(this) )
-            wxPendingDelete.Append(this);
-        return true;
-    }
-
-
-    int IconWidth() {
-        wxImageList* il = lv->GetImageList(wxIMAGE_LIST_SMALL);
-        if (il != NULL) {
-            int w, h;
-            il->GetSize(0, w, h);
-            return w;
-        }
-        return 0;
-    }
-
-
-    void SetDoubleClickAction(CallBackAction action, void *data) {
-        doubleClickAction = action;
-        doubleClickActionData = data;
-    }
-
-
-    void OnFocus(wxFocusEvent& event) {
-        GetParent()->SetFocus();
-        event.Skip();
-    }
-
-    void OnSize(wxSizeEvent& event) {
-        // resize the child
-        wxSize sz = GetSize();
-        sz.x -= 2;
-        sz.y -= 2;
-        lv->SetSize(1, 1, sz.x, sz.y);
-        // reset the column widths
-        lv->SetColumnWidth(0, IconWidth()+4);
-        lv->SetColumnWidth(1, sz.x - 2 - lv->GetColumnWidth(0) -
-                           wxSystemSettings::GetMetric(wxSYS_VSCROLL_X));
-        event.Skip();
-    }
-
-    void OnActivate(wxListEvent& WXUNUSED(event)) {
-        doubleClickAction(doubleClickActionData);
-    }
-
-    wxListView* GetLB() { return lv; }
-
-private:
-    DECLARE_EVENT_TABLE()
-
-};
-
-BEGIN_EVENT_TABLE(wxSTCListBoxWin, wxPopupWindow)
-    EVT_SET_FOCUS          (          wxSTCListBoxWin::OnFocus)
-    EVT_SIZE               (          wxSTCListBoxWin::OnSize)
-    EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxSTCListBoxWin::OnActivate)
-END_EVENT_TABLE()
-
-
-
-#else // !wxUSE_POPUPWIN -----------------------------------
-
-// A normal window to place the wxSTCListBox upon, but make it behave as much
-// like a wxPopupWindow as possible
-class wxSTCListBoxWin : public wxFrame {
-private:
-    wxListView*         lv;
-    CallBackAction      doubleClickAction;
-    void*               doubleClickActionData;
-public:
-    wxSTCListBoxWin(wxWindow* parent, wxWindowID id, Point location) :
-        wxFrame(parent, id, wxEmptyString, wxPoint(location.x, location.y), wxSize(0,0),
-                wxFRAME_NO_TASKBAR
-                | wxFRAME_FLOAT_ON_PARENT
-#ifdef __WXMAC__
-                | wxPOPUP_WINDOW 
-                | wxNO_BORDER
-#else
-                | wxSIMPLE_BORDER
-#endif
-            )
-    {
-
-        lv = new wxSTCListBox(this, id, wxDefaultPosition, wxDefaultSize,
-                              wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxNO_BORDER);
-        lv->SetCursor(wxCursor(wxCURSOR_ARROW));
-        lv->InsertColumn(0, wxEmptyString);
-        lv->InsertColumn(1, wxEmptyString);
-
-        // Eventhough we immediately reset the focus to the parent, this helps
-        // things to look right...
-        lv->SetFocus();
-
-        Hide();
-    } 
-
-
-    // On OSX and (possibly others) there can still be pending
-    // messages/events for the list control when Scintilla wants to
-    // close it, so do a pending delete of it instead of destroying
-    // immediately.
-    bool Destroy()
-    {
-#ifdef __WXMAC__
-        // The bottom edge of this window is not getting properly
-        // refreshed upon deletion, so help it out...
-        wxWindow* p = GetParent();
-        wxRect r(GetPosition(), GetSize());
-        r.SetHeight(r.GetHeight()+1);
-        p->Refresh(false, &r);
-#endif
-        if ( !wxPendingDelete.Member(this) )
-            wxPendingDelete.Append(this);
-        return true;
-    }
-
-
-    int IconWidth()
-    {
-        wxImageList* il = lv->GetImageList(wxIMAGE_LIST_SMALL);
-        if (il != NULL) {
-            int w, h;
-            il->GetSize(0, w, h);
-            return w;
-        }
-        return 0;
-    }
-
-
-    void SetDoubleClickAction(CallBackAction action, void *data)
-    {
-        doubleClickAction = action;
-        doubleClickActionData = data;
-    }
-
-
-    void OnFocus(wxFocusEvent& event)
-    {
-        ActivateParent();
-        GetParent()->SetFocus();
-        event.Skip();
-    }
-
-    void OnSize(wxSizeEvent& event)
-    {
-        // resize the child
-        wxSize sz = GetClientSize();
-        lv->SetSize(sz);
-        // reset the column widths
-        lv->SetColumnWidth(0, IconWidth()+4);
-        lv->SetColumnWidth(1, sz.x - 2 - lv->GetColumnWidth(0) -
-                           wxSystemSettings::GetMetric(wxSYS_VSCROLL_X));
-        event.Skip();
-    }
-
-    void ActivateParent()
-    {
-        // Although we're a frame, we always want the parent to be active, so
-        // raise it whenever we get shown, focused, etc.
-        wxTopLevelWindow *frame = wxDynamicCast(
-            wxGetTopLevelParent(GetParent()), wxTopLevelWindow);
-        if (frame)
-            frame->Raise();
-    }
-        
-
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO)
-    {
-        // convert coords to screen coords since we're a top-level window
-        if (x != wxDefaultCoord) {
-            GetParent()->ClientToScreen(&x, NULL);
-        }
-        if (y != wxDefaultCoord) {
-            GetParent()->ClientToScreen(NULL, &y);
-        }
-        wxFrame::DoSetSize(x, y, width, height, sizeFlags);
-    }
-
-    virtual bool Show(bool show = true)
-    {
-        bool rv = wxFrame::Show(show);
-        if (rv && show)
-            ActivateParent();
-#ifdef __WXMAC__
-        GetParent()->Refresh(false);
-#endif
-        return rv;
-    }
-
-    void OnActivate(wxListEvent& WXUNUSED(event))
-    {
-        doubleClickAction(doubleClickActionData);
-    }
-
-    wxListView* GetLB() { return lv; }
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-
-BEGIN_EVENT_TABLE(wxSTCListBoxWin, wxWindow)
-    EVT_SET_FOCUS          (          wxSTCListBoxWin::OnFocus)
-    EVT_SIZE               (          wxSTCListBoxWin::OnSize)
-    EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxSTCListBoxWin::OnActivate)
-END_EVENT_TABLE()
-
-#endif // wxUSE_POPUPWIN -----------------------------------
-
-
-inline wxSTCListBoxWin* GETLBW(WindowID win) {
-    return ((wxSTCListBoxWin*)win);
-}
-
-inline wxListView* GETLB(WindowID win) {
-    return GETLBW(win)->GetLB();
-}
-
-//----------------------------------------------------------------------
-
-class ListBoxImpl : public ListBox {
-private:
-    int                 lineHeight;
-    bool                unicodeMode;
-    int                 desiredVisibleRows;
-    int                 aveCharWidth;
-    size_t              maxStrWidth;
-    Point               location;       // Caret location at which the list is opened
-    wxImageList*        imgList;
-    wxArrayInt*         imgTypeMap;
-
-public:
-    ListBoxImpl();
-    ~ListBoxImpl();
-
-    virtual void SetFont(Font &font);
-    virtual void Create(Window &parent, int ctrlID, Point location_, int lineHeight_, bool unicodeMode_);
-    virtual void SetAverageCharWidth(int width);
-    virtual void SetVisibleRows(int rows);
-    virtual int GetVisibleRows() const;
-    virtual PRectangle GetDesiredRect();
-    virtual int CaretFromEdge();
-    virtual void Clear();
-    virtual void Append(char *s, int type = -1);
-            void Append(const wxString& text, int type);
-    virtual int Length();
-    virtual void Select(int n);
-    virtual int GetSelection();
-    virtual int Find(const char *prefix);
-    virtual void GetValue(int n, char *value, int len);
-    virtual void RegisterImage(int type, const char *xpm_data);
-    virtual void ClearRegisteredImages();
-    virtual void SetDoubleClickAction(CallBackAction, void *);
-    virtual void SetList(const char* list, char separator, char typesep);
-};
-
-
-ListBoxImpl::ListBoxImpl()
-    : lineHeight(10), unicodeMode(false),
-      desiredVisibleRows(5), aveCharWidth(8), maxStrWidth(0),
-      imgList(NULL), imgTypeMap(NULL)
-{
-}
-
-ListBoxImpl::~ListBoxImpl() {
-    if (imgList) {
-        delete imgList;
-        imgList = NULL;
-    }
-    if (imgTypeMap) {
-        delete imgTypeMap;
-        imgTypeMap = NULL;
-    }
-}
-
-
-void ListBoxImpl::SetFont(Font &font) {
-    GETLB(id)->SetFont(*((wxFont*)font.GetID()));
-}
-
-
-void ListBoxImpl::Create(Window &parent, int ctrlID, Point location_, int lineHeight_, bool unicodeMode_) {
-    location = location_;
-    lineHeight =  lineHeight_;
-    unicodeMode = unicodeMode_;
-    maxStrWidth = 0;
-    id = new wxSTCListBoxWin(GETWIN(parent.GetID()), ctrlID, location);
-    if (imgList != NULL)
-        GETLB(id)->SetImageList(imgList, wxIMAGE_LIST_SMALL);
-}
-
-
-void ListBoxImpl::SetAverageCharWidth(int width) {
-    aveCharWidth = width;
-}
-
-
-void ListBoxImpl::SetVisibleRows(int rows) {
-    desiredVisibleRows = rows;
-}
-
-
-int ListBoxImpl::GetVisibleRows() const {
-    return desiredVisibleRows;
-}
-
-PRectangle ListBoxImpl::GetDesiredRect() {
-    // wxListCtrl doesn't have a DoGetBestSize, so instead we kept track of
-    // the max size in Append and calculate it here...
-    int maxw = maxStrWidth * aveCharWidth;
-    int maxh ;
-
-    // give it a default if there are no lines, and/or add a bit more
-    if (maxw == 0) maxw = 100;
-    maxw += aveCharWidth * 3 +
-            GETLBW(id)->IconWidth() + wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
-    if (maxw > 350)
-        maxw = 350;
-
-    // estimate a desired height
-    int count = GETLB(id)->GetItemCount();
-    if (count) {
-        wxRect rect;
-        GETLB(id)->GetItemRect(0, rect);
-        maxh = count * rect.GetHeight();
-        if (maxh > 140)  // TODO:  Use desiredVisibleRows??
-            maxh = 140;
-
-        // Try to make the size an exact multiple of some number of lines
-        int lines = maxh / rect.GetHeight();
-        maxh = (lines + 1) * rect.GetHeight() + 2;
-    }
-    else
-        maxh = 100;
-
-    PRectangle rc;
-    rc.top = 0;
-    rc.left = 0;
-    rc.right = maxw;
-    rc.bottom = maxh;
-    return rc;
-}
-
-
-int ListBoxImpl::CaretFromEdge() {
-    return 4 + GETLBW(id)->IconWidth();
-}
-
-
-void ListBoxImpl::Clear() {
-    GETLB(id)->DeleteAllItems();
-}
-
-
-void ListBoxImpl::Append(char *s, int type) {
-    Append(stc2wx(s), type);
-}
-
-void ListBoxImpl::Append(const wxString& text, int type) {
-    long count  = GETLB(id)->GetItemCount();
-    long itemID  = GETLB(id)->InsertItem(count, wxEmptyString);
-    GETLB(id)->SetItem(itemID, 1, text);
-    maxStrWidth = wxMax(maxStrWidth, text.length());
-    if (type != -1) {
-        wxCHECK_RET(imgTypeMap, wxT("Unexpected NULL imgTypeMap"));
-        long idx = imgTypeMap->Item(type);
-        GETLB(id)->SetItemImage(itemID, idx, idx);
-    }
-}
-
-void ListBoxImpl::SetList(const char* list, char separator, char typesep) {
-    GETLB(id)->Freeze();
-    Clear();
-    wxStringTokenizer tkzr(stc2wx(list), (wxChar)separator);
-    while ( tkzr.HasMoreTokens() ) {
-        wxString token = tkzr.GetNextToken();
-        long type = -1;
-        int pos = token.Find(typesep);
-        if (pos != -1) {
-            token.Mid(pos+1).ToLong(&type);
-            token.Truncate(pos);
-        }
-        Append(token, (int)type);
-    }
-    GETLB(id)->Thaw();
-}
-
-
-int ListBoxImpl::Length() {
-    return GETLB(id)->GetItemCount();
-}
-
-
-void ListBoxImpl::Select(int n) {
-    bool select = true;
-    if (n == -1) {
-        n = 0;
-        select = false;
-    }
-    GETLB(id)->EnsureVisible(n);
-    GETLB(id)->Select(n, select);
-}
-
-
-int ListBoxImpl::GetSelection() {
-    return GETLB(id)->GetFirstSelected();
-}
-
-
-int ListBoxImpl::Find(const char *WXUNUSED(prefix)) {
-    // No longer used
-    return wxNOT_FOUND;
-}
-
-
-void ListBoxImpl::GetValue(int n, char *value, int len) {
-    wxListItem item;
-    item.SetId(n);
-    item.SetColumn(1);
-    item.SetMask(wxLIST_MASK_TEXT);
-    GETLB(id)->GetItem(item);
-    strncpy(value, wx2stc(item.GetText()), len);
-    value[len-1] = '\0';
-}
-
-
-void ListBoxImpl::RegisterImage(int type, const char *xpm_data) {
-    wxMemoryInputStream stream(xpm_data, strlen(xpm_data)+1);
-    wxImage img(stream, wxBITMAP_TYPE_XPM);
-    wxBitmap bmp(img);
-
-    if (! imgList) {
-        // assumes all images are the same size
-        imgList = new wxImageList(bmp.GetWidth(), bmp.GetHeight(), true);
-        imgTypeMap = new wxArrayInt;
-    }
-
-    int idx = imgList->Add(bmp);
-
-    // do we need to extend the mapping array?
-    wxArrayInt& itm = *imgTypeMap;
-    if ( itm.GetCount() < (size_t)type+1)
-        itm.Add(-1, type - itm.GetCount() + 1);
-
-    // Add an item that maps type to the image index
-    itm[type] = idx;
-}
-
-void ListBoxImpl::ClearRegisteredImages() {
-    if (imgList) {
-        delete imgList;
-        imgList = NULL;
-    }
-    if (imgTypeMap) {
-        delete imgTypeMap;
-        imgTypeMap = NULL;
-    }
-    if (id)
-        GETLB(id)->SetImageList(NULL, wxIMAGE_LIST_SMALL);
-}
-
-
-void ListBoxImpl::SetDoubleClickAction(CallBackAction action, void *data) {
-    GETLBW(id)->SetDoubleClickAction(action, data);
-}
-
-
-ListBox::ListBox() {
-}
-
-ListBox::~ListBox() {
-}
-
-ListBox *ListBox::Allocate() {
-    return new ListBoxImpl();
-}
-
-//----------------------------------------------------------------------
-
-Menu::Menu() : id(0) {
-}
-
-void Menu::CreatePopUp() {
-    Destroy();
-    id = new wxMenu();
-}
-
-void Menu::Destroy() {
-    if (id)
-        delete (wxMenu*)id;
-    id = 0;
-}
-
-void Menu::Show(Point pt, Window &w) {
-    GETWIN(w.GetID())->PopupMenu((wxMenu*)id, pt.x - 4, pt.y);
-    Destroy();
-}
-
-//----------------------------------------------------------------------
-
-DynamicLibrary *DynamicLibrary::Load(const char *WXUNUSED(modulePath)) {
-    wxFAIL_MSG(wxT("Dynamic lexer loading not implemented yet"));
-    return NULL;
-}
-
-//----------------------------------------------------------------------
-
-ColourDesired Platform::Chrome() {
-    wxColour c;
-    c = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-    return ColourDesired(c.Red(), c.Green(), c.Blue());
-}
-
-ColourDesired Platform::ChromeHighlight() {
-    wxColour c;
-    c = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT);
-    return ColourDesired(c.Red(), c.Green(), c.Blue());
-}
-
-const char *Platform::DefaultFont() {
-    static char buf[128];
-    strcpy(buf, wxNORMAL_FONT->GetFaceName().mbc_str());
-    return buf;
-}
-
-int Platform::DefaultFontSize() {
-    return wxNORMAL_FONT->GetPointSize();
-}
-
-unsigned int Platform::DoubleClickTime() {
-    return 500;   // **** ::GetDoubleClickTime();
-}
-
-bool Platform::MouseButtonBounce() {
-    return false;
-}
-
-bool Platform::IsKeyDown(int WXUNUSED(key)) {
-    return false;  // I don't think we'll need this.
-}
-
-long Platform::SendScintilla(WindowID w,
-                             unsigned int msg,
-                             unsigned long wParam,
-                             long lParam) {
-
-    wxStyledTextCtrl* stc = (wxStyledTextCtrl*)w;
-    return stc->SendMsg(msg, wParam, lParam);
-}
-
-long Platform::SendScintillaPointer(WindowID w,
-                                    unsigned int msg,
-                                    unsigned long wParam,
-                                    void *lParam) {
-
-    wxStyledTextCtrl* stc = (wxStyledTextCtrl*)w;
-    return stc->SendMsg(msg, wParam, (long)lParam);
-}
-
-
-// These are utility functions not really tied to a platform
-
-int Platform::Minimum(int a, int b) {
-    if (a < b)
-        return a;
-    else
-        return b;
-}
-
-int Platform::Maximum(int a, int b) {
-    if (a > b)
-        return a;
-    else
-        return b;
-}
-
-//#define TRACE
-
-void Platform::DebugDisplay(const char *s) {
-#ifdef TRACE
-    wxLogDebug(stc2wx(s));
-#else
-    wxUnusedVar(s);
-#endif
-}
-
-void Platform::DebugPrintf(const char *format, ...) {
-#ifdef TRACE
-    char buffer[2000];
-    va_list pArguments;
-    va_start(pArguments, format);
-    vsprintf(buffer,format,pArguments);
-    va_end(pArguments);
-    Platform::DebugDisplay(buffer);
-#endif
-}
-
-
-static bool assertionPopUps = true;
-
-bool Platform::ShowAssertionPopUps(bool assertionPopUps_) {
-    bool ret = assertionPopUps;
-    assertionPopUps = assertionPopUps_;
-    return ret;
-}
-
-void Platform::Assert(const char *c, const char *file, int line) {
-#ifdef TRACE
-    char buffer[2000];
-    sprintf(buffer, "Assertion [%s] failed at %s %d", c, file, line);
-    if (assertionPopUps) {
-        /*int idButton = */
-        wxMessageBox(stc2wx(buffer),
-                     wxT("Assertion failure"),
-                     wxICON_HAND | wxOK);
-    } else {
-        strcat(buffer, "\r\n");
-        Platform::DebugDisplay(buffer);
-        abort();
-    }
-#else
-    wxUnusedVar(c);
-    wxUnusedVar(file);
-    wxUnusedVar(line);
-#endif
-}
-
-
-int Platform::Clamp(int val, int minVal, int maxVal) {
-    if (val > maxVal)
-        val = maxVal;
-    if (val < minVal)
-        val = minVal;
-    return val;
-}
-
-
-bool Platform::IsDBCSLeadByte(int WXUNUSED(codePage), char WXUNUSED(ch)) {
-    return false;
-}
-
-int Platform::DBCSCharLength(int WXUNUSED(codePage), const char *WXUNUSED(s)) {
-    return 1;
-}
-
-int Platform::DBCSCharMaxLength() {
-    return 1;
-}
-
-
-//----------------------------------------------------------------------
-
-ElapsedTime::ElapsedTime() {
-    wxLongLong localTime = wxGetLocalTimeMillis();
-    littleBit = localTime.GetLo();
-    bigBit = localTime.GetHi();
-}
-
-double ElapsedTime::Duration(bool reset) {
-    wxLongLong prevTime(bigBit, littleBit);
-    wxLongLong localTime = wxGetLocalTimeMillis();
-    if(reset) {
-        littleBit = localTime.GetLo();
-        bigBit = localTime.GetHi();
-    }
-    wxLongLong duration = localTime - prevTime;
-    double result = duration.ToDouble();
-    result /= 1000.0;
-    return result;
-}
-
-
-//----------------------------------------------------------------------
-
-#if wxUSE_UNICODE
-
-#include "UniConversion.h"
-
-// Convert using Scintilla's functions instead of wx's, Scintilla's are more
-// forgiving and won't assert...
-
-wxString stc2wx(const char* str, size_t len)
-{
-    if (!len)
-        return wxEmptyString;
-
-    size_t wclen = UCS2Length(str, len);
-    wxWCharBuffer buffer(wclen+1);
-
-    size_t actualLen = UCS2FromUTF8(str, len, buffer.data(), wclen+1);
-    return wxString(buffer.data(), actualLen);
-}
-
-
-
-wxString stc2wx(const char* str)
-{
-    return stc2wx(str, strlen(str));
-}
-
-
-const wxWX2MBbuf wx2stc(const wxString& str)
-{
-    const wchar_t* wcstr = str.c_str();
-    size_t wclen         = str.length();
-    size_t len           = UTF8Length(wcstr, wclen);
-
-    wxCharBuffer buffer(len+1);
-    UTF8FromUCS2(wcstr, wclen, buffer.data(), len);
-
-    // TODO check NULL termination!!
-
-    return buffer;
-}
-
-#endif
diff --git a/src/stc/PlatWX.h b/src/stc/PlatWX.h
deleted file mode 100644
index e658a67f65..0000000000
--- a/src/stc/PlatWX.h
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-wxRect wxRectFromPRectangle(PRectangle prc);
-PRectangle PRectangleFromwxRect(wxRect rc);
-wxColour wxColourFromCA(const ColourAllocated& ca);
-
diff --git a/src/stc/README.txt b/src/stc/README.txt
deleted file mode 100644
index 4b66121e64..0000000000
--- a/src/stc/README.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-This contrib is the wxStyledTextCtrl, which is a wrapper around the
-Scintilla edit control.  (See www.scintilla.org)
-
-There is still VERY MUCH to be done, most notable of which is a more
-advanced sample that exercises more of the code.  (I havn't tested
-AutoComplete or CallTips, or most of the event types at all yet.)  And
-also documentation, adding wrappers for some new scintilla
-functionality, building and testing on wxGTK, etc.  Be patient, it all
-will get there soon.
-
-
-
-Let me describe a bit about the architecture I am implementing...
-Obviously there is the Platform layer which implements the varioius
-platform classes by using wxWindows classes and filling in where
-needed.  Then there is a ScintillaWX class that is derived from
-ScintillaBase and implements the necessary virtual methods that
-Scintilla needs to fully funciton.  This class however is not meant to
-ever be used directly by wx programmers.  I call it one end of the
-bridge between the wx and Scintilla worlds.  The other end of the
-bridge is a class called wxStyledTextCtrl that looks, feels and acts
-like other classes in wxWindows.  Here is a diagram:
-
-
- +------------------+          +-------------------+
- | wxStyledTextCtrl |--bridge--|    ScintillaWX    |
- +------------------+          +-------------------+
-                               |   ScintillaBase   |
-                               +-------------------+
-                               |       Editor      |
-                               +-------------------+
-                               |     PlatWX        |
-                               +-------------------+
-
-
-wxStyledTextCtrl derives from wxControl so it has a window that can be
-drawn upon.  When a wxStyledTextCtrl is constructed it constructs a
-ScintillaWX for itself and passes itself to the scintilla object to be
-set as the wMain and wDraw attributes.  All method calls on the STC
-are sent over the bridge in the form of calls to ScintiallWX::WndProc.
-All notifications are sent back over the bridge and turned into
-wxEvents.
-
-
-Robin
-
-[SOLARIS NOTE - ellers@iinet.net.au - June 2002]
-
-On sunos5 (sparc) the stc code breaks if optimisation is turned on (the
-default). If your release build breaks but the debug build is fine, 
-try reconfiguring with --disable-optimise and rebuilding. If you are using
-wxPython you will also need to disable optimised compiling. To do this I
-had to hand modify the python makefile in (prefix)/lib/python2.2/config/Makefile
-to remove optimisation flags.
-
diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
deleted file mode 100644
index 000db9a24b..0000000000
--- a/src/stc/ScintillaWX.cpp
+++ /dev/null
@@ -1,1139 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Name:        ScintillaWX.cxx
-// Purpose:     A wxWidgets implementation of Scintilla.  A class derived
-//              from ScintillaBase that uses the "wx platform" defined in
-//              PlatformWX.cxx  This class is one end of a bridge between
-//              the wx world and the Scintilla world.  It needs a peer
-//              object of type wxStyledTextCtrl to function.
-//
-// Author:      Robin Dunn
-//
-// Created:     13-Jan-2000
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wx.h"
-#include "wx/textbuf.h"
-#include "wx/dataobj.h"
-#include "wx/clipbrd.h"
-#include "wx/dnd.h"
-
-#include "ScintillaWX.h"
-#include "ExternalLexer.h"
-#include "wx/stc/stc.h"
-#include "PlatWX.h"
-
-#ifdef __WXMSW__
-    // GetHwndOf()
-    #include "wx/msw/private.h"
-#endif
-
-//----------------------------------------------------------------------
-// Helper classes
-
-class wxSTCTimer : public wxTimer {
-public:
-    wxSTCTimer(ScintillaWX* swx) {
-        this->swx = swx;
-    }
-
-    void Notify() {
-        swx->DoTick();
-    }
-
-private:
-    ScintillaWX* swx;
-};
-
-
-#if wxUSE_DRAG_AND_DROP
-class wxStartDragTimer : public wxTimer {
-public:
-    wxStartDragTimer(ScintillaWX* swx) {
-        this->swx = swx;
-    }
-
-    void Notify() {
-        swx->DoStartDrag();
-    }
-
-private:
-    ScintillaWX* swx;
-};
-
-
-bool wxSTCDropTarget::OnDropText(wxCoord x, wxCoord y, const wxString& data) {
-    return swx->DoDropText(x, y, data);
-}
-
-wxDragResult  wxSTCDropTarget::OnEnter(wxCoord x, wxCoord y, wxDragResult def) {
-    return swx->DoDragEnter(x, y, def);
-}
-
-wxDragResult  wxSTCDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def) {
-    return swx->DoDragOver(x, y, def);
-}
-
-void  wxSTCDropTarget::OnLeave() {
-    swx->DoDragLeave();
-}
-#endif // wxUSE_DRAG_AND_DROP
-
-
-#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
-#include <wx/popupwin.h>
-#define wxSTCCallTipBase wxPopupWindow
-#define param2  wxBORDER_NONE  // popup's 2nd param is flags
-#else
-#define wxSTCCallTipBase wxFrame
-#define param2 -1 // wxWindow's 2nd param is ID
-#endif
-
-#include <wx/dcbuffer.h>
-
-class wxSTCCallTip : public wxSTCCallTipBase {
-public:
-    wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx) :
-#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
-        wxSTCCallTipBase(parent, wxBORDER_NONE),
-#else
-        wxSTCCallTipBase(parent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize,
-                         wxFRAME_NO_TASKBAR
-                         | wxFRAME_FLOAT_ON_PARENT
-                         | wxBORDER_NONE
-#ifdef __WXMAC__
-                         | wxPOPUP_WINDOW  
-#endif
-            ), 
-#endif
-          m_ct(ct), m_swx(swx), m_cx(wxDefaultCoord), m_cy(wxDefaultCoord)
-        {
-        }
-
-    ~wxSTCCallTip() {
-#if wxUSE_POPUPWIN && wxSTC_USE_POPUP && defined(__WXGTK__)
-        wxRect rect = GetRect();
-        rect.x = m_cx;
-        rect.y = m_cy;
-        GetParent()->Refresh(false, &rect);
-#endif
-    }
-
-    bool AcceptsFocus() const { return false; }
-
-    void OnPaint(wxPaintEvent& WXUNUSED(evt))
-    {
-        wxBufferedPaintDC dc(this);
-        Surface* surfaceWindow = Surface::Allocate();
-        surfaceWindow->Init(&dc, m_ct->wDraw.GetID());
-        m_ct->PaintCT(surfaceWindow);
-        surfaceWindow->Release();
-        delete surfaceWindow;
-    }
-
-    void OnFocus(wxFocusEvent& event)
-    {
-        GetParent()->SetFocus();
-        event.Skip();
-    }
-
-    void OnLeftDown(wxMouseEvent& event)
-    {
-        wxPoint pt = event.GetPosition();
-        Point p(pt.x, pt.y);
-        m_ct->MouseClick(p);
-        m_swx->CallTipClick();
-    }
-
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO)
-    {
-        // convert coords to screen coords since we're a top-level window
-        if (x != wxDefaultCoord) {
-            m_cx = x;
-            GetParent()->ClientToScreen(&x, NULL);
-        }
-        if (y != wxDefaultCoord) {
-            m_cy = y;
-            GetParent()->ClientToScreen(NULL, &y);
-        }
-        wxSTCCallTipBase::DoSetSize(x, y, width, height, sizeFlags);
-    }
-
-#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
-#else
-    virtual bool Show( bool show = true )
-    {
-        // Although we're a frame, we always want the parent to be active, so
-        // raise it whenever we get shown.
-        bool rv = wxSTCCallTipBase::Show(show);
-        if (rv && show)
-        {
-            wxTopLevelWindow *frame = wxDynamicCast(
-                wxGetTopLevelParent(GetParent()), wxTopLevelWindow);
-            if (frame)
-                frame->Raise();
-        }
-        return rv;
-    }
-#endif
-    
-    wxPoint GetMyPosition()
-    {
-        return wxPoint(m_cx, m_cy);
-    }
-
-private:
-    CallTip*      m_ct;
-    ScintillaWX*  m_swx;
-    int           m_cx, m_cy;
-    DECLARE_EVENT_TABLE()
-};
-
-BEGIN_EVENT_TABLE(wxSTCCallTip, wxSTCCallTipBase)
-    EVT_PAINT(wxSTCCallTip::OnPaint)
-    EVT_SET_FOCUS(wxSTCCallTip::OnFocus)
-    EVT_LEFT_DOWN(wxSTCCallTip::OnLeftDown)
-END_EVENT_TABLE()
-
-
-//----------------------------------------------------------------------
-
-#if wxUSE_DATAOBJ
-static wxTextFileType wxConvertEOLMode(int scintillaMode)
-{
-    wxTextFileType type;
-
-    switch (scintillaMode) {
-        case wxSTC_EOL_CRLF:
-            type = wxTextFileType_Dos;
-            break;
-
-        case wxSTC_EOL_CR:
-            type = wxTextFileType_Mac;
-            break;
-
-        case wxSTC_EOL_LF:
-            type = wxTextFileType_Unix;
-            break;
-
-        default:
-            type = wxTextBuffer::typeDefault;
-            break;
-    }
-    return type;
-}
-#endif // wxUSE_DATAOBJ
-
-
-//----------------------------------------------------------------------
-// Constructor/Destructor
-
-
-ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) {
-    capturedMouse = false;
-    focusEvent = false;
-    wMain = win;
-    stc   = win;
-    wheelRotation = 0;
-    Initialise();
-#ifdef __WXMSW__
-    sysCaretBitmap = 0;
-    sysCaretWidth = 0;
-    sysCaretHeight = 0;
-#endif
-#if wxUSE_DRAG_AND_DROP
-    startDragTimer = new wxStartDragTimer(this);
-#endif // wxUSE_DRAG_AND_DROP
-}
-
-
-ScintillaWX::~ScintillaWX() {
-#if wxUSE_DRAG_AND_DROP
-    delete startDragTimer;
-#endif // wxUSE_DRAG_AND_DROP
-    Finalise();
-}
-
-//----------------------------------------------------------------------
-// base class virtuals
-
-
-void ScintillaWX::Initialise() {
-    //ScintillaBase::Initialise();
-#if wxUSE_DRAG_AND_DROP
-    dropTarget = new wxSTCDropTarget;
-    dropTarget->SetScintilla(this);
-    stc->SetDropTarget(dropTarget);
-#endif // wxUSE_DRAG_AND_DROP
-#ifdef __WXMAC__
-    vs.extraFontFlag = false;  // UseAntiAliasing
-#else
-    vs.extraFontFlag = true;   // UseAntiAliasing
-#endif
-}
-
-
-void ScintillaWX::Finalise() {
-    ScintillaBase::Finalise();
-    SetTicking(false);
-    SetIdle(false);
-    DestroySystemCaret();
-}
-
-
-void ScintillaWX::StartDrag() {
-#if wxUSE_DRAG_AND_DROP
-    // We defer the starting of the DnD, otherwise the LeftUp of a normal
-    // click could be lost and the STC will think it is doing a DnD when the
-    // user just wanted a normal click.
-    startDragTimer->Start(200, true);
-#endif // wxUSE_DRAG_AND_DROP
-}
-
-void ScintillaWX::DoStartDrag() {
-#if wxUSE_DRAG_AND_DROP
-    wxString dragText = stc2wx(drag.s, drag.len);
-
-    // Send an event to allow the drag text to be changed
-    wxStyledTextEvent evt(wxEVT_STC_START_DRAG, stc->GetId());
-    evt.SetEventObject(stc);
-    evt.SetDragText(dragText);
-    evt.SetDragAllowMove(true);
-    evt.SetPosition(wxMin(stc->GetSelectionStart(),
-                          stc->GetSelectionEnd()));
-    stc->GetEventHandler()->ProcessEvent(evt);
-    dragText = evt.GetDragText();
-
-    if (dragText.length()) {
-        wxDropSource        source(stc);
-        wxTextDataObject    data(dragText);
-        wxDragResult        result;
-
-        source.SetData(data);
-        dropWentOutside = true;
-        result = source.DoDragDrop(evt.GetDragAllowMove());
-        if (result == wxDragMove && dropWentOutside)
-            ClearSelection();
-        inDragDrop = false;
-        SetDragPosition(invalidPosition);
-    }
-#endif // wxUSE_DRAG_AND_DROP
-}
-
-
-bool ScintillaWX::SetIdle(bool on) {
-    if (idler.state != on) {
-        // connect or disconnect the EVT_IDLE handler
-        if (on)
-            stc->Connect(wxID_ANY, wxEVT_IDLE,
-                         (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);
-        else
-            stc->Disconnect(wxID_ANY, wxEVT_IDLE,
-                            (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);
-        idler.state = on;
-    }
-    return idler.state;
-}
-
-
-void ScintillaWX::SetTicking(bool on) {
-    wxSTCTimer* steTimer;
-    if (timer.ticking != on) {
-        timer.ticking = on;
-        if (timer.ticking) {
-            steTimer = new wxSTCTimer(this);
-            steTimer->Start(timer.tickSize);
-            timer.tickerID = steTimer;
-        } else {
-            steTimer = (wxSTCTimer*)timer.tickerID;
-            steTimer->Stop();
-            delete steTimer;
-            timer.tickerID = 0;
-        }
-    }
-    timer.ticksToWait = caret.period;
-}
-
-
-void ScintillaWX::SetMouseCapture(bool on) {
-    if (mouseDownCaptures) {
-        if (on && !capturedMouse)
-            stc->CaptureMouse();
-        else if (!on && capturedMouse && stc->HasCapture())
-            stc->ReleaseMouse();
-        capturedMouse = on;
-    }
-}
-
-
-bool ScintillaWX::HaveMouseCapture() {
-    return capturedMouse;
-}
-
-
-void ScintillaWX::ScrollText(int linesToMove) {
-    int dy = vs.lineHeight * (linesToMove);
-    stc->ScrollWindow(0, dy);
-    stc->Update();
-}
-
-void ScintillaWX::SetVerticalScrollPos() {
-    if (stc->m_vScrollBar == NULL) {  // Use built-in scrollbar
-        stc->SetScrollPos(wxVERTICAL, topLine);
-    }
-    else { // otherwise use the one that's been given to us
-        stc->m_vScrollBar->SetThumbPosition(topLine);
-    }
-}
-
-void ScintillaWX::SetHorizontalScrollPos() {
-    if (stc->m_hScrollBar == NULL) {  // Use built-in scrollbar
-        stc->SetScrollPos(wxHORIZONTAL, xOffset);
-    }
-    else { // otherwise use the one that's been given to us
-        stc->m_hScrollBar->SetThumbPosition(xOffset);
-    }
-}
-
-
-const int H_SCROLL_STEP = 20;
-
-bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
-    bool modified = false;
-
-    int vertEnd = nMax;
-    if (!verticalScrollBarVisible)
-        vertEnd = 0;
-
-    // Check the vertical scrollbar
-    if (stc->m_vScrollBar == NULL) {  // Use built-in scrollbar
-        int  sbMax    = stc->GetScrollRange(wxVERTICAL);
-        int  sbThumb  = stc->GetScrollThumb(wxVERTICAL);
-        int  sbPos    = stc->GetScrollPos(wxVERTICAL);
-        if (sbMax != vertEnd || sbThumb != nPage) {
-            stc->SetScrollbar(wxVERTICAL, sbPos, nPage, vertEnd+1);
-            modified = true;
-        }
-    }
-    else { // otherwise use the one that's been given to us
-        int  sbMax    = stc->m_vScrollBar->GetRange();
-        int  sbPage   = stc->m_vScrollBar->GetPageSize();
-        int  sbPos    = stc->m_vScrollBar->GetThumbPosition();
-        if (sbMax != vertEnd || sbPage != nPage) {
-            stc->m_vScrollBar->SetScrollbar(sbPos, nPage, vertEnd+1, nPage);
-            modified = true;
-        }
-    }
-
-
-    // Check the horizontal scrollbar
-    PRectangle rcText = GetTextRectangle();
-    int horizEnd = scrollWidth;
-    if (horizEnd < 0)
-        horizEnd = 0;
-    if (!horizontalScrollBarVisible || (wrapState != eWrapNone))
-        horizEnd = 0;
-    int pageWidth = rcText.Width();
-
-    if (stc->m_hScrollBar == NULL) {  // Use built-in scrollbar
-        int sbMax    = stc->GetScrollRange(wxHORIZONTAL);
-        int sbThumb  = stc->GetScrollThumb(wxHORIZONTAL);
-        int sbPos    = stc->GetScrollPos(wxHORIZONTAL);
-        if ((sbMax != horizEnd) || (sbThumb != pageWidth) || (sbPos != 0)) {
-            stc->SetScrollbar(wxHORIZONTAL, sbPos, pageWidth, horizEnd);
-            modified = true;
-            if (scrollWidth < pageWidth) {
-                HorizontalScrollTo(0);
-            }
-        }
-    }
-    else { // otherwise use the one that's been given to us
-        int sbMax    = stc->m_hScrollBar->GetRange();
-        int sbThumb  = stc->m_hScrollBar->GetPageSize();
-        int sbPos    = stc->m_hScrollBar->GetThumbPosition();
-        if ((sbMax != horizEnd) || (sbThumb != pageWidth) || (sbPos != 0)) {
-            stc->m_hScrollBar->SetScrollbar(sbPos, pageWidth, horizEnd, pageWidth);
-            modified = true;
-            if (scrollWidth < pageWidth) {
-                HorizontalScrollTo(0);
-            }
-        }
-    }
-
-    return modified;
-}
-
-
-void ScintillaWX::NotifyChange() {
-    stc->NotifyChange();
-}
-
-
-void ScintillaWX::NotifyParent(SCNotification scn) {
-    stc->NotifyParent(&scn);
-}
-
-
-// This method is overloaded from ScintillaBase in order to prevent the
-// AutoComplete window from being destroyed when it gets the focus.  There is
-// a side effect that the AutoComp will also not be destroyed when switching
-// to another window, but I think that is okay.
-void ScintillaWX::CancelModes() {
-    if (! focusEvent)
-        AutoCompleteCancel();
-    ct.CallTipCancel();
-    Editor::CancelModes();
-}
-
-
-
-void ScintillaWX::Copy() {
-    if (currentPos != anchor) {
-        SelectionText st;
-        CopySelectionRange(&st);
-        CopyToClipboard(st);
-    }
-}
-
-
-void ScintillaWX::Paste() {
-    pdoc->BeginUndoAction();
-    ClearSelection();
-
-#if wxUSE_DATAOBJ
-    wxTextDataObject data;
-    bool gotData = false;
-
-    if (wxTheClipboard->Open()) {
-        wxTheClipboard->UsePrimarySelection(false);
-        gotData = wxTheClipboard->GetData(data);
-        wxTheClipboard->Close();
-    }
-    if (gotData) {
-        wxString   text = wxTextBuffer::Translate(data.GetText(),
-                                                  wxConvertEOLMode(pdoc->eolMode));
-        wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-
-#if wxUSE_UNICODE
-        // free up the old character buffer in case the text is real big
-        data.SetText(wxEmptyString); 
-        text = wxEmptyString;
-#endif
-        int len = strlen(buf);
-        pdoc->InsertString(currentPos, buf, len);
-        SetEmptySelection(currentPos + len);
-    }
-#endif // wxUSE_DATAOBJ
-
-    pdoc->EndUndoAction();
-    NotifyChange();
-    Redraw();
-}
-
-
-void ScintillaWX::CopyToClipboard(const SelectionText& st) {
-#if wxUSE_CLIPBOARD
-    if (wxTheClipboard->Open()) {
-        wxTheClipboard->UsePrimarySelection(false);
-        wxString text = wxTextBuffer::Translate(stc2wx(st.s, st.len-1));
-        wxTheClipboard->SetData(new wxTextDataObject(text));
-        wxTheClipboard->Close();
-    }
-#else
-    wxUnusedVar(st);
-#endif // wxUSE_CLIPBOARD
-}
-
-
-bool ScintillaWX::CanPaste() {
-#if wxUSE_CLIPBOARD
-    bool canPaste = false;
-    bool didOpen;
-
-    if (Editor::CanPaste()) {
-        didOpen = !wxTheClipboard->IsOpened();
-        if ( didOpen )
-            wxTheClipboard->Open();
-
-        if (wxTheClipboard->IsOpened()) {
-            wxTheClipboard->UsePrimarySelection(false);
-            canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
-            if (didOpen)
-                wxTheClipboard->Close();
-        }
-    }
-    return canPaste;
-#else
-    return false;
-#endif // wxUSE_CLIPBOARD
-}
-
-void ScintillaWX::CreateCallTipWindow(PRectangle) {
-    if (! ct.wCallTip.Created() ) {
-        ct.wCallTip = new wxSTCCallTip(stc, &ct, this);
-        ct.wDraw = ct.wCallTip;
-    }
-}
-
-
-void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) {
-    if (!label[0])
-        ((wxMenu*)popup.GetID())->AppendSeparator();
-    else
-        ((wxMenu*)popup.GetID())->Append(cmd, wxGetTranslation(stc2wx(label)));
-
-    if (!enabled)
-        ((wxMenu*)popup.GetID())->Enable(cmd, enabled);
-}
-
-
-// This is called by the Editor base class whenever something is selected
-void ScintillaWX::ClaimSelection() {
-#if 0
-    // Until wxGTK is able to support using both the primary selection and the
-    // clipboard at the same time I think it causes more problems than it is
-    // worth to implement this method.  Selecting text should not clear the
-    // clipboard.  --Robin
-#ifdef __WXGTK__
-    // Put the selected text in the PRIMARY selection
-    if (currentPos != anchor) {
-        SelectionText st;
-        CopySelectionRange(&st);
-        if (wxTheClipboard->Open()) {
-            wxTheClipboard->UsePrimarySelection(true);
-            wxString text = stc2wx(st.s, st.len);
-            wxTheClipboard->SetData(new wxTextDataObject(text));
-            wxTheClipboard->UsePrimarySelection(false);
-            wxTheClipboard->Close();
-        }
-    }
-#endif
-#endif
-}
-
-
-void ScintillaWX::UpdateSystemCaret() {
-#ifdef __WXMSW__
-    if (hasFocus) {
-        if (HasCaretSizeChanged()) {
-            DestroySystemCaret();
-            CreateSystemCaret();
-        }
-        Point pos = LocationFromPosition(currentPos);
-        ::SetCaretPos(pos.x, pos.y);
-    }
-#endif
-}
-
-
-bool ScintillaWX::HasCaretSizeChanged() {
-#ifdef __WXMSW__
-    if (( (0 != vs.caretWidth) && (sysCaretWidth != vs.caretWidth) )
-        || (0 != vs.lineHeight) && (sysCaretHeight != vs.lineHeight)) {
-        return true;
-    }
-#endif
-    return false;
-}
-
-bool ScintillaWX::CreateSystemCaret() {
-#ifdef __WXMSW__
-    sysCaretWidth = vs.caretWidth;
-    if (0 == sysCaretWidth) {
-        sysCaretWidth = 1;
-    }
-    sysCaretHeight = vs.lineHeight;
-    int bitmapSize = (((sysCaretWidth + 15) & ~15) >> 3) * sysCaretHeight;
-    char *bits = new char[bitmapSize];
-    memset(bits, 0, bitmapSize);
-    sysCaretBitmap = ::CreateBitmap(sysCaretWidth, sysCaretHeight, 1,
-                                    1, reinterpret_cast<BYTE *>(bits));
-    delete [] bits;
-    BOOL retval = ::CreateCaret(GetHwndOf(stc), sysCaretBitmap,
-                                sysCaretWidth, sysCaretHeight);
-    ::ShowCaret(GetHwndOf(stc));
-    return retval != 0;
-#else
-    return false;
-#endif
-}
-
-bool ScintillaWX::DestroySystemCaret() {
-#ifdef __WXMSW__
-    ::HideCaret(GetHwndOf(stc));
-    BOOL retval = ::DestroyCaret();
-    if (sysCaretBitmap) {
-        ::DeleteObject(sysCaretBitmap);
-        sysCaretBitmap = 0;
-    }
-    return retval != 0;
-#else
-    return false;
-#endif
-}
-
-
-//----------------------------------------------------------------------
-
-
-long ScintillaWX::DefWndProc(unsigned int /*iMessage*/, unsigned long /*wParam*/, long /*lParam*/) {
-    return 0;
-}
-
-long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lParam) {
-      switch (iMessage) {
-      case SCI_CALLTIPSHOW: {
-          // NOTE: This is copied here from scintilla/src/ScintillaBase.cxx
-          // because of the little tweak that needs done below for wxGTK.
-          // When updating new versions double check that this is still
-          // needed, and that any new code there is copied here too.
-          Point pt = LocationFromPosition(wParam);
-          char* defn = reinterpret_cast<char *>(lParam);
-          AutoCompleteCancel();
-          pt.y += vs.lineHeight;
-          PRectangle rc = ct.CallTipStart(currentPos, pt,
-                                          defn,
-                                          vs.styles[STYLE_DEFAULT].fontName,
-                                          vs.styles[STYLE_DEFAULT].sizeZoomed,
-                                          CodePage(),
-                                          vs.styles[STYLE_DEFAULT].characterSet,
-                                          wMain);
-          // If the call-tip window would be out of the client
-          // space, adjust so it displays above the text.
-          PRectangle rcClient = GetClientRectangle();
-          if (rc.bottom > rcClient.bottom) {
-#ifdef __WXGTK__
-              int offset = int(vs.lineHeight * 1.25)  + rc.Height();
-#else
-              int offset = vs.lineHeight + rc.Height();
-#endif
-              rc.top -= offset;
-              rc.bottom -= offset;
-          }
-          // Now display the window.
-          CreateCallTipWindow(rc);
-          ct.wCallTip.SetPositionRelative(rc, wMain);
-          ct.wCallTip.Show();
-          break;
-      }
-
-#ifdef SCI_LEXER
-      case SCI_LOADLEXERLIBRARY:
-            LexerManager::GetInstance()->Load((const char*)lParam);
-            break;
-#endif
-
-      default:
-          return ScintillaBase::WndProc(iMessage, wParam, lParam);
-      }
-      return 0;
-}
-
-
-
-//----------------------------------------------------------------------
-// Event delegates
-
-void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
-
-    paintState = painting;
-    Surface* surfaceWindow = Surface::Allocate();
-    surfaceWindow->Init(dc, wMain.GetID());
-    rcPaint = PRectangleFromwxRect(rect);
-    PRectangle rcClient = GetClientRectangle();
-    paintingAllText = rcPaint.Contains(rcClient);
-
-    ClipChildren(*dc, rcPaint);
-    Paint(surfaceWindow, rcPaint);
-
-    delete surfaceWindow;
-    if (paintState == paintAbandoned) {
-        // Painting area was insufficient to cover new styling or brace
-        // highlight positions
-        FullPaint();
-    }
-    paintState = notPainting;
-}
-
-
-void ScintillaWX::DoHScroll(int type, int pos) {
-    int xPos = xOffset;
-    PRectangle rcText = GetTextRectangle();
-    int pageWidth = rcText.Width() * 2 / 3;
-    if (type == wxEVT_SCROLLWIN_LINEUP || type == wxEVT_SCROLL_LINEUP)
-        xPos -= H_SCROLL_STEP;
-    else if (type == wxEVT_SCROLLWIN_LINEDOWN || type == wxEVT_SCROLL_LINEDOWN)
-        xPos += H_SCROLL_STEP;
-    else if (type == wxEVT_SCROLLWIN_PAGEUP || type == wxEVT_SCROLL_PAGEUP)
-        xPos -= pageWidth;
-    else if (type == wxEVT_SCROLLWIN_PAGEDOWN || type == wxEVT_SCROLL_PAGEDOWN) {
-        xPos += pageWidth;
-        if (xPos > scrollWidth - rcText.Width()) {
-            xPos = scrollWidth - rcText.Width();
-        }
-    }
-    else if (type == wxEVT_SCROLLWIN_TOP || type == wxEVT_SCROLL_TOP)
-        xPos = 0;
-    else if (type == wxEVT_SCROLLWIN_BOTTOM || type == wxEVT_SCROLL_BOTTOM)
-        xPos = scrollWidth;
-    else if (type == wxEVT_SCROLLWIN_THUMBTRACK || type == wxEVT_SCROLL_THUMBTRACK)
-        xPos = pos;
-
-    HorizontalScrollTo(xPos);
-}
-
-void ScintillaWX::DoVScroll(int type, int pos) {
-    int topLineNew = topLine;
-    if (type == wxEVT_SCROLLWIN_LINEUP || type == wxEVT_SCROLL_LINEUP)
-        topLineNew -= 1;
-    else if (type == wxEVT_SCROLLWIN_LINEDOWN || type == wxEVT_SCROLL_LINEDOWN)
-        topLineNew += 1;
-    else if (type ==  wxEVT_SCROLLWIN_PAGEUP || type == wxEVT_SCROLL_PAGEUP)
-        topLineNew -= LinesToScroll();
-    else if (type ==  wxEVT_SCROLLWIN_PAGEDOWN || type == wxEVT_SCROLL_PAGEDOWN)
-        topLineNew += LinesToScroll();
-    else if (type ==  wxEVT_SCROLLWIN_TOP || type == wxEVT_SCROLL_TOP)
-        topLineNew = 0;
-    else if (type ==  wxEVT_SCROLLWIN_BOTTOM || type == wxEVT_SCROLL_BOTTOM)
-        topLineNew = MaxScrollPos();
-    else if (type ==   wxEVT_SCROLLWIN_THUMBTRACK || type == wxEVT_SCROLL_THUMBTRACK)
-        topLineNew = pos;
-
-    ScrollTo(topLineNew);
-}
-
-void ScintillaWX::DoMouseWheel(int rotation, int delta,
-                               int linesPerAction, int ctrlDown,
-                               bool isPageScroll ) {
-    int topLineNew = topLine;
-    int lines;
-
-    if (ctrlDown) {  // Zoom the fonts if Ctrl key down
-        if (rotation < 0) {
-            KeyCommand(SCI_ZOOMIN);
-        }
-        else {
-            KeyCommand(SCI_ZOOMOUT);
-        }
-    }
-    else { // otherwise just scroll the window
-        if ( !delta )
-            delta = 120;
-        wheelRotation += rotation;
-        lines = wheelRotation / delta;
-        wheelRotation -= lines * delta;
-        if (lines != 0) {
-            if (isPageScroll)
-                lines = lines * LinesOnScreen();  // lines is either +1 or -1
-            else
-                lines *= linesPerAction;
-            topLineNew -= lines;
-            ScrollTo(topLineNew);
-        }
-    }
-}
-
-
-void ScintillaWX::DoSize(int WXUNUSED(width), int WXUNUSED(height)) {
-    ChangeSize();
-}
-
-void ScintillaWX::DoLoseFocus(){
-    focusEvent = true;
-    SetFocusState(false);
-    focusEvent = false;
-    DestroySystemCaret();
-}
-
-void ScintillaWX::DoGainFocus(){
-    focusEvent = true;
-    SetFocusState(true);
-    focusEvent = false;
-    DestroySystemCaret();
-    CreateSystemCaret();
-}
-
-void ScintillaWX::DoSysColourChange() {
-    InvalidateStyleData();
-}
-
-void ScintillaWX::DoLeftButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt) {
-    ButtonDown(pt, curTime, shift, ctrl, alt);
-}
-
-void ScintillaWX::DoLeftButtonUp(Point pt, unsigned int curTime, bool ctrl) {
-    ButtonUp(pt, curTime, ctrl);
-#if wxUSE_DRAG_AND_DROP
-    if (startDragTimer->IsRunning()) {
-        startDragTimer->Stop();
-        SetDragPosition(invalidPosition);
-        SetEmptySelection(PositionFromLocation(pt));
-        ShowCaretAtCurrentPosition();
-    }
-#endif // wxUSE_DRAG_AND_DROP
-}
-
-void ScintillaWX::DoLeftButtonMove(Point pt) {
-    ButtonMove(pt);
-}
-
-#ifdef __WXGTK__
-void ScintillaWX::DoMiddleButtonUp(Point pt) {
-    // Set the current position to the mouse click point and
-    // then paste in the PRIMARY selection, if any.  wxGTK only.
-    int newPos = PositionFromLocation(pt);
-    MovePositionTo(newPos, noSel, true);
-
-    pdoc->BeginUndoAction();
-    wxTextDataObject data;
-    bool gotData = false;
-    if (wxTheClipboard->Open()) {
-        wxTheClipboard->UsePrimarySelection(true);
-        gotData = wxTheClipboard->GetData(data);
-        wxTheClipboard->UsePrimarySelection(false);
-        wxTheClipboard->Close();
-    }
-    if (gotData) {
-        wxString   text = wxTextBuffer::Translate(data.GetText(),
-                                                  wxConvertEOLMode(pdoc->eolMode));
-        wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-        int        len = strlen(buf);
-        pdoc->InsertString(currentPos, buf, len);
-        SetEmptySelection(currentPos + len);
-    }
-    pdoc->EndUndoAction();
-    NotifyChange();
-    Redraw();
-
-    ShowCaretAtCurrentPosition();
-    EnsureCaretVisible();
-}
-#else
-void ScintillaWX::DoMiddleButtonUp(Point WXUNUSED(pt)) {
-}
-#endif
-
-
-void ScintillaWX::DoAddChar(int key) {
-#if wxUSE_UNICODE
-    wxChar wszChars[2];
-    wszChars[0] = (wxChar)key;
-    wszChars[1] = 0;
-    wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(wszChars);
-    AddCharUTF((char*)buf.data(), strlen(buf));
-#else
-    AddChar((char)key);
-#endif
-}
-
-
-int  ScintillaWX::DoKeyDown(const wxKeyEvent& evt, bool* consumed)
-{
-    int key = evt.GetKeyCode();
-    bool shift = evt.ShiftDown(),
-         ctrl  = evt.ControlDown(),
-         alt   = evt.AltDown();
-
-    if (ctrl && key >= 1 && key <= 26 && key != WXK_BACK)
-        key += 'A' - 1;
-
-    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_PAGEUP:            key = SCK_PRIOR;    break;
-    case WXK_PAGEDOWN:          key = SCK_NEXT;     break;
-    case WXK_NUMPAD_DOWN:       key = SCK_DOWN;     break;
-    case WXK_NUMPAD_UP:         key = SCK_UP;       break;
-    case WXK_NUMPAD_LEFT:       key = SCK_LEFT;     break;
-    case WXK_NUMPAD_RIGHT:      key = SCK_RIGHT;    break;
-    case WXK_NUMPAD_HOME:       key = SCK_HOME;     break;
-    case WXK_NUMPAD_END:        key = SCK_END;      break;
-    case WXK_NUMPAD_PAGEUP:     key = SCK_PRIOR;    break;
-    case WXK_NUMPAD_PAGEDOWN:   key = SCK_NEXT;     break;
-    case WXK_NUMPAD_DELETE:     key = SCK_DELETE;   break;
-    case WXK_NUMPAD_INSERT:     key = SCK_INSERT;   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_NUMPAD_ENTER:      // fall through
-    case WXK_RETURN:            key = SCK_RETURN;   break;
-    case WXK_ADD:               // fall through
-    case WXK_NUMPAD_ADD:        key = SCK_ADD;      break;
-    case WXK_SUBTRACT:          // fall through
-    case WXK_NUMPAD_SUBTRACT:   key = SCK_SUBTRACT; break;
-    case WXK_DIVIDE:            // fall through
-    case WXK_NUMPAD_DIVIDE:     key = SCK_DIVIDE;   break;
-    case WXK_CONTROL:           key = 0; break;
-    case WXK_ALT:               key = 0; break;
-    case WXK_SHIFT:             key = 0; break;
-    case WXK_MENU:              key = 0; break;
-    }
-
-#ifdef __WXMAC__
-    if ( evt.MetaDown() ) {
-        // check for a few common Mac Meta-key combos and remap them to Ctrl
-        // for Scintilla
-        switch ( key ) {
-        case 'Z':       // Undo
-        case 'X':       // Cut
-        case 'C':       // Copy
-        case 'V':       // Paste
-        case 'A':       // Select All
-            ctrl = true;
-            break;
-        }
-    }
-#endif
-
-    int rv = KeyDown(key, shift, ctrl, alt, consumed);
-
-    if (key)
-        return rv;
-    else
-        return 1;
-}
-
-
-void ScintillaWX::DoCommand(int ID) {
-    Command(ID);
-}
-
-
-void ScintillaWX::DoContextMenu(Point pt) {
-    if (displayPopupMenu)
-        ContextMenu(pt);
-}
-
-void ScintillaWX::DoOnListBox() {
-    AutoCompleteCompleted();
-}
-
-
-void ScintillaWX::DoOnIdle(wxIdleEvent& evt) {
-
-    if ( Idle() )
-        evt.RequestMore();
-    else
-        SetIdle(false);
-}
-
-//----------------------------------------------------------------------
-
-#if wxUSE_DRAG_AND_DROP
-bool ScintillaWX::DoDropText(long x, long y, const wxString& data) {
-    SetDragPosition(invalidPosition);
-
-    wxString text = wxTextBuffer::Translate(data,
-                                            wxConvertEOLMode(pdoc->eolMode));
-
-    // Send an event to allow the drag details to be changed
-    wxStyledTextEvent evt(wxEVT_STC_DO_DROP, stc->GetId());
-    evt.SetEventObject(stc);
-    evt.SetDragResult(dragResult);
-    evt.SetX(x);
-    evt.SetY(y);
-    evt.SetPosition(PositionFromLocation(Point(x,y)));
-    evt.SetDragText(text);
-    stc->GetEventHandler()->ProcessEvent(evt);
-
-    dragResult = evt.GetDragResult();
-    if (dragResult == wxDragMove || dragResult == wxDragCopy) {
-        DropAt(evt.GetPosition(),
-               wx2stc(evt.GetDragText()),
-               dragResult == wxDragMove,
-               false); // TODO: rectangular?
-        return true;
-    }
-    return false;
-}
-
-
-wxDragResult ScintillaWX::DoDragEnter(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxDragResult def) {
-    dragResult = def;
-    return dragResult;
-}
-
-
-wxDragResult ScintillaWX::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) {
-    SetDragPosition(PositionFromLocation(Point(x, y)));
-
-    // Send an event to allow the drag result to be changed
-    wxStyledTextEvent evt(wxEVT_STC_DRAG_OVER, stc->GetId());
-    evt.SetEventObject(stc);
-    evt.SetDragResult(def);
-    evt.SetX(x);
-    evt.SetY(y);
-    evt.SetPosition(PositionFromLocation(Point(x,y)));
-    stc->GetEventHandler()->ProcessEvent(evt);
-
-    dragResult = evt.GetDragResult();
-    return dragResult;
-}
-
-
-void ScintillaWX::DoDragLeave() {
-    SetDragPosition(invalidPosition);
-}
-#endif // wxUSE_DRAG_AND_DROP
-//----------------------------------------------------------------------
-
-// Force the whole window to be repainted
-void ScintillaWX::FullPaint() {
-#ifndef __WXMAC__
-    stc->Refresh(false);
-#endif
-    stc->Update();
-}
-
-
-void ScintillaWX::DoScrollToLine(int line) {
-    ScrollTo(line);
-}
-
-
-void ScintillaWX::DoScrollToColumn(int column) {
-    HorizontalScrollTo(column * vs.spaceWidth);
-}
-
-// wxGTK doesn't appear to need this explicit clipping code any longer, but I
-// will leave it here commented out for a while just in case...
-void ScintillaWX::ClipChildren(wxDC& WXUNUSED(dc), PRectangle WXUNUSED(rect))
-{
-//     wxRegion rgn(wxRectFromPRectangle(rect));
-//     if (ac.Active()) {
-//         wxRect childRect = ((wxWindow*)ac.lb->GetID())->GetRect();
-//         rgn.Subtract(childRect);
-//     }
-//     if (ct.inCallTipMode) {
-//         wxSTCCallTip* tip = (wxSTCCallTip*)ct.wCallTip.GetID();
-//         wxRect childRect = tip->GetRect();
-// #if wxUSE_POPUPWIN && wxSTC_USE_POPUP
-//         childRect.SetPosition(tip->GetMyPosition());
-// #endif
-//         rgn.Subtract(childRect);
-//     }
-//     dc.SetClippingRegion(rgn);
-}
-
-
-void ScintillaWX::SetUseAntiAliasing(bool useAA) {
-    vs.extraFontFlag = useAA;
-    InvalidateStyleRedraw();
-}
-
-bool ScintillaWX::GetUseAntiAliasing() {
-    return vs.extraFontFlag;
-}
-
-//----------------------------------------------------------------------
-//----------------------------------------------------------------------
diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h
deleted file mode 100644
index 29cec64796..0000000000
--- a/src/stc/ScintillaWX.h
+++ /dev/null
@@ -1,196 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Name:        ScintillaWX.h
-// Purpose:     A wxWidgets implementation of Scintilla.  A class derived
-//              from ScintillaBase that uses the "wx platform" defined in
-//              PlatWX.cpp.  This class is one end of a bridge between
-//              the wx world and the Scintilla world.  It needs a peer
-//              object of type wxStyledTextCtrl to function.
-//
-// Author:      Robin Dunn
-//
-// Created:     13-Jan-2000
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __ScintillaWX_h__
-#define __ScintillaWX_h__
-
-//----------------------------------------------------------------------
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-#include "CharClassify.h"
-#include "XPM.h"
-#ifdef SCI_LEXER
-#include "SciLexer.h"
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#endif
-#include "ContractionState.h"
-#include "SVector.h"
-#include "CellBuffer.h"
-#include "CallTip.h"
-#include "KeyMap.h"
-#include "Indicator.h"
-#include "LineMarker.h"
-#include "Style.h"
-#include "ViewStyle.h"
-#include "AutoComplete.h"
-#include "Document.h"
-#include "Editor.h"
-#include "ScintillaBase.h"
-
-//----------------------------------------------------------------------
-
-#ifdef WXMAKINGDLL_STC
-    #define WXDLLIMPEXP_STC WXEXPORT
-#elif defined(WXUSINGDLL)
-    #define WXDLLIMPEXP_STC WXIMPORT
-#else // not making nor using DLL
-    #define WXDLLIMPEXP_STC
-#endif
-
-class WXDLLIMPEXP_STC wxStyledTextCtrl;           // forward
-class ScintillaWX;
-
-
-//----------------------------------------------------------------------
-// Helper classes
-
-#if wxUSE_DRAG_AND_DROP
-class wxSTCDropTarget : public wxTextDropTarget {
-public:
-    void SetScintilla(ScintillaWX* swx) {
-        this->swx = swx;
-    }
-
-    bool OnDropText(wxCoord x, wxCoord y, const wxString& data);
-    wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def);
-    wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
-    void OnLeave();
-
-private:
-    ScintillaWX* swx;
-};
-#endif
-
-//----------------------------------------------------------------------
-
-class ScintillaWX : public ScintillaBase {
-public:
-
-    ScintillaWX(wxStyledTextCtrl* win);
-    ~ScintillaWX();
-
-    // base class virtuals
-    virtual void Initialise();
-    virtual void Finalise();
-    virtual void StartDrag();
-    virtual bool SetIdle(bool on);
-    virtual void SetTicking(bool on);
-    virtual void SetMouseCapture(bool on);
-    virtual bool HaveMouseCapture();
-    virtual void ScrollText(int linesToMove);
-    virtual void SetVerticalScrollPos();
-    virtual void SetHorizontalScrollPos();
-    virtual bool ModifyScrollBars(int nMax, int nPage);
-    virtual void Copy();
-    virtual void Paste();
-    virtual void CopyToClipboard(const SelectionText &selectedText);
-
-    virtual void CreateCallTipWindow(PRectangle rc);
-    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 void NotifyChange();
-    virtual void NotifyParent(SCNotification scn);
-
-    virtual void CancelModes();
-
-    virtual void UpdateSystemCaret();
-
-    // Event delegates
-    void DoPaint(wxDC* dc, wxRect rect);
-    void DoHScroll(int type, int pos);
-    void DoVScroll(int type, int pos);
-    void DoSize(int width, int height);
-    void DoLoseFocus();
-    void DoGainFocus();
-    void DoSysColourChange();
-    void DoLeftButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt);
-    void DoLeftButtonUp(Point pt, unsigned int curTime, bool ctrl);
-    void DoLeftButtonMove(Point pt);
-    void DoMiddleButtonUp(Point pt);
-    void DoMouseWheel(int rotation, int delta, int linesPerAction, int ctrlDown, bool isPageScroll);
-    void DoAddChar(int key);
-    int  DoKeyDown(const wxKeyEvent& event, bool* consumed);
-    void DoTick() { Tick(); }
-    void DoOnIdle(wxIdleEvent& evt);
-    void DoStartDrag();
-
-#if wxUSE_DRAG_AND_DROP
-    bool DoDropText(long x, long y, const wxString& data);
-    wxDragResult DoDragEnter(wxCoord x, wxCoord y, wxDragResult def);
-    wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def);
-    void DoDragLeave();
-#endif
-
-    void DoCommand(int ID);
-    void DoContextMenu(Point pt);
-    void DoOnListBox();
-
-
-    // helpers
-    void FullPaint();
-    bool CanPaste();
-    bool GetHideSelection() { return hideSelection; }
-    void DoScrollToLine(int line);
-    void DoScrollToColumn(int column);
-    void ClipChildren(wxDC& dc, PRectangle rect);
-    void SetUseAntiAliasing(bool useAA);
-    bool GetUseAntiAliasing();
-
-private:
-    bool                capturedMouse;
-    bool                focusEvent;
-    wxStyledTextCtrl*   stc;
-
-#if wxUSE_DRAG_AND_DROP
-    wxSTCDropTarget*    dropTarget;
-    wxDragResult        dragResult;
-    wxTimer*            startDragTimer;
-#endif
-
-    int                 wheelRotation;
-
-    // For use in creating a system caret
-    bool HasCaretSizeChanged();
-    bool CreateSystemCaret();
-    bool DestroySystemCaret();
-#ifdef __WXMSW__
-    HBITMAP sysCaretBitmap;
-    int sysCaretWidth;
-    int sysCaretHeight;
-#endif
-   
-    friend class wxSTCCallTip;
-};
-
-//----------------------------------------------------------------------
-#endif
diff --git a/src/stc/gen_iface.py b/src/stc/gen_iface.py
deleted file mode 100644
index c432d18884..0000000000
--- a/src/stc/gen_iface.py
+++ /dev/null
@@ -1,896 +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, os
-from fileinput import FileInput
-
-
-IFACE         = os.path.abspath('./scintilla/include/Scintilla.iface')
-H_TEMPLATE    = os.path.abspath('./stc.h.in')
-CPP_TEMPLATE  = os.path.abspath('./stc.cpp.in')
-H_DEST        = os.path.abspath('../../include/wx/stc/stc.h')
-CPP_DEST      = os.path.abspath('./stc.cpp')
-DOCSTR_DEST   = os.path.abspath('../../../wxPython/contrib/stc/_stc_gendocs.i')
-
-
-# Value prefixes to convert
-valPrefixes = [('SCI_', ''),
-               ('SC_',  ''),
-               ('SCN_', None),  # just toss these out...
-               ('SCEN_', None),
-               ('SCE_', ''),
-               ('SCLEX_', 'LEX_'),
-               ('SCK_', 'KEY_'),
-               ('SCFIND_', 'FIND_'),
-               ('SCWS_', 'WS_'),
-]
-
-# Message function values that should have a CMD_ constant generated
-cmdValues = [ (2300, 2349),
-              2011,
-              2013,
-              (2176, 2180),
-              (2390, 2393),
-              (2395, 2396),
-              2404,
-              (2413, 2416),
-              (2426, 2442),
-              (2450, 2455),
-            ]
-
-
-# Should a funciton be also generated for the CMDs?
-FUNC_FOR_CMD = True
-
-
-# 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) {
-                    wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-                    SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
-                 0),
-
-    'AddStyledText' : (0,
-                       'void %s(const wxMemoryBuffer& data);',
-
-                       '''void %s(const wxMemoryBuffer& data) {
-                          SendMsg(%s, data.GetDataLen(), (long)data.GetData());''',
-                       0),
-
-    'AppendText' : (0,
-                 'void %s(const wxString& text);',
-
-                 '''void %s(const wxString& text) {
-                    wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-                    SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
-                 0),
-
-    'GetViewWS' : ( 'GetViewWhiteSpace', 0, 0, 0),
-    'SetViewWS' : ( 'SetViewWhiteSpace', 0, 0, 0),
-
-    'GetCharAt' :
-    ( 0, 0,
-      '''int %s(int pos) {
-         return (unsigned char)SendMsg(%s, pos, 0);''',
-      0),
-
-    'GetStyleAt' :
-    ( 0, 0,
-      '''int %s(int pos) {
-         return (unsigned char)SendMsg(%s, pos, 0);''',
-      0),
-
-    'GetStyledText' :
-    (0,
-     'wxMemoryBuffer %s(int startPos, int endPos);',
-
-     '''wxMemoryBuffer %s(int startPos, int endPos) {
-        wxMemoryBuffer buf;
-        if (endPos < startPos) {
-            int temp = startPos;
-            startPos = endPos;
-            endPos = temp;
-        }
-        int len = endPos - startPos;
-        if (!len) return buf;
-        TextRange tr;
-        tr.lpstrText = (char*)buf.GetWriteBuf(len*2+1);
-        tr.chrg.cpMin = startPos;
-        tr.chrg.cpMax = endPos;
-        len = SendMsg(%s, 0, (long)&tr);
-        buf.UngetWriteBuf(len);
-        return buf;''',
-
-     ('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,
-     '#ifdef SWIG\n    wxString %s(int* OUTPUT);\n#else\n    wxString GetCurLine(int* linePos=NULL);\n#endif',
-
-        '''wxString %s(int* linePos) {
-        int len = LineLength(GetCurrentLine());
-        if (!len) {
-            if (linePos)  *linePos = 0;
-            return wxEmptyString;
-        }
-
-        wxMemoryBuffer mbuf(len+1);
-        char* buf = (char*)mbuf.GetWriteBuf(len+1);
-
-        int pos = SendMsg(%s, len+1, (long)buf);
-        mbuf.UngetWriteBuf(len);
-        mbuf.AppendByte(0);
-        if (linePos)  *linePos = pos;
-        return stc2wx(buf);''',
-
-     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 fore and background colours.')),
-
-
-    'MarkerDefinePixmap' :
-    ('MarkerDefineBitmap',
-     '''void %s(int markerNumber, const wxBitmap& bmp);''',
-     '''void %s(int markerNumber, const wxBitmap& bmp) {
-        // convert bmp to a xpm in a string
-        wxMemoryOutputStream strm;
-        wxImage img = bmp.ConvertToImage();
-        if (img.HasAlpha())
-            img.ConvertAlphaToMask();
-        img.SaveFile(strm, wxBITMAP_TYPE_XPM);
-        size_t len = strm.GetSize();
-        char* buff = new char[len+1];
-        strm.CopyTo(buff, len);
-        buff[len] = 0;
-        SendMsg(%s, markerNumber, (long)buff);
-        delete [] buff;
-        ''',
-     ('Define a marker from a bitmap',)),
-
-
-    '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),
-    '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),
-
-    'SetWhitespaceFore' : ('SetWhitespaceForeground', 0, 0, 0),
-    'SetWhitespaceBack' : ('SetWhitespaceBackground', 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),
-    'AutoCSetAutoHide' : ('AutoCompSetAutoHide', 0, 0, 0),
-    'AutoCGetAutoHide' : ('AutoCompGetAutoHide', 0, 0, 0),
-    'AutoCSetDropRestOfWord' : ('AutoCompSetDropRestOfWord', 0,0,0),
-    'AutoCGetDropRestOfWord' : ('AutoCompGetDropRestOfWord', 0,0,0),
-    'AutoCGetTypeSeparator' : ('AutoCompGetTypeSeparator', 0, 0, 0),
-    'AutoCSetTypeSeparator' : ('AutoCompSetTypeSeparator', 0, 0, 0),
-    'AutoCGetCurrent'       : ('AutoCompGetCurrent', 0, 0, 0),
-    'AutoCSetMaxWidth'      : ('AutoCompSetMaxWidth', 0, 0, 0),
-    'AutoCGetMaxWidth'      : ('AutoCompGetMaxWidth', 0, 0, 0),
-    'AutoCSetMaxHeight'     : ('AutoCompSetMaxHeight', 0, 0, 0),
-    'AutoCGetMaxHeight'     : ('AutoCompGetMaxHeight', 0, 0, 0),
-    'AutoCGetMaxHeight'     : ('AutoCompGetMaxHeight', 0, 0, 0),
-    
-    'RegisterImage' :
-    (0,
-     '''void %s(int type, const wxBitmap& bmp);''',
-     '''void %s(int type, const wxBitmap& bmp) {
-        // convert bmp to a xpm in a string
-        wxMemoryOutputStream strm;
-        wxImage img = bmp.ConvertToImage();
-        if (img.HasAlpha())
-            img.ConvertAlphaToMask();
-        img.SaveFile(strm, wxBITMAP_TYPE_XPM);
-        size_t len = strm.GetSize();
-        char* buff = new char[len+1];
-        strm.CopyTo(buff, len);
-        buff[len] = 0;
-        SendMsg(%s, type, (long)buff);
-        delete [] buff;
-     ''',
-     ('Register an image for use in autocompletion lists.',)),
-
-
-    'ClearRegisteredImages' : (0, 0, 0,
-                               ('Clear all the registered images.',)),
-
-
-    'SetHScrollBar' : ('SetUseHorizontalScrollBar', 0, 0, 0),
-    'GetHScrollBar' : ('GetUseHorizontalScrollBar', 0, 0, 0),
-
-    'SetVScrollBar' : ('SetUseVerticalScrollBar', 0, 0, 0),
-    'GetVScrollBar' : ('GetUseVerticalScrollBar', 0, 0, 0),
-
-    'GetCaretFore' : ('GetCaretForeground', 0, 0, 0),
-
-    'GetUsePalette' : (None, 0, 0, 0),
-
-    'FindText' :
-    (0,
-     '''int %s(int minPos, int maxPos, const wxString& text, int flags=0);''',
-
-     '''int %s(int minPos, int maxPos,
-               const wxString& text,
-               int flags) {
-            TextToFind  ft;
-            ft.chrg.cpMin = minPos;
-            ft.chrg.cpMax = maxPos;
-            wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-            ft.lpstrText = (char*)(const char*)buf;
-
-            return SendMsg(%s, flags, (long)&ft);''',
-     0),
-
-    'FormatRange' :
-    (0,
-     '''int %s(bool   doDraw,
-               int    startPos,
-               int    endPos,
-               wxDC*  draw,
-               wxDC*  target, 
-               wxRect renderRect,
-               wxRect pageRect);''',
-     ''' int %s(bool   doDraw,
-                int    startPos,
-                int    endPos,
-                wxDC*  draw,
-                wxDC*  target, 
-                wxRect renderRect,
-                wxRect pageRect) {
-             RangeToFormat fr;
-
-             if (endPos < startPos) {
-                 int temp = startPos;
-                 startPos = endPos;
-                 endPos = temp;
-             }
-             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) {
-         int len = LineLength(line);
-         if (!len) return wxEmptyString;
-
-         wxMemoryBuffer mbuf(len+1);
-         char* buf = (char*)mbuf.GetWriteBuf(len+1);
-         SendMsg(%s, line, (long)buf);
-         mbuf.UngetWriteBuf(len);
-         mbuf.AppendByte(0);
-         return stc2wx(buf);''',
-
-     ('Retrieve the contents of a line.',)),
-
-    'SetSel' : ('SetSelection', 0, 0, 0),
-
-    'GetSelText' :
-    ('GetSelectedText',
-     'wxString %s();',
-
-     '''wxString %s() {
-         int   start;
-         int   end;
-
-         GetSelection(&start, &end);
-         int   len  = end - start;
-         if (!len) return wxEmptyString;
-
-         wxMemoryBuffer mbuf(len+2);
-         char* buf = (char*)mbuf.GetWriteBuf(len+1);
-         SendMsg(%s, 0, (long)buf);
-         mbuf.UngetWriteBuf(len);
-         mbuf.AppendByte(0);
-         return stc2wx(buf);''',
-
-     ('Retrieve the selected text.',)),
-
-
-    'GetTextRange' :
-    (0,
-     'wxString %s(int startPos, int endPos);',
-
-     '''wxString %s(int startPos, int endPos) {
-         if (endPos < startPos) {
-             int temp = startPos;
-             startPos = endPos;
-             endPos = temp;
-         }
-         int   len  = endPos - startPos;
-         if (!len) return wxEmptyString;
-         wxMemoryBuffer mbuf(len+1);
-         char* buf = (char*)mbuf.GetWriteBuf(len);
-         TextRange tr;
-         tr.lpstrText = buf;
-         tr.chrg.cpMin = startPos;
-         tr.chrg.cpMax = endPos;
-         SendMsg(%s, 0, (long)&tr);
-         mbuf.UngetWriteBuf(len);
-         mbuf.AppendByte(0);
-         return stc2wx(buf);''',
-
-     ('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() {
-         int len  = GetTextLength();
-         wxMemoryBuffer mbuf(len+1);   // leave room for the null...
-         char* buf = (char*)mbuf.GetWriteBuf(len+1);
-         SendMsg(%s, len+1, (long)buf);
-         mbuf.UngetWriteBuf(len);
-         mbuf.AppendByte(0);
-         return stc2wx(buf);''',
-
-     ('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),
-    'CallTipSetFore'    : ('CallTipSetForeground', 0, 0, 0),
-    'CallTipSetForeHlt' : ('CallTipSetForegroundHighlight', 0, 0, 0),
-
-    'SetHotspotActiveFore' : ('SetHotspotActiveForeground', 0, 0, 0),
-    'SetHotspotActiveBack' : ('SetHotspotActiveBackground', 0, 0, 0),
-    
-    'GetCaretLineBack' : ('GetCaretLineBackground', 0, 0, 0),
-    'SetCaretLineBack' : ('SetCaretLineBackground', 0, 0, 0),
-
-    'ReplaceTarget' :
-    (0,
-     'int %s(const wxString& text);',
-
-     '''
-     int %s(const wxString& text) {
-         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-         return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
-     0),
-
-    'ReplaceTargetRE' :
-    (0,
-     'int %s(const wxString& text);',
-
-     '''
-     int %s(const wxString& text) {
-         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-         return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
-     0),
-
-    'SearchInTarget' :
-    (0,
-     'int %s(const wxString& text);',
-
-     '''
-     int %s(const wxString& text) {
-         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-         return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
-     0),
-
-    # not sure what to do about these yet
-    'TargetAsUTF8' :       ( None, 0, 0, 0),
-    'SetLengthForEncode' : ( None, 0, 0, 0),
-    'EncodedFromUTF8' :    ( None, 0, 0, 0),
-
-
-    'GetProperty' :
-    (0,
-     'wxString %s(const wxString& key);',
-
-     '''wxString %s(const wxString& key) {
-         int len = SendMsg(SCI_GETPROPERTY, (long)(const char*)wx2stc(key), (long)NULL);
-         if (!len) return wxEmptyString;
-
-         wxMemoryBuffer mbuf(len+1);
-         char* buf = (char*)mbuf.GetWriteBuf(len+1);
-         SendMsg(%s, (long)(const char*)wx2stc(key), (long)buf);
-         mbuf.UngetWriteBuf(len);
-         mbuf.AppendByte(0);
-         return stc2wx(buf);''',
-     ("Retrieve a 'property' value previously set with SetProperty.",)),
-
-    'GetPropertyExpanded' :
-    (0,
-     'wxString %s(const wxString& key);',
-
-     '''wxString %s(const wxString& key) {
-         int len = SendMsg(SCI_GETPROPERTYEXPANDED, (long)(const char*)wx2stc(key), (long)NULL);
-         if (!len) return wxEmptyString;
-
-         wxMemoryBuffer mbuf(len+1);
-         char* buf = (char*)mbuf.GetWriteBuf(len+1);
-         SendMsg(%s, (long)(const char*)wx2stc(key), (long)buf);
-         mbuf.UngetWriteBuf(len);
-         mbuf.AppendByte(0);
-         return stc2wx(buf);''',
-     ("Retrieve a 'property' value previously set with SetProperty,",
-      "with '$()' variable replacement on returned buffer.")),
-
-    'GetPropertyInt'   : (0, 0, 0,
-       ("Retrieve a 'property' value previously set with SetProperty,",
-        "interpreted as an int AFTER any '$()' variable replacement.")),
-
-
-    'GetDocPointer' :
-    (0,
-     'void* %s();',
-     '''void* %s() {
-         return (void*)SendMsg(%s);''',
-     0),
-
-    'SetDocPointer' :
-    (0,
-     'void %s(void* docPointer);',
-     '''void %s(void* docPointer) {
-         SendMsg(%s, 0, (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, 0, (long)docPointer);''',
-     0),
-
-    'ReleaseDocument' :
-    (0,
-     'void %s(void* docPointer);',
-     '''void %s(void* docPointer) {
-         SendMsg(%s, 0, (long)docPointer);''',
-     0),
-
-    'SetCodePage' :
-    (0,
-     0,
-     '''void %s(int codePage) {
-#if wxUSE_UNICODE
-    wxASSERT_MSG(codePage == wxSTC_CP_UTF8,
-                 wxT("Only wxSTC_CP_UTF8 may be used when wxUSE_UNICODE is on."));
-#else
-    wxASSERT_MSG(codePage != wxSTC_CP_UTF8,
-                 wxT("wxSTC_CP_UTF8 may not be used when wxUSE_UNICODE is off."));
-#endif
-    SendMsg(%s, codePage);''',
-     ("Set the code page used to interpret the bytes of the document as characters.",) ),
-
-
-    'GrabFocus' : (None, 0, 0, 0),
-
-    # Rename some that would otherwise hide the wxWindow methods
-    'SetFocus'  : ('SetSTCFocus', 0, 0, 0),
-    'GetFocus'  : ('GetSTCFocus', 0, 0, 0),
-    'SetCursor' : ('SetSTCCursor', 0, 0, 0),
-    'GetCursor' : ('GetSTCCursor', 0, 0, 0),
-
-    'LoadLexerLibrary' : (None, 0,0,0),
-
-
-    '' : ('', 0, 0, 0),
-
-    }
-
-#----------------------------------------------------------------------------
-
-def processIface(iface, h_tmplt, cpp_tmplt, h_dest, cpp_dest, docstr_dest):
-    curDocStrings = []
-    values = []
-    methods = []
-    cmds = []
-
-    # 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, cmds)
-            curDocStrings = []
-
-        elif op == 'cat ':
-            if string.strip(line[4:]) == 'Deprecated':
-                break    # skip the rest of the file
-
-        elif op == 'evt ':
-            pass
-
-        elif op == 'enu ':
-            pass
-
-        elif op == 'lex ':
-            pass
-
-        else:
-            print '***** Unknown line type: ', line
-
-
-    # process templates
-    data = {}
-    data['VALUES'] = processVals(values)
-    data['CMDS']   = processVals(cmds)
-    defs, imps, docstrings = 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)
-    open(docstr_dest, 'w').write(docstrings)
-
-
-
-#----------------------------------------------------------------------------
-
-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 = []
-    dstr = []
-
-    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 docstrings
-        st = 'DocStr(wxStyledTextCtrl::%s,\n' \
-             '"%s", "");\n' % (name, '\n'.join(docs))
-        dstr.append(st)
-        
-        # 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 '\n'.join(defs), '\n'.join(imps), '\n'.join(dstr)
-
-
-#----------------------------------------------------------------------------
-
-def checkMethodOverride(name, number, docs):
-    theDef = theImp = None
-    if methodOverrideMap.has_key(name):
-        item = methodOverrideMap[name]
-
-        try:
-            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]
-        except:
-            print "*************", name
-            raise
-
-    return name, theDef, theImp, docs
-
-#----------------------------------------------------------------------------
-
-def makeArgString(param):
-    if not param:
-        return '0'
-
-    typ, name = param
-
-    if typ == 'string':
-        return '(long)(const char*)wx2stc(%s)' % 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 functions 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, docs)
-            
-            # if we are not also doing a function for CMD values, then
-            # just return, otherwise fall through to the append blow.
-            if not FUNC_FOR_CMD:
-                return
-                
-    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, DOCSTR_DEST)
-
-
-
-if __name__ == '__main__':
-    main(sys.argv)
-
-#----------------------------------------------------------------------------
-
diff --git a/src/stc/scintilla/License.txt b/src/stc/scintilla/License.txt
deleted file mode 100644
index cbe25b2fc2..0000000000
--- a/src/stc/scintilla/License.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-License for Scintilla and SciTE
-
-Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-
-All Rights Reserved 
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that 
-both that copyright notice and this permission notice appear in 
-supporting documentation. 
-
-NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY 
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, 
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER 
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE 
-OR PERFORMANCE OF THIS SOFTWARE. 
\ No newline at end of file
diff --git a/src/stc/scintilla/README.txt b/src/stc/scintilla/README.txt
deleted file mode 100644
index 89ff867d44..0000000000
--- a/src/stc/scintilla/README.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-This directory contains copies of the scintilla/src and
-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.70
-
diff --git a/src/stc/scintilla/include/Accessor.h b/src/stc/scintilla/include/Accessor.h
deleted file mode 100644
index 0b2c4baee2..0000000000
--- a/src/stc/scintilla/include/Accessor.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Scintilla source code edit control
-/** @file Accessor.h
- ** Rapid easy access to contents of a Scintilla.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-enum { wsSpace = 1, wsTab = 2, wsSpaceTab = 4, wsInconsistent=8};
-
-class Accessor;
-
-typedef bool (*PFNIsCommentLeader)(Accessor &styler, int pos, int len);
-
-/**
- * Interface to data in a Scintilla.
- */
-class Accessor {
-protected:
-	enum {extremePosition=0x7FFFFFFF};
-	/** @a bufferSize is a trade off between time taken to copy the characters
-	 * and retrieval overhead.
-	 * @a slopSize positions the buffer before the desired position
-	 * in case there is some backtracking. */
-	enum {bufferSize=4000, slopSize=bufferSize/8};
-	char buf[bufferSize+1];
-	int startPos;
-	int endPos;
-	int codePage;	
-
-	virtual bool InternalIsLeadByte(char ch)=0;
-	virtual void Fill(int position)=0;
-
-public:
-	Accessor() : startPos(extremePosition), endPos(0), codePage(0) {}
-	virtual ~Accessor() {}
-	char operator[](int position) {
-		if (position < startPos || position >= endPos) {
-			Fill(position);
-		}
-		return buf[position - startPos];
-	}
-	/** Safe version of operator[], returning a defined value for invalid position. */
-	char SafeGetCharAt(int position, char chDefault=' ') {
-		if (position < startPos || position >= endPos) {
-			Fill(position);
-			if (position < startPos || position >= endPos) {
-				// Position is outside range of document 
-				return chDefault;
-			}
-		}
-		return buf[position - startPos];
-	}
-	bool IsLeadByte(char ch) {
-		return codePage && InternalIsLeadByte(ch);
-	}
-	void SetCodePage(int codePage_) { codePage = codePage_; }
-
-	virtual bool Match(int pos, const char *s)=0;
-	virtual char StyleAt(int position)=0;
-	virtual int GetLine(int position)=0;
-	virtual int LineStart(int line)=0;
-	virtual int LevelAt(int line)=0;
-	virtual int Length()=0;
-	virtual void Flush()=0;
-	virtual int GetLineState(int line)=0;
-	virtual int SetLineState(int line, int state)=0;
-	virtual int GetPropertyInt(const char *key, int defaultValue=0)=0;
-	virtual char *GetProperties()=0;
-
-	// Style setting
-	virtual void StartAt(unsigned int start, char chMask=31)=0;
-	virtual void SetFlags(char chFlags_, char chWhile_)=0;
-	virtual unsigned int GetStartSegment()=0;
-	virtual void StartSegment(unsigned int pos)=0;
-	virtual void ColourTo(unsigned int pos, int chAttr)=0;
-	virtual void SetLevel(int line, int level)=0;
-	virtual int IndentAmount(int line, int *flags, PFNIsCommentLeader pfnIsCommentLeader = 0)=0;
-};
diff --git a/src/stc/scintilla/include/KeyWords.h b/src/stc/scintilla/include/KeyWords.h
deleted file mode 100644
index 059ac0da0f..0000000000
--- a/src/stc/scintilla/include/KeyWords.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Scintilla source code edit control
-/** @file KeyWords.h
- ** Colourise for particular languages.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-typedef void (*LexerFunction)(unsigned int startPos, int lengthDoc, int initStyle,
-                  WordList *keywordlists[], Accessor &styler);
-                  
-/**
- * A LexerModule is responsible for lexing and folding a particular language.
- * The class maintains a list of LexerModules which can be searched to find a
- * module appropriate to a particular language.
- */
-class LexerModule {
-protected:
-	const LexerModule *next;
-	int language;
-	LexerFunction fnLexer;
-	LexerFunction fnFolder;
-	const char * const * wordListDescriptions;
-	int styleBits;
-
-	static const LexerModule *base;
-	static int nextLanguage;
-
-public:
-	const char *languageName;
-	LexerModule(int language_, 
-		LexerFunction fnLexer_, 
-		const char *languageName_=0, 
-		LexerFunction fnFolder_=0,
-		const char * const wordListDescriptions_[] = NULL,
-		int styleBits_=5);
-	virtual ~LexerModule() {
-	}
-	int GetLanguage() const { return language; }
-
-	// -1 is returned if no WordList information is available
-	int GetNumWordLists() const;
-	const char *GetWordListDescription(int index) const;
-
-	int GetStyleBitsNeeded() const;
-
-	virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,
-                  WordList *keywordlists[], Accessor &styler) const;
-	virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle,
-                  WordList *keywordlists[], Accessor &styler) const;
-	static const LexerModule *Find(int language);
-	static const LexerModule *Find(const char *languageName);
-};
-
-/**
- * Check if a character is a space.
- * This is ASCII specific but is safe with chars >= 0x80.
- */
-inline bool isspacechar(unsigned char ch) {
-    return (ch == ' ') || ((ch >= 0x09) && (ch <= 0x0d));
-}
-
-inline bool iswordchar(char ch) {
-	return isascii(ch) && (isalnum(ch) || ch == '.' || ch == '_');
-}
-
-inline bool iswordstart(char ch) {
-	return isascii(ch) && (isalnum(ch) || ch == '_');
-}
-
-inline bool isoperator(char ch) {
-	if (isascii(ch) && isalnum(ch))
-		return false;
-	// '.' left out as it is used to make up numbers
-	if (ch == '%' || ch == '^' || ch == '&' || ch == '*' ||
-	        ch == '(' || ch == ')' || ch == '-' || ch == '+' ||
-	        ch == '=' || ch == '|' || ch == '{' || ch == '}' ||
-	        ch == '[' || ch == ']' || ch == ':' || ch == ';' ||
-	        ch == '<' || ch == '>' || ch == ',' || ch == '/' ||
-	        ch == '?' || ch == '!' || ch == '.' || ch == '~')
-		return true;
-	return false;
-}
diff --git a/src/stc/scintilla/include/Platform.h b/src/stc/scintilla/include/Platform.h
deleted file mode 100644
index 9dafa9f7d6..0000000000
--- a/src/stc/scintilla/include/Platform.h
+++ /dev/null
@@ -1,517 +0,0 @@
-// Scintilla source code edit control
-/** @file Platform.h
- ** Interface to platform facilities. Also includes some basic utilities.
- ** Implemented in PlatGTK.cxx for GTK+/Linux, PlatWin.cxx for Windows, and PlatWX.cxx for wxWidgets.
- **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef PLATFORM_H
-#define PLATFORM_H
-
-// PLAT_GTK = GTK+ on Linux or Win32
-// PLAT_GTK_WIN32 is defined additionally when running PLAT_GTK under Win32
-// PLAT_WIN = Win32 API on Win32 OS
-// PLAT_WX is wxWidgets on any supported platform
-
-#define PLAT_GTK 0
-#define PLAT_GTK_WIN32 0
-#define PLAT_WIN 0
-#define PLAT_WX  0
-#define PLAT_FOX 0
-
-#if defined(FOX)
-#undef PLAT_FOX
-#define PLAT_FOX 1
-
-#elif defined(__WX__)
-#undef PLAT_WX
-#define PLAT_WX  1
-
-#elif defined(GTK)
-#undef PLAT_GTK
-#define PLAT_GTK 1
-
-#ifdef _MSC_VER
-#undef PLAT_GTK_WIN32
-#define PLAT_GTK_WIN32 1
-#endif
-
-#else
-#undef PLAT_WIN
-#define PLAT_WIN 1
-
-#endif
-
-
-// Underlying the implementation of the platform classes are platform specific types.
-// Sometimes these need to be passed around by client code so they are defined here
-
-typedef void *FontID;
-typedef void *SurfaceID;
-typedef void *WindowID;
-typedef void *MenuID;
-typedef void *TickerID;
-typedef void *Function;
-typedef void *IdlerID;
-
-/**
- * A geometric point class.
- * Point is exactly the same as the Win32 POINT and GTK+ GdkPoint so can be used interchangeably.
- */
-class Point {
-public:
-	int x;
-	int y;
-
-	explicit Point(int x_=0, int y_=0) : x(x_), y(y_) {
-	}
-
-	// Other automatically defined methods (assignment, copy constructor, destructor) are fine
-
-	static Point FromLong(long lpoint);
-};
-
-/**
- * A geometric rectangle class.
- * PRectangle is exactly the same as the Win32 RECT so can be used interchangeably.
- * PRectangles contain their top and left sides, but not their right and bottom sides.
- */
-class PRectangle {
-public:
-	int left;
-	int top;
-	int right;
-	int bottom;
-
-	PRectangle(int left_=0, int top_=0, int right_=0, int bottom_ = 0) :
-		left(left_), top(top_), right(right_), bottom(bottom_) {
-	}
-
-	// Other automatically defined methods (assignment, copy constructor, destructor) are fine
-
-	bool operator==(PRectangle &rc) {
-		return (rc.left == left) && (rc.right == right) &&
-			(rc.top == top) && (rc.bottom == bottom);
-	}
-	bool Contains(Point pt) {
-		return (pt.x >= left) && (pt.x <= right) &&
-			(pt.y >= top) && (pt.y <= bottom);
-	}
-	bool Contains(PRectangle rc) {
-		return (rc.left >= left) && (rc.right <= right) &&
-			(rc.top >= top) && (rc.bottom <= bottom);
-	}
-	bool Intersects(PRectangle other) {
-		return (right > other.left) && (left < other.right) &&
-			(bottom > other.top) && (top < other.bottom);
-	}
-	void Move(int xDelta, int yDelta) {
-		left += xDelta;
-		top += yDelta;
-		right += xDelta;
-		bottom += yDelta;
-	}
-	int Width() { return right - left; }
-	int Height() { return bottom - top; }
-};
-
-/**
- * In some circumstances, including Win32 in paletted mode and GTK+, each colour
- * must be allocated before use. The desired colours are held in the ColourDesired class,
- * and after allocation the allocation entry is stored in the ColourAllocated class. In other
- * circumstances, such as Win32 in true colour mode, the allocation process just copies
- * the RGB values from the desired to the allocated class.
- * As each desired colour requires allocation before it can be used, the ColourPair class
- * holds both a ColourDesired and a ColourAllocated
- * The Palette class is responsible for managing the palette of colours which contains a
- * list of ColourPair objects and performs the allocation.
- */
-
-/**
- * Holds a desired RGB colour.
- */
-class ColourDesired {
-	long co;
-public:
-	ColourDesired(long lcol=0) {
-		co = lcol;
-	}
-
-	ColourDesired(unsigned int red, unsigned int green, unsigned int blue) {
-		Set(red, green, blue);
-	}
-
-	bool operator==(const ColourDesired &other) const {
-		return co == other.co;
-	}
-
-	void Set(long lcol) {
-		co = lcol;
-	}
-
-	void Set(unsigned int red, unsigned int green, unsigned int blue) {
-		co = red | (green << 8) | (blue << 16);
-	}
-
-	static inline unsigned int ValueOfHex(const char ch) {
-		if (ch >= '0' && ch <= '9')
-			return ch - '0';
-		else if (ch >= 'A' && ch <= 'F')
-			return ch - 'A' + 10;
-		else if (ch >= 'a' && ch <= 'f')
-			return ch - 'a' + 10;
-		else
-			return 0;
-	}
-
-	void Set(const char *val) {
-		if (*val == '#') {
-			val++;
-		}
-		unsigned int r = ValueOfHex(val[0]) * 16 + ValueOfHex(val[1]);
-		unsigned int g = ValueOfHex(val[2]) * 16 + ValueOfHex(val[3]);
-		unsigned int b = ValueOfHex(val[4]) * 16 + ValueOfHex(val[5]);
-		Set(r, g, b);
-	}
-
-	long AsLong() const {
-		return co;
-	}
-
-	unsigned int GetRed() {
-		return co & 0xff;
-	}
-
-	unsigned int GetGreen() {
-		return (co >> 8) & 0xff;
-	}
-
-	unsigned int GetBlue() {
-		return (co >> 16) & 0xff;
-	}
-};
-
-/**
- * Holds an allocated RGB colour which may be an approximation to the desired colour.
- */
-class ColourAllocated {
-	long coAllocated;
-
-public:
-
-	ColourAllocated(long lcol=0) {
-		coAllocated = lcol;
-	}
-
-	void Set(long lcol) {
-		coAllocated = lcol;
-	}
-
-	long AsLong() const {
-		return coAllocated;
-	}
-};
-
-/**
- * Colour pairs hold a desired colour and an allocated colour.
- */
-struct ColourPair {
-	ColourDesired desired;
-	ColourAllocated allocated;
-
-	ColourPair(ColourDesired desired_=ColourDesired(0,0,0)) {
-		desired = desired_;
-		allocated.Set(desired.AsLong());
-	}
-	void Copy() {
-		allocated.Set(desired.AsLong());
-	}
-};
-
-class Window;	// Forward declaration for Palette
-
-/**
- * Colour palette management.
- */
-class Palette {
-	int used;
-	int size;
-	ColourPair *entries;
-#if PLAT_GTK
-	void *allocatedPalette; // GdkColor *
-	int allocatedLen;
-#endif
-	// Private so Palette objects can not be copied
-	Palette(const Palette &) {}
-	Palette &operator=(const Palette &) { return *this; }
-public:
-#if PLAT_WIN
-	void *hpal;
-#endif
-	bool allowRealization;
-
-	Palette();
-	~Palette();
-
-	void Release();
-
-	/**
-	 * This method either adds a colour to the list of wanted colours (want==true)
-	 * or retrieves the allocated colour back to the ColourPair.
-	 * This is one method to make it easier to keep the code for wanting and retrieving in sync.
-	 */
-	void WantFind(ColourPair &cp, bool want);
-
-	void Allocate(Window &w);
-};
-
-/**
- * Font management.
- */
-class Font {
-protected:
-	FontID id;
-#if PLAT_WX
-	int ascent;
-#endif
-	// Private so Font objects can not be copied
-	Font(const Font &) {}
-	Font &operator=(const Font &) { id=0; return *this; }
-public:
-	Font();
-	virtual ~Font();
-
-	virtual void Create(const char *faceName, int characterSet, int size,
-		bool bold, bool italic, bool extraFontFlag=false);
-	virtual void Release();
-
-	FontID GetID() { return id; }
-	// Alias another font - caller guarantees not to Release
-	void SetID(FontID id_) { id = id_; }
-	friend class Surface;
-        friend class SurfaceImpl;
-};
-
-/**
- * A surface abstracts a place to draw.
- */
-class Surface {
-private:
-	// Private so Surface objects can not be copied
-	Surface(const Surface &) {}
-	Surface &operator=(const Surface &) { return *this; }
-public:
-	Surface() {};
-	virtual ~Surface() {};
-	static Surface *Allocate();
-
-	virtual void Init(WindowID wid)=0;
-	virtual void Init(SurfaceID sid, WindowID wid)=0;
-	virtual void InitPixMap(int width, int height, Surface *surface_, WindowID wid)=0;
-
-	virtual void Release()=0;
-	virtual bool Initialised()=0;
-	virtual void PenColour(ColourAllocated fore)=0;
-	virtual int LogPixelsY()=0;
-	virtual int DeviceHeightFont(int points)=0;
-	virtual void MoveTo(int x_, int y_)=0;
-	virtual void LineTo(int x_, int y_)=0;
-	virtual void Polygon(Point *pts, int npts, ColourAllocated fore, ColourAllocated back)=0;
-	virtual void RectangleDraw(PRectangle rc, ColourAllocated fore, ColourAllocated back)=0;
-	virtual void FillRectangle(PRectangle rc, ColourAllocated back)=0;
-	virtual void FillRectangle(PRectangle rc, Surface &surfacePattern)=0;
-	virtual void RoundedRectangle(PRectangle rc, ColourAllocated fore, ColourAllocated back)=0;
-	virtual void AlphaRectangle(PRectangle rc, int cornerSize, ColourAllocated fill, int alphaFill,
-		ColourAllocated outline, int alphaOutline, int flags)=0;
-	virtual void Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back)=0;
-	virtual void Copy(PRectangle rc, Point from, Surface &surfaceSource)=0;
-
-	virtual void DrawTextNoClip(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore, ColourAllocated back)=0;
-	virtual void DrawTextClipped(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore, ColourAllocated back)=0;
-	virtual void DrawTextTransparent(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore)=0;
-	virtual void MeasureWidths(Font &font_, const char *s, int len, int *positions)=0;
-	virtual int WidthText(Font &font_, const char *s, int len)=0;
-	virtual int WidthChar(Font &font_, char ch)=0;
-	virtual int Ascent(Font &font_)=0;
-	virtual int Descent(Font &font_)=0;
-	virtual int InternalLeading(Font &font_)=0;
-	virtual int ExternalLeading(Font &font_)=0;
-	virtual int Height(Font &font_)=0;
-	virtual int AverageCharWidth(Font &font_)=0;
-
-	virtual int SetPalette(Palette *pal, bool inBackGround)=0;
-	virtual void SetClip(PRectangle rc)=0;
-	virtual void FlushCachedState()=0;
-
-	virtual void SetUnicodeMode(bool unicodeMode_)=0;
-	virtual void SetDBCSMode(int codePage)=0;
-};
-
-/**
- * A simple callback action passing one piece of untyped user data.
- */
-typedef void (*CallBackAction)(void*);
-
-/**
- * Class to hide the details of window manipulation.
- * Does not own the window which will normally have a longer life than this object.
- */
-class Window {
-protected:
-	WindowID id;
-public:
-	Window() : id(0), cursorLast(cursorInvalid) {}
-	Window(const Window &source) : id(source.id), cursorLast(cursorInvalid) {}
-	virtual ~Window();
-	Window &operator=(WindowID id_) {
-		id = id_;
-		return *this;
-	}
-	WindowID GetID() const { return id; }
-	bool Created() const { return id != 0; }
-	void Destroy();
-	bool HasFocus();
-	PRectangle GetPosition();
-	void SetPosition(PRectangle rc);
-	void SetPositionRelative(PRectangle rc, Window relativeTo);
-	PRectangle GetClientPosition();
-	void Show(bool show=true);
-	void InvalidateAll();
-	void InvalidateRectangle(PRectangle rc);
-	virtual void SetFont(Font &font);
-	enum Cursor { cursorInvalid, cursorText, cursorArrow, cursorUp, cursorWait, cursorHoriz, cursorVert, cursorReverseArrow, cursorHand };
-	void SetCursor(Cursor curs);
-	void SetTitle(const char *s);
-private:
-	Cursor cursorLast;
-};
-
-/**
- * Listbox management.
- */
-
-class ListBox : public Window {
-public:
-	ListBox();
-	virtual ~ListBox();
-	static ListBox *Allocate();
-
-	virtual void SetFont(Font &font)=0;
-	virtual void Create(Window &parent, int ctrlID, Point location, int lineHeight_, bool unicodeMode_)=0;
-	virtual void SetAverageCharWidth(int width)=0;
-	virtual void SetVisibleRows(int rows)=0;
-	virtual int GetVisibleRows() const=0;
-	virtual PRectangle GetDesiredRect()=0;
-	virtual int CaretFromEdge()=0;
-	virtual void Clear()=0;
-	virtual void Append(char *s, int type = -1)=0;
-	virtual int Length()=0;
-	virtual void Select(int n)=0;
-	virtual int GetSelection()=0;
-	virtual int Find(const char *prefix)=0;
-	virtual void GetValue(int n, char *value, int len)=0;
-	virtual void RegisterImage(int type, const char *xpm_data)=0;
-	virtual void ClearRegisteredImages()=0;
-	virtual void SetDoubleClickAction(CallBackAction, void *)=0;
-	virtual void SetList(const char* list, char separator, char typesep)=0;
-};
-
-/**
- * Menu management.
- */
-class Menu {
-	MenuID id;
-public:
-	Menu();
-	MenuID GetID() { return id; }
-	void CreatePopUp();
-	void Destroy();
-	void Show(Point pt, Window &w);
-};
-
-class ElapsedTime {
-	long bigBit;
-	long littleBit;
-public:
-	ElapsedTime();
-	double Duration(bool reset=false);
-};
-
-/**
- * Dynamic Library (DLL/SO/...) loading
- */
-class DynamicLibrary {
-public:
-	virtual ~DynamicLibrary() {};
-
-	/// @return Pointer to function "name", or NULL on failure.
-	virtual Function FindFunction(const char *name) = 0;
-
-	/// @return true if the library was loaded successfully.
-	virtual bool IsValid() = 0;
-
-	/// @return An instance of a DynamicLibrary subclass with "modulePath" loaded.
-	static DynamicLibrary *Load(const char *modulePath);
-};
-
-/**
- * Platform class used to retrieve system wide parameters such as double click speed
- * and chrome colour. Not a creatable object, more of a module with several functions.
- */
-class Platform {
-	// Private so Platform objects can not be copied
-	Platform(const Platform &) {}
-	Platform &operator=(const Platform &) { return *this; }
-public:
-	// Should be private because no new Platforms are ever created
-	// but gcc warns about this
-	Platform() {}
-	~Platform() {}
-	static ColourDesired Chrome();
-	static ColourDesired ChromeHighlight();
-	static const char *DefaultFont();
-	static int DefaultFontSize();
-	static unsigned int DoubleClickTime();
-	static bool MouseButtonBounce();
-	static void DebugDisplay(const char *s);
-	static bool IsKeyDown(int key);
-	static long SendScintilla(
-		WindowID w, unsigned int msg, unsigned long wParam=0, long lParam=0);
-	static long SendScintillaPointer(
-		WindowID w, unsigned int msg, unsigned long wParam=0, void *lParam=0);
-	static bool IsDBCSLeadByte(int codePage, char ch);
-	static int DBCSCharLength(int codePage, const char *s);
-	static int DBCSCharMaxLength();
-
-	// 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 bool ShowAssertionPopUps(bool assertionPopUps_);
-	static void Assert(const char *c, const char *file, int line);
-	static int Clamp(int val, int minVal, int maxVal);
-};
-
-#ifdef  NDEBUG
-#define PLATFORM_ASSERT(c) ((void)0)
-#else
-#define PLATFORM_ASSERT(c) ((c) ? (void)(0) : Platform::Assert(#c, __FILE__, __LINE__))
-#endif
-
-// Shut up annoying Visual C++ warnings:
-#ifdef _MSC_VER
-#pragma warning(disable: 4244 4309 4514 4710)
-#endif
-
-#endif
diff --git a/src/stc/scintilla/include/PropSet.h b/src/stc/scintilla/include/PropSet.h
deleted file mode 100644
index e38de7dc40..0000000000
--- a/src/stc/scintilla/include/PropSet.h
+++ /dev/null
@@ -1,114 +0,0 @@
-// Scintilla source code edit control
-/** @file PropSet.h
- ** A Java style properties file module.
- **/
-// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef PROPSET_H
-#define PROPSET_H
-#include "SString.h"
-
-bool EqualCaseInsensitive(const char *a, const char *b);
-
-bool isprefix(const char *target, const char *prefix);
-
-struct Property {
-	unsigned int hash;
-	char *key;
-	char *val;
-	Property *next;
-	Property() : hash(0), key(0), val(0), next(0) {}
-};
-
-/**
- */
-class PropSet {
-protected:
-	enum { hashRoots=31 };
-	Property *props[hashRoots];
-	Property *enumnext;
-	int enumhash;
-	static bool caseSensitiveFilenames;
-	static unsigned int HashString(const char *s, size_t len) {
-		unsigned int ret = 0;
-		while (len--) {
-			ret <<= 4;
-			ret ^= *s;
-			s++;
-		}
-		return ret;
-	}
-	static bool IncludesVar(const char *value, const char *key);
-
-public:
-	PropSet *superPS;
-	PropSet();
-	~PropSet();
-	void Set(const char *key, const char *val, int lenKey=-1, int lenVal=-1);
-	void Set(const char *keyVal);
-	void Unset(const char *key, int lenKey=-1);
-	void SetMultiple(const char *s);
-	SString Get(const char *key);
-	SString GetExpanded(const char *key);
-	SString Expand(const char *withVars, int maxExpands=100);
-	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();
-	char *ToString();	// Caller must delete[] the return value
-	bool GetFirst(char **key, char **val);
-	bool GetNext(char **key, char **val);
-	static void SetCaseSensitiveFilenames(bool caseSensitiveFilenames_) {
-		caseSensitiveFilenames = caseSensitiveFilenames_;
-	}
-
-private:
-	// copy-value semantics not implemented
-	PropSet(const PropSet &copy);
-	void operator=(const PropSet &assign);
-};
-
-/**
- */
-class WordList {
-public:
-	// Each word contains at least one character - a empty word acts as sentinel at the end.
-	char **words;
-	char **wordsNoCase;
-	char *list;
-	int len;
-	bool onlyLineEnds;	///< Delimited by any white space or only line ends
-	bool sorted;
-	bool sortedNoCase;
-	int starts[256];
-	WordList(bool onlyLineEnds_ = false) :
-		words(0), wordsNoCase(0), list(0), len(0), onlyLineEnds(onlyLineEnds_),
-		sorted(false), sortedNoCase(false) {}
-	~WordList() { Clear(); }
-	operator bool() { return len ? true : false; }
-	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);
-	bool InListAbbreviated(const char *s, const char marker);
-	const char *GetNearestWord(const char *wordStart, int searchLen,
-		bool ignoreCase = false, SString wordCharacters="", int wordIndex = -1);
-	char *GetNearestWords(const char *wordStart, int searchLen,
-		bool ignoreCase=false, char otherSeparator='\0', bool exactLen=false);
-};
-
-inline bool IsAlphabetic(unsigned int ch) {
-	return ((ch >= 'A') && (ch <= 'Z')) || ((ch >= 'a') && (ch <= 'z'));
-}
-
-
-#ifdef _MSC_VER
-// Visual C++ doesn't like the private copy idiom for disabling
-// the default copy constructor and operator=, but it's fine.
-#pragma warning(disable: 4511 4512)
-#endif
-
-#endif
diff --git a/src/stc/scintilla/include/SString.h b/src/stc/scintilla/include/SString.h
deleted file mode 100644
index 38a206ccf2..0000000000
--- a/src/stc/scintilla/include/SString.h
+++ /dev/null
@@ -1,280 +0,0 @@
-// SciTE - Scintilla based Text Editor
-/** @file SString.h
- ** A simple string class.
- **/
-// Copyright 1998-2004 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef SSTRING_H
-#define SSTRING_H
-
-// These functions are implemented because each platform calls them something different.
-int CompareCaseInsensitive(const char *a, const char *b);
-int CompareNCaseInsensitive(const char *a, const char *b, size_t len);
-bool EqualCaseInsensitive(const char *a, const char *b);
-
-// Define another string class.
-// While it would be 'better' to use std::string, that doubles the executable size.
-// An SString may contain embedded nul characters.
-
-/**
- * Base class from which the two other classes (SBuffer & SString)
- * are derived.
- */
-class SContainer {
-public:
-	/** Type of string lengths (sizes) and positions (indexes). */
-	typedef size_t lenpos_t;
-	/** Out of bounds value indicating that the string argument should be measured. */
-	enum { measure_length=0xffffffffU};
-
-protected:
-	char *s;				///< The C string
-	lenpos_t sSize;			///< The size of the buffer, less 1: ie. the maximum size of the string
-
-	SContainer() : s(0), sSize(0) {}
-	~SContainer() {
-		delete []s;	// Suppose it was allocated using StringAllocate
-		s = 0;
-		sSize = 0;
-	}
-	/** Size of buffer. */
-	lenpos_t size() const {
-		if (s) {
-			return sSize;
-		} else {
-			return 0;
-		}
-	}
-public:
-	/**
-	 * Allocate uninitialized memory big enough to fit a string of the given length.
-	 * @return the pointer to the new string
-	 */
-	static char *StringAllocate(lenpos_t len);
-	/**
-	 * Duplicate a buffer/C string.
-	 * Allocate memory of the given size, or big enough to fit the string if length isn't given;
-	 * then copy the given string in the allocated memory.
-	 * @return the pointer to the new string
-	 */
-	static char *StringAllocate(
-		const char *s,			///< The string to duplicate
-		lenpos_t len=measure_length);	///< The length of memory to allocate. Optional.
-};
-
-
-/**
- * @brief A string buffer class.
- *
- * Main use is to ask an API the length of a string it can provide,
- * then to allocate a buffer of the given size, and to provide this buffer
- * to the API to put the string.
- * This class is intended to be shortlived, to be transformed as SString
- * as soon as it holds the string, so it has little members.
- * Note: we assume the buffer is filled by the API. If the length can be shorter,
- * we should set sLen to strlen(sb.ptr()) in related SString constructor and assignment.
- */
-class SBuffer : protected SContainer {
-public:
-	SBuffer(lenpos_t len) {
-		s = StringAllocate(len);
-		if (s) {
-			*s = '\0';
-		sSize = len;
-		} else {
-			sSize = 0;
-		}
-	}
-private:
-	/// Copy constructor
-	// Here only to be on the safe size, user should avoid returning SBuffer values.
-	SBuffer(const SBuffer &source) : SContainer() {
-		s = StringAllocate(source.s, source.sSize);
-		sSize = (s) ? source.sSize : 0;
-	}
-	/// Default assignment operator
-	// Same here, shouldn't be used
-	SBuffer &operator=(const SBuffer &source) {
-		if (this != &source) {
-			delete []s;
-			s = StringAllocate(source.s, source.sSize);
-			sSize = (s) ? source.sSize : 0;
-		}
-		return *this;
-	}
-public:
-	/** Provide direct read/write access to buffer. */
-	char *ptr() {
-	    return s;
-	}
-	/** Ownership of the buffer have been taken, so release it. */
-	void reset() {
-		s = 0;
-		sSize = 0;
-	}
-	/** Size of buffer. */
-	lenpos_t size() const {
-		return SContainer::size();
-	}
-};
-
-
-/**
- * @brief A simple string class.
- *
- * Hold the length of the string for quick operations,
- * can have a buffer bigger than the string to avoid too many memory allocations and copies.
- * May have embedded zeroes as a result of @a substitute, but relies too heavily on C string
- * functions to allow reliable manipulations of these strings, other than simple appends, etc.
- */
-class SString : protected SContainer {
-	lenpos_t sLen;			///< The size of the string in s
-	lenpos_t sizeGrowth;	///< Minimum growth size when appending strings
-	enum { sizeGrowthDefault = 64 };
-
-	bool grow(lenpos_t lenNew);
-	SString &assign(const char *sOther, lenpos_t sSize_=measure_length);
-
-public:
-	SString() : sLen(0), sizeGrowth(sizeGrowthDefault) {}
-	SString(const SString &source) : SContainer(), sizeGrowth(sizeGrowthDefault) {
-		s = StringAllocate(source.s, source.sLen);
-		sSize = sLen = (s) ? source.sLen : 0;
-	}
-	SString(const char *s_) : sizeGrowth(sizeGrowthDefault) {
-		s = StringAllocate(s_);
-		sSize = sLen = (s) ? strlen(s) : 0;
-	}
-	SString(SBuffer &buf) : sizeGrowth(sizeGrowthDefault) {
-		s = buf.ptr();
-		sSize = sLen = buf.size();
-		// Consumes the given buffer!
-		buf.reset();
-	}
-	SString(const char *s_, lenpos_t first, lenpos_t last) : sizeGrowth(sizeGrowthDefault) {
-		// note: expects the "last" argument to point one beyond the range end (a la STL iterators)
-		s = StringAllocate(s_ + first, last - first);
-		sSize = sLen = (s) ? last - first : 0;
-	}
-	SString(int i);
-	SString(double d, int precision);
-	~SString() {
-		sLen = 0;
-	}
-	void clear() {
-		if (s) {
-			*s = '\0';
-		}
-		sLen = 0;
-	}
-	/** Size of buffer. */
-	lenpos_t size() const {
-		return SContainer::size();
-	}
-	/** Size of string in buffer. */
-	lenpos_t length() const {
-		return sLen;
-	}
-	/** Read access to a character of the string. */
-	char operator[](lenpos_t i) const {
-		return (s && i < sSize) ? s[i] : '\0';
-	}
-	SString &operator=(const char *source) {
-		return assign(source);
-	}
-	SString &operator=(const SString &source) {
-		if (this != &source) {
-			assign(source.s, source.sLen);
-		}
-		return *this;
-	}
-	bool operator==(const SString &sOther) const;
-	bool operator!=(const SString &sOther) const {
-		return !operator==(sOther);
-	}
-	bool operator==(const char *sOther) const;
-	bool operator!=(const char *sOther) const {
-		return !operator==(sOther);
-	}
-	bool contains(char ch) const {
-		return (s && *s) ? strchr(s, ch) != 0 : false;
-	}
-	void setsizegrowth(lenpos_t sizeGrowth_) {
-		sizeGrowth = sizeGrowth_;
-	}
-	const char *c_str() const {
-		return s ? s : "";
-	}
-	/** Give ownership of buffer to caller which must use delete[] to free buffer. */
-	char *detach() {
-		char *sRet = s;
-		s = 0;
-		sSize = 0;
-		sLen = 0;
-		return sRet;
-	}
-	SString substr(lenpos_t subPos, lenpos_t subLen=measure_length) const;
-	SString &lowercase(lenpos_t subPos = 0, lenpos_t subLen=measure_length);
-	SString &uppercase(lenpos_t subPos = 0, lenpos_t subLen=measure_length);
-	SString &append(const char *sOther, lenpos_t sLenOther=measure_length, char sep = '\0');
-	SString &operator+=(const char *sOther) {
-		return append(sOther, static_cast<lenpos_t>(measure_length));
-	}
-	SString &operator+=(const SString &sOther) {
-		return append(sOther.s, sOther.sLen);
-	}
-	SString &operator+=(char ch) {
-		return append(&ch, 1);
-	}
-	SString &appendwithseparator(const char *sOther, char sep) {
-		return append(sOther, strlen(sOther), sep);
-	}
-	SString &insert(lenpos_t pos, const char *sOther, lenpos_t sLenOther=measure_length);
-
-	/**
-	 * Remove @a len characters from the @a pos position, included.
-	 * Characters at pos + len and beyond replace characters at pos.
-	 * If @a len is 0, or greater than the length of the string
-	 * starting at @a pos, the string is just truncated at @a pos.
-	 */
-	void remove(lenpos_t pos, lenpos_t len);
-
-	SString &change(lenpos_t pos, char ch) {
-		if (pos < sLen) {					// character changed must be in string bounds
-			*(s + pos) = ch;
-		}
-		return *this;
-	}
-	/** Read an integral numeric value from the string. */
-	int value() const {
-		return s ? atoi(s) : 0;
-	}
-	bool startswith(const char *prefix);
-	bool endswith(const char *suffix);
-	int search(const char *sFind, lenpos_t start=0) const;
-	bool contains(const char *sFind) const {
-		return search(sFind) >= 0;
-	}
-	int substitute(char chFind, char chReplace);
-	int substitute(const char *sFind, const char *sReplace);
-	int remove(const char *sFind) {
-		return substitute(sFind, "");
-	}
-};
-
-
-/**
- * Duplicate a C string.
- * Allocate memory of the given size, or big enough to fit the string if length isn't given;
- * then copy the given string in the allocated memory.
- * @return the pointer to the new string
- */
-inline char *StringDup(
-	const char *s,			///< The string to duplicate
-	SContainer::lenpos_t len=SContainer::measure_length)	///< The length of memory to allocate. Optional.
-{
-	return SContainer::StringAllocate(s, len);
-}
-
-#endif
diff --git a/src/stc/scintilla/include/SciLexer.h b/src/stc/scintilla/include/SciLexer.h
deleted file mode 100644
index 22d016d21c..0000000000
--- a/src/stc/scintilla/include/SciLexer.h
+++ /dev/null
@@ -1,1074 +0,0 @@
-// Scintilla source code edit control
-/** @file SciLexer.h
- ** Interface to the added lexer functions in the SciLexer version of the edit control.
- **/
-// Copyright 1998-2002 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
-#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
-#define SCLEX_LUA 15
-#define SCLEX_DIFF 16
-#define SCLEX_CONF 17
-#define SCLEX_PASCAL 18
-#define SCLEX_AVE 19
-#define SCLEX_ADA 20
-#define SCLEX_LISP 21
-#define SCLEX_RUBY 22
-#define SCLEX_EIFFEL 23
-#define SCLEX_EIFFELKW 24
-#define SCLEX_TCL 25
-#define SCLEX_NNCRONTAB 26
-#define SCLEX_BULLANT 27
-#define SCLEX_VBSCRIPT 28
-#define SCLEX_BAAN 31
-#define SCLEX_MATLAB 32
-#define SCLEX_SCRIPTOL 33
-#define SCLEX_ASM 34
-#define SCLEX_CPPNOCASE 35
-#define SCLEX_FORTRAN 36
-#define SCLEX_F77 37
-#define SCLEX_CSS 38
-#define SCLEX_POV 39
-#define SCLEX_LOUT 40
-#define SCLEX_ESCRIPT 41
-#define SCLEX_PS 42
-#define SCLEX_NSIS 43
-#define SCLEX_MMIXAL 44
-#define SCLEX_CLW 45
-#define SCLEX_CLWNOCASE 46
-#define SCLEX_LOT 47
-#define SCLEX_YAML 48
-#define SCLEX_TEX 49
-#define SCLEX_METAPOST 50
-#define SCLEX_POWERBASIC 51
-#define SCLEX_FORTH 52
-#define SCLEX_ERLANG 53
-#define SCLEX_OCTAVE 54
-#define SCLEX_MSSQL 55
-#define SCLEX_VERILOG 56
-#define SCLEX_KIX 57
-#define SCLEX_GUI4CLI 58
-#define SCLEX_SPECMAN 59
-#define SCLEX_AU3 60
-#define SCLEX_APDL 61
-#define SCLEX_BASH 62
-#define SCLEX_ASN1 63
-#define SCLEX_VHDL 64
-#define SCLEX_CAML 65
-#define SCLEX_BLITZBASIC 66
-#define SCLEX_PUREBASIC 67
-#define SCLEX_HASKELL 68
-#define SCLEX_PHPSCRIPT 69
-#define SCLEX_TADS3 70
-#define SCLEX_REBOL 71
-#define SCLEX_SMALLTALK 72
-#define SCLEX_FLAGSHIP 73
-#define SCLEX_CSOUND 74
-#define SCLEX_FREEBASIC 75
-#define SCLEX_INNOSETUP 76
-#define SCLEX_OPAL 77
-#define SCLEX_SPICE 78
-#define SCLEX_AUTOMATIC 1000
-#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
-#define SCE_P_WORD2 14
-#define SCE_P_DECORATOR 15
-#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
-#define SCE_C_VERBATIM 13
-#define SCE_C_REGEX 14
-#define SCE_C_COMMENTLINEDOC 15
-#define SCE_C_WORD2 16
-#define SCE_C_COMMENTDOCKEYWORD 17
-#define SCE_C_COMMENTDOCKEYWORDERROR 18
-#define SCE_C_GLOBALCLASS 19
-#define SCE_TCL_DEFAULT 0
-#define SCE_TCL_COMMENT 1
-#define SCE_TCL_COMMENTLINE 2
-#define SCE_TCL_NUMBER 3
-#define SCE_TCL_WORD_IN_QUOTE 4
-#define SCE_TCL_IN_QUOTE 5
-#define SCE_TCL_OPERATOR 6
-#define SCE_TCL_IDENTIFIER 7
-#define SCE_TCL_SUBSTITUTION 8
-#define SCE_TCL_SUB_BRACE 9
-#define SCE_TCL_MODIFIER 10
-#define SCE_TCL_EXPAND 11
-#define SCE_TCL_WORD 12
-#define SCE_TCL_WORD2 13
-#define SCE_TCL_WORD3 14
-#define SCE_TCL_WORD4 15
-#define SCE_TCL_WORD5 16
-#define SCE_TCL_WORD6 17
-#define SCE_TCL_WORD7 18
-#define SCE_TCL_WORD8 19
-#define SCE_TCL_COMMENT_BOX 20
-#define SCE_TCL_BLOCK_COMMENT 21
-#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
-#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
-#define SCE_H_XCCOMMENT 20
-#define SCE_H_SGML_DEFAULT 21
-#define SCE_H_SGML_COMMAND 22
-#define SCE_H_SGML_1ST_PARAM 23
-#define SCE_H_SGML_DOUBLESTRING 24
-#define SCE_H_SGML_SIMPLESTRING 25
-#define SCE_H_SGML_ERROR 26
-#define SCE_H_SGML_SPECIAL 27
-#define SCE_H_SGML_ENTITY 28
-#define SCE_H_SGML_COMMENT 29
-#define SCE_H_SGML_1ST_PARAM_COMMENT 30
-#define SCE_H_SGML_BLOCK_DEFAULT 31
-#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
-#define SCE_HJ_REGEX 52
-#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
-#define SCE_HJA_REGEX 67
-#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
-#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
-#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
-#define SCE_HPHP_COMPLEX_VARIABLE 104
-#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
-#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_HSTRING_VARIABLE 126
-#define SCE_HPHP_OPERATOR 127
-#define SCE_PL_DEFAULT 0
-#define SCE_PL_ERROR 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_VARIABLE_INDEXER 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
-#define SCE_PL_HERE_DELIM 22
-#define SCE_PL_HERE_Q 23
-#define SCE_PL_HERE_QQ 24
-#define SCE_PL_HERE_QX 25
-#define SCE_PL_STRING_Q 26
-#define SCE_PL_STRING_QQ 27
-#define SCE_PL_STRING_QX 28
-#define SCE_PL_STRING_QR 29
-#define SCE_PL_STRING_QW 30
-#define SCE_PL_POD_VERB 31
-#define SCE_RB_DEFAULT 0
-#define SCE_RB_ERROR 1
-#define SCE_RB_COMMENTLINE 2
-#define SCE_RB_POD 3
-#define SCE_RB_NUMBER 4
-#define SCE_RB_WORD 5
-#define SCE_RB_STRING 6
-#define SCE_RB_CHARACTER 7
-#define SCE_RB_CLASSNAME 8
-#define SCE_RB_DEFNAME 9
-#define SCE_RB_OPERATOR 10
-#define SCE_RB_IDENTIFIER 11
-#define SCE_RB_REGEX 12
-#define SCE_RB_GLOBAL 13
-#define SCE_RB_SYMBOL 14
-#define SCE_RB_MODULE_NAME 15
-#define SCE_RB_INSTANCE_VAR 16
-#define SCE_RB_CLASS_VAR 17
-#define SCE_RB_BACKTICKS 18
-#define SCE_RB_DATASECTION 19
-#define SCE_RB_HERE_DELIM 20
-#define SCE_RB_HERE_Q 21
-#define SCE_RB_HERE_QQ 22
-#define SCE_RB_HERE_QX 23
-#define SCE_RB_STRING_Q 24
-#define SCE_RB_STRING_QQ 25
-#define SCE_RB_STRING_QX 26
-#define SCE_RB_STRING_QR 27
-#define SCE_RB_STRING_QW 28
-#define SCE_RB_WORD_DEMOTED 29
-#define SCE_RB_STDIN 30
-#define SCE_RB_STDOUT 31
-#define SCE_RB_STDERR 40
-#define SCE_RB_UPPER_BOUND 41
-#define SCE_B_DEFAULT 0
-#define SCE_B_COMMENT 1
-#define SCE_B_NUMBER 2
-#define SCE_B_KEYWORD 3
-#define SCE_B_STRING 4
-#define SCE_B_PREPROCESSOR 5
-#define SCE_B_OPERATOR 6
-#define SCE_B_IDENTIFIER 7
-#define SCE_B_DATE 8
-#define SCE_B_STRINGEOL 9
-#define SCE_B_KEYWORD2 10
-#define SCE_B_KEYWORD3 11
-#define SCE_B_KEYWORD4 12
-#define SCE_B_CONSTANT 13
-#define SCE_B_ASM 14
-#define SCE_B_LABEL 15
-#define SCE_B_ERROR 16
-#define SCE_B_HEXNUMBER 17
-#define SCE_B_BINNUMBER 18
-#define SCE_PROPS_DEFAULT 0
-#define SCE_PROPS_COMMENT 1
-#define SCE_PROPS_SECTION 2
-#define SCE_PROPS_ASSIGNMENT 3
-#define SCE_PROPS_DEFVAL 4
-#define SCE_PROPS_KEY 5
-#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_LUA_WORD2 13
-#define SCE_LUA_WORD3 14
-#define SCE_LUA_WORD4 15
-#define SCE_LUA_WORD5 16
-#define SCE_LUA_WORD6 17
-#define SCE_LUA_WORD7 18
-#define SCE_LUA_WORD8 19
-#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
-#define SCE_ERR_NET 7
-#define SCE_ERR_LUA 8
-#define SCE_ERR_CTAG 9
-#define SCE_ERR_DIFF_CHANGED 10
-#define SCE_ERR_DIFF_ADDITION 11
-#define SCE_ERR_DIFF_DELETION 12
-#define SCE_ERR_DIFF_MESSAGE 13
-#define SCE_ERR_PHP 14
-#define SCE_ERR_ELF 15
-#define SCE_ERR_IFC 16
-#define SCE_ERR_IFORT 17
-#define SCE_ERR_ABSF 18
-#define SCE_ERR_TIDY 19
-#define SCE_ERR_JAVA_STACK 20
-#define SCE_BAT_DEFAULT 0
-#define SCE_BAT_COMMENT 1
-#define SCE_BAT_WORD 2
-#define SCE_BAT_LABEL 3
-#define SCE_BAT_HIDE 4
-#define SCE_BAT_COMMAND 5
-#define SCE_BAT_IDENTIFIER 6
-#define SCE_BAT_OPERATOR 7
-#define SCE_MAKE_DEFAULT 0
-#define SCE_MAKE_COMMENT 1
-#define SCE_MAKE_PREPROCESSOR 2
-#define SCE_MAKE_IDENTIFIER 3
-#define SCE_MAKE_OPERATOR 4
-#define SCE_MAKE_TARGET 5
-#define SCE_MAKE_IDEOL 9
-#define SCE_DIFF_DEFAULT 0
-#define SCE_DIFF_COMMENT 1
-#define SCE_DIFF_COMMAND 2
-#define SCE_DIFF_HEADER 3
-#define SCE_DIFF_POSITION 4
-#define SCE_DIFF_DELETED 5
-#define SCE_DIFF_ADDED 6
-#define SCE_CONF_DEFAULT 0
-#define SCE_CONF_COMMENT 1
-#define SCE_CONF_NUMBER 2
-#define SCE_CONF_IDENTIFIER 3
-#define SCE_CONF_EXTENSION 4
-#define SCE_CONF_PARAMETER 5
-#define SCE_CONF_STRING 6
-#define SCE_CONF_OPERATOR 7
-#define SCE_CONF_IP 8
-#define SCE_CONF_DIRECTIVE 9
-#define SCE_AVE_DEFAULT 0
-#define SCE_AVE_COMMENT 1
-#define SCE_AVE_NUMBER 2
-#define SCE_AVE_WORD 3
-#define SCE_AVE_STRING 6
-#define SCE_AVE_ENUM 7
-#define SCE_AVE_STRINGEOL 8
-#define SCE_AVE_IDENTIFIER 9
-#define SCE_AVE_OPERATOR 10
-#define SCE_AVE_WORD1 11
-#define SCE_AVE_WORD2 12
-#define SCE_AVE_WORD3 13
-#define SCE_AVE_WORD4 14
-#define SCE_AVE_WORD5 15
-#define SCE_AVE_WORD6 16
-#define SCE_ADA_DEFAULT 0
-#define SCE_ADA_WORD 1
-#define SCE_ADA_IDENTIFIER 2
-#define SCE_ADA_NUMBER 3
-#define SCE_ADA_DELIMITER 4
-#define SCE_ADA_CHARACTER 5
-#define SCE_ADA_CHARACTEREOL 6
-#define SCE_ADA_STRING 7
-#define SCE_ADA_STRINGEOL 8
-#define SCE_ADA_LABEL 9
-#define SCE_ADA_COMMENTLINE 10
-#define SCE_ADA_ILLEGAL 11
-#define SCE_BAAN_DEFAULT 0
-#define SCE_BAAN_COMMENT 1
-#define SCE_BAAN_COMMENTDOC 2
-#define SCE_BAAN_NUMBER 3
-#define SCE_BAAN_WORD 4
-#define SCE_BAAN_STRING 5
-#define SCE_BAAN_PREPROCESSOR 6
-#define SCE_BAAN_OPERATOR 7
-#define SCE_BAAN_IDENTIFIER 8
-#define SCE_BAAN_STRINGEOL 9
-#define SCE_BAAN_WORD2 10
-#define SCE_LISP_DEFAULT 0
-#define SCE_LISP_COMMENT 1
-#define SCE_LISP_NUMBER 2
-#define SCE_LISP_KEYWORD 3
-#define SCE_LISP_KEYWORD_KW 4
-#define SCE_LISP_SYMBOL 5
-#define SCE_LISP_STRING 6
-#define SCE_LISP_STRINGEOL 8
-#define SCE_LISP_IDENTIFIER 9
-#define SCE_LISP_OPERATOR 10
-#define SCE_LISP_SPECIAL 11
-#define SCE_LISP_MULTI_COMMENT 12
-#define SCE_EIFFEL_DEFAULT 0
-#define SCE_EIFFEL_COMMENTLINE 1
-#define SCE_EIFFEL_NUMBER 2
-#define SCE_EIFFEL_WORD 3
-#define SCE_EIFFEL_STRING 4
-#define SCE_EIFFEL_CHARACTER 5
-#define SCE_EIFFEL_OPERATOR 6
-#define SCE_EIFFEL_IDENTIFIER 7
-#define SCE_EIFFEL_STRINGEOL 8
-#define SCE_NNCRONTAB_DEFAULT 0
-#define SCE_NNCRONTAB_COMMENT 1
-#define SCE_NNCRONTAB_TASK 2
-#define SCE_NNCRONTAB_SECTION 3
-#define SCE_NNCRONTAB_KEYWORD 4
-#define SCE_NNCRONTAB_MODIFIER 5
-#define SCE_NNCRONTAB_ASTERISK 6
-#define SCE_NNCRONTAB_NUMBER 7
-#define SCE_NNCRONTAB_STRING 8
-#define SCE_NNCRONTAB_ENVIRONMENT 9
-#define SCE_NNCRONTAB_IDENTIFIER 10
-#define SCE_FORTH_DEFAULT 0
-#define SCE_FORTH_COMMENT 1
-#define SCE_FORTH_COMMENT_ML 2
-#define SCE_FORTH_IDENTIFIER 3
-#define SCE_FORTH_CONTROL 4
-#define SCE_FORTH_KEYWORD 5
-#define SCE_FORTH_DEFWORD 6
-#define SCE_FORTH_PREWORD1 7
-#define SCE_FORTH_PREWORD2 8
-#define SCE_FORTH_NUMBER 9
-#define SCE_FORTH_STRING 10
-#define SCE_FORTH_LOCALE 11
-#define SCE_MATLAB_DEFAULT 0
-#define SCE_MATLAB_COMMENT 1
-#define SCE_MATLAB_COMMAND 2
-#define SCE_MATLAB_NUMBER 3
-#define SCE_MATLAB_KEYWORD 4
-#define SCE_MATLAB_STRING 5
-#define SCE_MATLAB_OPERATOR 6
-#define SCE_MATLAB_IDENTIFIER 7
-#define SCE_MATLAB_DOUBLEQUOTESTRING 8
-#define SCE_SCRIPTOL_DEFAULT 0
-#define SCE_SCRIPTOL_WHITE 1
-#define SCE_SCRIPTOL_COMMENTLINE 2
-#define SCE_SCRIPTOL_PERSISTENT 3
-#define SCE_SCRIPTOL_CSTYLE 4
-#define SCE_SCRIPTOL_COMMENTBLOCK 5
-#define SCE_SCRIPTOL_NUMBER 6
-#define SCE_SCRIPTOL_STRING 7
-#define SCE_SCRIPTOL_CHARACTER 8
-#define SCE_SCRIPTOL_STRINGEOL 9
-#define SCE_SCRIPTOL_KEYWORD 10
-#define SCE_SCRIPTOL_OPERATOR 11
-#define SCE_SCRIPTOL_IDENTIFIER 12
-#define SCE_SCRIPTOL_TRIPLE 13
-#define SCE_SCRIPTOL_CLASSNAME 14
-#define SCE_SCRIPTOL_PREPROCESSOR 15
-#define SCE_ASM_DEFAULT 0
-#define SCE_ASM_COMMENT 1
-#define SCE_ASM_NUMBER 2
-#define SCE_ASM_STRING 3
-#define SCE_ASM_OPERATOR 4
-#define SCE_ASM_IDENTIFIER 5
-#define SCE_ASM_CPUINSTRUCTION 6
-#define SCE_ASM_MATHINSTRUCTION 7
-#define SCE_ASM_REGISTER 8
-#define SCE_ASM_DIRECTIVE 9
-#define SCE_ASM_DIRECTIVEOPERAND 10
-#define SCE_ASM_COMMENTBLOCK 11
-#define SCE_ASM_CHARACTER 12
-#define SCE_ASM_STRINGEOL 13
-#define SCE_ASM_EXTINSTRUCTION 14
-#define SCE_F_DEFAULT 0
-#define SCE_F_COMMENT 1
-#define SCE_F_NUMBER 2
-#define SCE_F_STRING1 3
-#define SCE_F_STRING2 4
-#define SCE_F_STRINGEOL 5
-#define SCE_F_OPERATOR 6
-#define SCE_F_IDENTIFIER 7
-#define SCE_F_WORD 8
-#define SCE_F_WORD2 9
-#define SCE_F_WORD3 10
-#define SCE_F_PREPROCESSOR 11
-#define SCE_F_OPERATOR2 12
-#define SCE_F_LABEL 13
-#define SCE_F_CONTINUATION 14
-#define SCE_CSS_DEFAULT 0
-#define SCE_CSS_TAG 1
-#define SCE_CSS_CLASS 2
-#define SCE_CSS_PSEUDOCLASS 3
-#define SCE_CSS_UNKNOWN_PSEUDOCLASS 4
-#define SCE_CSS_OPERATOR 5
-#define SCE_CSS_IDENTIFIER 6
-#define SCE_CSS_UNKNOWN_IDENTIFIER 7
-#define SCE_CSS_VALUE 8
-#define SCE_CSS_COMMENT 9
-#define SCE_CSS_ID 10
-#define SCE_CSS_IMPORTANT 11
-#define SCE_CSS_DIRECTIVE 12
-#define SCE_CSS_DOUBLESTRING 13
-#define SCE_CSS_SINGLESTRING 14
-#define SCE_CSS_IDENTIFIER2 15
-#define SCE_CSS_ATTRIBUTE 16
-#define SCE_POV_DEFAULT 0
-#define SCE_POV_COMMENT 1
-#define SCE_POV_COMMENTLINE 2
-#define SCE_POV_NUMBER 3
-#define SCE_POV_OPERATOR 4
-#define SCE_POV_IDENTIFIER 5
-#define SCE_POV_STRING 6
-#define SCE_POV_STRINGEOL 7
-#define SCE_POV_DIRECTIVE 8
-#define SCE_POV_BADDIRECTIVE 9
-#define SCE_POV_WORD2 10
-#define SCE_POV_WORD3 11
-#define SCE_POV_WORD4 12
-#define SCE_POV_WORD5 13
-#define SCE_POV_WORD6 14
-#define SCE_POV_WORD7 15
-#define SCE_POV_WORD8 16
-#define SCE_LOUT_DEFAULT 0
-#define SCE_LOUT_COMMENT 1
-#define SCE_LOUT_NUMBER 2
-#define SCE_LOUT_WORD 3
-#define SCE_LOUT_WORD2 4
-#define SCE_LOUT_WORD3 5
-#define SCE_LOUT_WORD4 6
-#define SCE_LOUT_STRING 7
-#define SCE_LOUT_OPERATOR 8
-#define SCE_LOUT_IDENTIFIER 9
-#define SCE_LOUT_STRINGEOL 10
-#define SCE_ESCRIPT_DEFAULT 0
-#define SCE_ESCRIPT_COMMENT 1
-#define SCE_ESCRIPT_COMMENTLINE 2
-#define SCE_ESCRIPT_COMMENTDOC 3
-#define SCE_ESCRIPT_NUMBER 4
-#define SCE_ESCRIPT_WORD 5
-#define SCE_ESCRIPT_STRING 6
-#define SCE_ESCRIPT_OPERATOR 7
-#define SCE_ESCRIPT_IDENTIFIER 8
-#define SCE_ESCRIPT_BRACE 9
-#define SCE_ESCRIPT_WORD2 10
-#define SCE_ESCRIPT_WORD3 11
-#define SCE_PS_DEFAULT 0
-#define SCE_PS_COMMENT 1
-#define SCE_PS_DSC_COMMENT 2
-#define SCE_PS_DSC_VALUE 3
-#define SCE_PS_NUMBER 4
-#define SCE_PS_NAME 5
-#define SCE_PS_KEYWORD 6
-#define SCE_PS_LITERAL 7
-#define SCE_PS_IMMEVAL 8
-#define SCE_PS_PAREN_ARRAY 9
-#define SCE_PS_PAREN_DICT 10
-#define SCE_PS_PAREN_PROC 11
-#define SCE_PS_TEXT 12
-#define SCE_PS_HEXSTRING 13
-#define SCE_PS_BASE85STRING 14
-#define SCE_PS_BADSTRINGCHAR 15
-#define SCE_NSIS_DEFAULT 0
-#define SCE_NSIS_COMMENT 1
-#define SCE_NSIS_STRINGDQ 2
-#define SCE_NSIS_STRINGLQ 3
-#define SCE_NSIS_STRINGRQ 4
-#define SCE_NSIS_FUNCTION 5
-#define SCE_NSIS_VARIABLE 6
-#define SCE_NSIS_LABEL 7
-#define SCE_NSIS_USERDEFINED 8
-#define SCE_NSIS_SECTIONDEF 9
-#define SCE_NSIS_SUBSECTIONDEF 10
-#define SCE_NSIS_IFDEFINEDEF 11
-#define SCE_NSIS_MACRODEF 12
-#define SCE_NSIS_STRINGVAR 13
-#define SCE_NSIS_NUMBER 14
-#define SCE_NSIS_SECTIONGROUP 15
-#define SCE_NSIS_PAGEEX 16
-#define SCE_NSIS_FUNCTIONDEF 17
-#define SCE_NSIS_COMMENTBOX 18
-#define SCE_MMIXAL_LEADWS 0
-#define SCE_MMIXAL_COMMENT 1
-#define SCE_MMIXAL_LABEL 2
-#define SCE_MMIXAL_OPCODE 3
-#define SCE_MMIXAL_OPCODE_PRE 4
-#define SCE_MMIXAL_OPCODE_VALID 5
-#define SCE_MMIXAL_OPCODE_UNKNOWN 6
-#define SCE_MMIXAL_OPCODE_POST 7
-#define SCE_MMIXAL_OPERANDS 8
-#define SCE_MMIXAL_NUMBER 9
-#define SCE_MMIXAL_REF 10
-#define SCE_MMIXAL_CHAR 11
-#define SCE_MMIXAL_STRING 12
-#define SCE_MMIXAL_REGISTER 13
-#define SCE_MMIXAL_HEX 14
-#define SCE_MMIXAL_OPERATOR 15
-#define SCE_MMIXAL_SYMBOL 16
-#define SCE_MMIXAL_INCLUDE 17
-#define SCE_CLW_DEFAULT 0
-#define SCE_CLW_LABEL 1
-#define SCE_CLW_COMMENT 2
-#define SCE_CLW_STRING 3
-#define SCE_CLW_USER_IDENTIFIER 4
-#define SCE_CLW_INTEGER_CONSTANT 5
-#define SCE_CLW_REAL_CONSTANT 6
-#define SCE_CLW_PICTURE_STRING 7
-#define SCE_CLW_KEYWORD 8
-#define SCE_CLW_COMPILER_DIRECTIVE 9
-#define SCE_CLW_RUNTIME_EXPRESSIONS 10
-#define SCE_CLW_BUILTIN_PROCEDURES_FUNCTION 11
-#define SCE_CLW_STRUCTURE_DATA_TYPE 12
-#define SCE_CLW_ATTRIBUTE 13
-#define SCE_CLW_STANDARD_EQUATE 14
-#define SCE_CLW_ERROR 15
-#define SCE_CLW_DEPRECATED 16
-#define SCE_LOT_DEFAULT 0
-#define SCE_LOT_HEADER 1
-#define SCE_LOT_BREAK 2
-#define SCE_LOT_SET 3
-#define SCE_LOT_PASS 4
-#define SCE_LOT_FAIL 5
-#define SCE_LOT_ABORT 6
-#define SCE_YAML_DEFAULT 0
-#define SCE_YAML_COMMENT 1
-#define SCE_YAML_IDENTIFIER 2
-#define SCE_YAML_KEYWORD 3
-#define SCE_YAML_NUMBER 4
-#define SCE_YAML_REFERENCE 5
-#define SCE_YAML_DOCUMENT 6
-#define SCE_YAML_TEXT 7
-#define SCE_YAML_ERROR 8
-#define SCE_TEX_DEFAULT 0
-#define SCE_TEX_SPECIAL 1
-#define SCE_TEX_GROUP 2
-#define SCE_TEX_SYMBOL 3
-#define SCE_TEX_COMMAND 4
-#define SCE_TEX_TEXT 5
-#define SCE_METAPOST_DEFAULT 0
-#define SCE_METAPOST_SPECIAL 1
-#define SCE_METAPOST_GROUP 2
-#define SCE_METAPOST_SYMBOL 3
-#define SCE_METAPOST_COMMAND 4
-#define SCE_METAPOST_TEXT 5
-#define SCE_METAPOST_EXTRA 6
-#define SCE_ERLANG_DEFAULT 0
-#define SCE_ERLANG_COMMENT 1
-#define SCE_ERLANG_VARIABLE 2
-#define SCE_ERLANG_NUMBER 3
-#define SCE_ERLANG_KEYWORD 4
-#define SCE_ERLANG_STRING 5
-#define SCE_ERLANG_OPERATOR 6
-#define SCE_ERLANG_ATOM 7
-#define SCE_ERLANG_FUNCTION_NAME 8
-#define SCE_ERLANG_CHARACTER 9
-#define SCE_ERLANG_MACRO 10
-#define SCE_ERLANG_RECORD 11
-#define SCE_ERLANG_SEPARATOR 12
-#define SCE_ERLANG_NODE_NAME 13
-#define SCE_ERLANG_UNKNOWN 31
-#define SCE_MSSQL_DEFAULT 0
-#define SCE_MSSQL_COMMENT 1
-#define SCE_MSSQL_LINE_COMMENT 2
-#define SCE_MSSQL_NUMBER 3
-#define SCE_MSSQL_STRING 4
-#define SCE_MSSQL_OPERATOR 5
-#define SCE_MSSQL_IDENTIFIER 6
-#define SCE_MSSQL_VARIABLE 7
-#define SCE_MSSQL_COLUMN_NAME 8
-#define SCE_MSSQL_STATEMENT 9
-#define SCE_MSSQL_DATATYPE 10
-#define SCE_MSSQL_SYSTABLE 11
-#define SCE_MSSQL_GLOBAL_VARIABLE 12
-#define SCE_MSSQL_FUNCTION 13
-#define SCE_MSSQL_STORED_PROCEDURE 14
-#define SCE_MSSQL_DEFAULT_PREF_DATATYPE 15
-#define SCE_MSSQL_COLUMN_NAME_2 16
-#define SCE_V_DEFAULT 0
-#define SCE_V_COMMENT 1
-#define SCE_V_COMMENTLINE 2
-#define SCE_V_COMMENTLINEBANG 3
-#define SCE_V_NUMBER 4
-#define SCE_V_WORD 5
-#define SCE_V_STRING 6
-#define SCE_V_WORD2 7
-#define SCE_V_WORD3 8
-#define SCE_V_PREPROCESSOR 9
-#define SCE_V_OPERATOR 10
-#define SCE_V_IDENTIFIER 11
-#define SCE_V_STRINGEOL 12
-#define SCE_V_USER 19
-#define SCE_KIX_DEFAULT 0
-#define SCE_KIX_COMMENT 1
-#define SCE_KIX_STRING1 2
-#define SCE_KIX_STRING2 3
-#define SCE_KIX_NUMBER 4
-#define SCE_KIX_VAR 5
-#define SCE_KIX_MACRO 6
-#define SCE_KIX_KEYWORD 7
-#define SCE_KIX_FUNCTIONS 8
-#define SCE_KIX_OPERATOR 9
-#define SCE_KIX_IDENTIFIER 31
-#define SCE_GC_DEFAULT 0
-#define SCE_GC_COMMENTLINE 1
-#define SCE_GC_COMMENTBLOCK 2
-#define SCE_GC_GLOBAL 3
-#define SCE_GC_EVENT 4
-#define SCE_GC_ATTRIBUTE 5
-#define SCE_GC_CONTROL 6
-#define SCE_GC_COMMAND 7
-#define SCE_GC_STRING 8
-#define SCE_GC_OPERATOR 9
-#define SCE_SN_DEFAULT 0
-#define SCE_SN_CODE 1
-#define SCE_SN_COMMENTLINE 2
-#define SCE_SN_COMMENTLINEBANG 3
-#define SCE_SN_NUMBER 4
-#define SCE_SN_WORD 5
-#define SCE_SN_STRING 6
-#define SCE_SN_WORD2 7
-#define SCE_SN_WORD3 8
-#define SCE_SN_PREPROCESSOR 9
-#define SCE_SN_OPERATOR 10
-#define SCE_SN_IDENTIFIER 11
-#define SCE_SN_STRINGEOL 12
-#define SCE_SN_REGEXTAG 13
-#define SCE_SN_SIGNAL 14
-#define SCE_SN_USER 19
-#define SCE_AU3_DEFAULT 0
-#define SCE_AU3_COMMENT 1
-#define SCE_AU3_COMMENTBLOCK 2
-#define SCE_AU3_NUMBER 3
-#define SCE_AU3_FUNCTION 4
-#define SCE_AU3_KEYWORD 5
-#define SCE_AU3_MACRO 6
-#define SCE_AU3_STRING 7
-#define SCE_AU3_OPERATOR 8
-#define SCE_AU3_VARIABLE 9
-#define SCE_AU3_SENT 10
-#define SCE_AU3_PREPROCESSOR 11
-#define SCE_AU3_SPECIAL 12
-#define SCE_AU3_EXPAND 13
-#define SCE_AU3_COMOBJ 14
-#define SCE_AU3_UDF 15
-#define SCE_APDL_DEFAULT 0
-#define SCE_APDL_COMMENT 1
-#define SCE_APDL_COMMENTBLOCK 2
-#define SCE_APDL_NUMBER 3
-#define SCE_APDL_STRING 4
-#define SCE_APDL_OPERATOR 5
-#define SCE_APDL_WORD 6
-#define SCE_APDL_PROCESSOR 7
-#define SCE_APDL_COMMAND 8
-#define SCE_APDL_SLASHCOMMAND 9
-#define SCE_APDL_STARCOMMAND 10
-#define SCE_APDL_ARGUMENT 11
-#define SCE_APDL_FUNCTION 12
-#define SCE_SH_DEFAULT 0
-#define SCE_SH_ERROR 1
-#define SCE_SH_COMMENTLINE 2
-#define SCE_SH_NUMBER 3
-#define SCE_SH_WORD 4
-#define SCE_SH_STRING 5
-#define SCE_SH_CHARACTER 6
-#define SCE_SH_OPERATOR 7
-#define SCE_SH_IDENTIFIER 8
-#define SCE_SH_SCALAR 9
-#define SCE_SH_PARAM 10
-#define SCE_SH_BACKTICKS 11
-#define SCE_SH_HERE_DELIM 12
-#define SCE_SH_HERE_Q 13
-#define SCE_ASN1_DEFAULT 0
-#define SCE_ASN1_COMMENT 1
-#define SCE_ASN1_IDENTIFIER 2
-#define SCE_ASN1_STRING 3
-#define SCE_ASN1_OID 4
-#define SCE_ASN1_SCALAR 5
-#define SCE_ASN1_KEYWORD 6
-#define SCE_ASN1_ATTRIBUTE 7
-#define SCE_ASN1_DESCRIPTOR 8
-#define SCE_ASN1_TYPE 9
-#define SCE_ASN1_OPERATOR 10
-#define SCE_VHDL_DEFAULT 0
-#define SCE_VHDL_COMMENT 1
-#define SCE_VHDL_COMMENTLINEBANG 2
-#define SCE_VHDL_NUMBER 3
-#define SCE_VHDL_STRING 4
-#define SCE_VHDL_OPERATOR 5
-#define SCE_VHDL_IDENTIFIER 6
-#define SCE_VHDL_STRINGEOL 7
-#define SCE_VHDL_KEYWORD 8
-#define SCE_VHDL_STDOPERATOR 9
-#define SCE_VHDL_ATTRIBUTE 10
-#define SCE_VHDL_STDFUNCTION 11
-#define SCE_VHDL_STDPACKAGE 12
-#define SCE_VHDL_STDTYPE 13
-#define SCE_VHDL_USERWORD 14
-#define SCE_CAML_DEFAULT 0
-#define SCE_CAML_IDENTIFIER 1
-#define SCE_CAML_TAGNAME 2
-#define SCE_CAML_KEYWORD 3
-#define SCE_CAML_KEYWORD2 4
-#define SCE_CAML_KEYWORD3 5
-#define SCE_CAML_LINENUM 6
-#define SCE_CAML_OPERATOR 7
-#define SCE_CAML_NUMBER 8
-#define SCE_CAML_CHAR 9
-#define SCE_CAML_STRING 11
-#define SCE_CAML_COMMENT 12
-#define SCE_CAML_COMMENT1 13
-#define SCE_CAML_COMMENT2 14
-#define SCE_CAML_COMMENT3 15
-#define SCE_HA_DEFAULT 0
-#define SCE_HA_IDENTIFIER 1
-#define SCE_HA_KEYWORD 2
-#define SCE_HA_NUMBER 3
-#define SCE_HA_STRING 4
-#define SCE_HA_CHARACTER 5
-#define SCE_HA_CLASS 6
-#define SCE_HA_MODULE 7
-#define SCE_HA_CAPITAL 8
-#define SCE_HA_DATA 9
-#define SCE_HA_IMPORT 10
-#define SCE_HA_OPERATOR 11
-#define SCE_HA_INSTANCE 12
-#define SCE_HA_COMMENTLINE 13
-#define SCE_HA_COMMENTBLOCK 14
-#define SCE_HA_COMMENTBLOCK2 15
-#define SCE_HA_COMMENTBLOCK3 16
-#define SCE_T3_DEFAULT 0
-#define SCE_T3_X_DEFAULT 1
-#define SCE_T3_PREPROCESSOR 2
-#define SCE_T3_BLOCK_COMMENT 3
-#define SCE_T3_LINE_COMMENT 4
-#define SCE_T3_OPERATOR 5
-#define SCE_T3_KEYWORD 6
-#define SCE_T3_NUMBER 7
-#define SCE_T3_IDENTIFIER 8
-#define SCE_T3_S_STRING 9
-#define SCE_T3_D_STRING 10
-#define SCE_T3_X_STRING 11
-#define SCE_T3_LIB_DIRECTIVE 12
-#define SCE_T3_MSG_PARAM 13
-#define SCE_T3_HTML_TAG 14
-#define SCE_T3_HTML_DEFAULT 15
-#define SCE_T3_HTML_STRING 16
-#define SCE_T3_USER1 17
-#define SCE_T3_USER2 18
-#define SCE_T3_USER3 19
-#define SCE_REBOL_DEFAULT 0
-#define SCE_REBOL_COMMENTLINE 1
-#define SCE_REBOL_COMMENTBLOCK 2
-#define SCE_REBOL_PREFACE 3
-#define SCE_REBOL_OPERATOR 4
-#define SCE_REBOL_CHARACTER 5
-#define SCE_REBOL_QUOTEDSTRING 6
-#define SCE_REBOL_BRACEDSTRING 7
-#define SCE_REBOL_NUMBER 8
-#define SCE_REBOL_PAIR 9
-#define SCE_REBOL_TUPLE 10
-#define SCE_REBOL_BINARY 11
-#define SCE_REBOL_MONEY 12
-#define SCE_REBOL_ISSUE 13
-#define SCE_REBOL_TAG 14
-#define SCE_REBOL_FILE 15
-#define SCE_REBOL_EMAIL 16
-#define SCE_REBOL_URL 17
-#define SCE_REBOL_DATE 18
-#define SCE_REBOL_TIME 19
-#define SCE_REBOL_IDENTIFIER 20
-#define SCE_REBOL_WORD 21
-#define SCE_REBOL_WORD2 22
-#define SCE_REBOL_WORD3 23
-#define SCE_REBOL_WORD4 24
-#define SCE_REBOL_WORD5 25
-#define SCE_REBOL_WORD6 26
-#define SCE_REBOL_WORD7 27
-#define SCE_REBOL_WORD8 28
-#define SCE_SQL_DEFAULT 0
-#define SCE_SQL_COMMENT 1
-#define SCE_SQL_COMMENTLINE 2
-#define SCE_SQL_COMMENTDOC 3
-#define SCE_SQL_NUMBER 4
-#define SCE_SQL_WORD 5
-#define SCE_SQL_STRING 6
-#define SCE_SQL_CHARACTER 7
-#define SCE_SQL_SQLPLUS 8
-#define SCE_SQL_SQLPLUS_PROMPT 9
-#define SCE_SQL_OPERATOR 10
-#define SCE_SQL_IDENTIFIER 11
-#define SCE_SQL_SQLPLUS_COMMENT 13
-#define SCE_SQL_COMMENTLINEDOC 15
-#define SCE_SQL_WORD2 16
-#define SCE_SQL_COMMENTDOCKEYWORD 17
-#define SCE_SQL_COMMENTDOCKEYWORDERROR 18
-#define SCE_SQL_USER1 19
-#define SCE_SQL_USER2 20
-#define SCE_SQL_USER3 21
-#define SCE_SQL_USER4 22
-#define SCE_SQL_QUOTEDIDENTIFIER 23
-#define SCE_ST_DEFAULT 0
-#define SCE_ST_STRING 1
-#define SCE_ST_NUMBER 2
-#define SCE_ST_COMMENT 3
-#define SCE_ST_SYMBOL 4
-#define SCE_ST_BINARY 5
-#define SCE_ST_BOOL 6
-#define SCE_ST_SELF 7
-#define SCE_ST_SUPER 8
-#define SCE_ST_NIL 9
-#define SCE_ST_GLOBAL 10
-#define SCE_ST_RETURN 11
-#define SCE_ST_SPECIAL 12
-#define SCE_ST_KWSEND 13
-#define SCE_ST_ASSIGN 14
-#define SCE_ST_CHARACTER 15
-#define SCE_ST_SPEC_SEL 16
-#define SCE_FS_DEFAULT 0
-#define SCE_FS_COMMENT 1
-#define SCE_FS_COMMENTLINE 2
-#define SCE_FS_COMMENTDOC 3
-#define SCE_FS_COMMENTLINEDOC 4
-#define SCE_FS_COMMENTDOCKEYWORD 5
-#define SCE_FS_COMMENTDOCKEYWORDERROR 6
-#define SCE_FS_KEYWORD 7
-#define SCE_FS_KEYWORD2 8
-#define SCE_FS_KEYWORD3 9
-#define SCE_FS_KEYWORD4 10
-#define SCE_FS_NUMBER 11
-#define SCE_FS_STRING 12
-#define SCE_FS_PREPROCESSOR 13
-#define SCE_FS_OPERATOR 14
-#define SCE_FS_IDENTIFIER 15
-#define SCE_FS_DATE 16
-#define SCE_FS_STRINGEOL 17
-#define SCE_FS_CONSTANT 18
-#define SCE_FS_ASM 19
-#define SCE_FS_LABEL 20
-#define SCE_FS_ERROR 21
-#define SCE_FS_HEXNUMBER 22
-#define SCE_FS_BINNUMBER 23
-#define SCE_CSOUND_DEFAULT 0
-#define SCE_CSOUND_COMMENT 1
-#define SCE_CSOUND_NUMBER 2
-#define SCE_CSOUND_OPERATOR 3
-#define SCE_CSOUND_INSTR 4
-#define SCE_CSOUND_IDENTIFIER 5
-#define SCE_CSOUND_OPCODE 6
-#define SCE_CSOUND_HEADERSTMT 7
-#define SCE_CSOUND_USERKEYWORD 8
-#define SCE_CSOUND_COMMENTBLOCK 9
-#define SCE_CSOUND_PARAM 10
-#define SCE_CSOUND_ARATE_VAR 11
-#define SCE_CSOUND_KRATE_VAR 12
-#define SCE_CSOUND_IRATE_VAR 13
-#define SCE_CSOUND_GLOBAL_VAR 14
-#define SCE_CSOUND_STRINGEOL 15
-#define SCE_INNO_DEFAULT 0
-#define SCE_INNO_COMMENT 1
-#define SCE_INNO_KEYWORD 2
-#define SCE_INNO_PARAMETER 3
-#define SCE_INNO_SECTION 4
-#define SCE_INNO_PREPROC 5
-#define SCE_INNO_PREPROC_INLINE 6
-#define SCE_INNO_COMMENT_PASCAL 7
-#define SCE_INNO_KEYWORD_PASCAL 8
-#define SCE_INNO_KEYWORD_USER 9
-#define SCE_INNO_STRING_DOUBLE 10
-#define SCE_INNO_STRING_SINGLE 11
-#define SCE_INNO_IDENTIFIER 12
-#define SCE_OPAL_SPACE 0
-#define SCE_OPAL_COMMENT_BLOCK 1
-#define SCE_OPAL_COMMENT_LINE 2
-#define SCE_OPAL_INTEGER 3
-#define SCE_OPAL_KEYWORD 4
-#define SCE_OPAL_SORT 5
-#define SCE_OPAL_STRING 6
-#define SCE_OPAL_PAR 7
-#define SCE_OPAL_BOOL_CONST 8
-#define SCE_OPAL_DEFAULT 32
-#define SCE_SPICE_DEFAULT 0
-#define SCE_SPICE_IDENTIFIER 1
-#define SCE_SPICE_KEYWORD 2
-#define SCE_SPICE_KEYWORD2 3
-#define SCE_SPICE_KEYWORD3 4
-#define SCE_SPICE_NUMBER 5
-#define SCE_SPICE_DELIMITER 6
-#define SCE_SPICE_VALUE 7
-#define SCE_SPICE_COMMENTLINE 8
-#define SCLEX_ASP 29
-#define SCLEX_PHP 30
-//--Autogenerated -- end of section automatically generated from Scintilla.iface
-
-#endif
diff --git a/src/stc/scintilla/include/Scintilla.h b/src/stc/scintilla/include/Scintilla.h
deleted file mode 100644
index 3a57da6ae2..0000000000
--- a/src/stc/scintilla/include/Scintilla.h
+++ /dev/null
@@ -1,780 +0,0 @@
-// Scintilla source code edit control
-/** @file Scintilla.h
- ** Interface to the edit control.
- **/
-// Copyright 1998-2003 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
-
-#if defined(LCCWIN) && LCCWIN
-typedef BOOL bool;
-#endif
-
-#if PLAT_WIN
-// Return false on failure:
-bool Scintilla_RegisterClasses(void *hInstance);
-bool Scintilla_ReleaseResources();
-#endif
-int Scintilla_LinkLexers();
-
-// Here should be placed typedefs for uptr_t, an unsigned integer type large enough to
-// hold a pointer and sptr_t, a signed integer large enough to hold a pointer.
-// May need to be changed for 64 bit platforms.
-#if defined(_MSC_VER) && _MSC_VER >= 1300
-#include <BaseTsd.h>
-#endif
-#ifdef MAXULONG_PTR
-typedef ULONG_PTR uptr_t;
-typedef LONG_PTR sptr_t;
-#else
-typedef unsigned long uptr_t;
-typedef long sptr_t;
-#endif
-
-typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam);
-
-//++Autogenerated -- start of section automatically generated from Scintilla.iface
-#define INVALID_POSITION -1
-#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_POSITIONFROMPOINTCLOSE 2023
-#define SCI_GOTOLINE 2024
-#define SCI_GOTOPOS 2025
-#define SCI_SETANCHOR 2026
-#define SCI_GETCURLINE 2027
-#define SCI_GETENDSTYLED 2028
-#define SC_EOL_CRLF 0
-#define SC_EOL_CR 1
-#define SC_EOL_LF 2
-#define SCI_CONVERTEOLS 2029
-#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 SC_CP_UTF8 65001
-#define SC_CP_DBCS 1
-#define SCI_SETCODEPAGE 2037
-#define SCI_SETUSEPALETTE 2039
-#define MARKER_MAX 31
-#define SC_MARK_CIRCLE 0
-#define SC_MARK_ROUNDRECT 1
-#define SC_MARK_ARROW 2
-#define SC_MARK_SMALLRECT 3
-#define SC_MARK_SHORTARROW 4
-#define SC_MARK_EMPTY 5
-#define SC_MARK_ARROWDOWN 6
-#define SC_MARK_MINUS 7
-#define SC_MARK_PLUS 8
-#define SC_MARK_VLINE 9
-#define SC_MARK_LCORNER 10
-#define SC_MARK_TCORNER 11
-#define SC_MARK_BOXPLUS 12
-#define SC_MARK_BOXPLUSCONNECTED 13
-#define SC_MARK_BOXMINUS 14
-#define SC_MARK_BOXMINUSCONNECTED 15
-#define SC_MARK_LCORNERCURVE 16
-#define SC_MARK_TCORNERCURVE 17
-#define SC_MARK_CIRCLEPLUS 18
-#define SC_MARK_CIRCLEPLUSCONNECTED 19
-#define SC_MARK_CIRCLEMINUS 20
-#define SC_MARK_CIRCLEMINUSCONNECTED 21
-#define SC_MARK_BACKGROUND 22
-#define SC_MARK_DOTDOTDOT 23
-#define SC_MARK_ARROWS 24
-#define SC_MARK_PIXMAP 25
-#define SC_MARK_FULLRECT 26
-#define SC_MARK_CHARACTER 10000
-#define SC_MARKNUM_FOLDEREND 25
-#define SC_MARKNUM_FOLDEROPENMID 26
-#define SC_MARKNUM_FOLDERMIDTAIL 27
-#define SC_MARKNUM_FOLDERTAIL 28
-#define SC_MARKNUM_FOLDERSUB 29
-#define SC_MARKNUM_FOLDER 30
-#define SC_MARKNUM_FOLDEROPEN 31
-#define SC_MASK_FOLDERS 0xFE000000
-#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 SCI_MARKERDEFINEPIXMAP 2049
-#define SCI_MARKERADDSET 2466
-#define SCI_MARKERSETALPHA 2476
-#define SC_MARGIN_SYMBOL 0
-#define SC_MARGIN_NUMBER 1
-#define SC_MARGIN_BACK 2
-#define SC_MARGIN_FORE 3
-#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 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_CALLTIP 38
-#define STYLE_LASTPREDEFINED 39
-#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_CYRILLIC 1251
-#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 SC_CHARSET_8859_15 1000
-#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 SC_CASE_MIXED 0
-#define SC_CASE_UPPER 1
-#define SC_CASE_LOWER 2
-#define SCI_STYLESETCASE 2060
-#define SCI_STYLESETCHARACTERSET 2066
-#define SCI_STYLESETHOTSPOT 2409
-#define SCI_SETSELFORE 2067
-#define SCI_SETSELBACK 2068
-#define SCI_GETSELALPHA 2477
-#define SCI_SETSELALPHA 2478
-#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 INDIC_MAX 7
-#define INDIC_PLAIN 0
-#define INDIC_SQUIGGLE 1
-#define INDIC_TT 2
-#define INDIC_DIAGONAL 3
-#define INDIC_STRIKE 4
-#define INDIC_HIDDEN 5
-#define INDIC_BOX 6
-#define INDIC_ROUNDBOX 7
-#define INDIC0_MASK 0x20
-#define INDIC1_MASK 0x40
-#define INDIC2_MASK 0x80
-#define INDICS_MASK 0xE0
-#define SCI_INDICSETSTYLE 2080
-#define SCI_INDICGETSTYLE 2081
-#define SCI_INDICSETFORE 2082
-#define SCI_INDICGETFORE 2083
-#define SCI_SETWHITESPACEFORE 2084
-#define SCI_SETWHITESPACEBACK 2085
-#define SCI_SETSTYLEBITS 2090
-#define SCI_GETSTYLEBITS 2091
-#define SCI_SETLINESTATE 2092
-#define SCI_GETLINESTATE 2093
-#define SCI_GETMAXLINESTATE 2094
-#define SCI_GETCARETLINEVISIBLE 2095
-#define SCI_SETCARETLINEVISIBLE 2096
-#define SCI_GETCARETLINEBACK 2097
-#define SCI_SETCARETLINEBACK 2098
-#define SCI_STYLESETCHANGEABLE 2099
-#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_USERLISTSHOW 2117
-#define SCI_AUTOCSETAUTOHIDE 2118
-#define SCI_AUTOCGETAUTOHIDE 2119
-#define SCI_AUTOCSETDROPRESTOFWORD 2270
-#define SCI_AUTOCGETDROPRESTOFWORD 2271
-#define SCI_REGISTERIMAGE 2405
-#define SCI_CLEARREGISTEREDIMAGES 2408
-#define SCI_AUTOCGETTYPESEPARATOR 2285
-#define SCI_AUTOCSETTYPESEPARATOR 2286
-#define SCI_AUTOCSETMAXWIDTH 2208
-#define SCI_AUTOCGETMAXWIDTH 2209
-#define SCI_AUTOCSETMAXHEIGHT 2210
-#define SCI_AUTOCGETMAXHEIGHT 2211
-#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 SC_PRINT_COLOURONWHITE 3
-#define SC_PRINT_COLOURONWHITEDEFAULTBG 4
-#define SCI_SETPRINTCOLOURMODE 2148
-#define SCI_GETPRINTCOLOURMODE 2149
-#define SCFIND_WHOLEWORD 2
-#define SCFIND_MATCHCASE 4
-#define SCFIND_WORDSTART 0x00100000
-#define SCFIND_REGEXP 0x00200000
-#define SCFIND_POSIX 0x00400000
-#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_SETCARETWIDTH 2188
-#define SCI_GETCARETWIDTH 2189
-#define SCI_SETTARGETSTART 2190
-#define SCI_GETTARGETSTART 2191
-#define SCI_SETTARGETEND 2192
-#define SCI_GETTARGETEND 2193
-#define SCI_REPLACETARGET 2194
-#define SCI_REPLACETARGETRE 2195
-#define SCI_SEARCHINTARGET 2197
-#define SCI_SETSEARCHFLAGS 2198
-#define SCI_GETSEARCHFLAGS 2199
-#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_CALLTIPSETFORE 2206
-#define SCI_CALLTIPSETFOREHLT 2207
-#define SCI_CALLTIPUSESTYLE 2212
-#define SCI_VISIBLEFROMDOCLINE 2220
-#define SCI_DOCLINEFROMVISIBLE 2221
-#define SCI_WRAPCOUNT 2235
-#define SC_FOLDLEVELBASE 0x400
-#define SC_FOLDLEVELWHITEFLAG 0x1000
-#define SC_FOLDLEVELHEADERFLAG 0x2000
-#define SC_FOLDLEVELBOXHEADERFLAG 0x4000
-#define SC_FOLDLEVELBOXFOOTERFLAG 0x8000
-#define SC_FOLDLEVELCONTRACTED 0x10000
-#define SC_FOLDLEVELUNINDENT 0x20000
-#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 SC_FOLDFLAG_LINEBEFORE_EXPANDED 0x0002
-#define SC_FOLDFLAG_LINEBEFORE_CONTRACTED 0x0004
-#define SC_FOLDFLAG_LINEAFTER_EXPANDED 0x0008
-#define SC_FOLDFLAG_LINEAFTER_CONTRACTED 0x0010
-#define SC_FOLDFLAG_LEVELNUMBERS 0x0040
-#define SC_FOLDFLAG_BOX 0x0001
-#define SCI_SETFOLDFLAGS 2233
-#define SCI_ENSUREVISIBLEENFORCEPOLICY 2234
-#define SCI_SETTABINDENTS 2260
-#define SCI_GETTABINDENTS 2261
-#define SCI_SETBACKSPACEUNINDENTS 2262
-#define SCI_GETBACKSPACEUNINDENTS 2263
-#define SC_TIME_FOREVER 10000000
-#define SCI_SETMOUSEDWELLTIME 2264
-#define SCI_GETMOUSEDWELLTIME 2265
-#define SCI_WORDSTARTPOSITION 2266
-#define SCI_WORDENDPOSITION 2267
-#define SC_WRAP_NONE 0
-#define SC_WRAP_WORD 1
-#define SC_WRAP_CHAR 2
-#define SCI_SETWRAPMODE 2268
-#define SCI_GETWRAPMODE 2269
-#define SC_WRAPVISUALFLAG_NONE 0x0000
-#define SC_WRAPVISUALFLAG_END 0x0001
-#define SC_WRAPVISUALFLAG_START 0x0002
-#define SCI_SETWRAPVISUALFLAGS 2460
-#define SCI_GETWRAPVISUALFLAGS 2461
-#define SC_WRAPVISUALFLAGLOC_DEFAULT 0x0000
-#define SC_WRAPVISUALFLAGLOC_END_BY_TEXT 0x0001
-#define SC_WRAPVISUALFLAGLOC_START_BY_TEXT 0x0002
-#define SCI_SETWRAPVISUALFLAGSLOCATION 2462
-#define SCI_GETWRAPVISUALFLAGSLOCATION 2463
-#define SCI_SETWRAPSTARTINDENT 2464
-#define SCI_GETWRAPSTARTINDENT 2465
-#define SC_CACHE_NONE 0
-#define SC_CACHE_CARET 1
-#define SC_CACHE_PAGE 2
-#define SC_CACHE_DOCUMENT 3
-#define SCI_SETLAYOUTCACHE 2272
-#define SCI_GETLAYOUTCACHE 2273
-#define SCI_SETSCROLLWIDTH 2274
-#define SCI_GETSCROLLWIDTH 2275
-#define SCI_TEXTWIDTH 2276
-#define SCI_SETENDATLASTLINE 2277
-#define SCI_GETENDATLASTLINE 2278
-#define SCI_TEXTHEIGHT 2279
-#define SCI_SETVSCROLLBAR 2280
-#define SCI_GETVSCROLLBAR 2281
-#define SCI_APPENDTEXT 2282
-#define SCI_GETTWOPHASEDRAW 2283
-#define SCI_SETTWOPHASEDRAW 2284
-#define SCI_TARGETFROMSELECTION 2287
-#define SCI_LINESJOIN 2288
-#define SCI_LINESSPLIT 2289
-#define SCI_SETFOLDMARGINCOLOUR 2290
-#define SCI_SETFOLDMARGINHICOLOUR 2291
-#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_LINEDUPLICATE 2404
-#define SCI_LOWERCASE 2340
-#define SCI_UPPERCASE 2341
-#define SCI_LINESCROLLDOWN 2342
-#define SCI_LINESCROLLUP 2343
-#define SCI_DELETEBACKNOTLINE 2344
-#define SCI_HOMEDISPLAY 2345
-#define SCI_HOMEDISPLAYEXTEND 2346
-#define SCI_LINEENDDISPLAY 2347
-#define SCI_LINEENDDISPLAYEXTEND 2348
-#define SCI_HOMEWRAP 2349
-#define SCI_HOMEWRAPEXTEND 2450
-#define SCI_LINEENDWRAP 2451
-#define SCI_LINEENDWRAPEXTEND 2452
-#define SCI_VCHOMEWRAP 2453
-#define SCI_VCHOMEWRAPEXTEND 2454
-#define SCI_LINECOPY 2455
-#define SCI_MOVECARETINSIDEVIEW 2401
-#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 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 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_SETFOCUS 2380
-#define SCI_GETFOCUS 2381
-#define SCI_SETSTATUS 2382
-#define SCI_GETSTATUS 2383
-#define SCI_SETMOUSEDOWNCAPTURES 2384
-#define SCI_GETMOUSEDOWNCAPTURES 2385
-#define SC_CURSORNORMAL -1
-#define SC_CURSORWAIT 4
-#define SCI_SETCURSOR 2386
-#define SCI_GETCURSOR 2387
-#define SCI_SETCONTROLCHARSYMBOL 2388
-#define SCI_GETCONTROLCHARSYMBOL 2389
-#define SCI_WORDPARTLEFT 2390
-#define SCI_WORDPARTLEFTEXTEND 2391
-#define SCI_WORDPARTRIGHT 2392
-#define SCI_WORDPARTRIGHTEXTEND 2393
-#define VISIBLE_SLOP 0x01
-#define VISIBLE_STRICT 0x04
-#define SCI_SETVISIBLEPOLICY 2394
-#define SCI_DELLINELEFT 2395
-#define SCI_DELLINERIGHT 2396
-#define SCI_SETXOFFSET 2397
-#define SCI_GETXOFFSET 2398
-#define SCI_CHOOSECARETX 2399
-#define SCI_GRABFOCUS 2400
-#define CARET_SLOP 0x01
-#define CARET_STRICT 0x04
-#define CARET_JUMPS 0x10
-#define CARET_EVEN 0x08
-#define SCI_SETXCARETPOLICY 2402
-#define SCI_SETYCARETPOLICY 2403
-#define SCI_SETPRINTWRAPMODE 2406
-#define SCI_GETPRINTWRAPMODE 2407
-#define SCI_SETHOTSPOTACTIVEFORE 2410
-#define SCI_SETHOTSPOTACTIVEBACK 2411
-#define SCI_SETHOTSPOTACTIVEUNDERLINE 2412
-#define SCI_SETHOTSPOTSINGLELINE 2421
-#define SCI_PARADOWN 2413
-#define SCI_PARADOWNEXTEND 2414
-#define SCI_PARAUP 2415
-#define SCI_PARAUPEXTEND 2416
-#define SCI_POSITIONBEFORE 2417
-#define SCI_POSITIONAFTER 2418
-#define SCI_COPYRANGE 2419
-#define SCI_COPYTEXT 2420
-#define SC_SEL_STREAM 0
-#define SC_SEL_RECTANGLE 1
-#define SC_SEL_LINES 2
-#define SCI_SETSELECTIONMODE 2422
-#define SCI_GETSELECTIONMODE 2423
-#define SCI_GETLINESELSTARTPOSITION 2424
-#define SCI_GETLINESELENDPOSITION 2425
-#define SCI_LINEDOWNRECTEXTEND 2426
-#define SCI_LINEUPRECTEXTEND 2427
-#define SCI_CHARLEFTRECTEXTEND 2428
-#define SCI_CHARRIGHTRECTEXTEND 2429
-#define SCI_HOMERECTEXTEND 2430
-#define SCI_VCHOMERECTEXTEND 2431
-#define SCI_LINEENDRECTEXTEND 2432
-#define SCI_PAGEUPRECTEXTEND 2433
-#define SCI_PAGEDOWNRECTEXTEND 2434
-#define SCI_STUTTEREDPAGEUP 2435
-#define SCI_STUTTEREDPAGEUPEXTEND 2436
-#define SCI_STUTTEREDPAGEDOWN 2437
-#define SCI_STUTTEREDPAGEDOWNEXTEND 2438
-#define SCI_WORDLEFTEND 2439
-#define SCI_WORDLEFTENDEXTEND 2440
-#define SCI_WORDRIGHTEND 2441
-#define SCI_WORDRIGHTENDEXTEND 2442
-#define SCI_SETWHITESPACECHARS 2443
-#define SCI_SETCHARSDEFAULT 2444
-#define SCI_AUTOCGETCURRENT 2445
-#define SCI_ALLOCATE 2446
-#define SCI_TARGETASUTF8 2447
-#define SCI_SETLENGTHFORENCODE 2448
-#define SCI_ENCODEDFROMUTF8 2449
-#define SCI_FINDCOLUMN 2456
-#define SCI_GETCARETSTICKY 2457
-#define SCI_SETCARETSTICKY 2458
-#define SCI_TOGGLECARETSTICKY 2459
-#define SCI_SETPASTECONVERTENDINGS 2467
-#define SCI_GETPASTECONVERTENDINGS 2468
-#define SCI_SELECTIONDUPLICATE 2469
-#define SC_ALPHA_TRANSPARENT 0
-#define SC_ALPHA_OPAQUE 255
-#define SC_ALPHA_NOALPHA 256
-#define SCI_SETCARETLINEBACKALPHA 2470
-#define SCI_GETCARETLINEBACKALPHA 2471
-#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 KEYWORDSET_MAX 8
-#define SCI_SETKEYWORDS 4005
-#define SCI_SETLEXERLANGUAGE 4006
-#define SCI_LOADLEXERLIBRARY 4007
-#define SCI_GETPROPERTY 4008
-#define SCI_GETPROPERTYEXPANDED 4009
-#define SCI_GETPROPERTYINT 4010
-#define SCI_GETSTYLEBITSNEEDED 4011
-#define SC_MOD_INSERTTEXT 0x1
-#define SC_MOD_DELETETEXT 0x2
-#define SC_MOD_CHANGESTYLE 0x4
-#define SC_MOD_CHANGEFOLD 0x8
-#define SC_PERFORMED_USER 0x10
-#define SC_PERFORMED_UNDO 0x20
-#define SC_PERFORMED_REDO 0x40
-#define SC_MULTISTEPUNDOREDO 0x80
-#define SC_LASTSTEPINUNDOREDO 0x100
-#define SC_MOD_CHANGEMARKER 0x200
-#define SC_MOD_BEFOREINSERT 0x400
-#define SC_MOD_BEFOREDELETE 0x800
-#define SC_MULTILINEUNDOREDO 0x1000
-#define SC_MODEVENTMASKALL 0x1FFF
-#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_NORM 0
-#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_MODIFIED 2008
-#define SCN_MACRORECORD 2009
-#define SCN_MARGINCLICK 2010
-#define SCN_NEEDSHOWN 2011
-#define SCN_PAINTED 2013
-#define SCN_USERLISTSELECTION 2014
-#define SCN_URIDROPPED 2015
-#define SCN_DWELLSTART 2016
-#define SCN_DWELLEND 2017
-#define SCN_ZOOM 2018
-#define SCN_HOTSPOTCLICK 2019
-#define SCN_HOTSPOTDOUBLECLICK 2020
-#define SCN_CALLTIPCLICK 2021
-#define SCN_AUTOCSELECTION 2022
-//--Autogenerated -- end of section automatically generated from Scintilla.iface
-
-// 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 {
-	struct CharacterRange chrg;
-	char *lpstrText;
-};
-
-struct TextToFind {
-	struct CharacterRange chrg;
-	char *lpstrText;
-	struct 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 {
-	// Compatible with Windows NMHDR.
-	// hwndFrom is really an environment specific window handle or pointer
-	// but most clients of Scintilla.h do not have this type visible.
-	void *hwndFrom;
-	uptr_t idFrom;
-	unsigned int code;
-};
-
-struct SCNotification {
-	struct NotifyHeader nmhdr;
-	int position;	// SCN_STYLENEEDED, SCN_MODIFIED, SCN_DWELLSTART, SCN_DWELLEND
-	int ch;		// SCN_CHARADDED, SCN_KEY
-	int modifiers;	// SCN_KEY
-	int modificationType;	// SCN_MODIFIED
-	const char *text;	// SCN_MODIFIED, SCN_USERLISTSELECTION, SCN_AUTOCSELECTION
-	int length;		// SCN_MODIFIED
-	int linesAdded;	// SCN_MODIFIED
-	int message;	// SCN_MACRORECORD
-	uptr_t wParam;	// SCN_MACRORECORD
-	sptr_t lParam;	// SCN_MACRORECORD
-	int line;		// SCN_MODIFIED
-	int foldLevelNow;	// SCN_MODIFIED
-	int foldLevelPrev;	// SCN_MODIFIED
-	int margin;		// SCN_MARGINCLICK
-	int listType;	// SCN_USERLISTSELECTION
-	int x;			// SCN_DWELLSTART, SCN_DWELLEND
-	int y;		// SCN_DWELLSTART, SCN_DWELLEND
-};
-
-// Deprecation section listing all API features that are deprecated and will
-// will be removed completely in a future version.
-// To enable these features define INCLUDE_DEPRECATED_FEATURES
-
-#ifdef INCLUDE_DEPRECATED_FEATURES
-
-#define SCI_SETCARETPOLICY 2369
-#define CARET_CENTER 0x02
-#define CARET_XEVEN 0x08
-#define CARET_XJUMPS 0x10
-
-#define SCN_POSCHANGED 2012
-#define SCN_CHECKBRACE 2007
-
-#endif
-
-#endif
diff --git a/src/stc/scintilla/include/Scintilla.iface b/src/stc/scintilla/include/Scintilla.iface
deleted file mode 100644
index 9540e0de1a..0000000000
--- a/src/stc/scintilla/include/Scintilla.iface
+++ /dev/null
@@ -1,3013 +0,0 @@
-## First line may be used for shbang
-
-## This file defines the interface to Scintilla
-
-## Copyright 2000-2003 by Neil Hodgson <neilh@scintilla.org>
-## The License.txt file describes the conditions under which this software may be distributed.
-
-## A line starting with ## is a pure comment and should be stripped by readers.
-## A line starting with #! is for future shbang use
-## A line starting with # followed by a space is a documentation comment and refers
-## to the next feature definition.
-
-## Each feature is defined by a line starting with fun, get, set, val or evt.
-##     cat -> start a category
-##     fun -> a function
-##     get -> a property get function
-##     set -> a property set function
-##     val -> definition of a constant
-##     evt -> an event
-##     enu -> associate an enumeration with a set of vals with a prefix
-##     lex -> associate a lexer with the lexical classes it produces
-##
-## All other feature names should be ignored. They may be defined in the future.
-## A property may have a set function, a get function or both. Each will have
-## "Get" or "Set" in their names and the corresponding name will have the obvious switch.
-## A property may be subscripted, in which case the first parameter is the subscript.
-## fun, get, and set features have a strict syntax:
-## <featureType><ws><returnType><ws><name>[=<number](<param>,<param>)
-## where <ws> stands for white space.
-## param may be empty (null value) or is <paramType><ws><paramName>[=<value>]
-## Additional white space is allowed between elements.
-## The syntax for evt is <featureType><ws><returnType><ws><name>[=<number]([<param>[,<param>]*])
-## Feature names that contain an underscore are defined by Windows, so in these
-## cases, using the Windows definition is preferred where available.
-## The feature numbers are stable so features will not be renumbered.
-## Features may be removed but they will go through a period of deprecation
-## before removal which is signalled by moving them into the Deprecated category.
-##
-## enu has the syntax enu<ws><enumeration>=<prefix>[<ws><prefix>]* where all the val
-## features in this file starting with a given <prefix> are considered part of the
-## enumeration.
-##
-## lex has the syntax lex<ws><name>=<lexerVal><ws><prefix>[<ws><prefix>]*
-## where name is a reasonably capitalised (Python, XML) identifier or UI name,
-## lexerVal is the val used to specify the lexer, and the list of prefixes is similar
-## to enu. The name may not be the same as that used within the lexer so the lexerVal
-## should be used to tie these entities together.
-
-## Types:
-##     void
-##     int
-##     bool -> integer, 1=true, 0=false
-##     position -> integer position in a document
-##     colour -> colour integer containing red, green and blue bytes.
-##     string -> pointer to const character
-##     stringresult -> pointer to character, NULL-> return size of result
-##     cells -> pointer to array of cells, each cell containing a style byte and character byte
-##     textrange -> range of a min and a max position with an output string
-##     findtext -> searchrange, text -> foundposition
-##     keymod -> integer containing key in low half and modifiers in high half
-##     formatrange
-## Types no longer used:
-##     findtextex -> searchrange
-##     charrange -> range of a min and a max position
-##     charrangeresult -> like charrange, but output param
-##     countedstring
-##     point -> x,y
-##     pointresult  -> like point, but output param
-##     rectangle -> left,top,right,bottom
-## Client code should ignore definitions containing types it does not understand, except
-## for possibly #defining the constants
-
-## Line numbers and positions start at 0.
-## String arguments may contain NUL ('\0') characters where the calls provide a length
-## argument and retrieve NUL characters. All retrieved strings except for those retrieved
-## by GetLine also have a NUL appended but client code should calculate the size that
-## will be returned rather than relying upon the NUL whenever possible. Allow for the
-## extra NUL character when allocating buffers. The size to allocate for a stringresult
-## can be determined by calling with a NULL (0) pointer.
-
-cat Basics
-
-################################################
-## For Scintilla.h
-val INVALID_POSITION=-1
-# Define start of Scintilla messages to be greater than all Windows edit (EM_*) messages
-# as many EM_ messages can be used although that use is deprecated.
-val SCI_START=2000
-val SCI_OPTIONAL_START=3000
-val SCI_LEXER_START=4000
-
-# Add text to the document at current position.
-fun void AddText=2001(int length, string text)
-
-# Add array of cells to document.
-fun void AddStyledText=2002(int length, cells c)
-
-# Insert string at a position.
-fun void InsertText=2003(position pos, string text)
-
-# Delete all text in the document.
-fun void ClearAll=2004(,)
-
-# Set all style bytes to 0, remove all folding information.
-fun void ClearDocumentStyle=2005(,)
-
-# Returns the number of characters in the document.
-get int GetLength=2006(,)
-
-# Returns the character byte at the position.
-get int GetCharAt=2007(position pos,)
-
-# Returns the position of the caret.
-get position GetCurrentPos=2008(,)
-
-# Returns the position of the opposite end of the selection to the caret.
-get position GetAnchor=2009(,)
-
-# Returns the style byte at the position.
-get int GetStyleAt=2010(position pos,)
-
-# Redoes the next action on the undo history.
-fun void Redo=2011(,)
-
-# Choose between collecting actions into the undo
-# history and discarding them.
-set void SetUndoCollection=2012(bool collectUndo,)
-
-# Select all the text in the document.
-fun void SelectAll=2013(,)
-
-# Remember the current position in the undo history as the position
-# at which the document was saved.
-fun void SetSavePoint=2014(,)
-
-# Retrieve a buffer of cells.
-# Returns the number of bytes in the buffer not including terminating NULs.
-fun int GetStyledText=2015(, textrange tr)
-
-# Are there any redoable actions in the undo history?
-fun bool CanRedo=2016(,)
-
-# Retrieve the line number at which a particular marker is located.
-fun int MarkerLineFromHandle=2017(int handle,)
-
-# Delete a marker.
-fun void MarkerDeleteHandle=2018(int handle,)
-
-# Is undo history being collected?
-get bool GetUndoCollection=2019(,)
-
-enu WhiteSpace=SCWS_
-val SCWS_INVISIBLE=0
-val SCWS_VISIBLEALWAYS=1
-val SCWS_VISIBLEAFTERINDENT=2
-
-# Are white space characters currently visible?
-# Returns one of SCWS_* constants.
-get int GetViewWS=2020(,)
-
-# Make white space characters invisible, always visible or visible outside indentation.
-set void SetViewWS=2021(int viewWS,)
-
-# Find the position from a point within the window.
-fun position PositionFromPoint=2022(int x, int y)
-
-# Find the position from a point within the window but return
-# INVALID_POSITION if not close to text.
-fun position PositionFromPointClose=2023(int x, int y)
-
-# Set caret to start of a line and ensure it is visible.
-fun void GotoLine=2024(int line,)
-
-# Set caret to a position and ensure it is visible.
-fun void GotoPos=2025(position pos,)
-
-# Set the selection anchor to a position. The anchor is the opposite
-# end of the selection from the caret.
-set void SetAnchor=2026(position posAnchor,)
-
-# Retrieve the text of the line containing the caret.
-# Returns the index of the caret on the line.
-fun int GetCurLine=2027(int length, stringresult text)
-
-# Retrieve the position of the last correctly styled character.
-get position GetEndStyled=2028(,)
-
-enu EndOfLine=SC_EOL_
-val SC_EOL_CRLF=0
-val SC_EOL_CR=1
-val SC_EOL_LF=2
-
-# Convert all line endings in the document to one mode.
-fun void ConvertEOLs=2029(int eolMode,)
-
-# Retrieve the current end of line mode - one of CRLF, CR, or LF.
-get int GetEOLMode=2030(,)
-
-# Set the current end of line mode.
-set void SetEOLMode=2031(int eolMode,)
-
-# Set the current styling position to pos and the styling mask to mask.
-# The styling mask can be used to protect some bits in each styling byte from modification.
-fun void StartStyling=2032(position pos, int mask)
-
-# Change style from current styling position for length characters to a style
-# and move the current styling position to after this newly styled segment.
-fun void SetStyling=2033(int length, int style)
-
-# Is drawing done first into a buffer or direct to the screen?
-get bool GetBufferedDraw=2034(,)
-
-# If drawing is buffered then each line of text is drawn into a bitmap buffer
-# before drawing it to the screen to avoid flicker.
-set void SetBufferedDraw=2035(bool buffered,)
-
-# Change the visible size of a tab to be a multiple of the width of a space character.
-set void SetTabWidth=2036(int tabWidth,)
-
-# Retrieve the visible size of a tab.
-get int GetTabWidth=2121(,)
-
-# The SC_CP_UTF8 value can be used to enter Unicode mode.
-# This is the same value as CP_UTF8 in Windows
-val SC_CP_UTF8=65001
-
-# The SC_CP_DBCS value can be used to indicate a DBCS mode for GTK+.
-val SC_CP_DBCS=1
-
-# Set the code page used to interpret the bytes of the document as characters.
-# The SC_CP_UTF8 value can be used to enter Unicode mode.
-set void SetCodePage=2037(int codePage,)
-
-# In palette mode, Scintilla uses the environment's palette calls to display
-# more colours. This may lead to ugly displays.
-set void SetUsePalette=2039(bool usePalette,)
-
-enu MarkerSymbol=SC_MARK_
-val MARKER_MAX=31
-val SC_MARK_CIRCLE=0
-val SC_MARK_ROUNDRECT=1
-val SC_MARK_ARROW=2
-val SC_MARK_SMALLRECT=3
-val SC_MARK_SHORTARROW=4
-val SC_MARK_EMPTY=5
-val SC_MARK_ARROWDOWN=6
-val SC_MARK_MINUS=7
-val SC_MARK_PLUS=8
-
-# Shapes used for outlining column.
-val SC_MARK_VLINE=9
-val SC_MARK_LCORNER=10
-val SC_MARK_TCORNER=11
-val SC_MARK_BOXPLUS=12
-val SC_MARK_BOXPLUSCONNECTED=13
-val SC_MARK_BOXMINUS=14
-val SC_MARK_BOXMINUSCONNECTED=15
-val SC_MARK_LCORNERCURVE=16
-val SC_MARK_TCORNERCURVE=17
-val SC_MARK_CIRCLEPLUS=18
-val SC_MARK_CIRCLEPLUSCONNECTED=19
-val SC_MARK_CIRCLEMINUS=20
-val SC_MARK_CIRCLEMINUSCONNECTED=21
-
-# Invisible mark that only sets the line background color.
-val SC_MARK_BACKGROUND=22
-val SC_MARK_DOTDOTDOT=23
-val SC_MARK_ARROWS=24
-val SC_MARK_PIXMAP=25
-val SC_MARK_FULLRECT=26
-
-val SC_MARK_CHARACTER=10000
-
-enu MarkerOutline=SC_MARKNUM_
-# Markers used for outlining column.
-val SC_MARKNUM_FOLDEREND=25
-val SC_MARKNUM_FOLDEROPENMID=26
-val SC_MARKNUM_FOLDERMIDTAIL=27
-val SC_MARKNUM_FOLDERTAIL=28
-val SC_MARKNUM_FOLDERSUB=29
-val SC_MARKNUM_FOLDER=30
-val SC_MARKNUM_FOLDEROPEN=31
-
-val SC_MASK_FOLDERS=0xFE000000
-
-# Set the symbol used for a particular marker number.
-fun void MarkerDefine=2040(int markerNumber, int markerSymbol)
-
-# Set the foreground colour used for a particular marker number.
-fun void MarkerSetFore=2041(int markerNumber, colour fore)
-
-# Set the background colour used for a particular marker number.
-fun void MarkerSetBack=2042(int markerNumber, colour back)
-
-# Add a marker to a line, returning an ID which can be used to find or delete the marker.
-fun int MarkerAdd=2043(int line, int markerNumber)
-
-# Delete a marker from a line.
-fun void MarkerDelete=2044(int line, int markerNumber)
-
-# Delete all markers with a particular number from all lines.
-fun void MarkerDeleteAll=2045(int markerNumber,)
-
-# Get a bit mask of all the markers set on a line.
-fun int MarkerGet=2046(int line,)
-
-# Find the next line after lineStart that includes a marker in mask.
-fun int MarkerNext=2047(int lineStart, int markerMask)
-
-# Find the previous line before lineStart that includes a marker in mask.
-fun int MarkerPrevious=2048(int lineStart, int markerMask)
-
-# Define a marker from a pixmap.
-fun void MarkerDefinePixmap=2049(int markerNumber, string pixmap)
-
-# Add a set of markers to a line.
-fun void MarkerAddSet=2466(int line, int set)
-
-# Set the alpha used for a marker that is drawn in the text area, not the margin.
-fun void MarkerSetAlpha=2476(int markerNumber, int alpha)
-
-enu MarginType=SC_MARGIN_
-val SC_MARGIN_SYMBOL=0
-val SC_MARGIN_NUMBER=1
-val SC_MARGIN_BACK=2
-val SC_MARGIN_FORE=3
-
-# Set a margin to be either numeric or symbolic.
-set void SetMarginTypeN=2240(int margin, int marginType)
-
-# Retrieve the type of a margin.
-get int GetMarginTypeN=2241(int margin,)
-
-# Set the width of a margin to a width expressed in pixels.
-set void SetMarginWidthN=2242(int margin, int pixelWidth)
-
-# Retrieve the width of a margin in pixels.
-get int GetMarginWidthN=2243(int margin,)
-
-# Set a mask that determines which markers are displayed in a margin.
-set void SetMarginMaskN=2244(int margin, int mask)
-
-# Retrieve the marker mask of a margin.
-get int GetMarginMaskN=2245(int margin,)
-
-# Make a margin sensitive or insensitive to mouse clicks.
-set void SetMarginSensitiveN=2246(int margin, bool sensitive)
-
-# Retrieve the mouse click sensitivity of a margin.
-get bool GetMarginSensitiveN=2247(int margin,)
-
-# Styles in range 32..38 are predefined for parts of the UI and are not used as normal styles.
-# Style 39 is for future use.
-enu StylesCommon=STYLE_
-val STYLE_DEFAULT=32
-val STYLE_LINENUMBER=33
-val STYLE_BRACELIGHT=34
-val STYLE_BRACEBAD=35
-val STYLE_CONTROLCHAR=36
-val STYLE_INDENTGUIDE=37
-val STYLE_CALLTIP=38
-val STYLE_LASTPREDEFINED=39
-val STYLE_MAX=127
-
-# Character set identifiers are used in StyleSetCharacterSet.
-# The values are the same as the Windows *_CHARSET values.
-enu CharacterSet=SC_CHARSET_
-val SC_CHARSET_ANSI=0
-val SC_CHARSET_DEFAULT=1
-val SC_CHARSET_BALTIC=186
-val SC_CHARSET_CHINESEBIG5=136
-val SC_CHARSET_EASTEUROPE=238
-val SC_CHARSET_GB2312=134
-val SC_CHARSET_GREEK=161
-val SC_CHARSET_HANGUL=129
-val SC_CHARSET_MAC=77
-val SC_CHARSET_OEM=255
-val SC_CHARSET_RUSSIAN=204
-val SC_CHARSET_CYRILLIC=1251
-val SC_CHARSET_SHIFTJIS=128
-val SC_CHARSET_SYMBOL=2
-val SC_CHARSET_TURKISH=162
-val SC_CHARSET_JOHAB=130
-val SC_CHARSET_HEBREW=177
-val SC_CHARSET_ARABIC=178
-val SC_CHARSET_VIETNAMESE=163
-val SC_CHARSET_THAI=222
-val SC_CHARSET_8859_15=1000
-
-# Clear all the styles and make equivalent to the global default style.
-set void StyleClearAll=2050(,)
-
-# Set the foreground colour of a style.
-set void StyleSetFore=2051(int style, colour fore)
-
-# Set the background colour of a style.
-set void StyleSetBack=2052(int style, colour back)
-
-# Set a style to be bold or not.
-set void StyleSetBold=2053(int style, bool bold)
-
-# Set a style to be italic or not.
-set void StyleSetItalic=2054(int style, bool italic)
-
-# Set the size of characters of a style.
-set void StyleSetSize=2055(int style, int sizePoints)
-
-# Set the font of a style.
-set void StyleSetFont=2056(int style, string fontName)
-
-# Set a style to have its end of line filled or not.
-set void StyleSetEOLFilled=2057(int style, bool filled)
-
-# Reset the default style to its state at startup
-fun void StyleResetDefault=2058(,)
-
-# Set a style to be underlined or not.
-set void StyleSetUnderline=2059(int style, bool underline)
-
-enu CaseVisible=SC_CASE_
-val SC_CASE_MIXED=0
-val SC_CASE_UPPER=1
-val SC_CASE_LOWER=2
-# Set a style to be mixed case, or to force upper or lower case.
-set void StyleSetCase=2060(int style, int caseForce)
-
-# Set the character set of the font in a style.
-set void StyleSetCharacterSet=2066(int style, int characterSet)
-
-# Set a style to be a hotspot or not.
-set void StyleSetHotSpot=2409(int style, bool hotspot)
-
-# Set the foreground colour of the selection and whether to use this setting.
-fun void SetSelFore=2067(bool useSetting, colour fore)
-
-# Set the background colour of the selection and whether to use this setting.
-fun void SetSelBack=2068(bool useSetting, colour back)
-
-# Get the alpha of the selection.
-get int GetSelAlpha=2477(,)
-
-# Set the alpha of the selection.
-set void SetSelAlpha=2478(int alpha,)
-
-# Set the foreground colour of the caret.
-set void SetCaretFore=2069(colour fore,)
-
-# When key+modifier combination km is pressed perform msg.
-fun void AssignCmdKey=2070(keymod km, int msg)
-
-# When key+modifier combination km is pressed do nothing.
-fun void ClearCmdKey=2071(keymod km,)
-
-# Drop all key mappings.
-fun void ClearAllCmdKeys=2072(,)
-
-# Set the styles for a segment of the document.
-fun void SetStylingEx=2073(int length, string styles)
-
-# Set a style to be visible or not.
-set void StyleSetVisible=2074(int style, bool visible)
-
-# Get the time in milliseconds that the caret is on and off.
-get int GetCaretPeriod=2075(,)
-
-# Get the time in milliseconds that the caret is on and off. 0 = steady on.
-set void SetCaretPeriod=2076(int periodMilliseconds,)
-
-# Set the set of characters making up words for when moving or selecting by word.
-# First sets deaults like SetCharsDefault.
-set void SetWordChars=2077(, string characters)
-
-# Start a sequence of actions that is undone and redone as a unit.
-# May be nested.
-fun void BeginUndoAction=2078(,)
-
-# End a sequence of actions that is undone and redone as a unit.
-fun void EndUndoAction=2079(,)
-
-enu IndicatorStyle=INDIC_
-val INDIC_MAX=7
-val INDIC_PLAIN=0
-val INDIC_SQUIGGLE=1
-val INDIC_TT=2
-val INDIC_DIAGONAL=3
-val INDIC_STRIKE=4
-val INDIC_HIDDEN=5
-val INDIC_BOX=6
-val INDIC_ROUNDBOX=7
-val INDIC0_MASK=0x20
-val INDIC1_MASK=0x40
-val INDIC2_MASK=0x80
-val INDICS_MASK=0xE0
-
-# Set an indicator to plain, squiggle or TT.
-set void IndicSetStyle=2080(int indic, int style)
-
-# Retrieve the style of an indicator.
-get int IndicGetStyle=2081(int indic,)
-
-# Set the foreground colour of an indicator.
-set void IndicSetFore=2082(int indic, colour fore)
-
-# Retrieve the foreground colour of an indicator.
-get colour IndicGetFore=2083(int indic,)
-
-# Set the foreground colour of all whitespace and whether to use this setting.
-fun void SetWhitespaceFore=2084(bool useSetting, colour fore)
-
-# Set the background colour of all whitespace and whether to use this setting.
-fun void SetWhitespaceBack=2085(bool useSetting, colour back)
-
-# Divide each styling byte into lexical class bits (default: 5) and indicator
-# bits (default: 3). If a lexer requires more than 32 lexical states, then this
-# is used to expand the possible states.
-set void SetStyleBits=2090(int bits,)
-
-# Retrieve number of bits in style bytes used to hold the lexical state.
-get int GetStyleBits=2091(,)
-
-# Used to hold extra styling information for each line.
-set void SetLineState=2092(int line, int state)
-
-# Retrieve the extra styling information for a line.
-get int GetLineState=2093(int line,)
-
-# Retrieve the last line number that has line state.
-get int GetMaxLineState=2094(,)
-
-# Is the background of the line containing the caret in a different colour?
-get bool GetCaretLineVisible=2095(,)
-
-# Display the background of the line containing the caret in a different colour.
-set void SetCaretLineVisible=2096(bool show,)
-
-# Get the colour of the background of the line containing the caret.
-get colour GetCaretLineBack=2097(,)
-
-# Set the colour of the background of the line containing the caret.
-set void SetCaretLineBack=2098(colour back,)
-
-# Set a style to be changeable or not (read only).
-# Experimental feature, currently buggy.
-set void StyleSetChangeable=2099(int style, bool changeable)
-
-# Display a auto-completion list.
-# The lenEntered parameter indicates how many characters before
-# the caret should be used to provide context.
-fun void AutoCShow=2100(int lenEntered, string itemList)
-
-# Remove the auto-completion list from the screen.
-fun void AutoCCancel=2101(,)
-
-# Is there an auto-completion list visible?
-fun bool AutoCActive=2102(,)
-
-# Retrieve the position of the caret when the auto-completion list was displayed.
-fun position AutoCPosStart=2103(,)
-
-# User has selected an item so remove the list and insert the selection.
-fun void AutoCComplete=2104(,)
-
-# Define a set of character that when typed cancel the auto-completion list.
-fun void AutoCStops=2105(, string characterSet)
-
-# Change the separator character in the string setting up an auto-completion list.
-# Default is space but can be changed if items contain space.
-set void AutoCSetSeparator=2106(int separatorCharacter,)
-
-# Retrieve the auto-completion list separator character.
-get int AutoCGetSeparator=2107(,)
-
-# Select the item in the auto-completion list that starts with a string.
-fun void AutoCSelect=2108(, string text)
-
-# Should the auto-completion list be cancelled if the user backspaces to a
-# position before where the box was created.
-set void AutoCSetCancelAtStart=2110(bool cancel,)
-
-# Retrieve whether auto-completion cancelled by backspacing before start.
-get bool AutoCGetCancelAtStart=2111(,)
-
-# Define a set of characters that when typed will cause the autocompletion to
-# choose the selected item.
-set void AutoCSetFillUps=2112(, string characterSet)
-
-# Should a single item auto-completion list automatically choose the item.
-set void AutoCSetChooseSingle=2113(bool chooseSingle,)
-
-# Retrieve whether a single item auto-completion list automatically choose the item.
-get bool AutoCGetChooseSingle=2114(,)
-
-# Set whether case is significant when performing auto-completion searches.
-set void AutoCSetIgnoreCase=2115(bool ignoreCase,)
-
-# Retrieve state of ignore case flag.
-get bool AutoCGetIgnoreCase=2116(,)
-
-# Display a list of strings and send notification when user chooses one.
-fun void UserListShow=2117(int listType, string itemList)
-
-# Set whether or not autocompletion is hidden automatically when nothing matches.
-set void AutoCSetAutoHide=2118(bool autoHide,)
-
-# Retrieve whether or not autocompletion is hidden automatically when nothing matches.
-get bool AutoCGetAutoHide=2119(,)
-
-# Set whether or not autocompletion deletes any word characters
-# after the inserted text upon completion.
-set void AutoCSetDropRestOfWord=2270(bool dropRestOfWord,)
-
-# Retrieve whether or not autocompletion deletes any word characters
-# after the inserted text upon completion.
-get bool AutoCGetDropRestOfWord=2271(,)
-
-# Register an XPM image for use in autocompletion lists.
-fun void RegisterImage=2405(int type, string xpmData)
-
-# Clear all the registered XPM images.
-fun void ClearRegisteredImages=2408(,)
-
-# Retrieve the auto-completion list type-separator character.
-get int AutoCGetTypeSeparator=2285(,)
-
-# Change the type-separator character in the string setting up an auto-completion list.
-# Default is '?' but can be changed if items contain '?'.
-set void AutoCSetTypeSeparator=2286(int separatorCharacter,)
-
-# Set the maximum width, in characters, of auto-completion and user lists.
-# Set to 0 to autosize to fit longest item, which is the default.
-set void AutoCSetMaxWidth=2208(int characterCount,)
-
-# Get the maximum width, in characters, of auto-completion and user lists.
-get int AutoCGetMaxWidth=2209(,)
-
-# Set the maximum height, in rows, of auto-completion and user lists.
-# The default is 5 rows.
-set void AutoCSetMaxHeight=2210(int rowCount,)
-
-# Set the maximum height, in rows, of auto-completion and user lists.
-get int AutoCGetMaxHeight=2211(,)
-
-# Set the number of spaces used for one level of indentation.
-set void SetIndent=2122(int indentSize,)
-
-# Retrieve indentation size.
-get int GetIndent=2123(,)
-
-# Indentation will only use space characters if useTabs is false, otherwise
-# it will use a combination of tabs and spaces.
-set void SetUseTabs=2124(bool useTabs,)
-
-# Retrieve whether tabs will be used in indentation.
-get bool GetUseTabs=2125(,)
-
-# Change the indentation of a line to a number of columns.
-set void SetLineIndentation=2126(int line, int indentSize)
-
-# Retrieve the number of columns that a line is indented.
-get int GetLineIndentation=2127(int line,)
-
-# Retrieve the position before the first non indentation character on a line.
-get position GetLineIndentPosition=2128(int line,)
-
-# Retrieve the column number of a position, taking tab width into account.
-get int GetColumn=2129(position pos,)
-
-# Show or hide the horizontal scroll bar.
-set void SetHScrollBar=2130(bool show,)
-
-# Is the horizontal scroll bar visible?
-get bool GetHScrollBar=2131(,)
-
-# Show or hide indentation guides.
-set void SetIndentationGuides=2132(bool show,)
-
-# Are the indentation guides visible?
-get bool GetIndentationGuides=2133(,)
-
-# Set the highlighted indentation guide column.
-# 0 = no highlighted guide.
-set void SetHighlightGuide=2134(int column,)
-
-# Get the highlighted indentation guide column.
-get int GetHighlightGuide=2135(,)
-
-# Get the position after the last visible characters on a line.
-get int GetLineEndPosition=2136(int line,)
-
-# Get the code page used to interpret the bytes of the document as characters.
-get int GetCodePage=2137(,)
-
-# Get the foreground colour of the caret.
-get colour GetCaretFore=2138(,)
-
-# In palette mode?
-get bool GetUsePalette=2139(,)
-
-# In read-only mode?
-get bool GetReadOnly=2140(,)
-
-# Sets the position of the caret.
-set void SetCurrentPos=2141(position pos,)
-
-# Sets the position that starts the selection - this becomes the anchor.
-set void SetSelectionStart=2142(position pos,)
-
-# Returns the position at the start of the selection.
-get position GetSelectionStart=2143(,)
-
-# Sets the position that ends the selection - this becomes the currentPosition.
-set void SetSelectionEnd=2144(position pos,)
-
-# Returns the position at the end of the selection.
-get position GetSelectionEnd=2145(,)
-
-# Sets the print magnification added to the point size of each style for printing.
-set void SetPrintMagnification=2146(int magnification,)
-
-# Returns the print magnification.
-get int GetPrintMagnification=2147(,)
-
-enu PrintOption=SC_PRINT_
-# PrintColourMode - use same colours as screen.
-val SC_PRINT_NORMAL=0
-# PrintColourMode - invert the light value of each style for printing.
-val SC_PRINT_INVERTLIGHT=1
-# PrintColourMode - force black text on white background for printing.
-val SC_PRINT_BLACKONWHITE=2
-# PrintColourMode - text stays coloured, but all background is forced to be white for printing.
-val SC_PRINT_COLOURONWHITE=3
-# PrintColourMode - only the default-background is forced to be white for printing.
-val SC_PRINT_COLOURONWHITEDEFAULTBG=4
-
-# Modify colours when printing for clearer printed text.
-set void SetPrintColourMode=2148(int mode,)
-
-# Returns the print colour mode.
-get int GetPrintColourMode=2149(,)
-
-enu FindOption=SCFIND_
-val SCFIND_WHOLEWORD=2
-val SCFIND_MATCHCASE=4
-val SCFIND_WORDSTART=0x00100000
-val SCFIND_REGEXP=0x00200000
-val SCFIND_POSIX=0x00400000
-
-# Find some text in the document.
-fun position FindText=2150(int flags, findtext ft)
-
-# On Windows, will draw the document into a display context such as a printer.
-fun position FormatRange=2151(bool draw, formatrange fr)
-
-# Retrieve the display line at the top of the display.
-get int GetFirstVisibleLine=2152(,)
-
-# Retrieve the contents of a line.
-# Returns the length of the line.
-fun int GetLine=2153(int line, stringresult text)
-
-# Returns the number of lines in the document. There is always at least one.
-get int GetLineCount=2154(,)
-
-# Sets the size in pixels of the left margin.
-set void SetMarginLeft=2155(, int pixelWidth)
-
-# Returns the size in pixels of the left margin.
-get int GetMarginLeft=2156(,)
-
-# Sets the size in pixels of the right margin.
-set void SetMarginRight=2157(, int pixelWidth)
-
-# Returns the size in pixels of the right margin.
-get int GetMarginRight=2158(,)
-
-# Is the document different from when it was last saved?
-get bool GetModify=2159(,)
-
-# Select a range of text.
-fun void SetSel=2160(position start, position end)
-
-# Retrieve the selected text.
-# Return the length of the text.
-fun int GetSelText=2161(, stringresult text)
-
-# Retrieve a range of text.
-# Return the length of the text.
-fun int GetTextRange=2162(, textrange tr)
-
-# Draw the selection in normal style or with selection highlighted.
-fun void HideSelection=2163(bool normal,)
-
-# Retrieve the x value of the point in the window where a position is displayed.
-fun int PointXFromPosition=2164(, position pos)
-
-# Retrieve the y value of the point in the window where a position is displayed.
-fun int PointYFromPosition=2165(, position pos)
-
-# Retrieve the line containing a position.
-fun int LineFromPosition=2166(position pos,)
-
-# Retrieve the position at the start of a line.
-fun position PositionFromLine=2167(int line,)
-
-# Scroll horizontally and vertically.
-fun void LineScroll=2168(int columns, int lines)
-
-# Ensure the caret is visible.
-fun void ScrollCaret=2169(,)
-
-# Replace the selected text with the argument text.
-fun void ReplaceSel=2170(, string text)
-
-# Set to read only or read write.
-set void SetReadOnly=2171(bool readOnly,)
-
-# Null operation.
-fun void Null=2172(,)
-
-# Will a paste succeed?
-fun bool CanPaste=2173(,)
-
-# Are there any undoable actions in the undo history?
-fun bool CanUndo=2174(,)
-
-# Delete the undo history.
-fun void EmptyUndoBuffer=2175(,)
-
-# Undo one action in the undo history.
-fun void Undo=2176(,)
-
-# Cut the selection to the clipboard.
-fun void Cut=2177(,)
-
-# Copy the selection to the clipboard.
-fun void Copy=2178(,)
-
-# Paste the contents of the clipboard into the document replacing the selection.
-fun void Paste=2179(,)
-
-# Clear the selection.
-fun void Clear=2180(,)
-
-# Replace the contents of the document with the argument text.
-fun void SetText=2181(, string text)
-
-# Retrieve all the text in the document.
-# Returns number of characters retrieved.
-fun int GetText=2182(int length, stringresult text)
-
-# Retrieve the number of characters in the document.
-get int GetTextLength=2183(,)
-
-# Retrieve a pointer to a function that processes messages for this Scintilla.
-get int GetDirectFunction=2184(,)
-
-# Retrieve a pointer value to use as the first argument when calling
-# the function returned by GetDirectFunction.
-get int GetDirectPointer=2185(,)
-
-# Set to overtype (true) or insert mode.
-set void SetOvertype=2186(bool overtype,)
-
-# Returns true if overtype mode is active otherwise false is returned.
-get bool GetOvertype=2187(,)
-
-# Set the width of the insert mode caret.
-set void SetCaretWidth=2188(int pixelWidth,)
-
-# Returns the width of the insert mode caret.
-get int GetCaretWidth=2189(,)
-
-# Sets the position that starts the target which is used for updating the
-# document without affecting the scroll position.
-set void SetTargetStart=2190(position pos,)
-
-# Get the position that starts the target.
-get position GetTargetStart=2191(,)
-
-# Sets the position that ends the target which is used for updating the
-# document without affecting the scroll position.
-set void SetTargetEnd=2192(position pos,)
-
-# Get the position that ends the target.
-get position GetTargetEnd=2193(,)
-
-# Replace the target text with the argument text.
-# Text is counted so it can contain NULs.
-# Returns the length of the replacement text.
-fun int ReplaceTarget=2194(int length, string text)
-
-# Replace the target text with the argument text after \d processing.
-# Text is counted so it can contain NULs.
-# Looks for \d where d is between 1 and 9 and replaces these with the strings
-# matched in the last search operation which were surrounded by \( and \).
-# Returns the length of the replacement text including any change
-# caused by processing the \d patterns.
-fun int ReplaceTargetRE=2195(int length, string text)
-
-# Search for a counted string in the target and set the target to the found
-# range. Text is counted so it can contain NULs.
-# Returns length of range or -1 for failure in which case target is not moved.
-fun int SearchInTarget=2197(int length, string text)
-
-# Set the search flags used by SearchInTarget.
-set void SetSearchFlags=2198(int flags,)
-
-# Get the search flags used by SearchInTarget.
-get int GetSearchFlags=2199(,)
-
-# Show a call tip containing a definition near position pos.
-fun void CallTipShow=2200(position pos, string definition)
-
-# Remove the call tip from the screen.
-fun void CallTipCancel=2201(,)
-
-# Is there an active call tip?
-fun bool CallTipActive=2202(,)
-
-# Retrieve the position where the caret was before displaying the call tip.
-fun position CallTipPosStart=2203(,)
-
-# Highlight a segment of the definition.
-fun void CallTipSetHlt=2204(int start, int end)
-
-# Set the background colour for the call tip.
-set void CallTipSetBack=2205(colour back,)
-
-# Set the foreground colour for the call tip.
-set void CallTipSetFore=2206(colour fore,)
-
-# Set the foreground colour for the highlighted part of the call tip.
-set void CallTipSetForeHlt=2207(colour fore,)
-
-# Enable use of STYLE_CALLTIP and set call tip tab size in pixels.
-set void CallTipUseStyle=2212(int tabSize,)
-
-# Find the display line of a document line taking hidden lines into account.
-fun int VisibleFromDocLine=2220(int line,)
-
-# Find the document line of a display line taking hidden lines into account.
-fun int DocLineFromVisible=2221(int lineDisplay,)
-
-# The number of display lines needed to wrap a document line
-fun int WrapCount=2235(int line,)
-
-enu FoldLevel=SC_FOLDLEVEL
-val SC_FOLDLEVELBASE=0x400
-val SC_FOLDLEVELWHITEFLAG=0x1000
-val SC_FOLDLEVELHEADERFLAG=0x2000
-val SC_FOLDLEVELBOXHEADERFLAG=0x4000
-val SC_FOLDLEVELBOXFOOTERFLAG=0x8000
-val SC_FOLDLEVELCONTRACTED=0x10000
-val SC_FOLDLEVELUNINDENT=0x20000
-val SC_FOLDLEVELNUMBERMASK=0x0FFF
-
-# Set the fold level of a line.
-# This encodes an integer level along with flags indicating whether the
-# line is a header and whether it is effectively white space.
-set void SetFoldLevel=2222(int line, int level)
-
-# Retrieve the fold level of a line.
-get int GetFoldLevel=2223(int line,)
-
-# Find the last child line of a header line.
-get int GetLastChild=2224(int line, int level)
-
-# Find the parent line of a child line.
-get int GetFoldParent=2225(int line,)
-
-# Make a range of lines visible.
-fun void ShowLines=2226(int lineStart, int lineEnd)
-
-# Make a range of lines invisible.
-fun void HideLines=2227(int lineStart, int lineEnd)
-
-# Is a line visible?
-get bool GetLineVisible=2228(int line,)
-
-# Show the children of a header line.
-set void SetFoldExpanded=2229(int line, bool expanded)
-
-# Is a header line expanded?
-get bool GetFoldExpanded=2230(int line,)
-
-# Switch a header line between expanded and contracted.
-fun void ToggleFold=2231(int line,)
-
-# Ensure a particular line is visible by expanding any header line hiding it.
-fun void EnsureVisible=2232(int line,)
-
-enu FoldFlag=SC_FOLDFLAG_
-val SC_FOLDFLAG_LINEBEFORE_EXPANDED=0x0002
-val SC_FOLDFLAG_LINEBEFORE_CONTRACTED=0x0004
-val SC_FOLDFLAG_LINEAFTER_EXPANDED=0x0008
-val SC_FOLDFLAG_LINEAFTER_CONTRACTED=0x0010
-val SC_FOLDFLAG_LEVELNUMBERS=0x0040
-val SC_FOLDFLAG_BOX=0x0001
-
-# Set some style options for folding.
-fun void SetFoldFlags=2233(int flags,)
-
-# Ensure a particular line is visible by expanding any header line hiding it.
-# Use the currently set visibility policy to determine which range to display.
-fun void EnsureVisibleEnforcePolicy=2234(int line,)
-
-# Sets whether a tab pressed when caret is within indentation indents.
-set void SetTabIndents=2260(bool tabIndents,)
-
-# Does a tab pressed when caret is within indentation indent?
-get bool GetTabIndents=2261(,)
-
-# Sets whether a backspace pressed when caret is within indentation unindents.
-set void SetBackSpaceUnIndents=2262(bool bsUnIndents,)
-
-# Does a backspace pressed when caret is within indentation unindent?
-get bool GetBackSpaceUnIndents=2263(,)
-
-val SC_TIME_FOREVER=10000000
-
-# Sets the time the mouse must sit still to generate a mouse dwell event.
-set void SetMouseDwellTime=2264(int periodMilliseconds,)
-
-# Retrieve the time the mouse must sit still to generate a mouse dwell event.
-get int GetMouseDwellTime=2265(,)
-
-# Get position of start of word.
-fun int WordStartPosition=2266(position pos, bool onlyWordCharacters)
-
-# Get position of end of word.
-fun int WordEndPosition=2267(position pos, bool onlyWordCharacters)
-
-enu Wrap=SC_WRAP_
-val SC_WRAP_NONE=0
-val SC_WRAP_WORD=1
-val SC_WRAP_CHAR=2
-
-# Sets whether text is word wrapped.
-set void SetWrapMode=2268(int mode,)
-
-# Retrieve whether text is word wrapped.
-get int GetWrapMode=2269(,)
-
-enu WrapVisualFlag=SC_WRAPVISUALFLAG_
-val SC_WRAPVISUALFLAG_NONE=0x0000
-val SC_WRAPVISUALFLAG_END=0x0001
-val SC_WRAPVISUALFLAG_START=0x0002
-
-# Set the display mode of visual flags for wrapped lines.
-set void SetWrapVisualFlags=2460(int wrapVisualFlags,)
-
-# Retrive the display mode of visual flags for wrapped lines.
-get int GetWrapVisualFlags=2461(,)
-
-enu WrapVisualLocation=SC_WRAPVISUALFLAGLOC_
-val SC_WRAPVISUALFLAGLOC_DEFAULT=0x0000
-val SC_WRAPVISUALFLAGLOC_END_BY_TEXT=0x0001
-val SC_WRAPVISUALFLAGLOC_START_BY_TEXT=0x0002
-
-# Set the location of visual flags for wrapped lines.
-set void SetWrapVisualFlagsLocation=2462(int wrapVisualFlagsLocation,)
-
-# Retrive the location of visual flags for wrapped lines.
-get int GetWrapVisualFlagsLocation=2463(,)
-
-# Set the start indent for wrapped lines.
-set void SetWrapStartIndent=2464(int indent,)
-
-# Retrive the start indent for wrapped lines.
-get int GetWrapStartIndent=2465(,)
-
-enu LineCache=SC_CACHE_
-val SC_CACHE_NONE=0
-val SC_CACHE_CARET=1
-val SC_CACHE_PAGE=2
-val SC_CACHE_DOCUMENT=3
-
-# Sets the degree of caching of layout information.
-set void SetLayoutCache=2272(int mode,)
-
-# Retrieve the degree of caching of layout information.
-get int GetLayoutCache=2273(,)
-
-# Sets the document width assumed for scrolling.
-set void SetScrollWidth=2274(int pixelWidth,)
-
-# Retrieve the document width assumed for scrolling.
-get int GetScrollWidth=2275(,)
-
-# Measure the pixel width of some text in a particular style.
-# NUL terminated text argument.
-# Does not handle tab or control characters.
-fun int TextWidth=2276(int style, string text)
-
-# Sets the scroll range so that maximum scroll position has
-# the last line at the bottom of the view (default).
-# Setting this to false allows scrolling one page below the last line.
-set void SetEndAtLastLine=2277(bool endAtLastLine,)
-
-# Retrieve whether the maximum scroll position has the last
-# line at the bottom of the view.
-get bool GetEndAtLastLine=2278(,)
-
-# Retrieve the height of a particular line of text in pixels.
-fun int TextHeight=2279(int line,)
-
-# Show or hide the vertical scroll bar.
-set void SetVScrollBar=2280(bool show,)
-
-# Is the vertical scroll bar visible?
-get bool GetVScrollBar=2281(,)
-
-# Append a string to the end of the document without changing the selection.
-fun void AppendText=2282(int length, string text)
-
-# Is drawing done in two phases with backgrounds drawn before foregrounds?
-get bool GetTwoPhaseDraw=2283(,)
-
-# In twoPhaseDraw mode, drawing is performed in two phases, first the background
-# and then the foreground. This avoids chopping off characters that overlap the next run.
-set void SetTwoPhaseDraw=2284(bool twoPhase,)
-
-# Make the target range start and end be the same as the selection range start and end.
-fun void TargetFromSelection=2287(,)
-
-# Join the lines in the target.
-fun void LinesJoin=2288(,)
-
-# Split the lines in the target into lines that are less wide than pixelWidth
-# where possible.
-fun void LinesSplit=2289(int pixelWidth,)
-
-# Set the colours used as a chequerboard pattern in the fold margin
-fun void SetFoldMarginColour=2290(bool useSetting, colour back)
-fun void SetFoldMarginHiColour=2291(bool useSetting, colour fore)
-
-## New messages go here
-
-## Start of key messages
-# Move caret down one line.
-fun void LineDown=2300(,)
-
-# Move caret down one line extending selection to new caret position.
-fun void LineDownExtend=2301(,)
-
-# Move caret up one line.
-fun void LineUp=2302(,)
-
-# Move caret up one line extending selection to new caret position.
-fun void LineUpExtend=2303(,)
-
-# Move caret left one character.
-fun void CharLeft=2304(,)
-
-# Move caret left one character extending selection to new caret position.
-fun void CharLeftExtend=2305(,)
-
-# Move caret right one character.
-fun void CharRight=2306(,)
-
-# Move caret right one character extending selection to new caret position.
-fun void CharRightExtend=2307(,)
-
-# Move caret left one word.
-fun void WordLeft=2308(,)
-
-# Move caret left one word extending selection to new caret position.
-fun void WordLeftExtend=2309(,)
-
-# Move caret right one word.
-fun void WordRight=2310(,)
-
-# Move caret right one word extending selection to new caret position.
-fun void WordRightExtend=2311(,)
-
-# Move caret to first position on line.
-fun void Home=2312(,)
-
-# Move caret to first position on line extending selection to new caret position.
-fun void HomeExtend=2313(,)
-
-# Move caret to last position on line.
-fun void LineEnd=2314(,)
-
-# Move caret to last position on line extending selection to new caret position.
-fun void LineEndExtend=2315(,)
-
-# Move caret to first position in document.
-fun void DocumentStart=2316(,)
-
-# Move caret to first position in document extending selection to new caret position.
-fun void DocumentStartExtend=2317(,)
-
-# Move caret to last position in document.
-fun void DocumentEnd=2318(,)
-
-# Move caret to last position in document extending selection to new caret position.
-fun void DocumentEndExtend=2319(,)
-
-# Move caret one page up.
-fun void PageUp=2320(,)
-
-# Move caret one page up extending selection to new caret position.
-fun void PageUpExtend=2321(,)
-
-# Move caret one page down.
-fun void PageDown=2322(,)
-
-# Move caret one page down extending selection to new caret position.
-fun void PageDownExtend=2323(,)
-
-# Switch from insert to overtype mode or the reverse.
-fun void EditToggleOvertype=2324(,)
-
-# Cancel any modes such as call tip or auto-completion list display.
-fun void Cancel=2325(,)
-
-# Delete the selection or if no selection, the character before the caret.
-fun void DeleteBack=2326(,)
-
-# If selection is empty or all on one line replace the selection with a tab character.
-# If more than one line selected, indent the lines.
-fun void Tab=2327(,)
-
-# Dedent the selected lines.
-fun void BackTab=2328(,)
-
-# Insert a new line, may use a CRLF, CR or LF depending on EOL mode.
-fun void NewLine=2329(,)
-
-# Insert a Form Feed character.
-fun void FormFeed=2330(,)
-
-# Move caret to before first visible character on line.
-# If already there move to first character on line.
-fun void VCHome=2331(,)
-
-# Like VCHome but extending selection to new caret position.
-fun void VCHomeExtend=2332(,)
-
-# Magnify the displayed text by increasing the sizes by 1 point.
-fun void ZoomIn=2333(,)
-
-# Make the displayed text smaller by decreasing the sizes by 1 point.
-fun void ZoomOut=2334(,)
-
-# Delete the word to the left of the caret.
-fun void DelWordLeft=2335(,)
-
-# Delete the word to the right of the caret.
-fun void DelWordRight=2336(,)
-
-# Cut the line containing the caret.
-fun void LineCut=2337(,)
-
-# Delete the line containing the caret.
-fun void LineDelete=2338(,)
-
-# Switch the current line with the previous.
-fun void LineTranspose=2339(,)
-
-# Duplicate the current line.
-fun void LineDuplicate=2404(,)
-
-# Transform the selection to lower case.
-fun void LowerCase=2340(,)
-
-# Transform the selection to upper case.
-fun void UpperCase=2341(,)
-
-# Scroll the document down, keeping the caret visible.
-fun void LineScrollDown=2342(,)
-
-# Scroll the document up, keeping the caret visible.
-fun void LineScrollUp=2343(,)
-
-# Delete the selection or if no selection, the character before the caret.
-# Will not delete the character before at the start of a line.
-fun void DeleteBackNotLine=2344(,)
-
-# Move caret to first position on display line.
-fun void HomeDisplay=2345(,)
-
-# Move caret to first position on display line extending selection to
-# new caret position.
-fun void HomeDisplayExtend=2346(,)
-
-# Move caret to last position on display line.
-fun void LineEndDisplay=2347(,)
-
-# Move caret to last position on display line extending selection to new
-# caret position.
-fun void LineEndDisplayExtend=2348(,)
-
-# These are like their namesakes Home(Extend)?, LineEnd(Extend)?, VCHome(Extend)?
-# except they behave differently when word-wrap is enabled:
-# They go first to the start / end of the display line, like (Home|LineEnd)Display
-# The difference is that, the cursor is already at the point, it goes on to the start
-# or end of the document line, as appropriate for (Home|LineEnd|VCHome)(Extend)?.
-
-fun void HomeWrap=2349(,)
-fun void HomeWrapExtend=2450(,)
-fun void LineEndWrap=2451(,)
-fun void LineEndWrapExtend=2452(,)
-fun void VCHomeWrap=2453(,)
-fun void VCHomeWrapExtend=2454(,)
-
-# Copy the line containing the caret.
-fun void LineCopy=2455(,)
-
-# Move the caret inside current view if it's not there already.
-fun void MoveCaretInsideView=2401(,)
-
-# How many characters are on a line, not including end of line characters?
-fun int LineLength=2350(int line,)
-
-# Highlight the characters at two positions.
-fun void BraceHighlight=2351(position pos1, position pos2)
-
-# Highlight the character at a position indicating there is no matching brace.
-fun void BraceBadLight=2352(position pos,)
-
-# Find the position of a matching brace or INVALID_POSITION if no match.
-fun position BraceMatch=2353(position pos,)
-
-# Are the end of line characters visible?
-get bool GetViewEOL=2355(,)
-
-# Make the end of line characters visible or invisible.
-set void SetViewEOL=2356(bool visible,)
-
-# Retrieve a pointer to the document object.
-get int GetDocPointer=2357(,)
-
-# Change the document object used.
-set void SetDocPointer=2358(, int pointer)
-
-# Set which document modification events are sent to the container.
-set void SetModEventMask=2359(int mask,)
-
-enu EdgeVisualStyle=EDGE_
-val EDGE_NONE=0
-val EDGE_LINE=1
-val EDGE_BACKGROUND=2
-
-# Retrieve the column number which text should be kept within.
-get int GetEdgeColumn=2360(,)
-
-# Set the column number of the edge.
-# If text goes past the edge then it is highlighted.
-set void SetEdgeColumn=2361(int column,)
-
-# Retrieve the edge highlight mode.
-get int GetEdgeMode=2362(,)
-
-# The edge may be displayed by a line (EDGE_LINE) or by highlighting text that
-# goes beyond it (EDGE_BACKGROUND) or not displayed at all (EDGE_NONE).
-set void SetEdgeMode=2363(int mode,)
-
-# Retrieve the colour used in edge indication.
-get colour GetEdgeColour=2364(,)
-
-# Change the colour used in edge indication.
-set void SetEdgeColour=2365(colour edgeColour,)
-
-# Sets the current caret position to be the search anchor.
-fun void SearchAnchor=2366(,)
-
-# Find some text starting at the search anchor.
-# Does not ensure the selection is visible.
-fun int SearchNext=2367(int flags, string text)
-
-# Find some text starting at the search anchor and moving backwards.
-# Does not ensure the selection is visible.
-fun int SearchPrev=2368(int flags, string text)
-
-# Retrieves the number of lines completely visible.
-get int LinesOnScreen=2370(,)
-
-# Set whether a pop up menu is displayed automatically when the user presses
-# the wrong mouse button.
-fun void UsePopUp=2371(bool allowPopUp,)
-
-# Is the selection rectangular? The alternative is the more common stream selection.
-get bool SelectionIsRectangle=2372(,)
-
-# Set the zoom level. This number of points is added to the size of all fonts.
-# It may be positive to magnify or negative to reduce.
-set void SetZoom=2373(int zoom,)
-# Retrieve the zoom level.
-get int GetZoom=2374(,)
-
-# Create a new document object.
-# Starts with reference count of 1 and not selected into editor.
-fun int CreateDocument=2375(,)
-# Extend life of document.
-fun void AddRefDocument=2376(, int doc)
-# Release a reference to the document, deleting document if it fades to black.
-fun void ReleaseDocument=2377(, int doc)
-
-# Get which document modification events are sent to the container.
-get int GetModEventMask=2378(,)
-
-# Change internal focus flag.
-set void SetFocus=2380(bool focus,)
-# Get internal focus flag.
-get bool GetFocus=2381(,)
-
-# Change error status - 0 = OK.
-set void SetStatus=2382(int statusCode,)
-# Get error status.
-get int GetStatus=2383(,)
-
-# Set whether the mouse is captured when its button is pressed.
-set void SetMouseDownCaptures=2384(bool captures,)
-# Get whether mouse gets captured.
-get bool GetMouseDownCaptures=2385(,)
-
-enu CursorShape=SC_CURSOR
-val SC_CURSORNORMAL=-1
-val SC_CURSORWAIT=4
-# Sets the cursor to one of the SC_CURSOR* values.
-set void SetCursor=2386(int cursorType,)
-# Get cursor type.
-get int GetCursor=2387(,)
-
-# Change the way control characters are displayed:
-# If symbol is < 32, keep the drawn way, else, use the given character.
-set void SetControlCharSymbol=2388(int symbol,)
-# Get the way control characters are displayed.
-get int GetControlCharSymbol=2389(,)
-
-# Move to the previous change in capitalisation.
-fun void WordPartLeft=2390(,)
-# Move to the previous change in capitalisation extending selection
-# to new caret position.
-fun void WordPartLeftExtend=2391(,)
-# Move to the change next in capitalisation.
-fun void WordPartRight=2392(,)
-# Move to the next change in capitalisation extending selection
-# to new caret position.
-fun void WordPartRightExtend=2393(,)
-
-# Constants for use with SetVisiblePolicy, similar to SetCaretPolicy.
-val VISIBLE_SLOP=0x01
-val VISIBLE_STRICT=0x04
-# Set the way the display area is determined when a particular line
-# is to be moved to by Find, FindNext, GotoLine, etc.
-fun void SetVisiblePolicy=2394(int visiblePolicy, int visibleSlop)
-
-# Delete back from the current position to the start of the line.
-fun void DelLineLeft=2395(,)
-
-# Delete forwards from the current position to the end of the line.
-fun void DelLineRight=2396(,)
-
-# Get and Set the xOffset (ie, horizonal scroll position).
-set void SetXOffset=2397(int newOffset,)
-get int GetXOffset=2398(,)
-
-# Set the last x chosen value to be the caret x position.
-fun void ChooseCaretX=2399(,)
-
-# Set the focus to this Scintilla widget.
-fun void GrabFocus=2400(,)
-
-enu CaretPolicy = CARET_
-# Caret policy, used by SetXCaretPolicy and SetYCaretPolicy.
-# If CARET_SLOP is set, we can define a slop value: caretSlop.
-# This value defines an unwanted zone (UZ) where the caret is... unwanted.
-# This zone is defined as a number of pixels near the vertical margins,
-# and as a number of lines near the horizontal margins.
-# By keeping the caret away from the edges, it is seen within its context,
-# so it is likely that the identifier that the caret is on can be completely seen,
-# and that the current line is seen with some of the lines following it which are
-# often dependent on that line.
-val CARET_SLOP=0x01
-# If CARET_STRICT is set, the policy is enforced... strictly.
-# The caret is centred on the display if slop is not set,
-# and cannot go in the UZ if slop is set.
-val CARET_STRICT=0x04
-# If CARET_JUMPS is set, the display is moved more energetically
-# so the caret can move in the same direction longer before the policy is applied again.
-val CARET_JUMPS=0x10
-# If CARET_EVEN is not set, instead of having symmetrical UZs,
-# the left and bottom UZs are extended up to right and top UZs respectively.
-# This way, we favour the displaying of useful information: the begining of lines,
-# where most code reside, and the lines after the caret, eg. the body of a function.
-val CARET_EVEN=0x08
-
-# Set the way the caret is kept visible when going sideway.
-# The exclusion zone is given in pixels.
-fun void SetXCaretPolicy=2402(int caretPolicy, int caretSlop)
-
-# Set the way the line the caret is on is kept visible.
-# The exclusion zone is given in lines.
-fun void SetYCaretPolicy=2403(int caretPolicy, int caretSlop)
-
-# Set printing to line wrapped (SC_WRAP_WORD) or not line wrapped (SC_WRAP_NONE).
-set void SetPrintWrapMode=2406(int mode,)
-
-# Is printing line wrapped?
-get int GetPrintWrapMode=2407(,)
-
-# Set a fore colour for active hotspots.
-set void SetHotspotActiveFore=2410(bool useSetting, colour fore)
-
-# Set a back colour for active hotspots.
-set void SetHotspotActiveBack=2411(bool useSetting, colour back)
-
-# Enable / Disable underlining active hotspots.
-set void SetHotspotActiveUnderline=2412(bool underline,)
-
-# Limit hotspots to single line so hotspots on two lines don't merge.
-set void SetHotspotSingleLine=2421(bool singleLine,)
-
-# Move caret between paragraphs (delimited by empty lines).
-fun void ParaDown=2413(,)
-fun void ParaDownExtend=2414(,)
-fun void ParaUp=2415(,)
-fun void ParaUpExtend=2416(,)
-
-# Given a valid document position, return the previous position taking code
-# page into account. Returns 0 if passed 0.
-fun position PositionBefore=2417(position pos,)
-
-# Given a valid document position, return the next position taking code
-# page into account. Maximum value returned is the last position in the document.
-fun position PositionAfter=2418(position pos,)
-
-# Copy a range of text to the clipboard. Positions are clipped into the document.
-fun void CopyRange=2419(position start, position end)
-
-# Copy argument text to the clipboard.
-fun void CopyText=2420(int length, string text)
-
-# Selection modes
-enu SelectionMode=SC_SEL_
-val SC_SEL_STREAM=0
-val SC_SEL_RECTANGLE=1
-val SC_SEL_LINES=2
-
-# Set the selection mode to stream (SC_SEL_STREAM) or rectangular (SC_SEL_RECTANGLE) or
-# by lines (SC_SEL_LINES).
-set void SetSelectionMode=2422(int mode,)
-
-# Get the mode of the current selection.
-get int GetSelectionMode=2423(,)
-
-# Retrieve the position of the start of the selection at the given line (INVALID_POSITION if no selection on this line).
-fun position GetLineSelStartPosition=2424(int line,)
-
-# Retrieve the position of the end of the selection at the given line (INVALID_POSITION if no selection on this line).
-fun position GetLineSelEndPosition=2425(int line,)
-
-## RectExtended rectangular selection moves
-# Move caret down one line, extending rectangular selection to new caret position.
-fun void LineDownRectExtend=2426(,)
-
-# Move caret up one line, extending rectangular selection to new caret position.
-fun void LineUpRectExtend=2427(,)
-
-# Move caret left one character, extending rectangular selection to new caret position.
-fun void CharLeftRectExtend=2428(,)
-
-# Move caret right one character, extending rectangular selection to new caret position.
-fun void CharRightRectExtend=2429(,)
-
-# Move caret to first position on line, extending rectangular selection to new caret position.
-fun void HomeRectExtend=2430(,)
-
-# Move caret to before first visible character on line.
-# If already there move to first character on line.
-# In either case, extend rectangular selection to new caret position.
-fun void VCHomeRectExtend=2431(,)
-
-# Move caret to last position on line, extending rectangular selection to new caret position.
-fun void LineEndRectExtend=2432(,)
-
-# Move caret one page up, extending rectangular selection to new caret position.
-fun void PageUpRectExtend=2433(,)
-
-# Move caret one page down, extending rectangular selection to new caret position.
-fun void PageDownRectExtend=2434(,)
-
-
-# Move caret to top of page, or one page up if already at top of page.
-fun void StutteredPageUp=2435(,)
-
-# Move caret to top of page, or one page up if already at top of page, extending selection to new caret position.
-fun void StutteredPageUpExtend=2436(,)
-
-# Move caret to bottom of page, or one page down if already at bottom of page.
-fun void StutteredPageDown=2437(,)
-
-# Move caret to bottom of page, or one page down if already at bottom of page, extending selection to new caret position.
-fun void StutteredPageDownExtend=2438(,)
-
-
-# Move caret left one word, position cursor at end of word.
-fun void WordLeftEnd=2439(,)
-
-# Move caret left one word, position cursor at end of word, extending selection to new caret position.
-fun void WordLeftEndExtend=2440(,)
-
-# Move caret right one word, position cursor at end of word.
-fun void WordRightEnd=2441(,)
-
-# Move caret right one word, position cursor at end of word, extending selection to new caret position.
-fun void WordRightEndExtend=2442(,)
-
-# Set the set of characters making up whitespace for when moving or selecting by word.
-# Should be called after SetWordChars.
-set void SetWhitespaceChars=2443(, string characters)
-
-# Reset the set of characters for whitespace and word characters to the defaults.
-fun void SetCharsDefault=2444(,)
-
-# Get currently selected item position in the auto-completion list
-fun int AutoCGetCurrent=2445(,)
-
-# Enlarge the document to a particular size of text bytes.
-fun void Allocate=2446(int bytes,)
-
-# Returns the target converted to UTF8.
-# Return the length in bytes.
-fun int TargetAsUTF8=2447(, stringresult s)
-
-# Set the length of the utf8 argument for calling EncodedFromUTF8.
-# Set to -1 and the string will be measured to the first nul.
-fun void SetLengthForEncode=2448(int bytes,)
-
-# Translates a UTF8 string into the document encoding.
-# Return the length of the result in bytes.
-# On error return 0.
-fun int EncodedFromUTF8=2449(string utf8, stringresult encoded)
-
-# Find the position of a column on a line taking into account tabs and
-# multi-byte characters. If beyond end of line, return line end position.
-fun int FindColumn=2456(int line, int column)
-
-# Can the caret preferred x position only be changed by explicit movement commands?
-get bool GetCaretSticky=2457(,)
-
-# Stop the caret preferred x position changing when the user types.
-set void SetCaretSticky=2458(bool useCaretStickyBehaviour,)
-
-# Switch between sticky and non-sticky: meant to be bound to a key.
-fun void ToggleCaretSticky=2459(,)
-
-# Enable/Disable convert-on-paste for line endings
-set void SetPasteConvertEndings=2467(bool convert,)
-
-# Get convert-on-paste setting
-get bool GetPasteConvertEndings=2468(,)
-
-# Duplicate the selection. If selection empty duplicate the line containing the caret.
-fun void SelectionDuplicate=2469(,)
-
-val SC_ALPHA_TRANSPARENT=0
-val SC_ALPHA_OPAQUE=255
-val SC_ALPHA_NOALPHA=256
-
-# Set background alpha of the caret line.
-set void SetCaretLineBackAlpha=2470(int alpha,)
-
-# Get the background alpha of the caret line.
-get int GetCaretLineBackAlpha=2471(,)
-
-# Start notifying the container of all key presses and commands.
-fun void StartRecord=3001(,)
-
-# Stop notifying the container of all key presses and commands.
-fun void StopRecord=3002(,)
-
-# Set the lexing language of the document.
-set void SetLexer=4001(int lexer,)
-
-# Retrieve the lexing language of the document.
-get int GetLexer=4002(,)
-
-# Colourise a segment of the document using the current lexing language.
-fun void Colourise=4003(position start, position end)
-
-# Set up a value that may be used by a lexer for some optional feature.
-set void SetProperty=4004(string key, string value)
-
-# Maximum value of keywordSet parameter of SetKeyWords.
-val KEYWORDSET_MAX=8
-
-# Set up the key words used by the lexer.
-set void SetKeyWords=4005(int keywordSet, string keyWords)
-
-# Set the lexing language of the document based on string name.
-set void SetLexerLanguage=4006(, string language)
-
-# Load a lexer library (dll / so).
-fun void LoadLexerLibrary=4007(, string path)
-
-# Retrieve a "property" value previously set with SetProperty.
-fun int GetProperty=4008(string key, stringresult buf)
-
-# Retrieve a "property" value previously set with SetProperty,
-# with "$()" variable replacement on returned buffer.
-fun int GetPropertyExpanded=4009(string key, stringresult buf)
-
-# Retrieve a "property" value previously set with SetProperty,
-# interpreted as an int AFTER any "$()" variable replacement.
-get int GetPropertyInt=4010(string key,)
-
-# Retrieve the number of bits the current lexer needs for styling.
-get int GetStyleBitsNeeded=4011(,)
-
-# 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_*.
-enu ModificationFlags=SC_MOD_ SC_PERFORMED_ SC_LAST
-val SC_MOD_INSERTTEXT=0x1
-val SC_MOD_DELETETEXT=0x2
-val SC_MOD_CHANGESTYLE=0x4
-val SC_MOD_CHANGEFOLD=0x8
-val SC_PERFORMED_USER=0x10
-val SC_PERFORMED_UNDO=0x20
-val SC_PERFORMED_REDO=0x40
-val SC_MULTISTEPUNDOREDO=0x80
-val SC_LASTSTEPINUNDOREDO=0x100
-val SC_MOD_CHANGEMARKER=0x200
-val SC_MOD_BEFOREINSERT=0x400
-val SC_MOD_BEFOREDELETE=0x800
-val SC_MULTILINEUNDOREDO=0x1000
-val SC_MODEVENTMASKALL=0x1FFF
-
-# For compatibility, these go through the COMMAND notification rather than NOTIFY
-# and should have had exactly the same values as the EN_* constants.
-# Unfortunately the SETFOCUS and KILLFOCUS are flipped over from EN_*
-# As clients depend on these constants, this will not be changed.
-val SCEN_CHANGE=768
-val SCEN_SETFOCUS=512
-val SCEN_KILLFOCUS=256
-
-# Symbolic key codes and modifier flags.
-# ASCII and other printable characters below 256.
-# Extended keys above 300.
-
-enu Keys=SCK_
-val SCK_DOWN=300
-val SCK_UP=301
-val SCK_LEFT=302
-val SCK_RIGHT=303
-val SCK_HOME=304
-val SCK_END=305
-val SCK_PRIOR=306
-val SCK_NEXT=307
-val SCK_DELETE=308
-val SCK_INSERT=309
-val SCK_ESCAPE=7
-val SCK_BACK=8
-val SCK_TAB=9
-val SCK_RETURN=13
-val SCK_ADD=310
-val SCK_SUBTRACT=311
-val SCK_DIVIDE=312
-
-enu KeyMod=SCMOD_
-val SCMOD_NORM=0
-val SCMOD_SHIFT=1
-val SCMOD_CTRL=2
-val SCMOD_ALT=4
-
-################################################
-# For SciLexer.h
-enu Lexer=SCLEX_
-val SCLEX_CONTAINER=0
-val SCLEX_NULL=1
-val SCLEX_PYTHON=2
-val SCLEX_CPP=3
-val SCLEX_HTML=4
-val SCLEX_XML=5
-val SCLEX_PERL=6
-val SCLEX_SQL=7
-val SCLEX_VB=8
-val SCLEX_PROPERTIES=9
-val SCLEX_ERRORLIST=10
-val SCLEX_MAKEFILE=11
-val SCLEX_BATCH=12
-val SCLEX_XCODE=13
-val SCLEX_LATEX=14
-val SCLEX_LUA=15
-val SCLEX_DIFF=16
-val SCLEX_CONF=17
-val SCLEX_PASCAL=18
-val SCLEX_AVE=19
-val SCLEX_ADA=20
-val SCLEX_LISP=21
-val SCLEX_RUBY=22
-val SCLEX_EIFFEL=23
-val SCLEX_EIFFELKW=24
-val SCLEX_TCL=25
-val SCLEX_NNCRONTAB=26
-val SCLEX_BULLANT=27
-val SCLEX_VBSCRIPT=28
-val SCLEX_BAAN=31
-val SCLEX_MATLAB=32
-val SCLEX_SCRIPTOL=33
-val SCLEX_ASM=34
-val SCLEX_CPPNOCASE=35
-val SCLEX_FORTRAN=36
-val SCLEX_F77=37
-val SCLEX_CSS=38
-val SCLEX_POV=39
-val SCLEX_LOUT=40
-val SCLEX_ESCRIPT=41
-val SCLEX_PS=42
-val SCLEX_NSIS=43
-val SCLEX_MMIXAL=44
-val SCLEX_CLW=45
-val SCLEX_CLWNOCASE=46
-val SCLEX_LOT=47
-val SCLEX_YAML=48
-val SCLEX_TEX=49
-val SCLEX_METAPOST=50
-val SCLEX_POWERBASIC=51
-val SCLEX_FORTH=52
-val SCLEX_ERLANG=53
-val SCLEX_OCTAVE=54
-val SCLEX_MSSQL=55
-val SCLEX_VERILOG=56
-val SCLEX_KIX=57
-val SCLEX_GUI4CLI=58
-val SCLEX_SPECMAN=59
-val SCLEX_AU3=60
-val SCLEX_APDL=61
-val SCLEX_BASH=62
-val SCLEX_ASN1=63
-val SCLEX_VHDL=64
-val SCLEX_CAML=65
-val SCLEX_BLITZBASIC=66
-val SCLEX_PUREBASIC=67
-val SCLEX_HASKELL=68
-val SCLEX_PHPSCRIPT=69
-val SCLEX_TADS3=70
-val SCLEX_REBOL=71
-val SCLEX_SMALLTALK=72
-val SCLEX_FLAGSHIP=73
-val SCLEX_CSOUND=74
-val SCLEX_FREEBASIC=75
-val SCLEX_INNOSETUP=76
-val SCLEX_OPAL=77
-val SCLEX_SPICE=78
-
-# When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
-# value assigned in sequence from SCLEX_AUTOMATIC+1.
-val SCLEX_AUTOMATIC=1000
-# Lexical states for SCLEX_PYTHON
-lex Python=SCLEX_PYTHON SCE_P_
-val SCE_P_DEFAULT=0
-val SCE_P_COMMENTLINE=1
-val SCE_P_NUMBER=2
-val SCE_P_STRING=3
-val SCE_P_CHARACTER=4
-val SCE_P_WORD=5
-val SCE_P_TRIPLE=6
-val SCE_P_TRIPLEDOUBLE=7
-val SCE_P_CLASSNAME=8
-val SCE_P_DEFNAME=9
-val SCE_P_OPERATOR=10
-val SCE_P_IDENTIFIER=11
-val SCE_P_COMMENTBLOCK=12
-val SCE_P_STRINGEOL=13
-val SCE_P_WORD2=14
-val SCE_P_DECORATOR=15
-# Lexical states for SCLEX_CPP
-lex Cpp=SCLEX_CPP SCE_C_
-lex Pascal=SCLEX_PASCAL SCE_C_
-lex BullAnt=SCLEX_BULLANT SCE_C_
-val SCE_C_DEFAULT=0
-val SCE_C_COMMENT=1
-val SCE_C_COMMENTLINE=2
-val SCE_C_COMMENTDOC=3
-val SCE_C_NUMBER=4
-val SCE_C_WORD=5
-val SCE_C_STRING=6
-val SCE_C_CHARACTER=7
-val SCE_C_UUID=8
-val SCE_C_PREPROCESSOR=9
-val SCE_C_OPERATOR=10
-val SCE_C_IDENTIFIER=11
-val SCE_C_STRINGEOL=12
-val SCE_C_VERBATIM=13
-val SCE_C_REGEX=14
-val SCE_C_COMMENTLINEDOC=15
-val SCE_C_WORD2=16
-val SCE_C_COMMENTDOCKEYWORD=17
-val SCE_C_COMMENTDOCKEYWORDERROR=18
-val SCE_C_GLOBALCLASS=19
-# Lexical states for SCLEX_TCL
-lex TCL=SCLEX_TCL SCE_TCL_
-val SCE_TCL_DEFAULT=0
-val SCE_TCL_COMMENT=1
-val SCE_TCL_COMMENTLINE=2
-val SCE_TCL_NUMBER=3
-val SCE_TCL_WORD_IN_QUOTE=4
-val SCE_TCL_IN_QUOTE=5
-val SCE_TCL_OPERATOR=6
-val SCE_TCL_IDENTIFIER=7
-val SCE_TCL_SUBSTITUTION=8
-val SCE_TCL_SUB_BRACE=9
-val SCE_TCL_MODIFIER=10
-val SCE_TCL_EXPAND=11
-val SCE_TCL_WORD=12
-val SCE_TCL_WORD2=13
-val SCE_TCL_WORD3=14
-val SCE_TCL_WORD4=15
-val SCE_TCL_WORD5=16
-val SCE_TCL_WORD6=17
-val SCE_TCL_WORD7=18
-val SCE_TCL_WORD8=19
-val SCE_TCL_COMMENT_BOX=20
-val SCE_TCL_BLOCK_COMMENT=21
-# Lexical states for SCLEX_HTML, SCLEX_XML
-lex HTML=SCLEX_HTML SCE_H
-lex XML=SCLEX_XML SCE_H
-lex ASP=SCLEX_ASP SCE_H
-lex PHP=SCLEX_PHP SCE_H
-val SCE_H_DEFAULT=0
-val SCE_H_TAG=1
-val SCE_H_TAGUNKNOWN=2
-val SCE_H_ATTRIBUTE=3
-val SCE_H_ATTRIBUTEUNKNOWN=4
-val SCE_H_NUMBER=5
-val SCE_H_DOUBLESTRING=6
-val SCE_H_SINGLESTRING=7
-val SCE_H_OTHER=8
-val SCE_H_COMMENT=9
-val SCE_H_ENTITY=10
-# XML and ASP
-val SCE_H_TAGEND=11
-val SCE_H_XMLSTART=12
-val SCE_H_XMLEND=13
-val SCE_H_SCRIPT=14
-val SCE_H_ASP=15
-val SCE_H_ASPAT=16
-val SCE_H_CDATA=17
-val SCE_H_QUESTION=18
-# More HTML
-val SCE_H_VALUE=19
-# X-Code
-val SCE_H_XCCOMMENT=20
-# SGML
-val SCE_H_SGML_DEFAULT=21
-val SCE_H_SGML_COMMAND=22
-val SCE_H_SGML_1ST_PARAM=23
-val SCE_H_SGML_DOUBLESTRING=24
-val SCE_H_SGML_SIMPLESTRING=25
-val SCE_H_SGML_ERROR=26
-val SCE_H_SGML_SPECIAL=27
-val SCE_H_SGML_ENTITY=28
-val SCE_H_SGML_COMMENT=29
-val SCE_H_SGML_1ST_PARAM_COMMENT=30
-val SCE_H_SGML_BLOCK_DEFAULT=31
-# Embedded Javascript
-val SCE_HJ_START=40
-val SCE_HJ_DEFAULT=41
-val SCE_HJ_COMMENT=42
-val SCE_HJ_COMMENTLINE=43
-val SCE_HJ_COMMENTDOC=44
-val SCE_HJ_NUMBER=45
-val SCE_HJ_WORD=46
-val SCE_HJ_KEYWORD=47
-val SCE_HJ_DOUBLESTRING=48
-val SCE_HJ_SINGLESTRING=49
-val SCE_HJ_SYMBOLS=50
-val SCE_HJ_STRINGEOL=51
-val SCE_HJ_REGEX=52
-# ASP Javascript
-val SCE_HJA_START=55
-val SCE_HJA_DEFAULT=56
-val SCE_HJA_COMMENT=57
-val SCE_HJA_COMMENTLINE=58
-val SCE_HJA_COMMENTDOC=59
-val SCE_HJA_NUMBER=60
-val SCE_HJA_WORD=61
-val SCE_HJA_KEYWORD=62
-val SCE_HJA_DOUBLESTRING=63
-val SCE_HJA_SINGLESTRING=64
-val SCE_HJA_SYMBOLS=65
-val SCE_HJA_STRINGEOL=66
-val SCE_HJA_REGEX=67
-# Embedded VBScript
-val SCE_HB_START=70
-val SCE_HB_DEFAULT=71
-val SCE_HB_COMMENTLINE=72
-val SCE_HB_NUMBER=73
-val SCE_HB_WORD=74
-val SCE_HB_STRING=75
-val SCE_HB_IDENTIFIER=76
-val SCE_HB_STRINGEOL=77
-# ASP VBScript
-val SCE_HBA_START=80
-val SCE_HBA_DEFAULT=81
-val SCE_HBA_COMMENTLINE=82
-val SCE_HBA_NUMBER=83
-val SCE_HBA_WORD=84
-val SCE_HBA_STRING=85
-val SCE_HBA_IDENTIFIER=86
-val SCE_HBA_STRINGEOL=87
-# Embedded Python
-val SCE_HP_START=90
-val SCE_HP_DEFAULT=91
-val SCE_HP_COMMENTLINE=92
-val SCE_HP_NUMBER=93
-val SCE_HP_STRING=94
-val SCE_HP_CHARACTER=95
-val SCE_HP_WORD=96
-val SCE_HP_TRIPLE=97
-val SCE_HP_TRIPLEDOUBLE=98
-val SCE_HP_CLASSNAME=99
-val SCE_HP_DEFNAME=100
-val SCE_HP_OPERATOR=101
-val SCE_HP_IDENTIFIER=102
-# PHP
-val SCE_HPHP_COMPLEX_VARIABLE=104
-# ASP Python
-val SCE_HPA_START=105
-val SCE_HPA_DEFAULT=106
-val SCE_HPA_COMMENTLINE=107
-val SCE_HPA_NUMBER=108
-val SCE_HPA_STRING=109
-val SCE_HPA_CHARACTER=110
-val SCE_HPA_WORD=111
-val SCE_HPA_TRIPLE=112
-val SCE_HPA_TRIPLEDOUBLE=113
-val SCE_HPA_CLASSNAME=114
-val SCE_HPA_DEFNAME=115
-val SCE_HPA_OPERATOR=116
-val SCE_HPA_IDENTIFIER=117
-# PHP
-val SCE_HPHP_DEFAULT=118
-val SCE_HPHP_HSTRING=119
-val SCE_HPHP_SIMPLESTRING=120
-val SCE_HPHP_WORD=121
-val SCE_HPHP_NUMBER=122
-val SCE_HPHP_VARIABLE=123
-val SCE_HPHP_COMMENT=124
-val SCE_HPHP_COMMENTLINE=125
-val SCE_HPHP_HSTRING_VARIABLE=126
-val SCE_HPHP_OPERATOR=127
-# Lexical states for SCLEX_PERL
-lex Perl=SCLEX_PERL SCE_PL_
-val SCE_PL_DEFAULT=0
-val SCE_PL_ERROR=1
-val SCE_PL_COMMENTLINE=2
-val SCE_PL_POD=3
-val SCE_PL_NUMBER=4
-val SCE_PL_WORD=5
-val SCE_PL_STRING=6
-val SCE_PL_CHARACTER=7
-val SCE_PL_PUNCTUATION=8
-val SCE_PL_PREPROCESSOR=9
-val SCE_PL_OPERATOR=10
-val SCE_PL_IDENTIFIER=11
-val SCE_PL_SCALAR=12
-val SCE_PL_ARRAY=13
-val SCE_PL_HASH=14
-val SCE_PL_SYMBOLTABLE=15
-val SCE_PL_VARIABLE_INDEXER=16
-val SCE_PL_REGEX=17
-val SCE_PL_REGSUBST=18
-val SCE_PL_LONGQUOTE=19
-val SCE_PL_BACKTICKS=20
-val SCE_PL_DATASECTION=21
-val SCE_PL_HERE_DELIM=22
-val SCE_PL_HERE_Q=23
-val SCE_PL_HERE_QQ=24
-val SCE_PL_HERE_QX=25
-val SCE_PL_STRING_Q=26
-val SCE_PL_STRING_QQ=27
-val SCE_PL_STRING_QX=28
-val SCE_PL_STRING_QR=29
-val SCE_PL_STRING_QW=30
-val SCE_PL_POD_VERB=31
-# Lexical states for SCLEX_RUBY
-lex Ruby=SCLEX_RUBY SCE_RB_
-val SCE_RB_DEFAULT=0
-val SCE_RB_ERROR=1
-val SCE_RB_COMMENTLINE=2
-val SCE_RB_POD=3
-val SCE_RB_NUMBER=4
-val SCE_RB_WORD=5
-val SCE_RB_STRING=6
-val SCE_RB_CHARACTER=7
-val SCE_RB_CLASSNAME=8
-val SCE_RB_DEFNAME=9
-val SCE_RB_OPERATOR=10
-val SCE_RB_IDENTIFIER=11
-val SCE_RB_REGEX=12
-val SCE_RB_GLOBAL=13
-val SCE_RB_SYMBOL=14
-val SCE_RB_MODULE_NAME=15
-val SCE_RB_INSTANCE_VAR=16
-val SCE_RB_CLASS_VAR=17
-val SCE_RB_BACKTICKS=18
-val SCE_RB_DATASECTION=19
-val SCE_RB_HERE_DELIM=20
-val SCE_RB_HERE_Q=21
-val SCE_RB_HERE_QQ=22
-val SCE_RB_HERE_QX=23
-val SCE_RB_STRING_Q=24
-val SCE_RB_STRING_QQ=25
-val SCE_RB_STRING_QX=26
-val SCE_RB_STRING_QR=27
-val SCE_RB_STRING_QW=28
-val SCE_RB_WORD_DEMOTED=29
-val SCE_RB_STDIN=30
-val SCE_RB_STDOUT=31
-val SCE_RB_STDERR=40
-val SCE_RB_UPPER_BOUND=41
-# Lexical states for SCLEX_VB, SCLEX_VBSCRIPT, SCLEX_POWERBASIC
-lex VB=SCLEX_VB SCE_B_
-lex VBScript=SCLEX_VBSCRIPT SCE_B_
-lex PowerBasic=SCLEX_POWERBASIC SCE_B_
-val SCE_B_DEFAULT=0
-val SCE_B_COMMENT=1
-val SCE_B_NUMBER=2
-val SCE_B_KEYWORD=3
-val SCE_B_STRING=4
-val SCE_B_PREPROCESSOR=5
-val SCE_B_OPERATOR=6
-val SCE_B_IDENTIFIER=7
-val SCE_B_DATE=8
-val SCE_B_STRINGEOL=9
-val SCE_B_KEYWORD2=10
-val SCE_B_KEYWORD3=11
-val SCE_B_KEYWORD4=12
-val SCE_B_CONSTANT=13
-val SCE_B_ASM=14
-val SCE_B_LABEL=15
-val SCE_B_ERROR=16
-val SCE_B_HEXNUMBER=17
-val SCE_B_BINNUMBER=18
-# Lexical states for SCLEX_PROPERTIES
-lex Properties=SCLEX_PROPERTIES SCE_PROPS_
-val SCE_PROPS_DEFAULT=0
-val SCE_PROPS_COMMENT=1
-val SCE_PROPS_SECTION=2
-val SCE_PROPS_ASSIGNMENT=3
-val SCE_PROPS_DEFVAL=4
-val SCE_PROPS_KEY=5
-# Lexical states for SCLEX_LATEX
-lex LaTeX=SCLEX_LATEX SCE_L_
-val SCE_L_DEFAULT=0
-val SCE_L_COMMAND=1
-val SCE_L_TAG=2
-val SCE_L_MATH=3
-val SCE_L_COMMENT=4
-# Lexical states for SCLEX_LUA
-lex Lua=SCLEX_LUA SCE_LUA_
-val SCE_LUA_DEFAULT=0
-val SCE_LUA_COMMENT=1
-val SCE_LUA_COMMENTLINE=2
-val SCE_LUA_COMMENTDOC=3
-val SCE_LUA_NUMBER=4
-val SCE_LUA_WORD=5
-val SCE_LUA_STRING=6
-val SCE_LUA_CHARACTER=7
-val SCE_LUA_LITERALSTRING=8
-val SCE_LUA_PREPROCESSOR=9
-val SCE_LUA_OPERATOR=10
-val SCE_LUA_IDENTIFIER=11
-val SCE_LUA_STRINGEOL=12
-val SCE_LUA_WORD2=13
-val SCE_LUA_WORD3=14
-val SCE_LUA_WORD4=15
-val SCE_LUA_WORD5=16
-val SCE_LUA_WORD6=17
-val SCE_LUA_WORD7=18
-val SCE_LUA_WORD8=19
-# Lexical states for SCLEX_ERRORLIST
-lex ErrorList=SCLEX_ERRORLIST SCE_ERR_
-val SCE_ERR_DEFAULT=0
-val SCE_ERR_PYTHON=1
-val SCE_ERR_GCC=2
-val SCE_ERR_MS=3
-val SCE_ERR_CMD=4
-val SCE_ERR_BORLAND=5
-val SCE_ERR_PERL=6
-val SCE_ERR_NET=7
-val SCE_ERR_LUA=8
-val SCE_ERR_CTAG=9
-val SCE_ERR_DIFF_CHANGED=10
-val SCE_ERR_DIFF_ADDITION=11
-val SCE_ERR_DIFF_DELETION=12
-val SCE_ERR_DIFF_MESSAGE=13
-val SCE_ERR_PHP=14
-val SCE_ERR_ELF=15
-val SCE_ERR_IFC=16
-val SCE_ERR_IFORT=17
-val SCE_ERR_ABSF=18
-val SCE_ERR_TIDY=19
-val SCE_ERR_JAVA_STACK=20
-# Lexical states for SCLEX_BATCH
-lex Batch=SCLEX_BATCH SCE_BAT_
-val SCE_BAT_DEFAULT=0
-val SCE_BAT_COMMENT=1
-val SCE_BAT_WORD=2
-val SCE_BAT_LABEL=3
-val SCE_BAT_HIDE=4
-val SCE_BAT_COMMAND=5
-val SCE_BAT_IDENTIFIER=6
-val SCE_BAT_OPERATOR=7
-# Lexical states for SCLEX_MAKEFILE
-lex MakeFile=SCLEX_MAKEFILE SCE_MAKE_
-val SCE_MAKE_DEFAULT=0
-val SCE_MAKE_COMMENT=1
-val SCE_MAKE_PREPROCESSOR=2
-val SCE_MAKE_IDENTIFIER=3
-val SCE_MAKE_OPERATOR=4
-val SCE_MAKE_TARGET=5
-val SCE_MAKE_IDEOL=9
-# Lexical states for SCLEX_DIFF
-lex Diff=SCLEX_DIFF SCE_DIFF_
-val SCE_DIFF_DEFAULT=0
-val SCE_DIFF_COMMENT=1
-val SCE_DIFF_COMMAND=2
-val SCE_DIFF_HEADER=3
-val SCE_DIFF_POSITION=4
-val SCE_DIFF_DELETED=5
-val SCE_DIFF_ADDED=6
-# Lexical states for SCLEX_CONF (Apache Configuration Files Lexer)
-lex Conf=SCLEX_CONF SCE_CONF_
-val SCE_CONF_DEFAULT=0
-val SCE_CONF_COMMENT=1
-val SCE_CONF_NUMBER=2
-val SCE_CONF_IDENTIFIER=3
-val SCE_CONF_EXTENSION=4
-val SCE_CONF_PARAMETER=5
-val SCE_CONF_STRING=6
-val SCE_CONF_OPERATOR=7
-val SCE_CONF_IP=8
-val SCE_CONF_DIRECTIVE=9
-# Lexical states for SCLEX_AVE, Avenue
-lex Avenue=SCLEX_AVE SCE_AVE_
-val SCE_AVE_DEFAULT=0
-val SCE_AVE_COMMENT=1
-val SCE_AVE_NUMBER=2
-val SCE_AVE_WORD=3
-val SCE_AVE_STRING=6
-val SCE_AVE_ENUM=7
-val SCE_AVE_STRINGEOL=8
-val SCE_AVE_IDENTIFIER=9
-val SCE_AVE_OPERATOR=10
-val SCE_AVE_WORD1=11
-val SCE_AVE_WORD2=12
-val SCE_AVE_WORD3=13
-val SCE_AVE_WORD4=14
-val SCE_AVE_WORD5=15
-val SCE_AVE_WORD6=16
-# Lexical states for SCLEX_ADA
-lex Ada=SCLEX_ADA SCE_ADA_
-val SCE_ADA_DEFAULT=0
-val SCE_ADA_WORD=1
-val SCE_ADA_IDENTIFIER=2
-val SCE_ADA_NUMBER=3
-val SCE_ADA_DELIMITER=4
-val SCE_ADA_CHARACTER=5
-val SCE_ADA_CHARACTEREOL=6
-val SCE_ADA_STRING=7
-val SCE_ADA_STRINGEOL=8
-val SCE_ADA_LABEL=9
-val SCE_ADA_COMMENTLINE=10
-val SCE_ADA_ILLEGAL=11
-# Lexical states for SCLEX_BAAN
-lex Baan=SCLEX_BAAN SCE_BAAN_
-val SCE_BAAN_DEFAULT=0
-val SCE_BAAN_COMMENT=1
-val SCE_BAAN_COMMENTDOC=2
-val SCE_BAAN_NUMBER=3
-val SCE_BAAN_WORD=4
-val SCE_BAAN_STRING=5
-val SCE_BAAN_PREPROCESSOR=6
-val SCE_BAAN_OPERATOR=7
-val SCE_BAAN_IDENTIFIER=8
-val SCE_BAAN_STRINGEOL=9
-val SCE_BAAN_WORD2=10
-# Lexical states for SCLEX_LISP
-lex Lisp=SCLEX_LISP SCE_LISP_
-val SCE_LISP_DEFAULT=0
-val SCE_LISP_COMMENT=1
-val SCE_LISP_NUMBER=2
-val SCE_LISP_KEYWORD=3
-val SCE_LISP_KEYWORD_KW=4
-val SCE_LISP_SYMBOL=5
-val SCE_LISP_STRING=6
-val SCE_LISP_STRINGEOL=8
-val SCE_LISP_IDENTIFIER=9
-val SCE_LISP_OPERATOR=10
-val SCE_LISP_SPECIAL=11
-val SCE_LISP_MULTI_COMMENT=12
-# Lexical states for SCLEX_EIFFEL and SCLEX_EIFFELKW
-lex Eiffel=SCLEX_EIFFEL SCE_EIFFEL_
-lex EiffelKW=SCLEX_EIFFELKW SCE_EIFFEL_
-val SCE_EIFFEL_DEFAULT=0
-val SCE_EIFFEL_COMMENTLINE=1
-val SCE_EIFFEL_NUMBER=2
-val SCE_EIFFEL_WORD=3
-val SCE_EIFFEL_STRING=4
-val SCE_EIFFEL_CHARACTER=5
-val SCE_EIFFEL_OPERATOR=6
-val SCE_EIFFEL_IDENTIFIER=7
-val SCE_EIFFEL_STRINGEOL=8
-# Lexical states for SCLEX_NNCRONTAB (nnCron crontab Lexer)
-lex NNCronTab=SCLEX_NNCRONTAB SCE_NNCRONTAB_
-val SCE_NNCRONTAB_DEFAULT=0
-val SCE_NNCRONTAB_COMMENT=1
-val SCE_NNCRONTAB_TASK=2
-val SCE_NNCRONTAB_SECTION=3
-val SCE_NNCRONTAB_KEYWORD=4
-val SCE_NNCRONTAB_MODIFIER=5
-val SCE_NNCRONTAB_ASTERISK=6
-val SCE_NNCRONTAB_NUMBER=7
-val SCE_NNCRONTAB_STRING=8
-val SCE_NNCRONTAB_ENVIRONMENT=9
-val SCE_NNCRONTAB_IDENTIFIER=10
-# Lexical states for SCLEX_FORTH (Forth Lexer)
-lex Forth=SCLEX_FORTH SCE_FORTH_
-val SCE_FORTH_DEFAULT=0
-val SCE_FORTH_COMMENT=1
-val SCE_FORTH_COMMENT_ML=2
-val SCE_FORTH_IDENTIFIER=3
-val SCE_FORTH_CONTROL=4
-val SCE_FORTH_KEYWORD=5
-val SCE_FORTH_DEFWORD=6
-val SCE_FORTH_PREWORD1=7
-val SCE_FORTH_PREWORD2=8
-val SCE_FORTH_NUMBER=9
-val SCE_FORTH_STRING=10
-val SCE_FORTH_LOCALE=11
-# Lexical states for SCLEX_MATLAB
-lex MatLab=SCLEX_MATLAB SCE_MATLAB_
-val SCE_MATLAB_DEFAULT=0
-val SCE_MATLAB_COMMENT=1
-val SCE_MATLAB_COMMAND=2
-val SCE_MATLAB_NUMBER=3
-val SCE_MATLAB_KEYWORD=4
-# single quoted string
-val SCE_MATLAB_STRING=5
-val SCE_MATLAB_OPERATOR=6
-val SCE_MATLAB_IDENTIFIER=7
-val SCE_MATLAB_DOUBLEQUOTESTRING=8
-# Lexical states for SCLEX_SCRIPTOL
-lex Sol=SCLEX_SCRIPTOL SCE_SCRIPTOL_
-val SCE_SCRIPTOL_DEFAULT=0
-val SCE_SCRIPTOL_WHITE=1
-val SCE_SCRIPTOL_COMMENTLINE=2
-val SCE_SCRIPTOL_PERSISTENT=3
-val SCE_SCRIPTOL_CSTYLE=4
-val SCE_SCRIPTOL_COMMENTBLOCK=5
-val SCE_SCRIPTOL_NUMBER=6
-val SCE_SCRIPTOL_STRING=7
-val SCE_SCRIPTOL_CHARACTER=8
-val SCE_SCRIPTOL_STRINGEOL=9
-val SCE_SCRIPTOL_KEYWORD=10
-val SCE_SCRIPTOL_OPERATOR=11
-val SCE_SCRIPTOL_IDENTIFIER=12
-val SCE_SCRIPTOL_TRIPLE=13
-val SCE_SCRIPTOL_CLASSNAME=14
-val SCE_SCRIPTOL_PREPROCESSOR=15
-# Lexical states for SCLEX_ASM
-lex Asm=SCLEX_ASM SCE_ASM_
-val SCE_ASM_DEFAULT=0
-val SCE_ASM_COMMENT=1
-val SCE_ASM_NUMBER=2
-val SCE_ASM_STRING=3
-val SCE_ASM_OPERATOR=4
-val SCE_ASM_IDENTIFIER=5
-val SCE_ASM_CPUINSTRUCTION=6
-val SCE_ASM_MATHINSTRUCTION=7
-val SCE_ASM_REGISTER=8
-val SCE_ASM_DIRECTIVE=9
-val SCE_ASM_DIRECTIVEOPERAND=10
-val SCE_ASM_COMMENTBLOCK=11
-val SCE_ASM_CHARACTER=12
-val SCE_ASM_STRINGEOL=13
-val SCE_ASM_EXTINSTRUCTION=14
-# Lexical states for SCLEX_FORTRAN
-lex Fortran=SCLEX_FORTRAN SCE_F_
-lex F77=SCLEX_F77 SCE_F_
-val SCE_F_DEFAULT=0
-val SCE_F_COMMENT=1
-val SCE_F_NUMBER=2
-val SCE_F_STRING1=3
-val SCE_F_STRING2=4
-val SCE_F_STRINGEOL=5
-val SCE_F_OPERATOR=6
-val SCE_F_IDENTIFIER=7
-val SCE_F_WORD=8
-val SCE_F_WORD2=9
-val SCE_F_WORD3=10
-val SCE_F_PREPROCESSOR=11
-val SCE_F_OPERATOR2=12
-val SCE_F_LABEL=13
-val SCE_F_CONTINUATION=14
-# Lexical states for SCLEX_CSS
-lex CSS=SCLEX_CSS SCE_CSS_
-val SCE_CSS_DEFAULT=0
-val SCE_CSS_TAG=1
-val SCE_CSS_CLASS=2
-val SCE_CSS_PSEUDOCLASS=3
-val SCE_CSS_UNKNOWN_PSEUDOCLASS=4
-val SCE_CSS_OPERATOR=5
-val SCE_CSS_IDENTIFIER=6
-val SCE_CSS_UNKNOWN_IDENTIFIER=7
-val SCE_CSS_VALUE=8
-val SCE_CSS_COMMENT=9
-val SCE_CSS_ID=10
-val SCE_CSS_IMPORTANT=11
-val SCE_CSS_DIRECTIVE=12
-val SCE_CSS_DOUBLESTRING=13
-val SCE_CSS_SINGLESTRING=14
-val SCE_CSS_IDENTIFIER2=15
-val SCE_CSS_ATTRIBUTE=16
-# Lexical states for SCLEX_POV
-lex POV=SCLEX_POV SCE_POV_
-val SCE_POV_DEFAULT=0
-val SCE_POV_COMMENT=1
-val SCE_POV_COMMENTLINE=2
-val SCE_POV_NUMBER=3
-val SCE_POV_OPERATOR=4
-val SCE_POV_IDENTIFIER=5
-val SCE_POV_STRING=6
-val SCE_POV_STRINGEOL=7
-val SCE_POV_DIRECTIVE=8
-val SCE_POV_BADDIRECTIVE=9
-val SCE_POV_WORD2=10
-val SCE_POV_WORD3=11
-val SCE_POV_WORD4=12
-val SCE_POV_WORD5=13
-val SCE_POV_WORD6=14
-val SCE_POV_WORD7=15
-val SCE_POV_WORD8=16
-# Lexical states for SCLEX_LOUT
-lex LOUT=SCLEX_LOUT SCE_LOUT_
-val SCE_LOUT_DEFAULT=0
-val SCE_LOUT_COMMENT=1
-val SCE_LOUT_NUMBER=2
-val SCE_LOUT_WORD=3
-val SCE_LOUT_WORD2=4
-val SCE_LOUT_WORD3=5
-val SCE_LOUT_WORD4=6
-val SCE_LOUT_STRING=7
-val SCE_LOUT_OPERATOR=8
-val SCE_LOUT_IDENTIFIER=9
-val SCE_LOUT_STRINGEOL=10
-# Lexical states for SCLEX_ESCRIPT
-lex ESCRIPT=SCLEX_ESCRIPT SCE_ESCRIPT_
-val SCE_ESCRIPT_DEFAULT=0
-val SCE_ESCRIPT_COMMENT=1
-val SCE_ESCRIPT_COMMENTLINE=2
-val SCE_ESCRIPT_COMMENTDOC=3
-val SCE_ESCRIPT_NUMBER=4
-val SCE_ESCRIPT_WORD=5
-val SCE_ESCRIPT_STRING=6
-val SCE_ESCRIPT_OPERATOR=7
-val SCE_ESCRIPT_IDENTIFIER=8
-val SCE_ESCRIPT_BRACE=9
-val SCE_ESCRIPT_WORD2=10
-val SCE_ESCRIPT_WORD3=11
-# Lexical states for SCLEX_PS
-lex PS=SCLEX_PS SCE_PS_
-val SCE_PS_DEFAULT=0
-val SCE_PS_COMMENT=1
-val SCE_PS_DSC_COMMENT=2
-val SCE_PS_DSC_VALUE=3
-val SCE_PS_NUMBER=4
-val SCE_PS_NAME=5
-val SCE_PS_KEYWORD=6
-val SCE_PS_LITERAL=7
-val SCE_PS_IMMEVAL=8
-val SCE_PS_PAREN_ARRAY=9
-val SCE_PS_PAREN_DICT=10
-val SCE_PS_PAREN_PROC=11
-val SCE_PS_TEXT=12
-val SCE_PS_HEXSTRING=13
-val SCE_PS_BASE85STRING=14
-val SCE_PS_BADSTRINGCHAR=15
-# Lexical states for SCLEX_NSIS
-lex NSIS=SCLEX_NSIS SCE_NSIS_
-val SCE_NSIS_DEFAULT=0
-val SCE_NSIS_COMMENT=1
-val SCE_NSIS_STRINGDQ=2
-val SCE_NSIS_STRINGLQ=3
-val SCE_NSIS_STRINGRQ=4
-val SCE_NSIS_FUNCTION=5
-val SCE_NSIS_VARIABLE=6
-val SCE_NSIS_LABEL=7
-val SCE_NSIS_USERDEFINED=8
-val SCE_NSIS_SECTIONDEF=9
-val SCE_NSIS_SUBSECTIONDEF=10
-val SCE_NSIS_IFDEFINEDEF=11
-val SCE_NSIS_MACRODEF=12
-val SCE_NSIS_STRINGVAR=13
-val SCE_NSIS_NUMBER=14
-val SCE_NSIS_SECTIONGROUP=15
-val SCE_NSIS_PAGEEX=16
-val SCE_NSIS_FUNCTIONDEF=17
-val SCE_NSIS_COMMENTBOX=18
-# Lexical states for SCLEX_MMIXAL
-lex MMIXAL=SCLEX_MMIXAL SCE_MMIXAL_
-val SCE_MMIXAL_LEADWS=0
-val SCE_MMIXAL_COMMENT=1
-val SCE_MMIXAL_LABEL=2
-val SCE_MMIXAL_OPCODE=3
-val SCE_MMIXAL_OPCODE_PRE=4
-val SCE_MMIXAL_OPCODE_VALID=5
-val SCE_MMIXAL_OPCODE_UNKNOWN=6
-val SCE_MMIXAL_OPCODE_POST=7
-val SCE_MMIXAL_OPERANDS=8
-val SCE_MMIXAL_NUMBER=9
-val SCE_MMIXAL_REF=10
-val SCE_MMIXAL_CHAR=11
-val SCE_MMIXAL_STRING=12
-val SCE_MMIXAL_REGISTER=13
-val SCE_MMIXAL_HEX=14
-val SCE_MMIXAL_OPERATOR=15
-val SCE_MMIXAL_SYMBOL=16
-val SCE_MMIXAL_INCLUDE=17
-# Lexical states for SCLEX_CLW
-lex Clarion=SCLEX_CLW SCE_CLW_
-val SCE_CLW_DEFAULT=0
-val SCE_CLW_LABEL=1
-val SCE_CLW_COMMENT=2
-val SCE_CLW_STRING=3
-val SCE_CLW_USER_IDENTIFIER=4
-val SCE_CLW_INTEGER_CONSTANT=5
-val SCE_CLW_REAL_CONSTANT=6
-val SCE_CLW_PICTURE_STRING=7
-val SCE_CLW_KEYWORD=8
-val SCE_CLW_COMPILER_DIRECTIVE=9
-val SCE_CLW_RUNTIME_EXPRESSIONS=10
-val SCE_CLW_BUILTIN_PROCEDURES_FUNCTION=11
-val SCE_CLW_STRUCTURE_DATA_TYPE=12
-val SCE_CLW_ATTRIBUTE=13
-val SCE_CLW_STANDARD_EQUATE=14
-val SCE_CLW_ERROR=15
-val SCE_CLW_DEPRECATED=16
-# Lexical states for SCLEX_LOT
-lex LOT=SCLEX_LOT SCE_LOT_
-val SCE_LOT_DEFAULT=0
-val SCE_LOT_HEADER=1
-val SCE_LOT_BREAK=2
-val SCE_LOT_SET=3
-val SCE_LOT_PASS=4
-val SCE_LOT_FAIL=5
-val SCE_LOT_ABORT=6
-# Lexical states for SCLEX_YAML
-lex YAML=SCLEX_YAML SCE_YAML_
-val SCE_YAML_DEFAULT=0
-val SCE_YAML_COMMENT=1
-val SCE_YAML_IDENTIFIER=2
-val SCE_YAML_KEYWORD=3
-val SCE_YAML_NUMBER=4
-val SCE_YAML_REFERENCE=5
-val SCE_YAML_DOCUMENT=6
-val SCE_YAML_TEXT=7
-val SCE_YAML_ERROR=8
-# Lexical states for SCLEX_TEX
-lex TeX=SCLEX_TEX SCE_TEX_
-val SCE_TEX_DEFAULT=0
-val SCE_TEX_SPECIAL=1
-val SCE_TEX_GROUP=2
-val SCE_TEX_SYMBOL=3
-val SCE_TEX_COMMAND=4
-val SCE_TEX_TEXT=5
-lex Metapost=SCLEX_METAPOST SCE_METAPOST_
-val SCE_METAPOST_DEFAULT=0
-val SCE_METAPOST_SPECIAL=1
-val SCE_METAPOST_GROUP=2
-val SCE_METAPOST_SYMBOL=3
-val SCE_METAPOST_COMMAND=4
-val SCE_METAPOST_TEXT=5
-val SCE_METAPOST_EXTRA=6
-# Lexical states for SCLEX_ERLANG
-lex Erlang=SCLEX_ERLANG SCE_ERLANG_
-val SCE_ERLANG_DEFAULT=0
-val SCE_ERLANG_COMMENT=1
-val SCE_ERLANG_VARIABLE=2
-val SCE_ERLANG_NUMBER=3
-val SCE_ERLANG_KEYWORD=4
-val SCE_ERLANG_STRING=5
-val SCE_ERLANG_OPERATOR=6
-val SCE_ERLANG_ATOM=7
-val SCE_ERLANG_FUNCTION_NAME=8
-val SCE_ERLANG_CHARACTER=9
-val SCE_ERLANG_MACRO=10
-val SCE_ERLANG_RECORD=11
-val SCE_ERLANG_SEPARATOR=12
-val SCE_ERLANG_NODE_NAME=13
-val SCE_ERLANG_UNKNOWN=31
-# Lexical states for SCLEX_OCTAVE are identical to MatLab
-lex Octave=SCLEX_OCTAVE SCE_MATLAB_
-# Lexical states for SCLEX_MSSQL
-lex MSSQL=SCLEX_MSSQL SCE_MSSQL_
-val SCE_MSSQL_DEFAULT=0
-val SCE_MSSQL_COMMENT=1
-val SCE_MSSQL_LINE_COMMENT=2
-val SCE_MSSQL_NUMBER=3
-val SCE_MSSQL_STRING=4
-val SCE_MSSQL_OPERATOR=5
-val SCE_MSSQL_IDENTIFIER=6
-val SCE_MSSQL_VARIABLE=7
-val SCE_MSSQL_COLUMN_NAME=8
-val SCE_MSSQL_STATEMENT=9
-val SCE_MSSQL_DATATYPE=10
-val SCE_MSSQL_SYSTABLE=11
-val SCE_MSSQL_GLOBAL_VARIABLE=12
-val SCE_MSSQL_FUNCTION=13
-val SCE_MSSQL_STORED_PROCEDURE=14
-val SCE_MSSQL_DEFAULT_PREF_DATATYPE=15
-val SCE_MSSQL_COLUMN_NAME_2=16
-# Lexical states for SCLEX_VERILOG
-lex Verilog=SCLEX_VERILOG SCE_V_
-val SCE_V_DEFAULT=0
-val SCE_V_COMMENT=1
-val SCE_V_COMMENTLINE=2
-val SCE_V_COMMENTLINEBANG=3
-val SCE_V_NUMBER=4
-val SCE_V_WORD=5
-val SCE_V_STRING=6
-val SCE_V_WORD2=7
-val SCE_V_WORD3=8
-val SCE_V_PREPROCESSOR=9
-val SCE_V_OPERATOR=10
-val SCE_V_IDENTIFIER=11
-val SCE_V_STRINGEOL=12
-val SCE_V_USER=19
-# Lexical states for SCLEX_KIX
-lex Kix=SCLEX_KIX SCE_KIX_
-val SCE_KIX_DEFAULT=0
-val SCE_KIX_COMMENT=1
-val SCE_KIX_STRING1=2
-val SCE_KIX_STRING2=3
-val SCE_KIX_NUMBER=4
-val SCE_KIX_VAR=5
-val SCE_KIX_MACRO=6
-val SCE_KIX_KEYWORD=7
-val SCE_KIX_FUNCTIONS=8
-val SCE_KIX_OPERATOR=9
-val SCE_KIX_IDENTIFIER=31
-# Lexical states for SCLEX_GUI4CLI
-val SCE_GC_DEFAULT=0
-val SCE_GC_COMMENTLINE=1
-val SCE_GC_COMMENTBLOCK=2
-val SCE_GC_GLOBAL=3
-val SCE_GC_EVENT=4
-val SCE_GC_ATTRIBUTE=5
-val SCE_GC_CONTROL=6
-val SCE_GC_COMMAND=7
-val SCE_GC_STRING=8
-val SCE_GC_OPERATOR=9
-# Lexical states for SCLEX_SPECMAN
-lex Specman=SCLEX_SPECMAN SCE_SN_
-val SCE_SN_DEFAULT=0
-val SCE_SN_CODE=1
-val SCE_SN_COMMENTLINE=2
-val SCE_SN_COMMENTLINEBANG=3
-val SCE_SN_NUMBER=4
-val SCE_SN_WORD=5
-val SCE_SN_STRING=6
-val SCE_SN_WORD2=7
-val SCE_SN_WORD3=8
-val SCE_SN_PREPROCESSOR=9
-val SCE_SN_OPERATOR=10
-val SCE_SN_IDENTIFIER=11
-val SCE_SN_STRINGEOL=12
-val SCE_SN_REGEXTAG=13
-val SCE_SN_SIGNAL=14
-val SCE_SN_USER=19
-# Lexical states for SCLEX_AU3
-lex Au3=SCLEX_AU3 SCE_AU3_
-val SCE_AU3_DEFAULT=0
-val SCE_AU3_COMMENT=1
-val SCE_AU3_COMMENTBLOCK=2
-val SCE_AU3_NUMBER=3
-val SCE_AU3_FUNCTION=4
-val SCE_AU3_KEYWORD=5
-val SCE_AU3_MACRO=6
-val SCE_AU3_STRING=7
-val SCE_AU3_OPERATOR=8
-val SCE_AU3_VARIABLE=9
-val SCE_AU3_SENT=10
-val SCE_AU3_PREPROCESSOR=11
-val SCE_AU3_SPECIAL=12
-val SCE_AU3_EXPAND=13
-val SCE_AU3_COMOBJ=14
-val SCE_AU3_UDF=15
-# Lexical states for SCLEX_APDL
-lex APDL=SCLEX_APDL SCE_APDL_
-val SCE_APDL_DEFAULT=0
-val SCE_APDL_COMMENT=1
-val SCE_APDL_COMMENTBLOCK=2
-val SCE_APDL_NUMBER=3
-val SCE_APDL_STRING=4
-val SCE_APDL_OPERATOR=5
-val SCE_APDL_WORD=6
-val SCE_APDL_PROCESSOR=7
-val SCE_APDL_COMMAND=8
-val SCE_APDL_SLASHCOMMAND=9
-val SCE_APDL_STARCOMMAND=10
-val SCE_APDL_ARGUMENT=11
-val SCE_APDL_FUNCTION=12
-# Lexical states for SCLEX_BASH
-lex Bash=SCLEX_BASH SCE_SH_
-val SCE_SH_DEFAULT=0
-val SCE_SH_ERROR=1
-val SCE_SH_COMMENTLINE=2
-val SCE_SH_NUMBER=3
-val SCE_SH_WORD=4
-val SCE_SH_STRING=5
-val SCE_SH_CHARACTER=6
-val SCE_SH_OPERATOR=7
-val SCE_SH_IDENTIFIER=8
-val SCE_SH_SCALAR=9
-val SCE_SH_PARAM=10
-val SCE_SH_BACKTICKS=11
-val SCE_SH_HERE_DELIM=12
-val SCE_SH_HERE_Q=13
-# Lexical states for SCLEX_ASN1
-lex Asn1=SCLEX_ASN1 SCE_ASN1_
-val SCE_ASN1_DEFAULT=0
-val SCE_ASN1_COMMENT=1
-val SCE_ASN1_IDENTIFIER=2
-val SCE_ASN1_STRING=3
-val SCE_ASN1_OID=4
-val SCE_ASN1_SCALAR=5
-val SCE_ASN1_KEYWORD=6
-val SCE_ASN1_ATTRIBUTE=7
-val SCE_ASN1_DESCRIPTOR=8
-val SCE_ASN1_TYPE=9
-val SCE_ASN1_OPERATOR=10
-# Lexical states for SCLEX_VHDL
-lex VHDL=SCLEX_VHDL SCE_VHDL_
-val SCE_VHDL_DEFAULT=0
-val SCE_VHDL_COMMENT=1
-val SCE_VHDL_COMMENTLINEBANG=2
-val SCE_VHDL_NUMBER=3
-val SCE_VHDL_STRING=4
-val SCE_VHDL_OPERATOR=5
-val SCE_VHDL_IDENTIFIER=6
-val SCE_VHDL_STRINGEOL=7
-val SCE_VHDL_KEYWORD=8
-val SCE_VHDL_STDOPERATOR=9
-val SCE_VHDL_ATTRIBUTE=10
-val SCE_VHDL_STDFUNCTION=11
-val SCE_VHDL_STDPACKAGE=12
-val SCE_VHDL_STDTYPE=13
-val SCE_VHDL_USERWORD=14
-# Lexical states for SCLEX_CAML
-lex Caml=SCLEX_CAML SCE_CAML_
-val SCE_CAML_DEFAULT=0
-val SCE_CAML_IDENTIFIER=1
-val SCE_CAML_TAGNAME=2
-val SCE_CAML_KEYWORD=3
-val SCE_CAML_KEYWORD2=4
-val SCE_CAML_KEYWORD3=5
-val SCE_CAML_LINENUM=6
-val SCE_CAML_OPERATOR=7
-val SCE_CAML_NUMBER=8
-val SCE_CAML_CHAR=9
-val SCE_CAML_STRING=11
-val SCE_CAML_COMMENT=12
-val SCE_CAML_COMMENT1=13
-val SCE_CAML_COMMENT2=14
-val SCE_CAML_COMMENT3=15
-# Lexical states for SCLEX_HASKELL
-lex Haskell=SCLEX_HASKELL SCE_HA_
-val SCE_HA_DEFAULT=0
-val SCE_HA_IDENTIFIER=1
-val SCE_HA_KEYWORD=2
-val SCE_HA_NUMBER=3
-val SCE_HA_STRING=4
-val SCE_HA_CHARACTER=5
-val SCE_HA_CLASS=6
-val SCE_HA_MODULE=7
-val SCE_HA_CAPITAL=8
-val SCE_HA_DATA=9
-val SCE_HA_IMPORT=10
-val SCE_HA_OPERATOR=11
-val SCE_HA_INSTANCE=12
-val SCE_HA_COMMENTLINE=13
-val SCE_HA_COMMENTBLOCK=14
-val SCE_HA_COMMENTBLOCK2=15
-val SCE_HA_COMMENTBLOCK3=16
-# Lexical states of SCLEX_TADS3
-lex TADS3=SCLEX_TADS3 SCE_T3_
-val SCE_T3_DEFAULT=0
-val SCE_T3_X_DEFAULT=1
-val SCE_T3_PREPROCESSOR=2
-val SCE_T3_BLOCK_COMMENT=3
-val SCE_T3_LINE_COMMENT=4
-val SCE_T3_OPERATOR=5
-val SCE_T3_KEYWORD=6
-val SCE_T3_NUMBER=7
-val SCE_T3_IDENTIFIER=8
-val SCE_T3_S_STRING=9
-val SCE_T3_D_STRING=10
-val SCE_T3_X_STRING=11
-val SCE_T3_LIB_DIRECTIVE=12
-val SCE_T3_MSG_PARAM=13
-val SCE_T3_HTML_TAG=14
-val SCE_T3_HTML_DEFAULT=15
-val SCE_T3_HTML_STRING=16
-val SCE_T3_USER1=17
-val SCE_T3_USER2=18
-val SCE_T3_USER3=19
-# Lexical states for SCLEX_REBOL
-lex Rebol=SCLEX_REBOL SCE_REBOL_
-val SCE_REBOL_DEFAULT=0
-val SCE_REBOL_COMMENTLINE=1
-val SCE_REBOL_COMMENTBLOCK=2
-val SCE_REBOL_PREFACE=3
-val SCE_REBOL_OPERATOR=4
-val SCE_REBOL_CHARACTER=5
-val SCE_REBOL_QUOTEDSTRING=6
-val SCE_REBOL_BRACEDSTRING=7
-val SCE_REBOL_NUMBER=8
-val SCE_REBOL_PAIR=9
-val SCE_REBOL_TUPLE=10
-val SCE_REBOL_BINARY=11
-val SCE_REBOL_MONEY=12
-val SCE_REBOL_ISSUE=13
-val SCE_REBOL_TAG=14
-val SCE_REBOL_FILE=15
-val SCE_REBOL_EMAIL=16
-val SCE_REBOL_URL=17
-val SCE_REBOL_DATE=18
-val SCE_REBOL_TIME=19
-val SCE_REBOL_IDENTIFIER=20
-val SCE_REBOL_WORD=21
-val SCE_REBOL_WORD2=22
-val SCE_REBOL_WORD3=23
-val SCE_REBOL_WORD4=24
-val SCE_REBOL_WORD5=25
-val SCE_REBOL_WORD6=26
-val SCE_REBOL_WORD7=27
-val SCE_REBOL_WORD8=28
-# Lexical states for SCLEX_SQL
-lex SQL=SCLEX_SQL SCE_SQL_
-val SCE_SQL_DEFAULT=0
-val SCE_SQL_COMMENT=1
-val SCE_SQL_COMMENTLINE=2
-val SCE_SQL_COMMENTDOC=3
-val SCE_SQL_NUMBER=4
-val SCE_SQL_WORD=5
-val SCE_SQL_STRING=6
-val SCE_SQL_CHARACTER=7
-val SCE_SQL_SQLPLUS=8
-val SCE_SQL_SQLPLUS_PROMPT=9
-val SCE_SQL_OPERATOR=10
-val SCE_SQL_IDENTIFIER=11
-val SCE_SQL_SQLPLUS_COMMENT=13
-val SCE_SQL_COMMENTLINEDOC=15
-val SCE_SQL_WORD2=16
-val SCE_SQL_COMMENTDOCKEYWORD=17
-val SCE_SQL_COMMENTDOCKEYWORDERROR=18
-val SCE_SQL_USER1=19
-val SCE_SQL_USER2=20
-val SCE_SQL_USER3=21
-val SCE_SQL_USER4=22
-val SCE_SQL_QUOTEDIDENTIFIER=23
-# Lexical states for SCLEX_SMALLTALK
-lex Smalltalk=SCLEX_SMALLTALK SCE_ST_
-val SCE_ST_DEFAULT=0
-val SCE_ST_STRING=1
-val SCE_ST_NUMBER=2
-val SCE_ST_COMMENT=3
-val SCE_ST_SYMBOL=4
-val SCE_ST_BINARY=5
-val SCE_ST_BOOL=6
-val SCE_ST_SELF=7
-val SCE_ST_SUPER=8
-val SCE_ST_NIL=9
-val SCE_ST_GLOBAL=10
-val SCE_ST_RETURN=11
-val SCE_ST_SPECIAL=12
-val SCE_ST_KWSEND=13
-val SCE_ST_ASSIGN=14
-val SCE_ST_CHARACTER=15
-val SCE_ST_SPEC_SEL=16
-# Lexical states for SCLEX_FLAGSHIP (clipper)
-lex FlagShip=SCLEX_FLAGSHIP SCE_B_
-val SCE_FS_DEFAULT=0
-val SCE_FS_COMMENT=1
-val SCE_FS_COMMENTLINE=2
-val SCE_FS_COMMENTDOC=3
-val SCE_FS_COMMENTLINEDOC=4
-val SCE_FS_COMMENTDOCKEYWORD=5
-val SCE_FS_COMMENTDOCKEYWORDERROR=6
-val SCE_FS_KEYWORD=7
-val SCE_FS_KEYWORD2=8
-val SCE_FS_KEYWORD3=9
-val SCE_FS_KEYWORD4=10
-val SCE_FS_NUMBER=11
-val SCE_FS_STRING=12
-val SCE_FS_PREPROCESSOR=13
-val SCE_FS_OPERATOR=14
-val SCE_FS_IDENTIFIER=15
-val SCE_FS_DATE=16
-val SCE_FS_STRINGEOL=17
-val SCE_FS_CONSTANT=18
-val SCE_FS_ASM=19
-val SCE_FS_LABEL=20
-val SCE_FS_ERROR=21
-val SCE_FS_HEXNUMBER=22
-val SCE_FS_BINNUMBER=23
-# Lexical states for SCLEX_CSOUND
-lex Csound=SCLEX_CSOUND SCE_CSOUND_
-val SCE_CSOUND_DEFAULT=0
-val SCE_CSOUND_COMMENT=1
-val SCE_CSOUND_NUMBER=2
-val SCE_CSOUND_OPERATOR=3
-val SCE_CSOUND_INSTR=4
-val SCE_CSOUND_IDENTIFIER=5
-val SCE_CSOUND_OPCODE=6
-val SCE_CSOUND_HEADERSTMT=7
-val SCE_CSOUND_USERKEYWORD=8
-val SCE_CSOUND_COMMENTBLOCK=9
-val SCE_CSOUND_PARAM=10
-val SCE_CSOUND_ARATE_VAR=11
-val SCE_CSOUND_KRATE_VAR=12
-val SCE_CSOUND_IRATE_VAR=13
-val SCE_CSOUND_GLOBAL_VAR=14
-val SCE_CSOUND_STRINGEOL=15
-# Lexical states for SCLEX_INNOSETUP
-lex Inno=SCLEX_INNOSETUP SCE_INNO_
-val SCE_INNO_DEFAULT=0
-val SCE_INNO_COMMENT=1
-val SCE_INNO_KEYWORD=2
-val SCE_INNO_PARAMETER=3
-val SCE_INNO_SECTION=4
-val SCE_INNO_PREPROC=5
-val SCE_INNO_PREPROC_INLINE=6
-val SCE_INNO_COMMENT_PASCAL=7
-val SCE_INNO_KEYWORD_PASCAL=8
-val SCE_INNO_KEYWORD_USER=9
-val SCE_INNO_STRING_DOUBLE=10
-val SCE_INNO_STRING_SINGLE=11
-val SCE_INNO_IDENTIFIER=12
-# Lexical states for SCLEX_OPAL
-lex Opal=SCLEX_OPAL SCE_OPAL_
-val SCE_OPAL_SPACE=0
-val SCE_OPAL_COMMENT_BLOCK=1
-val SCE_OPAL_COMMENT_LINE=2
-val SCE_OPAL_INTEGER=3
-val SCE_OPAL_KEYWORD=4
-val SCE_OPAL_SORT=5
-val SCE_OPAL_STRING=6
-val SCE_OPAL_PAR=7
-val SCE_OPAL_BOOL_CONST=8
-val SCE_OPAL_DEFAULT=32
-# Lexical states for SCLEX_SPICE
-lex Spice=SCLEX_SPICE SCE_SPICE_
-val SCE_SPICE_DEFAULT=0
-val SCE_SPICE_IDENTIFIER=1
-val SCE_SPICE_KEYWORD=2
-val SCE_SPICE_KEYWORD2=3
-val SCE_SPICE_KEYWORD3=4
-val SCE_SPICE_NUMBER=5
-val SCE_SPICE_DELIMITER=6
-val SCE_SPICE_VALUE=7
-val SCE_SPICE_COMMENTLINE=8
-
-# Events
-
-evt void StyleNeeded=2000(int position)
-evt void CharAdded=2001(int ch)
-evt void SavePointReached=2002(void)
-evt void SavePointLeft=2003(void)
-evt void ModifyAttemptRO=2004(void)
-# GTK+ Specific to work around focus and accelerator problems:
-evt void Key=2005(int ch, int modifiers)
-evt void DoubleClick=2006(void)
-evt void UpdateUI=2007(void)
-evt void Modified=2008(int position, int modificationType, string text, int length, int linesAdded, int line, int foldLevelNow, int foldLevelPrev)
-evt void MacroRecord=2009(int message, int wParam, int lParam)
-evt void MarginClick=2010(int modifiers, int position, int margin)
-evt void NeedShown=2011(int position, int length)
-evt void Painted=2013(void)
-evt void UserListSelection=2014(int listType, string text)
-evt void URIDropped=2015(string text)
-evt void DwellStart=2016(int position)
-evt void DwellEnd=2017(int position)
-evt void Zoom=2018(void)
-evt void HotSpotClick=2019(int modifiers, int position)
-evt void HotSpotDoubleClick=2020(int modifiers, int position)
-evt void CallTipClick=2021(int position)
-evt void AutoCSelection=2022(string text)
-
-cat Deprecated
-
-# CARET_POLICY changed in 1.47
-fun void SetCaretPolicy=2369(int caretPolicy, int caretSlop)
-val CARET_CENTER=0x02
-val CARET_XEVEN=0x08
-val CARET_XJUMPS=0x10
-
-# The old name for SCN_UPDATEUI
-val SCN_CHECKBRACE=2007
-evt void PosChanged=2012(int position)
-
-# SCLEX_HTML should be used in preference to these.
-val SCLEX_ASP=29
-val SCLEX_PHP=30
diff --git a/src/stc/scintilla/include/ScintillaWidget.h b/src/stc/scintilla/include/ScintillaWidget.h
deleted file mode 100644
index 9d23ce2a91..0000000000
--- a/src/stc/scintilla/include/ScintillaWidget.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Scintilla source code edit control
-/** @file ScintillaWidget.h
- ** Definition of Scintilla widget for GTK+.
- ** Only needed by GTK+ code but is harmless on other platforms.
- **/
-// Copyright 1998-2001 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 {
-	GtkContainer cont;
-	void *pscin;
-};
-
-struct _ScintillaClass {
-	GtkContainerClass parent_class;
-
-	void (* command) (ScintillaObject *ttt);
-	void (* notify) (ScintillaObject *ttt);
-};
-
-#if GLIB_MAJOR_VERSION < 2
-GtkType		scintilla_get_type	(void);
-#else
-GType		scintilla_get_type	(void);
-#endif
-GtkWidget*	scintilla_new		(void);
-void		scintilla_set_id	(ScintillaObject *sci, uptr_t id);
-sptr_t		scintilla_send_message	(ScintillaObject *sci,unsigned int iMessage, uptr_t wParam, sptr_t lParam);
-void		scintilla_release_resources(void);
-
-#if GTK_MAJOR_VERSION < 2
-#define SCINTILLA_NOTIFY "notify"
-#else
-#define SCINTILLA_NOTIFY "sci-notify"
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-#endif
diff --git a/src/stc/scintilla/include/WindowAccessor.h b/src/stc/scintilla/include/WindowAccessor.h
deleted file mode 100644
index 6c16b150f2..0000000000
--- a/src/stc/scintilla/include/WindowAccessor.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Scintilla source code edit control
-/** @file WindowAccessor.h
- ** Implementation of BufferAccess and StylingAccess on a Scintilla
- ** rapid easy access to contents of a Scintilla.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-/**
- */
-class WindowAccessor : public Accessor {
-	// Private so WindowAccessor objects can not be copied
-	WindowAccessor(const WindowAccessor &source) : Accessor(), props(source.props) {}
-	WindowAccessor &operator=(const WindowAccessor &) { return *this; }
-protected:
-	WindowID id;
-	PropSet &props;
-	int lenDoc;
-
-	char styleBuf[bufferSize];
-	int validLen;
-	char chFlags;
-	char chWhile;
-	unsigned int startSeg;
-
-	bool InternalIsLeadByte(char ch);
-	void Fill(int position);
-public:
-	WindowAccessor(WindowID id_, PropSet &props_) : 
-		Accessor(), id(id_), props(props_), 
-		lenDoc(-1), validLen(0), chFlags(0), chWhile(0) {
-	}
-	~WindowAccessor();
-	bool Match(int pos, const char *s);
-	char StyleAt(int position);
-	int GetLine(int position);
-	int LineStart(int line);
-	int LevelAt(int line);
-	int Length();
-	void Flush();
-	int GetLineState(int line);
-	int SetLineState(int line, int state);
-	int GetPropertyInt(const char *key, int defaultValue=0) { 
-		return props.GetInt(key, defaultValue); 
-	}
-	char *GetProperties() {
-		return props.ToString();
-	}
-
-	void StartAt(unsigned int start, char chMask=31);
-	void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; };
-	unsigned int GetStartSegment() { return startSeg; }
-	void StartSegment(unsigned int pos);
-	void ColourTo(unsigned int pos, int chAttr);
-	void SetLevel(int line, int level);
-	int IndentAmount(int line, int *flags, PFNIsCommentLeader pfnIsCommentLeader = 0);
-};
diff --git a/src/stc/scintilla/src/AutoComplete.cxx b/src/stc/scintilla/src/AutoComplete.cxx
deleted file mode 100644
index 753adca779..0000000000
--- a/src/stc/scintilla/src/AutoComplete.cxx
+++ /dev/null
@@ -1,174 +0,0 @@
-// Scintilla source code edit control
-/** @file AutoComplete.cxx
- ** Defines the auto completion list box.
- **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "AutoComplete.h"
-
-AutoComplete::AutoComplete() :
-	active(false),
-	separator(' '),
-	typesep('?'),
-	ignoreCase(false),
-	chooseSingle(false),
-	lb(0),
-	posStart(0),
-	startLen(0),
-	cancelAtStartPos(true),
-	autoHide(true),
-	dropRestOfWord(false)	{
-	lb = ListBox::Allocate();
-	stopChars[0] = '\0';
-	fillUpChars[0] = '\0';
-}
-
-AutoComplete::~AutoComplete() {
-	if (lb) {
-		lb->Destroy();
-		delete lb;
-		lb = 0;
-	}
-}
-
-bool AutoComplete::Active() {
-	return active;
-}
-
-void AutoComplete::Start(Window &parent, int ctrlID, 
-	int position, Point location, int startLen_, 
-	int lineHeight, bool unicodeMode) {
-	if (active) {
-		Cancel();
-	}
-	lb->Create(parent, ctrlID, location, lineHeight, unicodeMode);
-	lb->Clear();
-	active = true;
-	startLen = startLen_;
-	posStart = position;
-}
-
-void AutoComplete::SetStopChars(const char *stopChars_) {
-	strncpy(stopChars, stopChars_, sizeof(stopChars));
-	stopChars[sizeof(stopChars) - 1] = '\0';
-}
-
-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_;
-}
-
-char AutoComplete::GetSeparator() {
-	return separator;
-}
-
-void AutoComplete::SetTypesep(char separator_) {
-	typesep = separator_;
-}
-
-char AutoComplete::GetTypesep() {
-	return typesep;
-}
-
-void AutoComplete::SetList(const char *list) {
-	lb->SetList(list, separator, typesep);
-}
-
-void AutoComplete::Show(bool show) {
-	lb->Show(show);
-	if (show)
-		lb->Select(0);
-}
-
-void AutoComplete::Cancel() {
-	if (lb->Created()) {
-		lb->Clear();
-		lb->Destroy();
-		active = false;
-	}
-}
-
-
-void AutoComplete::Move(int delta) {
-	int count = lb->Length();
-	int current = lb->GetSelection();
-	current += delta;
-	if (current >= count)
-		current = count - 1;
-	if (current < 0)
-		current = 0;
-	lb->Select(current);
-}
-
-void AutoComplete::Select(const char *word) {
-	size_t lenWord = strlen(word);
-	int location = -1;
-	const int maxItemLen=1000;
-	char item[maxItemLen];
-	int start = 0; // lower bound of the api array block to search
-	int end = lb->Length() - 1; // upper bound of the api array block to search
-	while ((start <= end) && (location == -1)) { // Binary searching loop
-		int pivot = (start + end) / 2;
-		lb->GetValue(pivot, item, maxItemLen);
-		int cond;
-		if (ignoreCase)
-			cond = CompareNCaseInsensitive(word, item, lenWord);
-		else
-			cond = strncmp(word, item, lenWord);
-		if (!cond) {
-			// Find first match
-			while (pivot > start) {
-				lb->GetValue(pivot-1, item, maxItemLen);
-				if (ignoreCase)
-					cond = CompareNCaseInsensitive(word, item, lenWord);
-				else
-					cond = strncmp(word, item, lenWord);
-				if (0 != cond)
-					break;
-				--pivot;
-			}
-			location = pivot;
-			if (ignoreCase) {
-				// Check for exact-case match
-				for (; pivot <= end; pivot++) {
-					lb->GetValue(pivot, item, maxItemLen);
-					if (!strncmp(word, item, lenWord)) {
-						location = pivot;
-						break;
-					}
-					if (CompareNCaseInsensitive(word, item, lenWord))
-						break;
-				}
-			}
-		} else if (cond < 0) {
-			end = pivot - 1;
-		} else if (cond > 0) {
-			start = pivot + 1;
-		}
-	}
-	if (location == -1 && autoHide)
-		Cancel();
-	else
-		lb->Select(location);
-}
-
diff --git a/src/stc/scintilla/src/AutoComplete.h b/src/stc/scintilla/src/AutoComplete.h
deleted file mode 100644
index 10577ca380..0000000000
--- a/src/stc/scintilla/src/AutoComplete.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Scintilla source code edit control
-/** @file AutoComplete.h
- ** Defines the auto completion list box.
- **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef AUTOCOMPLETE_H
-#define AUTOCOMPLETE_H
-
-/**
- */
-class AutoComplete {
-	bool active;
-	char stopChars[256];
-	char fillUpChars[256];
-	char separator;
-	char typesep; // Type seperator
-
-public:
-	bool ignoreCase;
-	bool chooseSingle;
-	ListBox *lb;
-	int posStart;
-	int startLen;
-	/// Should autocompletion be canceled if editor's currentPos <= startPos?
-	bool cancelAtStartPos;
-	bool autoHide;
-	bool dropRestOfWord;
-
-	AutoComplete();
-	~AutoComplete();
-
-	/// Is the auto completion list displayed?
-	bool Active();
-
-	/// Display the auto completion list positioned to be near a character position
-	void Start(Window &parent, int ctrlID, int position, Point location,
-		int startLen_, int lineHeight, bool unicodeMode);
-
-	/// The stop chars are characters which, when typed, cause the auto completion list to disappear
-	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 typesep character is used for seperating the word from the type
-	void SetTypesep(char separator_);
-	char GetTypesep();
-
-	/// The list string contains a sequence of words separated by the separator character
-	void SetList(const char *list);
-
-	void Show(bool show);
-	void Cancel();
-
-	/// Move the current list element by delta, scrolling appropriately
-	void Move(int delta);
-
-	/// Select a list element that starts with word as the current element
-	void Select(const char *word);
-};
-
-#endif
diff --git a/src/stc/scintilla/src/CallTip.cxx b/src/stc/scintilla/src/CallTip.cxx
deleted file mode 100644
index f4bc5f83c4..0000000000
--- a/src/stc/scintilla/src/CallTip.cxx
+++ /dev/null
@@ -1,314 +0,0 @@
-// Scintilla source code edit control
-/** @file CallTip.cxx
- ** Code for displaying call tips.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-#include "CallTip.h"
-
-static const int insetX = 5;    // text inset in x from calltip border
-static const int widthArrow = 14;
-
-CallTip::CallTip() {
-	wCallTip = 0;
-	inCallTipMode = false;
-	posStartCallTip = 0;
-	val = 0;
-	rectUp = PRectangle(0,0,0,0);
-	rectDown = PRectangle(0,0,0,0);
-	lineHeight = 1;
-	startHighlight = 0;
-	endHighlight = 0;
-	tabSize = 0;
-	useStyleCallTip = false;    // for backwards compatibility
-
-	colourBG.desired = ColourDesired(0xff, 0xff, 0xff);
-	colourUnSel.desired = ColourDesired(0x80, 0x80, 0x80);
-	colourSel.desired = ColourDesired(0, 0, 0x80);
-	colourShade.desired = ColourDesired(0, 0, 0);
-	colourLight.desired = ColourDesired(0xc0, 0xc0, 0xc0);
-}
-
-CallTip::~CallTip() {
-	font.Release();
-	wCallTip.Destroy();
-	delete []val;
-	val = 0;
-}
-
-void CallTip::RefreshColourPalette(Palette &pal, bool want) {
-	pal.WantFind(colourBG, want);
-	pal.WantFind(colourUnSel, want);
-	pal.WantFind(colourSel, want);
-	pal.WantFind(colourShade, want);
-	pal.WantFind(colourLight, want);
-}
-
-// Although this test includes 0, we should never see a \0 character.
-static bool IsArrowCharacter(char ch) {
-	return (ch == 0) || (ch == '\001') || (ch == '\002');
-}
-
-// We ignore tabs unless a tab width has been set.
-bool CallTip::IsTabCharacter(char ch) {
-	return (tabSize > 0) && (ch == '\t');
-}
-
-int CallTip::NextTabPos(int x) {
-	if (tabSize > 0) {              // paranoia... not called unless this is true
-		x -= insetX;                // position relative to text
-		x = (x + tabSize) / tabSize;  // tab "number"
-		return tabSize*x + insetX;  // position of next tab
-	} else {
-		return x + 1;                 // arbitrary
-	}
-}
-
-// Draw a section of the call tip that does not include \n in one colour.
-// The text may include up to numEnds tabs or arrow characters.
-void CallTip::DrawChunk(Surface *surface, int &x, const char *s,
-	int posStart, int posEnd, int ytext, PRectangle rcClient,
-	bool highlight, bool draw) {
-	s += posStart;
-	int len = posEnd - posStart;
-
-	// Divide the text into sections that are all text, or that are
-	// single arrows or single tab characters (if tabSize > 0).
-	int maxEnd = 0;
-	const int numEnds = 10;
-	int ends[numEnds + 2];
-	for (int i=0;i<len;i++) {
-		if ((maxEnd < numEnds) &&
-		        (IsArrowCharacter(s[i]) || IsTabCharacter(s[i])) ) {
-			if (i > 0)
-				ends[maxEnd++] = i;
-			ends[maxEnd++] = i+1;
-		}
-	}
-	ends[maxEnd++] = len;
-	int startSeg = 0;
-	int xEnd;
-	for (int seg = 0; seg<maxEnd; seg++) {
-		int endSeg = ends[seg];
-		if (endSeg > startSeg) {
-			if (IsArrowCharacter(s[startSeg])) {
-				bool upArrow = s[startSeg] == '\001';
-				rcClient.left = x;
-				rcClient.right = rcClient.left + widthArrow;
-				if (draw) {
-					const int halfWidth = widthArrow / 2 - 3;
-					const int centreX = rcClient.left + widthArrow / 2 - 1;
-					const int centreY = (rcClient.top + rcClient.bottom) / 2;
-					surface->FillRectangle(rcClient, colourBG.allocated);
-					PRectangle rcClientInner(rcClient.left + 1, rcClient.top + 1,
-					                         rcClient.right - 2, rcClient.bottom - 1);
-					surface->FillRectangle(rcClientInner, colourUnSel.allocated);
-
-					if (upArrow) {      // Up arrow
-						Point pts[] = {
-    						Point(centreX - halfWidth, centreY + halfWidth / 2),
-    						Point(centreX + halfWidth, centreY + halfWidth / 2),
-    						Point(centreX, centreY - halfWidth + halfWidth / 2),
-						};
-						surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),
-                 						colourBG.allocated, colourBG.allocated);
-					} else {            // Down arrow
-						Point pts[] = {
-    						Point(centreX - halfWidth, centreY - halfWidth / 2),
-    						Point(centreX + halfWidth, centreY - halfWidth / 2),
-    						Point(centreX, centreY + halfWidth - halfWidth / 2),
-						};
-						surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),
-                 						colourBG.allocated, colourBG.allocated);
-					}
-				}
-				xEnd = rcClient.right;
-				offsetMain = xEnd;
-				if (upArrow) {
-					rectUp = rcClient;
-				} else {
-					rectDown = rcClient;
-				}
-			} else if (IsTabCharacter(s[startSeg])) {
-				xEnd = NextTabPos(x);
-			} else {
-				xEnd = x + surface->WidthText(font, s + startSeg, endSeg - startSeg);
-				if (draw) {
-					rcClient.left = x;
-					rcClient.right = xEnd;
-					surface->DrawTextTransparent(rcClient, font, ytext,
-										s+startSeg, endSeg - startSeg,
-					                             highlight ? colourSel.allocated : colourUnSel.allocated);
-				}
-			}
-			x = xEnd;
-			startSeg = endSeg;
-		}
-	}
-}
-
-int CallTip::PaintContents(Surface *surfaceWindow, bool draw) {
-	PRectangle rcClientPos = wCallTip.GetClientPosition();
-	PRectangle rcClientSize(0, 0, rcClientPos.right - rcClientPos.left,
-	                        rcClientPos.bottom - rcClientPos.top);
-	PRectangle rcClient(1, 1, rcClientSize.right - 1, rcClientSize.bottom - 1);
-
-	// To make a nice small call tip window, it is only sized to fit most normal characters without accents
-	int ascent = surfaceWindow->Ascent(font) - surfaceWindow->InternalLeading(font);
-
-	// For each line...
-	// Draw the definition in three parts: before highlight, highlighted, after highlight
-	int ytext = rcClient.top + ascent + 1;
-	rcClient.bottom = ytext + surfaceWindow->Descent(font) + 1;
-	char *chunkVal = val;
-	bool moreChunks = true;
-	int maxWidth = 0;
-	while (moreChunks) {
-		char *chunkEnd = strchr(chunkVal, '\n');
-		if (chunkEnd == NULL) {
-			chunkEnd = chunkVal + strlen(chunkVal);
-			moreChunks = false;
-		}
-		int chunkOffset = chunkVal - val;
-		int chunkLength = chunkEnd - chunkVal;
-		int chunkEndOffset = chunkOffset + chunkLength;
-		int thisStartHighlight = Platform::Maximum(startHighlight, chunkOffset);
-		thisStartHighlight = Platform::Minimum(thisStartHighlight, chunkEndOffset);
-		thisStartHighlight -= chunkOffset;
-		int thisEndHighlight = Platform::Maximum(endHighlight, chunkOffset);
-		thisEndHighlight = Platform::Minimum(thisEndHighlight, chunkEndOffset);
-		thisEndHighlight -= chunkOffset;
-		rcClient.top = ytext - ascent - 1;
-
-		int x = insetX;     // start each line at this inset
-
-		DrawChunk(surfaceWindow, x, chunkVal, 0, thisStartHighlight,
-			ytext, rcClient, false, draw);
-		DrawChunk(surfaceWindow, x, chunkVal, thisStartHighlight, thisEndHighlight,
-			ytext, rcClient, true, draw);
-		DrawChunk(surfaceWindow, x, chunkVal, thisEndHighlight, chunkLength,
-			ytext, rcClient, false, draw);
-
-		chunkVal = chunkEnd + 1;
-		ytext += lineHeight;
-		rcClient.bottom += lineHeight;
-		maxWidth = Platform::Maximum(maxWidth, x);
-	}
-	return maxWidth;
-}
-
-void CallTip::PaintCT(Surface *surfaceWindow) {
-	if (!val)
-		return;
-	PRectangle rcClientPos = wCallTip.GetClientPosition();
-	PRectangle rcClientSize(0, 0, rcClientPos.right - rcClientPos.left,
-	                        rcClientPos.bottom - rcClientPos.top);
-	PRectangle rcClient(1, 1, rcClientSize.right - 1, rcClientSize.bottom - 1);
-
-	surfaceWindow->FillRectangle(rcClient, colourBG.allocated);
-
-	offsetMain = insetX;    // initial alignment assuming no arrows
-	PaintContents(surfaceWindow, true);
-
-	// Draw a raised border around the edges of the window
-	surfaceWindow->MoveTo(0, rcClientSize.bottom - 1);
-	surfaceWindow->PenColour(colourShade.allocated);
-	surfaceWindow->LineTo(rcClientSize.right - 1, rcClientSize.bottom - 1);
-	surfaceWindow->LineTo(rcClientSize.right - 1, 0);
-	surfaceWindow->PenColour(colourLight.allocated);
-	surfaceWindow->LineTo(0, 0);
-	surfaceWindow->LineTo(0, rcClientSize.bottom - 1);
-}
-
-void CallTip::MouseClick(Point pt) {
-	clickPlace = 0;
-	if (rectUp.Contains(pt))
-		clickPlace = 1;
-	if (rectDown.Contains(pt))
-		clickPlace = 2;
-}
-
-PRectangle CallTip::CallTipStart(int pos, Point pt, const char *defn,
-                                 const char *faceName, int size,
-                                 int codePage_, int characterSet, Window &wParent) {
-	clickPlace = 0;
-	if (val)
-		delete []val;
-	val = new char[strlen(defn) + 1];
-	if (!val)
-		return PRectangle();
-	strcpy(val, defn);
-	codePage = codePage_;
-	Surface *surfaceMeasure = Surface::Allocate();
-	if (!surfaceMeasure)
-		return PRectangle();
-	surfaceMeasure->Init(wParent.GetID());
-	surfaceMeasure->SetUnicodeMode(SC_CP_UTF8 == codePage);
-	surfaceMeasure->SetDBCSMode(codePage);
-	startHighlight = 0;
-	endHighlight = 0;
-	inCallTipMode = true;
-	posStartCallTip = pos;
-	int deviceHeight = surfaceMeasure->DeviceHeightFont(size);
-	font.Create(faceName, characterSet, deviceHeight, false, false);
-	// Look for multiple lines in the text
-	// Only support \n here - simply means container must avoid \r!
-	int numLines = 1;
-	const char *newline;
-	const char *look = val;
-	rectUp = PRectangle(0,0,0,0);
-	rectDown = PRectangle(0,0,0,0);
-	offsetMain = insetX;            // changed to right edge of any arrows
-	int width = PaintContents(surfaceMeasure, false) + insetX;
-	while ((newline = strchr(look, '\n')) != NULL) {
-		look = newline + 1;
-		numLines++;
-	}
-	lineHeight = surfaceMeasure->Height(font);
-
-	// Extra line for border and an empty line at top and bottom. The returned
-	// rectangle is aligned to the right edge of the last arrow encountered in
-	// the tip text, else to the tip text left edge.
-	int height = lineHeight * numLines - surfaceMeasure->InternalLeading(font) + 2 + 2;
-	delete surfaceMeasure;
-	return PRectangle(pt.x - offsetMain, pt.y + 1, pt.x + width - offsetMain, pt.y + 1 + height);
-}
-
-void CallTip::CallTipCancel() {
-	inCallTipMode = false;
-	if (wCallTip.Created()) {
-		wCallTip.Destroy();
-	}
-}
-
-void CallTip::SetHighlight(int start, int end) {
-	// Avoid flashing by checking something has really changed
-	if ((start != startHighlight) || (end != endHighlight)) {
-		startHighlight = start;
-		endHighlight = end;
-		if (wCallTip.Created()) {
-			wCallTip.InvalidateAll();
-		}
-	}
-}
-
-// Set the tab size (sizes > 0 enable the use of tabs). This also enables the
-// use of the STYLE_CALLTIP.
-void CallTip::SetTabSize(int tabSz) {
-	tabSize = tabSz;
-	useStyleCallTip = true;
-}
-
-// It might be better to have two access functions for this and to use
-// them for all settings of colours.
-void CallTip::SetForeBack(const ColourPair &fore, const ColourPair &back) {
-	colourBG = back;
-	colourUnSel = fore;
-}
diff --git a/src/stc/scintilla/src/CallTip.h b/src/stc/scintilla/src/CallTip.h
deleted file mode 100644
index 9848a10af9..0000000000
--- a/src/stc/scintilla/src/CallTip.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// Scintilla source code edit control
-/** @file CallTip.h
- ** Interface to the call tip control.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef CALLTIP_H
-#define CALLTIP_H
-
-/**
- */
-class CallTip {
-	int startHighlight;    // character offset to start and...
-	int endHighlight;      // ...end of highlighted text
-	char *val;
-	Font font;
-	PRectangle rectUp;      // rectangle of last up angle in the tip
-	PRectangle rectDown;    // rectangle of last down arrow in the tip
-	int lineHeight;         // vertical line spacing
-	int offsetMain;         // The alignment point of the call tip
-	int tabSize;            // Tab size in pixels, <=0 no TAB expand
-	bool useStyleCallTip;   // if true, STYLE_CALLTIP should be used
-
-	// Private so CallTip objects can not be copied
-	CallTip(const CallTip &) {}
-	CallTip &operator=(const CallTip &) { return *this; }
-	void DrawChunk(Surface *surface, int &x, const char *s,
-		int posStart, int posEnd, int ytext, PRectangle rcClient,
-		bool highlight, bool draw);
-	int PaintContents(Surface *surfaceWindow, bool draw);
-	bool IsTabCharacter(char c);
-	int NextTabPos(int x);
-
-public:
-	Window wCallTip;
-	Window wDraw;
-	bool inCallTipMode;
-	int posStartCallTip;
-	ColourPair colourBG;
-	ColourPair colourUnSel;
-	ColourPair colourSel;
-	ColourPair colourShade;
-	ColourPair colourLight;
-	int codePage;
-	int clickPlace;
-
-	CallTip();
-	~CallTip();
-
-	/// Claim or accept palette entries for the colours required to paint a calltip.
-	void RefreshColourPalette(Palette &pal, bool want);
-
-	void PaintCT(Surface *surfaceWindow);
-
-	void MouseClick(Point pt);
-
-	/// Setup the calltip and return a rectangle of the area required.
-	PRectangle CallTipStart(int pos, Point pt, const char *defn,
-		const char *faceName, int size, int codePage_, 
-		int characterSet, Window &wParent);
-
-	void CallTipCancel();
-
-	/// Set a range of characters to be displayed in a highlight style.
-	/// Commonly used to highlight the current parameter.
-	void SetHighlight(int start, int end);
-
-	/// Set the tab size in pixels for the call tip. 0 or -ve means no tab expand.
-	void SetTabSize(int tabSz);
-
-	/// Used to determine which STYLE_xxxx to use for call tip information
-	bool UseStyleCallTip() const { return useStyleCallTip;}
-
-	// Modify foreground and background colours
-	void SetForeBack(const ColourPair &fore, const ColourPair &back);
-};
-
-#endif
diff --git a/src/stc/scintilla/src/CellBuffer.cxx b/src/stc/scintilla/src/CellBuffer.cxx
deleted file mode 100644
index 1109a17fbe..0000000000
--- a/src/stc/scintilla/src/CellBuffer.cxx
+++ /dev/null
@@ -1,1120 +0,0 @@
-// Scintilla source code edit control
-/** @file CellBuffer.cxx
- ** Manages a buffer of cells.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-#include "SVector.h"
-#include "CellBuffer.h"
-
-MarkerHandleSet::MarkerHandleSet() {
-	root = 0;
-}
-
-MarkerHandleSet::~MarkerHandleSet() {
-	MarkerHandleNumber *mhn = root;
-	while (mhn) {
-		MarkerHandleNumber *mhnToFree = mhn;
-		mhn = mhn->next;
-		delete mhnToFree;
-	}
-	root = 0;
-}
-
-int MarkerHandleSet::Length() {
-	int c = 0;
-	MarkerHandleNumber *mhn = root;
-	while (mhn) {
-		c++;
-		mhn = mhn->next;
-	}
-	return c;
-}
-
-int MarkerHandleSet::NumberFromHandle(int handle) {
-	MarkerHandleNumber *mhn = root;
-	while (mhn) {
-		if (mhn->handle == handle) {
-			return mhn->number;
-		}
-		mhn = mhn->next;
-	}
-	return - 1;
-}
-
-int MarkerHandleSet::MarkValue() {
-	unsigned int m = 0;
-	MarkerHandleNumber *mhn = root;
-	while (mhn) {
-		m |= (1 << mhn->number);
-		mhn = mhn->next;
-	}
-	return m;
-}
-
-bool MarkerHandleSet::Contains(int handle) {
-	MarkerHandleNumber *mhn = root;
-	while (mhn) {
-		if (mhn->handle == handle) {
-			return true;
-		}
-		mhn = mhn->next;
-	}
-	return false;
-}
-
-bool MarkerHandleSet::InsertHandle(int handle, int markerNum) {
-	MarkerHandleNumber *mhn = new MarkerHandleNumber;
-	if (!mhn)
-		return false;
-	mhn->handle = handle;
-	mhn->number = markerNum;
-	mhn->next = root;
-	root = mhn;
-	return true;
-}
-
-void MarkerHandleSet::RemoveHandle(int handle) {
-	MarkerHandleNumber **pmhn = &root;
-	while (*pmhn) {
-		MarkerHandleNumber *mhn = *pmhn;
-		if (mhn->handle == handle) {
-			*pmhn = mhn->next;
-			delete mhn;
-			return ;
-		}
-		pmhn = &((*pmhn)->next);
-	}
-}
-
-bool MarkerHandleSet::RemoveNumber(int markerNum) {
-	bool performedDeletion = false;
-	MarkerHandleNumber **pmhn = &root;
-	while (*pmhn) {
-		MarkerHandleNumber *mhn = *pmhn;
-		if (mhn->number == markerNum) {
-			*pmhn = mhn->next;
-			delete mhn;
-			performedDeletion = true;
-		} else {
-			pmhn = &((*pmhn)->next);
-		}
-	}
-	return performedDeletion;
-}
-
-void MarkerHandleSet::CombineWith(MarkerHandleSet *other) {
-	MarkerHandleNumber **pmhn = &root;
-	while (*pmhn) {
-		pmhn = &((*pmhn)->next);
-	}
-	*pmhn = other->root;
-	other->root = 0;
-}
-
-LineVector::LineVector() {
-	linesData = 0;
-	lines = 0;
-	size = 0;
-	levels = 0;
-	sizeLevels = 0;
-	handleCurrent = 1;
-	growSize = 1000;
-
-	Init();
-}
-
-LineVector::~LineVector() {
-	for (int line = 0; line < lines; line++) {
-		delete linesData[line].handleSet;
-		linesData[line].handleSet = 0;
-	}
-	delete []linesData;
-	linesData = 0;
-	delete []levels;
-	levels = 0;
-}
-
-void LineVector::Init() {
-	for (int line = 0; line < lines; line++) {
-		delete linesData[line].handleSet;
-		linesData[line].handleSet = 0;
-	}
-	delete []linesData;
-	linesData = new LineData[static_cast<int>(growSize)];
-	size = growSize;
-	lines = 1;
-	delete []levels;
-	levels = 0;
-	sizeLevels = 0;
-}
-
-void LineVector::Expand(int sizeNew) {
-	LineData *linesDataNew = new LineData[sizeNew];
-	if (linesDataNew) {
-		for (int i = 0; i < size; i++)
-			linesDataNew[i] = linesData[i];
-		// Do not delete handleSets here as they are transferred to new linesData
-		delete []linesData;
-		linesData = linesDataNew;
-		size = sizeNew;
-	} else {
-		Platform::DebugPrintf("No memory available\n");
-		// TODO: Blow up
-	}
-
-}
-
-void LineVector::ExpandLevels(int sizeNew) {
-	if (sizeNew == -1)
-		sizeNew = size;
-	int *levelsNew = new int[sizeNew];
-	if (levelsNew) {
-		int i = 0;
-		for (; i < sizeLevels; i++)
-			levelsNew[i] = levels[i];
-		for (; i < sizeNew; i++)
-			levelsNew[i] = SC_FOLDLEVELBASE;
-		delete []levels;
-		levels = levelsNew;
-		sizeLevels = sizeNew;
-	} else {
-		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) {
-	//Platform::DebugPrintf("InsertValue[%d] = %d\n", pos, value);
-	if ((lines + 2) >= size) {
-		if (growSize * 6 < size)
-			growSize *= 2;
-		Expand(size + growSize);
-		if (levels) {
-			ExpandLevels(size + growSize);
-		}
-	}
-	lines++;
-	for (int i = lines; i > pos; i--) {
-		linesData[i] = linesData[i - 1];
-	}
-	linesData[pos].startPosition = value;
-	linesData[pos].handleSet = 0;
-	if (levels) {
-		for (int j = lines; j > pos; j--) {
-			levels[j] = levels[j - 1];
-		}
-		if (pos == 0) {
-			levels[pos] = SC_FOLDLEVELBASE;
-		} else if (pos == (lines - 1)) {	// Last line will not be a folder
-			levels[pos] = SC_FOLDLEVELBASE;
-		} else {
-			levels[pos] = levels[pos - 1];
-		}
-	}
-}
-
-void LineVector::SetValue(int pos, int value) {
-	//Platform::DebugPrintf("SetValue[%d] = %d\n", pos, value);
-	if ((pos + 2) >= size) {
-		//Platform::DebugPrintf("Resize %d %d\n", size,pos);
-		Expand(pos + growSize);
-		//Platform::DebugPrintf("end Resize %d %d\n", size,pos);
-		lines = pos;
-		if (levels) {
-			ExpandLevels(pos + growSize);
-		}
-	}
-	linesData[pos].startPosition = value;
-}
-
-void LineVector::Remove(int pos) {
-	//Platform::DebugPrintf("Remove %d\n", pos);
-	// Retain the markers from the deleted line by oring them into the previous line
-	if (pos > 0) {
-		MergeMarkers(pos - 1);
-	}
-	for (int i = pos; i < lines; i++) {
-		linesData[i] = linesData[i + 1];
-	}
-	if (levels) {
-		// Move up following lines but merge header flag from this line
-		// to line before to avoid a temporary disappearence causing expansion.
-		int firstHeader = levels[pos] & SC_FOLDLEVELHEADERFLAG;
-		for (int j = pos; j < lines; j++) {
-			levels[j] = levels[j + 1];
-		}
-		if (pos > 0)
-			levels[pos-1] |= firstHeader;
-	}
-	lines--;
-}
-
-int LineVector::LineFromPosition(int pos) {
-	//Platform::DebugPrintf("LineFromPostion %d lines=%d end = %d\n", pos, lines, linesData[lines].startPosition);
-	if (lines == 0)
-		return 0;
-	//Platform::DebugPrintf("LineFromPosition %d\n", pos);
-	if (pos >= linesData[lines].startPosition)
-		return lines - 1;
-	int lower = 0;
-	int upper = lines;
-	do {
-		int middle = (upper + lower + 1) / 2; 	// Round high
-		if (pos < linesData[middle].startPosition) {
-			upper = middle - 1;
-		} else {
-			lower = middle;
-		}
-	} while (lower < upper);
-	//Platform::DebugPrintf("LineFromPostion %d %d %d\n", pos, lower, linesData[lower].startPosition, linesData[lower > 1 ? lower - 1 : 0].startPosition);
-	return lower;
-}
-
-int LineVector::AddMark(int line, int markerNum) {
-	handleCurrent++;
-	if (!linesData[line].handleSet) {
-		// Need new structure to hold marker handle
-		linesData[line].handleSet = new MarkerHandleSet;
-		if (!linesData[line].handleSet)
-			return - 1;
-	}
-	linesData[line].handleSet->InsertHandle(handleCurrent, markerNum);
-
-	return handleCurrent;
-}
-
-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;
-	}
-}
-
-void LineVector::DeleteMark(int line, int markerNum, bool all) {
-	if (linesData[line].handleSet) {
-		if (markerNum == -1) {
-			delete linesData[line].handleSet;
-			linesData[line].handleSet = 0;
-		} else {
-			bool performedDeletion = 
-				linesData[line].handleSet->RemoveNumber(markerNum);
-			while (all && performedDeletion) {
-				performedDeletion = 
-					linesData[line].handleSet->RemoveNumber(markerNum);
-			}
-			if (linesData[line].handleSet->Length() == 0) {
-				delete linesData[line].handleSet;
-				linesData[line].handleSet = 0;
-			}
-		}
-	}
-}
-
-void LineVector::DeleteMarkFromHandle(int markerHandle) {
-	int line = LineFromHandle(markerHandle);
-	if (line >= 0) {
-		linesData[line].handleSet->RemoveHandle(markerHandle);
-		if (linesData[line].handleSet->Length() == 0) {
-			delete linesData[line].handleSet;
-			linesData[line].handleSet = 0;
-		}
-	}
-}
-
-int LineVector::LineFromHandle(int markerHandle) {
-	for (int line = 0; line < lines; line++) {
-		if (linesData[line].handleSet) {
-			if (linesData[line].handleSet->Contains(markerHandle)) {
-				return line;
-			}
-		}
-	}
-	return - 1;
-}
-
-Action::Action() {
-	at = startAction;
-	position = 0;
-	data = 0;
-	lenData = 0;
-}
-
-Action::~Action() {
-	Destroy();
-}
-
-void Action::Create(actionType at_, int position_, char *data_, int lenData_, bool mayCoalesce_) {
-	delete []data;
-	position = position_;
-	at = at_;
-	data = data_;
-	lenData = lenData_;
-	mayCoalesce = mayCoalesce_;
-}
-
-void Action::Destroy() {
-	delete []data;
-	data = 0;
-}
-
-void Action::Grab(Action *source) {
-	delete []data;
-
-	position = source->position;
-	at = source->at;
-	data = source->data;
-	lenData = source->lenData;
-	mayCoalesce = source->mayCoalesce;
-
-	// Ownership of source data transferred to this
-	source->position = 0;
-	source->at = startAction;
-	source->data = 0;
-	source->lenData = 0;
-	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.
-// 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
-// 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
-// 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
-// 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
-// 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.
-
-UndoHistory::UndoHistory() {
-
-	lenActions = 100;
-	actions = new Action[lenActions];
-	maxAction = 0;
-	currentAction = 0;
-	undoSequenceDepth = 0;
-	savePoint = 0;
-
-	actions[currentAction].Create(startAction);
-}
-
-UndoHistory::~UndoHistory() {
-	delete []actions;
-	actions = 0;
-}
-
-void UndoHistory::EnsureUndoRoom() {
-	// Have to test that there is room for 2 more actions in the array
-	// as two actions may be created by the calling function
-	if (currentAction >= (lenActions - 2)) {
-		// Run out of undo nodes so extend the array
-		int lenActionsNew = lenActions * 2;
-		Action *actionsNew = new Action[lenActionsNew];
-		if (!actionsNew)
-			return ;
-		for (int act = 0; act <= currentAction; act++)
-			actionsNew[act].Grab(&actions[act]);
-		delete []actions;
-		lenActions = lenActionsNew;
-		actions = actionsNew;
-	}
-}
-
-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,
-	//	actions[currentAction - 1].position, actions[currentAction - 1].lenData);
-	if (currentAction < savePoint) {
-		savePoint = -1;
-	}
-	if (currentAction >= 1) {
-		if (0 == undoSequenceDepth) {
-			// 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
-			if (at != actPrevious.at) {
-				currentAction++;
-			} else if (currentAction == savePoint) {
-				currentAction++;
-			} else if ((at == insertAction) &&
-			           (position != (actPrevious.position + actPrevious.lenData))) {
-				// Insertions must be immediately after to coalesce
-				currentAction++;
-			} else if (!actions[currentAction].mayCoalesce) {
-				// Not allowed to coalesce if this set
-				currentAction++;
-			} else if (at == removeAction) {
-				if ((lengthData == 1) || (lengthData == 2)){
-					if ((position + lengthData) == actPrevious.position) {
-						; // Backspace -> OK
-					} else if (position == actPrevious.position) {
-						; // Delete -> OK
-					} else {
-						// Removals must be at same position to coalesce
-						currentAction++;
-					}
-				} else {
-					// Removals must be of one character 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++;
-	}
-	actions[currentAction].Create(at, position, data, lengthData);
-	currentAction++;
-	actions[currentAction].Create(startAction);
-	maxAction = currentAction;
-}
-
-void UndoHistory::BeginUndoAction() {
-	EnsureUndoRoom();
-	if (undoSequenceDepth == 0) {
-		if (actions[currentAction].at != startAction) {
-			currentAction++;
-			actions[currentAction].Create(startAction);
-			maxAction = currentAction;
-		}
-		actions[currentAction].mayCoalesce = false;
-	}
-	undoSequenceDepth++;
-}
-
-void UndoHistory::EndUndoAction() {
-	EnsureUndoRoom();
-	undoSequenceDepth--;
-	if (0 == undoSequenceDepth) {
-		if (actions[currentAction].at != startAction) {
-			currentAction++;
-			actions[currentAction].Create(startAction);
-			maxAction = currentAction;
-		}
-		actions[currentAction].mayCoalesce = false;
-	}
-}
-
-void UndoHistory::DropUndoSequence() {
-	undoSequenceDepth = 0;
-}
-
-void UndoHistory::DeleteUndoHistory() {
-	for (int i = 1; i < maxAction; i++)
-		actions[i].Destroy();
-	maxAction = 0;
-	currentAction = 0;
-	actions[currentAction].Create(startAction);
-	savePoint = 0;
-}
-
-void UndoHistory::SetSavePoint() {
-	savePoint = currentAction;
-}
-
-bool UndoHistory::IsSavePoint() const {
-	return savePoint == currentAction;
-}
-
-bool UndoHistory::CanUndo() const {
-	return (currentAction > 0) && (maxAction > 0);
-}
-
-int UndoHistory::StartUndo() {
-	// Drop any trailing startAction
-	if (actions[currentAction].at == startAction && currentAction > 0)
-		currentAction--;
-
-	// Count the steps in this action
-	int act = currentAction;
-	while (actions[act].at != startAction && act > 0) {
-		act--;
-	}
-	return currentAction - act;
-}
-
-const Action &UndoHistory::GetUndoStep() const {
-	return actions[currentAction];
-}
-
-void UndoHistory::CompletedUndoStep() {
-	currentAction--;
-}
-
-bool UndoHistory::CanRedo() const {
-	return maxAction > currentAction;
-}
-
-int UndoHistory::StartRedo() {
-	// Drop any leading startAction
-	if (actions[currentAction].at == startAction && currentAction < maxAction)
-		currentAction++;
-
-	// Count the steps in this action
-	int act = currentAction;
-	while (actions[act].at != startAction && act < maxAction) {
-		act++;
-	}
-	return act - currentAction;
-}
-
-const Action &UndoHistory::GetRedoStep() const {
-	return actions[currentAction];
-}
-
-void UndoHistory::CompletedRedoStep() {
-	currentAction++;
-}
-
-CellBuffer::CellBuffer(int initialLength) {
-	body = new char[initialLength];
-	size = initialLength;
-	length = 0;
-	part1len = 0;
-	gaplen = initialLength;
-	part2body = body + gaplen;
-	readOnly = false;
-	collectingUndo = true;
-	growSize = 4000;
-}
-
-CellBuffer::~CellBuffer() {
-	delete []body;
-	body = 0;
-}
-
-void CellBuffer::GapTo(int position) {
-	if (position == part1len)
-		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);
-		for (int i = 0; i < diff; i++)
-			body[part1len + gaplen - i - 1] = body[part1len - i - 1];
-	} else {	// position > part1len
-		int diff = position - part1len;
-		//Platform::DebugPrintf("Move gap forwards to %d diff =%d\n", position,diff);
-		for (int i = 0; i < diff; i++)
-			body[part1len + i] = body[part1len + gaplen + i];
-	}
-	part1len = position;
-	part2body = body + gaplen;
-}
-
-void CellBuffer::RoomFor(int insertionLength) {
-	//Platform::DebugPrintf("need room %d %d\n", gaplen, insertionLength);
-	if (gaplen <= insertionLength) {
-		//Platform::DebugPrintf("need room %d %d\n", gaplen, insertionLength);
-		if (growSize * 6 < size)
-			growSize *= 2;
-		int newSize = size + insertionLength + growSize;
-		Allocate(newSize);
-	}
-}
-
-// To make it easier to write code that uses ByteAt, a position outside the range of the buffer
-// can be retrieved. All characters outside the range have the value '\0'.
-char CellBuffer::ByteAt(int position) {
-	if (position < part1len) {
-		if (position < 0) {
-			return '\0';
-		} else {
-			return body[position];
-		}
-	} else {
-		if (position >= length) {
-			return '\0';
-		} else {
-			return part2body[position];
-		}
-	}
-}
-
-void CellBuffer::SetByteAt(int position, char ch) {
-
-	if (position < 0) {
-		//Platform::DebugPrintf("Bad position %d\n",position);
-		return ;
-	}
-	if (position >= length + 11) {
-		Platform::DebugPrintf("Very Bad position %d of %d\n", position, length);
-		//exit(2);
-		return ;
-	}
-	if (position >= length) {
-		//Platform::DebugPrintf("Bad position %d of %d\n",position,length);
-		return ;
-	}
-
-	if (position < part1len) {
-		body[position] = ch;
-	} else {
-		part2body[position] = ch;
-	}
-}
-
-char CellBuffer::CharAt(int position) {
-	return ByteAt(position*2);
-}
-
-void CellBuffer::GetCharRange(char *buffer, int position, int lengthRetrieve) {
-	if (lengthRetrieve < 0)
-		return ;
-	if (position < 0)
-		return ;
-	int bytePos = position * 2;
-	if ((bytePos + lengthRetrieve * 2) > length) {
-		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;
-	}
-}
-
-char CellBuffer::StyleAt(int position) {
-	return ByteAt(position*2 + 1);
-}
-
-const char *CellBuffer::InsertString(int position, char *s, int insertLength) {
-	char *data = 0;
-	// InsertString and DeleteChars are the bottleneck though which all changes occur
-	if (!readOnly) {
-		if (collectingUndo) {
-			// Save into the undo/redo stack, but only the characters - not the formatting
-			// This takes up about half load time
-			data = new char[insertLength / 2];
-			for (int i = 0; i < insertLength / 2; i++) {
-				data[i] = s[i * 2];
-			}
-			uh.AppendAction(insertAction, position / 2, data, insertLength / 2);
-		}
-
-		BasicInsertString(position, s, insertLength);
-	}
-	return data;
-}
-
-bool CellBuffer::SetStyleAt(int position, char style, char mask) {
-	style &= mask;
-	char curVal = ByteAt(position * 2 + 1);
-	if ((curVal & mask) != style) {
-		SetByteAt(position*2 + 1, static_cast<char>((curVal & ~mask) | style));
-		return true;
-	} else {
-		return false;
-	}
-}
-
-bool CellBuffer::SetStyleFor(int position, int lengthStyle, char style, char mask) {
-	int bytePos = position * 2 + 1;
-	bool changed = false;
-	PLATFORM_ASSERT(lengthStyle == 0 ||
-		(lengthStyle > 0 && lengthStyle + position < length));
-	while (lengthStyle--) {
-		char curVal = ByteAt(bytePos);
-		if ((curVal & mask) != style) {
-			SetByteAt(bytePos, static_cast<char>((curVal & ~mask) | style));
-			changed = true;
-		}
-		bytePos += 2;
-	}
-	return changed;
-}
-
-const char *CellBuffer::DeleteChars(int position, int deleteLength) {
-	// InsertString and DeleteChars are the bottleneck though which all changes occur
-	PLATFORM_ASSERT(deleteLength > 0);
-	char *data = 0;
-	if (!readOnly) {
-		if (collectingUndo) {
-			// Save into the undo/redo stack, but only the characters - not the formatting
-			data = new char[deleteLength / 2];
-			for (int i = 0; i < deleteLength / 2; i++) {
-				data[i] = ByteAt(position + i * 2);
-			}
-			uh.AppendAction(removeAction, position / 2, data, deleteLength / 2);
-		}
-
-		BasicDeleteChars(position, deleteLength);
-	}
-	return data;
-}
-
-int CellBuffer::ByteLength() {
-	return length;
-}
-
-int CellBuffer::Length() {
-	return ByteLength() / 2;
-}
-
-void CellBuffer::Allocate(int newSize) {
-	if (newSize > length) {
-		GapTo(length);
-		char *newBody = new char[newSize];
-		memcpy(newBody, body, length);
-		delete []body;
-		body = newBody;
-		gaplen += newSize - size;
-		part2body = body + gaplen;
-		size = newSize;
-	}
-}
-
-int CellBuffer::Lines() {
-	//Platform::DebugPrintf("Lines = %d\n", lv.lines);
-	return lv.lines;
-}
-
-int CellBuffer::LineStart(int line) {
-	if (line < 0)
-		return 0;
-	else if (line > lv.lines)
-		return Length();
-	else
-		return lv.linesData[line].startPosition;
-}
-
-bool CellBuffer::IsReadOnly() {
-	return readOnly;
-}
-
-void CellBuffer::SetReadOnly(bool set) {
-	readOnly = set;
-}
-
-void CellBuffer::SetSavePoint() {
-	uh.SetSavePoint();
-}
-
-bool CellBuffer::IsSavePoint() {
-	return uh.IsSavePoint();
-}
-
-int CellBuffer::AddMark(int line, int markerNum) {
-	if ((line >= 0) && (line < lv.lines)) {
-		return lv.AddMark(line, markerNum);
-	}
-	return - 1;
-}
-
-void CellBuffer::DeleteMark(int line, int markerNum) {
-	if ((line >= 0) && (line < lv.lines)) {
-		lv.DeleteMark(line, markerNum, false);
-	}
-}
-
-void CellBuffer::DeleteMarkFromHandle(int markerHandle) {
-	lv.DeleteMarkFromHandle(markerHandle);
-}
-
-int CellBuffer::GetMark(int line) {
-	if ((line >= 0) && (line < lv.lines) && (lv.linesData[line].handleSet))
-		return lv.linesData[line].handleSet->MarkValue();
-	return 0;
-}
-
-void CellBuffer::DeleteAllMarks(int markerNum) {
-	for (int line = 0; line < lv.lines; line++) {
-		lv.DeleteMark(line, markerNum, true);
-	}
-}
-
-int CellBuffer::LineFromHandle(int markerHandle) {
-	return lv.LineFromHandle(markerHandle);
-}
-
-// Without undo
-
-void CellBuffer::BasicInsertString(int position, char *s, int insertLength) {
-	//Platform::DebugPrintf("Inserting at %d for %d\n", position, insertLength);
-	if (insertLength == 0)
-		return ;
-	PLATFORM_ASSERT(insertLength > 0);
-	RoomFor(insertLength);
-	GapTo(position);
-
-	memcpy(body + part1len, s, insertLength);
-	length += insertLength;
-	part1len += insertLength;
-	gaplen -= insertLength;
-	part2body = body + gaplen;
-
-	int lineInsert = lv.LineFromPosition(position / 2) + 1;
-	// Point all the lines after the insertion point further along in the buffer
-	for (int lineAfter = lineInsert; lineAfter <= lv.lines; lineAfter++) {
-		lv.linesData[lineAfter].startPosition += insertLength / 2;
-	}
-	char chPrev = ' ';
-	if ((position - 2) >= 0)
-		chPrev = ByteAt(position - 2);
-	char chAfter = ' ';
-	if ((position + insertLength) < length)
-		chAfter = ByteAt(position + insertLength);
-	if (chPrev == '\r' && chAfter == '\n') {
-		//Platform::DebugPrintf("Splitting a crlf pair at %d\n", lineInsert);
-		// Splitting up a crlf pair at position
-		lv.InsertValue(lineInsert, position / 2);
-		lineInsert++;
-	}
-	char ch = ' ';
-	for (int i = 0; i < insertLength; i += 2) {
-		ch = s[i];
-		if (ch == '\r') {
-			//Platform::DebugPrintf("Inserting cr at %d\n", lineInsert);
-			lv.InsertValue(lineInsert, (position + i) / 2 + 1);
-			lineInsert++;
-		} else if (ch == '\n') {
-			if (chPrev == '\r') {
-				//Platform::DebugPrintf("Patching cr before lf at %d\n", lineInsert-1);
-				// Patch up what was end of line
-				lv.SetValue(lineInsert - 1, (position + i) / 2 + 1);
-			} else {
-				//Platform::DebugPrintf("Inserting lf at %d\n", lineInsert);
-				lv.InsertValue(lineInsert, (position + i) / 2 + 1);
-				lineInsert++;
-			}
-		}
-		chPrev = ch;
-	}
-	// Joining two lines where last insertion is cr and following text starts with lf
-	if (chAfter == '\n') {
-		if (ch == '\r') {
-			//Platform::DebugPrintf("Joining cr before lf at %d\n", lineInsert-1);
-			// End of line already in buffer so drop the newly created one
-			lv.Remove(lineInsert - 1);
-		}
-	}
-}
-
-void CellBuffer::BasicDeleteChars(int position, int deleteLength) {
-	//Platform::DebugPrintf("Deleting at %d for %d\n", position, deleteLength);
-	if (deleteLength == 0)
-		return ;
-
-	if ((position == 0) && (deleteLength == length)) {
-		// If whole buffer is being deleted, faster to reinitialise lines data
-		// than to delete each line.
-		//printf("Whole buffer being deleted\n");
-		lv.Init();
-	} else {
-		// Have to fix up line positions before doing deletion as looking at text in buffer
-		// to work out which lines have been removed
-
-		int lineRemove = lv.LineFromPosition(position / 2) + 1;
-		// Point all the lines after the insertion point further along in the buffer
-		for (int lineAfter = lineRemove; lineAfter <= lv.lines; lineAfter++) {
-			lv.linesData[lineAfter].startPosition -= deleteLength / 2;
-		}
-		char chPrev = ' ';
-		if (position >= 2)
-			chPrev = ByteAt(position - 2);
-		char chBefore = chPrev;
-		char chNext = ' ';
-		if (position < length)
-			chNext = ByteAt(position);
-		bool ignoreNL = false;
-		if (chPrev == '\r' && chNext == '\n') {
-			//Platform::DebugPrintf("Deleting lf after cr, move line end to cr at %d\n", lineRemove);
-			// Move back one
-			lv.SetValue(lineRemove, position / 2);
-			lineRemove++;
-			ignoreNL = true; 	// First \n is not real deletion
-		}
-
-		char ch = chNext;
-		for (int i = 0; i < deleteLength; i += 2) {
-			chNext = ' ';
-			if ((position + i + 2) < length)
-				chNext = ByteAt(position + i + 2);
-			//Platform::DebugPrintf("Deleting %d %x\n", i, ch);
-			if (ch == '\r') {
-				if (chNext != '\n') {
-					//Platform::DebugPrintf("Removing cr end of line\n");
-					lv.Remove(lineRemove);
-				}
-			} else if (ch == '\n') {
-				if (ignoreNL) {
-					ignoreNL = false; 	// Further \n are real deletions
-				} else {
-					//Platform::DebugPrintf("Removing lf end of line\n");
-					lv.Remove(lineRemove);
-				}
-			}
-
-			ch = chNext;
-		}
-		// May have to fix up end if last deletion causes cr to be next to lf
-		// or removes one of a crlf pair
-		char chAfter = ' ';
-		if ((position + deleteLength) < length)
-			chAfter = ByteAt(position + deleteLength);
-		if (chBefore == '\r' && chAfter == '\n') {
-			//d.printf("Joining cr before lf at %d\n", lineRemove);
-			// Using lineRemove-1 as cr ended line before start of deletion
-			lv.Remove(lineRemove - 1);
-			lv.SetValue(lineRemove - 1, position / 2 + 1);
-		}
-	}
-	GapTo(position);
-	length -= deleteLength;
-	gaplen += deleteLength;
-	part2body = body + gaplen;
-}
-
-bool CellBuffer::SetUndoCollection(bool collectUndo) {
-	collectingUndo = collectUndo;
-	uh.DropUndoSequence();
-	return collectingUndo;
-}
-
-bool CellBuffer::IsCollectingUndo() {
-	return collectingUndo;
-}
-
-void CellBuffer::BeginUndoAction() {
-	uh.BeginUndoAction();
-}
-
-void CellBuffer::EndUndoAction() {
-	uh.EndUndoAction();
-}
-
-void CellBuffer::DeleteUndoHistory() {
-	uh.DeleteUndoHistory();
-}
-
-bool CellBuffer::CanUndo() {
-	return uh.CanUndo();
-}
-
-int CellBuffer::StartUndo() {
-	return uh.StartUndo();
-}
-
-const Action &CellBuffer::GetUndoStep() const {
-	return uh.GetUndoStep();
-}
-
-void CellBuffer::PerformUndoStep() {
-	const Action &actionStep = uh.GetUndoStep();
-	if (actionStep.at == insertAction) {
-		BasicDeleteChars(actionStep.position*2, actionStep.lenData*2);
-	} else if (actionStep.at == removeAction) {
-		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;
-		}
-		BasicInsertString(actionStep.position*2, styledData, actionStep.lenData*2);
-		delete []styledData;
-	}
-	uh.CompletedUndoStep();
-}
-
-bool CellBuffer::CanRedo() {
-	return uh.CanRedo();
-}
-
-int CellBuffer::StartRedo() {
-	return uh.StartRedo();
-}
-
-const Action &CellBuffer::GetRedoStep() const {
-	return uh.GetRedoStep();
-}
-
-void CellBuffer::PerformRedoStep() {
-	const Action &actionStep = uh.GetRedoStep();
-	if (actionStep.at == insertAction) {
-		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;
-		}
-		BasicInsertString(actionStep.position*2, styledData, actionStep.lenData*2);
-		delete []styledData;
-	} else if (actionStep.at == removeAction) {
-		BasicDeleteChars(actionStep.position*2, actionStep.lenData*2);
-	}
-	uh.CompletedRedoStep();
-}
-
-int CellBuffer::SetLineState(int line, int state) {
-	int stateOld = lineStates[line];
-	lineStates[line] = state;
-	return stateOld;
-}
-
-int CellBuffer::GetLineState(int line) {
-	return lineStates[line];
-}
-
-int CellBuffer::GetMaxLineState() {
-	return lineStates.Length();
-}
-
-int CellBuffer::SetLevel(int line, int level) {
-	int prev = 0;
-	if ((line >= 0) && (line < lv.lines)) {
-		if (!lv.levels) {
-			lv.ExpandLevels();
-		}
-		prev = lv.levels[line];
-		if (lv.levels[line] != level) {
-			lv.levels[line] = level;
-		}
-	}
-	return prev;
-}
-
-int CellBuffer::GetLevel(int line) {
-	if (lv.levels && (line >= 0) && (line < lv.lines)) {
-		return lv.levels[line];
-	} else {
-		return SC_FOLDLEVELBASE;
-	}
-}
-
-void CellBuffer::ClearLevels() {
-	lv.ClearLevels();
-}
diff --git a/src/stc/scintilla/src/CellBuffer.h b/src/stc/scintilla/src/CellBuffer.h
deleted file mode 100644
index bb81fd5722..0000000000
--- a/src/stc/scintilla/src/CellBuffer.h
+++ /dev/null
@@ -1,250 +0,0 @@
-// Scintilla source code edit control
-/** @file CellBuffer.h
- ** Manages the text of the document.
- **/
-// Copyright 1998-2004 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef CELLBUFFER_H
-#define CELLBUFFER_H
-
-/**
- * This holds the marker identifier and the marker type to display.
- * MarkerHandleNumbers are members of lists.
- */
-struct MarkerHandleNumber {
-	int handle;
-	int number;
-	MarkerHandleNumber *next;
-};
-
-/**
- * A marker handle set contains any number of MarkerHandleNumbers.
- */
-class MarkerHandleSet {
-	MarkerHandleNumber *root;
-
-public:
-	MarkerHandleSet();
-	~MarkerHandleSet();
-	int Length();
-	int NumberFromHandle(int handle);
-	int MarkValue();	///< Bit set of marker numbers.
-	bool Contains(int handle);
-	bool InsertHandle(int handle, int markerNum);
-	void RemoveHandle(int handle);
-	bool RemoveNumber(int markerNum);
-	void CombineWith(MarkerHandleSet *other);
-};
-
-/**
- * Each line stores the starting position of the first character of the line in the cell buffer
- * and potentially a marker handle set. Often a line will not have any attached markers.
- */
-struct LineData {
-	int startPosition;
-	MarkerHandleSet *handleSet;
-	LineData() : startPosition(0), handleSet(0) {
-	}
-};
-
-/**
- * The line vector contains information about each of the lines in a cell buffer.
- */
-class LineVector {
-public:
-	int growSize;
-	int lines;
-	LineData *linesData;
-	int size;
-	int *levels;
-	int sizeLevels;
-
-	/// Handles are allocated sequentially and should never have to be reused as 32 bit ints are very big.
-	int handleCurrent;
-
-	LineVector();
-	~LineVector();
-	void Init();
-
-	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);
-	int LineFromPosition(int pos);
-
-	int AddMark(int line, int marker);
-	void MergeMarkers(int pos);
-	void DeleteMark(int line, int markerNum, bool all);
-	void DeleteMarkFromHandle(int markerHandle);
-	int LineFromHandle(int markerHandle);
-};
-
-enum actionType { insertAction, removeAction, startAction };
-
-/**
- * Actions are used to store all the information required to perform one undo/redo step.
- */
-class Action {
-public:
-	actionType at;
-	int position;
-	char *data;
-	int lenData;
-	bool mayCoalesce;
-
-	Action();
-	~Action();
-	void Create(actionType at_, int position_=0, char *data_=0, int lenData_=0, bool mayCoalesce_=true);
-	void Destroy();
-	void Grab(Action *source);
-};
-
-/**
- *
- */
-class UndoHistory {
-	Action *actions;
-	int lenActions;
-	int maxAction;
-	int currentAction;
-	int undoSequenceDepth;
-	int savePoint;
-
-	void EnsureUndoRoom();
-
-public:
-	UndoHistory();
-	~UndoHistory();
-
-	void AppendAction(actionType at, int position, char *data, int length);
-
-	void BeginUndoAction();
-	void EndUndoAction();
-	void DropUndoSequence();
-	void DeleteUndoHistory();
-
-	/// The save point is a marker in the undo stack where the container has stated that
-	/// the buffer was saved. Undo and redo can move over the save point.
-	void SetSavePoint();
-	bool IsSavePoint() const;
-
-	/// To perform an undo, StartUndo is called to retrieve the number of steps, then UndoStep is
-	/// called that many times. Similarly for redo.
-	bool CanUndo() const;
-	int StartUndo();
-	const Action &GetUndoStep() const;
-	void CompletedUndoStep();
-	bool CanRedo() const;
-	int StartRedo();
-	const Action &GetRedoStep() const;
-	void CompletedRedoStep();
-};
-
-/**
- * Holder for an expandable array of characters that supports undo and line markers.
- * Based on article "Data Structures in a Bit-Mapped Text Editor"
- * by Wilfred J. Hansen, Byte January 1987, page 183.
- */
-class CellBuffer {
-private:
-	char *body;		///< The cell buffer itself.
-	int size;		///< Allocated size of the buffer.
-	int length;		///< Total length of the data.
-	int part1len;	///< Length of the first part.
-	int gaplen;		///< Length of the gap between the two parts.
-	char *part2body;	///< The second part of the cell buffer.
-						///< Doesn't point after the gap but set so that
-						///< part2body[position] is consistent with body[position].
-	bool readOnly;
-	int growSize;
-
-	bool collectingUndo;
-	UndoHistory uh;
-
-	LineVector lv;
-
-	SVector lineStates;
-
-	void GapTo(int position);
-	void RoomFor(int insertionLength);
-
-	inline char ByteAt(int position);
-	void SetByteAt(int position, char ch);
-
-public:
-
-	CellBuffer(int initialLength = 4000);
-	~CellBuffer();
-
-	/// Retrieving positions outside the range of the buffer works and returns 0
-	char CharAt(int position);
-	void GetCharRange(char *buffer, int position, int lengthRetrieve);
-	char StyleAt(int position);
-
-	int ByteLength();
-	int Length();
-	void Allocate(int newSize);
-	int Lines();
-	int LineStart(int line);
-	int LineFromPosition(int pos) { return lv.LineFromPosition(pos); }
-	const char *InsertString(int position, char *s, int insertLength);
-
-	/// Setting styles for positions outside the range of the buffer is safe and has no effect.
-	/// @return true if the style of a character is changed.
-	bool SetStyleAt(int position, char style, char mask='\377');
-	bool SetStyleFor(int position, int length, char style, char mask);
-
-	const char *DeleteChars(int position, int deleteLength);
-
-	bool IsReadOnly();
-	void SetReadOnly(bool set);
-
-	/// The save point is a marker in the undo stack where the container has stated that
-	/// the buffer was saved. Undo and redo can move over the save point.
-	void SetSavePoint();
-	bool IsSavePoint();
-
-	/// Line marker functions
-	int AddMark(int line, int markerNum);
-	void DeleteMark(int line, int markerNum);
-	void DeleteMarkFromHandle(int markerHandle);
-	int GetMark(int line);
-	void DeleteAllMarks(int markerNum);
-	int LineFromHandle(int markerHandle);
-
-	/// Actions without undo
-	void BasicInsertString(int position, char *s, int insertLength);
-	void BasicDeleteChars(int position, int deleteLength);
-
-	bool SetUndoCollection(bool collectUndo);
-	bool IsCollectingUndo();
-	void BeginUndoAction();
-	void EndUndoAction();
-	void DeleteUndoHistory();
-
-	/// To perform an undo, StartUndo is called to retrieve the number of steps, then UndoStep is
-	/// called that many times. Similarly for redo.
-	bool CanUndo();
-	int StartUndo();
-	const Action &GetUndoStep() const;
-	void PerformUndoStep();
-	bool CanRedo();
-	int StartRedo();
-	const Action &GetRedoStep() const;
-	void PerformRedoStep();
-
-	int SetLineState(int line, int state);
-	int GetLineState(int line);
-	int GetMaxLineState();
-
-	int SetLevel(int line, int level);
-	int GetLevel(int line);
-	void ClearLevels();
-};
-
-#define CELL_SIZE	2
-
-#endif
diff --git a/src/stc/scintilla/src/CharClassify.cxx b/src/stc/scintilla/src/CharClassify.cxx
deleted file mode 100644
index acab4b2295..0000000000
--- a/src/stc/scintilla/src/CharClassify.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-// Scintilla source code edit control
-/** @file CharClassify.cxx
- ** Character classifications used by Document and RESearch.
- **/
-// Copyright 2006 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <ctype.h>
-
-#include "CharClassify.h"
-
-// Shut up annoying Visual C++ warnings:
-#ifdef _MSC_VER
-#pragma warning(disable: 4514)
-#endif
-
-CharClassify::CharClassify() {
-	SetDefaultCharClasses(true);
-}
-
-void CharClassify::SetDefaultCharClasses(bool includeWordClass) {
-	// Initialize all char classes to default values
-	for (int ch = 0; ch < 256; ch++) {
-		if (ch == '\r' || ch == '\n')
-			charClass[ch] = ccNewLine;
-		else if (ch < 0x20 || ch == ' ')
-			charClass[ch] = ccSpace;
-		else if (includeWordClass && (ch >= 0x80 || isalnum(ch) || ch == '_'))
-			charClass[ch] = ccWord;
-		else
-			charClass[ch] = ccPunctuation;
-	}
-}
-
-void CharClassify::SetCharClasses(const unsigned char *chars, cc newCharClass) {
-	// Apply the newCharClass to the specifed chars
-	if (chars) {
-		while (*chars) {
-			charClass[*chars] = static_cast<unsigned char>(newCharClass);
-			chars++;
-		}
-	}
-}
diff --git a/src/stc/scintilla/src/CharClassify.h b/src/stc/scintilla/src/CharClassify.h
deleted file mode 100644
index 881d3a114b..0000000000
--- a/src/stc/scintilla/src/CharClassify.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Scintilla source code edit control
-/** @file CharClassify.h
- ** Character classifications used by Document and RESearch.
- **/
-// Copyright 2006 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef CHARCLASSIFY_H
-#define CHARCLASSIFY_H
-
-class CharClassify {
-public:
-	CharClassify();
-
-	enum cc { ccSpace, ccNewLine, ccWord, ccPunctuation };
-	void SetDefaultCharClasses(bool includeWordClass);
-	void SetCharClasses(const unsigned char *chars, cc newCharClass);
-	cc GetClass(unsigned char ch) const { return static_cast<cc>(charClass[ch]);}
-	bool IsWord(unsigned char ch) const { return static_cast<cc>(charClass[ch]) == ccWord;}
-
-private:
-	enum { maxChar=256 };
-	unsigned char charClass[maxChar];    // not type cc to save space
-};
-#endif
diff --git a/src/stc/scintilla/src/ContractionState.cxx b/src/stc/scintilla/src/ContractionState.cxx
deleted file mode 100644
index 3d021b080b..0000000000
--- a/src/stc/scintilla/src/ContractionState.cxx
+++ /dev/null
@@ -1,289 +0,0 @@
-// Scintilla source code edit control
-/** @file ContractionState.cxx
- ** Manages visibility of lines for folding.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include "Platform.h"
-
-#include "ContractionState.h"
-
-OneLine::OneLine() {
-	displayLine = 0;
-	//docLine = 0;
-	visible = true;
-	height = 1;
-	expanded = true;
-}
-
-ContractionState::ContractionState() {
-	lines = 0;
-	size = 0;
-	linesInDoc = 1;
-	linesInDisplay = 1;
-	valid = false;
-	docLines = 0;
-	sizeDocLines = 0;
-}
-
-ContractionState::~ContractionState() {
-	Clear();
-}
-
-void ContractionState::MakeValid() const {
-	if (!valid) {
-		// Could be cleverer by keeping the index of the last still valid entry
-		// rather than invalidating all.
-		linesInDisplay = 0;
-		for (int lineInDoc=0; lineInDoc<linesInDoc; lineInDoc++) {
-			lines[lineInDoc].displayLine = linesInDisplay;
-			if (lines[lineInDoc].visible) {
-				linesInDisplay += lines[lineInDoc].height;
-			}
-		}
-		if (sizeDocLines < linesInDisplay) {
-			delete []docLines;
-			int *docLinesNew = new int[linesInDisplay + growSize];
-			if (!docLinesNew) {
-				docLines = 0;
-				sizeDocLines = 0;
-				return;
-			}
-			docLines = docLinesNew;
-			sizeDocLines = linesInDisplay + growSize;
-		}
-
-		int lineInDisplay=0;
-		for (int line=0; line<linesInDoc; line++) {
-			if (lines[line].visible) {
-				for (int linePiece=0; linePiece<lines[line].height; linePiece++) {
-					docLines[lineInDisplay] = line;
-					lineInDisplay++;
-				}
-			}
-		}
-		valid = true;
-	}
-}
-
-void ContractionState::Clear() {
-	delete []lines;
-	lines = 0;
-	size = 0;
-	linesInDoc = 1;
-	linesInDisplay = 1;
-	delete []docLines;
-	docLines = 0;
-	sizeDocLines = 0;
-}
-
-int ContractionState::LinesInDoc() const {
-	return linesInDoc;
-}
-
-int ContractionState::LinesDisplayed() const {
-	if (size != 0) {
-		MakeValid();
-	}
-	return linesInDisplay;
-}
-
-int ContractionState::DisplayFromDoc(int lineDoc) const {
-	if (size == 0) {
-		return lineDoc;
-	}
-	MakeValid();
-	if ((lineDoc >= 0) && (lineDoc < linesInDoc)) {
-		return lines[lineDoc].displayLine;
-	}
-	return -1;
-}
-
-int ContractionState::DocFromDisplay(int lineDisplay) const {
-	if (lineDisplay <= 0)
-		return 0;
-	if (lineDisplay >= linesInDisplay)
-		return linesInDoc;
-	if (size == 0)
-		return lineDisplay;
-	MakeValid();
-	if (docLines) {	// Valid allocation
-		return docLines[lineDisplay];
-	} else {
-		return 0;
-	}
-}
-
-void ContractionState::Grow(int sizeNew) {
-	OneLine *linesNew = new OneLine[sizeNew];
-	if (linesNew) {
-		int i = 0;
-		for (; i < size; i++) {
-			linesNew[i] = lines[i];
-		}
-		for (; i < sizeNew; i++) {
-			linesNew[i].displayLine = i;
-		}
-		delete []lines;
-		lines = linesNew;
-		size = sizeNew;
-		valid = false;
-	} else {
-		Platform::DebugPrintf("No memory available\n");
-		// TODO: Blow up
-	}
-}
-
-void ContractionState::InsertLines(int lineDoc, int lineCount) {
-	if (size == 0) {
-		linesInDoc += lineCount;
-		linesInDisplay += lineCount;
-		return;
-	}
-	//Platform::DebugPrintf("InsertLine[%d] = %d\n", lineDoc);
-	if ((linesInDoc + lineCount + 2) >= size) {
-		Grow(linesInDoc + lineCount + growSize);
-	}
-	linesInDoc += lineCount;
-	for (int i = linesInDoc; i >= lineDoc + lineCount; i--) {
-		lines[i].visible = lines[i - lineCount].visible;
-		lines[i].height = lines[i - lineCount].height;
-		linesInDisplay += lines[i].height;
-		lines[i].expanded = lines[i - lineCount].expanded;
-	}
-	for (int d=0;d<lineCount;d++) {
-		lines[lineDoc+d].visible = true;	// Should inherit visibility from context ?
-		lines[lineDoc+d].height = 1;
-		lines[lineDoc+d].expanded = true;
-	}
-	valid = false;
-}
-
-void ContractionState::DeleteLines(int lineDoc, int lineCount) {
-	if (size == 0) {
-		linesInDoc -= lineCount;
-		linesInDisplay -= lineCount;
-		return;
-	}
-	int deltaDisplayed = 0;
-	for (int d=0;d<lineCount;d++) {
-		if (lines[lineDoc+d].visible)
-			deltaDisplayed -= lines[lineDoc+d].height;
-	}
-	for (int i = lineDoc; i < linesInDoc-lineCount; i++) {
-		if (i != 0) // Line zero is always visible
-			lines[i].visible = lines[i + lineCount].visible;
-		lines[i].expanded = lines[i + lineCount].expanded;
-		lines[i].height = lines[i + lineCount].height;
-	}
-	linesInDoc -= lineCount;
-	linesInDisplay += deltaDisplayed;
-	valid = false;
-}
-
-bool ContractionState::GetVisible(int lineDoc) const {
-	if (size == 0)
-		return true;
-	if ((lineDoc >= 0) && (lineDoc < linesInDoc)) {
-		return lines[lineDoc].visible;
-	} else {
-		return false;
-	}
-}
-
-bool ContractionState::SetVisible(int lineDocStart, int lineDocEnd, bool visible) {
-	if (lineDocStart == 0)
-		lineDocStart++;
-	if (lineDocStart > lineDocEnd)
-		return false;
-	if (size == 0) {
-		Grow(linesInDoc + growSize);
-	}
-	// TODO: modify docLine members to mirror displayLine
-	int delta = 0;
-	// Change lineDocs
-	if ((lineDocStart <= lineDocEnd) && (lineDocStart >= 0) && (lineDocEnd < linesInDoc)) {
-		for (int line=lineDocStart; line <= lineDocEnd; line++) {
-			if (lines[line].visible != visible) {
-				delta += visible ? lines[line].height : -lines[line].height;
-				lines[line].visible = visible;
-			}
-		}
-	}
-	linesInDisplay += delta;
-	valid = false;
-	return delta != 0;
-}
-
-bool ContractionState::GetExpanded(int lineDoc) const {
-	if (size == 0)
-		return true;
-	if ((lineDoc >= 0) && (lineDoc < linesInDoc)) {
-		return lines[lineDoc].expanded;
-	} else {
-		return false;
-	}
-}
-
-bool ContractionState::SetExpanded(int lineDoc, bool expanded) {
-	if (size == 0) {
-		if (expanded) {
-			// If in completely expanded state then setting
-			// one line to expanded has no effect.
-			return false;
-		}
-		Grow(linesInDoc + growSize);
-	}
-	if ((lineDoc >= 0) && (lineDoc < linesInDoc)) {
-		if (lines[lineDoc].expanded != expanded) {
-			lines[lineDoc].expanded = expanded;
-			return true;
-		}
-	}
-	return false;
-}
-
-int ContractionState::GetHeight(int lineDoc) const {
-	if (size == 0)
-		return 1;
-	if ((lineDoc >= 0) && (lineDoc < linesInDoc)) {
-		return lines[lineDoc].height;
-	} else {
-		return 1;
-	}
-}
-
-// Set the number of display lines needed for this line.
-// Return true if this is a change.
-bool ContractionState::SetHeight(int lineDoc, int height) {
-	if (lineDoc > linesInDoc)
-		return false;
-	if (size == 0) {
-		if (height == 1) {
-			// If in completely expanded state then all lines
-			// assumed to have height of one so no effect here.
-			return false;
-		}
-		Grow(linesInDoc + growSize);
-	}
-	if (lines[lineDoc].height != height) {
-		lines[lineDoc].height = height;
-		valid = false;
-		return true;
-	} else {
-		return false;
-	}
-}
-
-void ContractionState::ShowAll() {
-	delete []lines;
-	lines = 0;
-	size = 0;
-
-	delete []docLines;
-	docLines = 0;
-	sizeDocLines = 0;
-
-	linesInDisplay = linesInDoc;
-}
diff --git a/src/stc/scintilla/src/ContractionState.h b/src/stc/scintilla/src/ContractionState.h
deleted file mode 100644
index e15ee3bbe6..0000000000
--- a/src/stc/scintilla/src/ContractionState.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Scintilla source code edit control
-/** @file ContractionState.h
- ** Manages visibility of lines for folding.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef CONTRACTIONSTATE_H
-#define CONTRACTIONSTATE_H
-
-/**
- */
-class OneLine {
-public:
-	int displayLine;	///< Position within set of visible lines
-	//int docLine;		///< Inverse of @a displayLine
-	int height;	///< Number of display lines needed to show all of the line
-	bool visible;
-	bool expanded;
-
-	OneLine();
-	virtual ~OneLine() {}
-};
-
-/**
- */
-class ContractionState {
-	void Grow(int sizeNew);
-	enum { growSize = 4000 };
-	int linesInDoc;
-	mutable int linesInDisplay;
-	mutable OneLine *lines;
-	int size;
-	mutable int *docLines;
-	mutable int sizeDocLines;
-	mutable bool valid;
-	void MakeValid() const;
-
-public:
-	ContractionState();
-	virtual ~ContractionState();
-
-	void Clear();
-
-	int LinesInDoc() const;
-	int LinesDisplayed() const;
-	int DisplayFromDoc(int lineDoc) const;
-	int DocFromDisplay(int lineDisplay) const;
-
-	void InsertLines(int lineDoc, int lineCount);
-	void DeleteLines(int lineDoc, int lineCount);
-
-	bool GetVisible(int lineDoc) const;
-	bool SetVisible(int lineDocStart, int lineDocEnd, bool visible);
-
-	bool GetExpanded(int lineDoc) const;
-	bool SetExpanded(int lineDoc, bool expanded);
-
-	int GetHeight(int lineDoc) const;
-	bool SetHeight(int lineDoc, int height);
-
-	void ShowAll();
-};
-
-#endif
diff --git a/src/stc/scintilla/src/Document.cxx b/src/stc/scintilla/src/Document.cxx
deleted file mode 100644
index 92be92691c..0000000000
--- a/src/stc/scintilla/src/Document.cxx
+++ /dev/null
@@ -1,1577 +0,0 @@
-// Scintilla source code edit control
-/** @file Document.cxx
- ** Text document that handles notifications, DBCS, styling, words and end of line.
- **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-#include "SVector.h"
-#include "CellBuffer.h"
-#include "CharClassify.h"
-#include "Document.h"
-#include "RESearch.h"
-
-// This is ASCII specific but is safe with chars >= 0x80
-static inline bool isspacechar(unsigned char ch) {
-	return (ch == ' ') || ((ch >= 0x09) && (ch <= 0x0d));
-}
-
-static inline bool IsPunctuation(char ch) {
-	return isascii(ch) && ispunct(ch);
-}
-
-static inline bool IsADigit(char ch) {
-	return isascii(ch) && isdigit(ch);
-}
-
-static inline bool IsLowerCase(char ch) {
-	return isascii(ch) && islower(ch);
-}
-
-static inline bool IsUpperCase(char ch) {
-	return isascii(ch) && isupper(ch);
-}
-
-Document::Document() {
-	refCount = 0;
-#ifdef unix
-	eolMode = SC_EOL_LF;
-#else
-	eolMode = SC_EOL_CRLF;
-#endif
-	dbcsCodePage = 0;
-	stylingBits = 5;
-	stylingBitsMask = 0x1F;
-	stylingMask = 0;
-	endStyled = 0;
-	styleClock = 0;
-	enteredCount = 0;
-	enteredReadOnlyCount = 0;
-	tabInChars = 8;
-	indentInChars = 0;
-	actualIndentInChars = 8;
-	useTabs = true;
-	tabIndents = true;
-	backspaceUnindents = false;
-	watchers = 0;
-	lenWatchers = 0;
-
-	matchesValid = false;
-	pre = 0;
-	substituted = 0;
-}
-
-Document::~Document() {
-	for (int i = 0; i < lenWatchers; i++) {
-		watchers[i].watcher->NotifyDeleted(this, watchers[i].userData);
-	}
-	delete []watchers;
-	watchers = 0;
-	lenWatchers = 0;
-	delete pre;
-	pre = 0;
-	delete []substituted;
-	substituted = 0;
-}
-
-// Increase reference count and return its previous value.
-int Document::AddRef() {
-	return refCount++;
-}
-
-// Decrease reference count and return its previous value.
-// Delete the document if reference count reaches zero.
-int Document::Release() {
-	int curRefCount = --refCount;
-	if (curRefCount == 0)
-		delete this;
-	return curRefCount;
-}
-
-void Document::SetSavePoint() {
-	cb.SetSavePoint();
-	NotifySavePoint(true);
-}
-
-int Document::AddMark(int line, int markerNum) {
-	int prev = cb.AddMark(line, markerNum);
-	DocModification mh(SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, 0, line);
-	mh.line = line;
-	NotifyModified(mh);
-	return prev;
-}
-
-void Document::AddMarkSet(int line, int valueSet) {
-	unsigned int m = valueSet;
-	for (int i = 0; m; i++, m >>= 1)
-		if (m & 1)
-			cb.AddMark(line, i);
-	DocModification mh(SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, 0, line);
-	mh.line = line;
-	NotifyModified(mh);
-}
-
-void Document::DeleteMark(int line, int markerNum) {
-	cb.DeleteMark(line, markerNum);
-	DocModification mh(SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, 0, line);
-	mh.line = line;
-	NotifyModified(mh);
-}
-
-void Document::DeleteMarkFromHandle(int markerHandle) {
-	cb.DeleteMarkFromHandle(markerHandle);
-	DocModification mh(SC_MOD_CHANGEMARKER, 0, 0, 0, 0);
-	mh.line = -1;
-	NotifyModified(mh);
-}
-
-void Document::DeleteAllMarks(int markerNum) {
-	cb.DeleteAllMarks(markerNum);
-	DocModification mh(SC_MOD_CHANGEMARKER, 0, 0, 0, 0);
-	mh.line = -1;
-	NotifyModified(mh);
-}
-
-int Document::LineStart(int line) {
-	return cb.LineStart(line);
-}
-
-int Document::LineEnd(int line) {
-	if (line == LinesTotal() - 1) {
-		return LineStart(line + 1);
-	} else {
-		int position = LineStart(line + 1) - 1;
-		// When line terminator is CR+LF, may need to go back one more
-		if ((position > LineStart(line)) && (cb.CharAt(position - 1) == '\r')) {
-			position--;
-		}
-		return position;
-	}
-}
-
-int Document::LineFromPosition(int pos) {
-	return cb.LineFromPosition(pos);
-}
-
-int Document::LineEndPosition(int position) {
-	return LineEnd(LineFromPosition(position));
-}
-
-int Document::VCHomePosition(int position) {
-	int line = LineFromPosition(position);
-	int startPosition = LineStart(line);
-	int endLine = LineStart(line + 1) - 1;
-	int startText = startPosition;
-	while (startText < endLine && (cb.CharAt(startText) == ' ' || cb.CharAt(startText) == '\t' ) )
-		startText++;
-	if (position == startText)
-		return startPosition;
-	else
-		return startText;
-}
-
-int Document::SetLevel(int line, int level) {
-	int prev = cb.SetLevel(line, level);
-	if (prev != level) {
-		DocModification mh(SC_MOD_CHANGEFOLD | SC_MOD_CHANGEMARKER,
-		                   LineStart(line), 0, 0, 0);
-		mh.line = line;
-		mh.foldLevelNow = level;
-		mh.foldLevelPrev = prev;
-		NotifyModified(mh);
-	}
-	return prev;
-}
-
-static bool IsSubordinate(int levelStart, int levelTry) {
-	if (levelTry & SC_FOLDLEVELWHITEFLAG)
-		return true;
-	else
-		return (levelStart & SC_FOLDLEVELNUMBERMASK) < (levelTry & SC_FOLDLEVELNUMBERMASK);
-}
-
-int Document::GetLastChild(int lineParent, int level) {
-	if (level == -1)
-		level = GetLevel(lineParent) & SC_FOLDLEVELNUMBERMASK;
-	int maxLine = LinesTotal();
-	int lineMaxSubord = lineParent;
-	while (lineMaxSubord < maxLine - 1) {
-		EnsureStyledTo(LineStart(lineMaxSubord + 2));
-		if (!IsSubordinate(level, GetLevel(lineMaxSubord + 1)))
-			break;
-		lineMaxSubord++;
-	}
-	if (lineMaxSubord > lineParent) {
-		if (level > (GetLevel(lineMaxSubord + 1) & SC_FOLDLEVELNUMBERMASK)) {
-			// Have chewed up some whitespace that belongs to a parent so seek back
-			if (GetLevel(lineMaxSubord) & SC_FOLDLEVELWHITEFLAG) {
-				lineMaxSubord--;
-			}
-		}
-	}
-	return lineMaxSubord;
-}
-
-int Document::GetFoldParent(int line) {
-	int level = GetLevel(line) & SC_FOLDLEVELNUMBERMASK;
-	int lineLook = line - 1;
-	while ((lineLook > 0) && (
-	            (!(GetLevel(lineLook) & SC_FOLDLEVELHEADERFLAG)) ||
-	            ((GetLevel(lineLook) & SC_FOLDLEVELNUMBERMASK) >= level))
-	      ) {
-		lineLook--;
-	}
-	if ((GetLevel(lineLook) & SC_FOLDLEVELHEADERFLAG) &&
-	        ((GetLevel(lineLook) & SC_FOLDLEVELNUMBERMASK) < level)) {
-		return lineLook;
-	} else {
-		return -1;
-	}
-}
-
-int Document::ClampPositionIntoDocument(int pos) {
-	return Platform::Clamp(pos, 0, Length());
-}
-
-bool Document::IsCrLf(int pos) {
-	if (pos < 0)
-		return false;
-	if (pos >= (Length() - 1))
-		return false;
-	return (cb.CharAt(pos) == '\r') && (cb.CharAt(pos + 1) == '\n');
-}
-
-static const int maxBytesInDBCSCharacter=5;
-
-int Document::LenChar(int pos) {
-	if (pos < 0) {
-		return 1;
-	} else if (IsCrLf(pos)) {
-		return 2;
-	} else if (SC_CP_UTF8 == dbcsCodePage) {
-		unsigned char ch = static_cast<unsigned char>(cb.CharAt(pos));
-		if (ch < 0x80)
-			return 1;
-		int len = 2;
-		if (ch >= (0x80 + 0x40 + 0x20))
-			len = 3;
-		int lengthDoc = Length();
-		if ((pos + len) > lengthDoc)
-			return lengthDoc -pos;
-		else
-			return len;
-	} else if (dbcsCodePage) {
-		char mbstr[maxBytesInDBCSCharacter+1];
-		int i;
-		for (i=0; i<Platform::DBCSCharMaxLength(); i++) {
-			mbstr[i] = cb.CharAt(pos+i);
-		}
-		mbstr[i] = '\0';
-		return Platform::DBCSCharLength(dbcsCodePage, mbstr);
-	} else {
-		return 1;
-	}
-}
-
-// Normalise a position so that it is not halfway through a two byte character.
-// This can occur in two situations -
-// When lines are terminated with \r\n pairs which should be treated as one character.
-// When displaying DBCS text such as Japanese.
-// If moving, move the position in the indicated direction.
-int Document::MovePositionOutsideChar(int pos, int moveDir, bool checkLineEnd) {
-	//Platform::DebugPrintf("NoCRLF %d %d\n", pos, moveDir);
-	// If out of range, just return minimum/maximum value.
-	if (pos <= 0)
-		return 0;
-	if (pos >= Length())
-		return Length();
-
-	// PLATFORM_ASSERT(pos > 0 && pos < Length());
-	if (checkLineEnd && IsCrLf(pos - 1)) {
-		if (moveDir > 0)
-			return pos + 1;
-		else
-			return pos - 1;
-	}
-
-	// Not between CR and LF
-
-	if (dbcsCodePage) {
-		if (SC_CP_UTF8 == dbcsCodePage) {
-			unsigned char ch = static_cast<unsigned char>(cb.CharAt(pos));
-			while ((pos > 0) && (pos < Length()) && (ch >= 0x80) && (ch < (0x80 + 0x40))) {
-				// ch is a trail byte
-				if (moveDir > 0)
-					pos++;
-				else
-					pos--;
-				ch = static_cast<unsigned char>(cb.CharAt(pos));
-			}
-		} else {
-			// Anchor DBCS calculations at start of line because start of line can
-			// not be a DBCS trail byte.
-			int posCheck = LineStart(LineFromPosition(pos));
-			while (posCheck < pos) {
-				char mbstr[maxBytesInDBCSCharacter+1];
-				int i;
-				for(i=0;i<Platform::DBCSCharMaxLength();i++) {
-					mbstr[i] = cb.CharAt(posCheck+i);
-				}
-				mbstr[i] = '\0';
-
-				int mbsize = Platform::DBCSCharLength(dbcsCodePage, mbstr);
-				if (posCheck + mbsize == pos) {
-					return pos;
-				} else if (posCheck + mbsize > pos) {
-					if (moveDir > 0) {
-						return posCheck + mbsize;
-					} else {
-						return posCheck;
-					}
-				}
-				posCheck += mbsize;
-			}
-		}
-	}
-
-	return pos;
-}
-
-void Document::ModifiedAt(int pos) {
-	if (endStyled > pos)
-		endStyled = pos;
-}
-
-void Document::CheckReadOnly() {
-	if (cb.IsReadOnly() && enteredReadOnlyCount == 0) {
-		enteredReadOnlyCount++;
-		NotifyModifyAttempt();
-		enteredReadOnlyCount--;
-	}
-}
-
-// Document only modified by gateways DeleteChars, InsertStyledString, Undo, Redo, and SetStyleAt.
-// SetStyleAt does not change the persistent state of a document
-
-// Unlike Undo, Redo, and InsertStyledString, the pos argument is a cell number not a char number
-bool Document::DeleteChars(int pos, int len) {
-	if (len == 0)
-		return false;
-	if ((pos + len) > Length())
-		return false;
-	CheckReadOnly();
-	if (enteredCount != 0) {
-		return false;
-	} else {
-		enteredCount++;
-		if (!cb.IsReadOnly()) {
-			NotifyModified(
-			    DocModification(
-			        SC_MOD_BEFOREDELETE | SC_PERFORMED_USER,
-			        pos, len,
-			        0, 0));
-			int prevLinesTotal = LinesTotal();
-			bool startSavePoint = cb.IsSavePoint();
-			const char *text = cb.DeleteChars(pos * 2, len * 2);
-			if (startSavePoint && cb.IsCollectingUndo())
-				NotifySavePoint(!startSavePoint);
-			if ((pos < Length()) || (pos == 0))
-				ModifiedAt(pos);
-			else
-				ModifiedAt(pos-1);
-			NotifyModified(
-			    DocModification(
-			        SC_MOD_DELETETEXT | SC_PERFORMED_USER,
-			        pos, len,
-			        LinesTotal() - prevLinesTotal, text));
-		}
-		enteredCount--;
-	}
-	return !cb.IsReadOnly();
-}
-
-/**
- * Insert a styled string (char/style pairs) with a length.
- */
-bool Document::InsertStyledString(int position, char *s, int insertLength) {
-	CheckReadOnly();
-	if (enteredCount != 0) {
-		return false;
-	} else {
-		enteredCount++;
-		if (!cb.IsReadOnly()) {
-			NotifyModified(
-			    DocModification(
-			        SC_MOD_BEFOREINSERT | SC_PERFORMED_USER,
-			        position / 2, insertLength / 2,
-			        0, s));
-			int prevLinesTotal = LinesTotal();
-			bool startSavePoint = cb.IsSavePoint();
-			const char *text = cb.InsertString(position, s, insertLength);
-			if (startSavePoint && cb.IsCollectingUndo())
-				NotifySavePoint(!startSavePoint);
-			ModifiedAt(position / 2);
-			NotifyModified(
-			    DocModification(
-			        SC_MOD_INSERTTEXT | SC_PERFORMED_USER,
-			        position / 2, insertLength / 2,
-			        LinesTotal() - prevLinesTotal, text));
-		}
-		enteredCount--;
-	}
-	return !cb.IsReadOnly();
-}
-
-int Document::Undo() {
-	int newPos = -1;
-	CheckReadOnly();
-	if (enteredCount == 0) {
-		enteredCount++;
-		if (!cb.IsReadOnly()) {
-			bool startSavePoint = cb.IsSavePoint();
-			bool multiLine = false;
-			int steps = cb.StartUndo();
-			//Platform::DebugPrintf("Steps=%d\n", steps);
-			for (int step = 0; step < steps; step++) {
-				const int prevLinesTotal = LinesTotal();
-				const Action &action = cb.GetUndoStep();
-				if (action.at == removeAction) {
-					NotifyModified(DocModification(
-									SC_MOD_BEFOREINSERT | SC_PERFORMED_UNDO, action));
-				} else {
-					NotifyModified(DocModification(
-									SC_MOD_BEFOREDELETE | SC_PERFORMED_UNDO, action));
-				}
-				cb.PerformUndoStep();
-				int cellPosition = action.position;
-				ModifiedAt(cellPosition);
-				newPos = cellPosition;
-
-				int modFlags = SC_PERFORMED_UNDO;
-				// With undo, an insertion action becomes a deletion notification
-				if (action.at == removeAction) {
-					newPos += action.lenData;
-					modFlags |= SC_MOD_INSERTTEXT;
-				} else {
-					modFlags |= SC_MOD_DELETETEXT;
-				}
-				if (steps > 1)
-					modFlags |= SC_MULTISTEPUNDOREDO;
-				const int linesAdded = LinesTotal() - prevLinesTotal;
-				if (linesAdded != 0)
-					multiLine = true;
-				if (step == steps - 1) {
-					modFlags |= SC_LASTSTEPINUNDOREDO;
-					if (multiLine)
-						modFlags |= SC_MULTILINEUNDOREDO;
-				}
-				NotifyModified(DocModification(modFlags, cellPosition, action.lenData,
-											   linesAdded, action.data));
-			}
-
-			bool endSavePoint = cb.IsSavePoint();
-			if (startSavePoint != endSavePoint)
-				NotifySavePoint(endSavePoint);
-		}
-		enteredCount--;
-	}
-	return newPos;
-}
-
-int Document::Redo() {
-	int newPos = -1;
-	CheckReadOnly();
-	if (enteredCount == 0) {
-		enteredCount++;
-		if (!cb.IsReadOnly()) {
-			bool startSavePoint = cb.IsSavePoint();
-			bool multiLine = false;
-			int steps = cb.StartRedo();
-			for (int step = 0; step < steps; step++) {
-				const int prevLinesTotal = LinesTotal();
-				const Action &action = cb.GetRedoStep();
-				if (action.at == insertAction) {
-					NotifyModified(DocModification(
-									SC_MOD_BEFOREINSERT | SC_PERFORMED_REDO, action));
-				} else {
-					NotifyModified(DocModification(
-									SC_MOD_BEFOREDELETE | SC_PERFORMED_REDO, action));
-				}
-				cb.PerformRedoStep();
-				ModifiedAt(action.position);
-				newPos = action.position;
-
-				int modFlags = SC_PERFORMED_REDO;
-				if (action.at == insertAction) {
-					newPos += action.lenData;
-					modFlags |= SC_MOD_INSERTTEXT;
-				} else {
-					modFlags |= SC_MOD_DELETETEXT;
-				}
-				if (steps > 1)
-					modFlags |= SC_MULTISTEPUNDOREDO;
-				const int linesAdded = LinesTotal() - prevLinesTotal;
-				if (linesAdded != 0)
-					multiLine = true;
-				if (step == steps - 1) {
-					modFlags |= SC_LASTSTEPINUNDOREDO;
-					if (multiLine)
-						modFlags |= SC_MULTILINEUNDOREDO;
-				}
-				NotifyModified(
-					DocModification(modFlags, action.position, action.lenData,
-									linesAdded, action.data));
-			}
-
-			bool endSavePoint = cb.IsSavePoint();
-			if (startSavePoint != endSavePoint)
-				NotifySavePoint(endSavePoint);
-		}
-		enteredCount--;
-	}
-	return newPos;
-}
-
-/**
- * Insert a single character.
- */
-bool Document::InsertChar(int pos, char ch) {
-	char chs[2];
-	chs[0] = ch;
-	chs[1] = 0;
-	return InsertStyledString(pos*2, chs, 2);
-}
-
-/**
- * Insert a null terminated string.
- */
-bool Document::InsertString(int position, const char *s) {
-	return InsertString(position, s, strlen(s));
-}
-
-/**
- * Insert a string with a length.
- */
-bool Document::InsertString(int position, const char *s, size_t insertLength) {
-	bool changed = false;
-	if (insertLength > 0) {
-		char *sWithStyle = new char[insertLength * 2];
-		if (sWithStyle) {
-			for (size_t i = 0; i < insertLength; i++) {
-				sWithStyle[i*2] = s[i];
-				sWithStyle[i*2 + 1] = 0;
-			}
-			changed = InsertStyledString(position*2, sWithStyle,
-				static_cast<int>(insertLength*2));
-			delete []sWithStyle;
-		}
-	}
-	return changed;
-}
-
-void Document::ChangeChar(int pos, char ch) {
-	DeleteChars(pos, 1);
-	InsertChar(pos, ch);
-}
-
-void Document::DelChar(int pos) {
-	DeleteChars(pos, LenChar(pos));
-}
-
-void Document::DelCharBack(int pos) {
-	if (pos <= 0) {
-		return;
-	} else if (IsCrLf(pos - 2)) {
-		DeleteChars(pos - 2, 2);
-	} else if (dbcsCodePage) {
-		int startChar = MovePositionOutsideChar(pos - 1, -1, false);
-		DeleteChars(startChar, pos - startChar);
-	} else {
-		DeleteChars(pos - 1, 1);
-	}
-}
-
-static bool isindentchar(char ch) {
-	return (ch == ' ') || (ch == '\t');
-}
-
-static int NextTab(int pos, int tabSize) {
-	return ((pos / tabSize) + 1) * tabSize;
-}
-
-static void CreateIndentation(char *linebuf, int length, int indent, int tabSize, bool insertSpaces) {
-	length--;	// ensure space for \0
-	if (!insertSpaces) {
-		while ((indent >= tabSize) && (length > 0)) {
-			*linebuf++ = '\t';
-			indent -= tabSize;
-			length--;
-		}
-	}
-	while ((indent > 0) && (length > 0)) {
-		*linebuf++ = ' ';
-		indent--;
-		length--;
-	}
-	*linebuf = '\0';
-}
-
-int Document::GetLineIndentation(int line) {
-	int indent = 0;
-	if ((line >= 0) && (line < LinesTotal())) {
-		int lineStart = LineStart(line);
-		int length = Length();
-		for (int i = lineStart;i < length;i++) {
-			char ch = cb.CharAt(i);
-			if (ch == ' ')
-				indent++;
-			else if (ch == '\t')
-				indent = NextTab(indent, tabInChars);
-			else
-				return indent;
-		}
-	}
-	return indent;
-}
-
-void Document::SetLineIndentation(int line, int indent) {
-	int indentOfLine = GetLineIndentation(line);
-	if (indent < 0)
-		indent = 0;
-	if (indent != indentOfLine) {
-		char linebuf[1000];
-		CreateIndentation(linebuf, sizeof(linebuf), indent, tabInChars, !useTabs);
-		int thisLineStart = LineStart(line);
-		int indentPos = GetLineIndentPosition(line);
-		BeginUndoAction();
-		DeleteChars(thisLineStart, indentPos - thisLineStart);
-		InsertString(thisLineStart, linebuf);
-		EndUndoAction();
-	}
-}
-
-int Document::GetLineIndentPosition(int line) {
-	if (line < 0)
-		return 0;
-	int pos = LineStart(line);
-	int length = Length();
-	while ((pos < length) && isindentchar(cb.CharAt(pos))) {
-		pos++;
-	}
-	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;) {
-			char ch = cb.CharAt(i);
-			if (ch == '\t') {
-				column = NextTab(column, tabInChars);
-				i++;
-			} else if (ch == '\r') {
-				return column;
-			} else if (ch == '\n') {
-				return column;
-			} else {
-				column++;
-				i = MovePositionOutsideChar(i + 1, 1);
-			}
-		}
-	}
-	return column;
-}
-
-int Document::FindColumn(int line, int column) {
-	int position = LineStart(line);
-	int columnCurrent = 0;
-	if ((line >= 0) && (line < LinesTotal())) {
-		while ((columnCurrent < column) && (position < Length())) {
-			char ch = cb.CharAt(position);
-			if (ch == '\t') {
-				columnCurrent = NextTab(columnCurrent, tabInChars);
-				position++;
-			} else if (ch == '\r') {
-				return position;
-			} else if (ch == '\n') {
-				return position;
-			} else {
-				columnCurrent++;
-				position = MovePositionOutsideChar(position + 1, 1);
-			}
-		}
-	}
-	return position;
-}
-
-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--) {
-		int indentOfLine = GetLineIndentation(line);
-		if (forwards) {
-			if (LineStart(line) < LineEnd(line)) {
-				SetLineIndentation(line, indentOfLine + IndentSize());
-			}
-		} else {
-			SetLineIndentation(line, indentOfLine - IndentSize());
-		}
-	}
-}
-
-// Convert line endings for a piece of text to a particular mode.
-// Stop at len or when a NUL is found.
-// Caller must delete the returned pointer.
-char *Document::TransformLineEnds(int *pLenOut, const char *s, size_t len, int eolMode) {
-	char *dest = new char[2 * len + 1];
-	const char *sptr = s;
-	char *dptr = dest;
-	for (size_t i = 0; (i < len) && (*sptr != '\0'); i++) {
-		if (*sptr == '\n' || *sptr == '\r') {
-			if (eolMode == SC_EOL_CR) {
-				*dptr++ = '\r';
-			} else if (eolMode == SC_EOL_LF) {
-				*dptr++ = '\n';
-			} else { // eolMode == SC_EOL_CRLF
-				*dptr++ = '\r';
-				*dptr++ = '\n';
-			}
-			if ((*sptr == '\r') && (i+1 < len) && (*(sptr+1) == '\n')) {
-				i++;
-				sptr++;
-			}
-			sptr++;
-		} else {
-			*dptr++ = *sptr++;
-		}
-	}
-	*dptr++ = '\0';
-	*pLenOut = (dptr - dest) - 1;
-	return dest;
-}
-
-void Document::ConvertLineEnds(int eolModeSet) {
-	BeginUndoAction();
-
-	for (int pos = 0; pos < Length(); pos++) {
-		if (cb.CharAt(pos) == '\r') {
-			if (cb.CharAt(pos + 1) == '\n') {
-				// CRLF
-				if (eolModeSet == SC_EOL_CR) {
-					DeleteChars(pos + 1, 1); // Delete the LF
-				} else if (eolModeSet == SC_EOL_LF) {
-					DeleteChars(pos, 1); // Delete the CR
-				} else {
-					pos++;
-				}
-			} else {
-				// CR
-				if (eolModeSet == SC_EOL_CRLF) {
-					InsertString(pos + 1, "\n", 1); // Insert LF
-					pos++;
-				} else if (eolModeSet == SC_EOL_LF) {
-					InsertString(pos, "\n", 1); // Insert LF
-					DeleteChars(pos + 1, 1); // Delete CR
-				}
-			}
-		} else if (cb.CharAt(pos) == '\n') {
-			// LF
-			if (eolModeSet == SC_EOL_CRLF) {
-				InsertString(pos, "\r", 1); // Insert CR
-				pos++;
-			} else if (eolModeSet == SC_EOL_CR) {
-				InsertString(pos, "\r", 1); // Insert CR
-				DeleteChars(pos + 1, 1); // Delete LF
-			}
-		}
-	}
-
-	EndUndoAction();
-}
-
-bool Document::IsWhiteLine(int line) {
-	int currentChar = LineStart(line);
-	int endLine = LineEnd(line);
-	while (currentChar < endLine) {
-		if (cb.CharAt(currentChar) != ' ' && cb.CharAt(currentChar) != '\t') {
-			return false;
-		}
-		++currentChar;
-	}
-	return true;
-}
-
-int Document::ParaUp(int pos) {
-	int line = LineFromPosition(pos);
-	line--;
-	while (line >= 0 && IsWhiteLine(line)) { // skip empty lines
-		line--;
-	}
-	while (line >= 0 && !IsWhiteLine(line)) { // skip non-empty lines
-		line--;
-	}
-	line++;
-	return LineStart(line);
-}
-
-int Document::ParaDown(int pos) {
-	int line = LineFromPosition(pos);
-	while (line < LinesTotal() && !IsWhiteLine(line)) { // skip non-empty lines
-		line++;
-	}
-	while (line < LinesTotal() && IsWhiteLine(line)) { // skip empty lines
-		line++;
-	}
-	if (line < LinesTotal())
-		return LineStart(line);
-	else // end of a document
-		return LineEnd(line-1);
-}
-
-CharClassify::cc Document::WordCharClass(unsigned char ch) {
-	if ((SC_CP_UTF8 == dbcsCodePage) && (ch >= 0x80))
-		return CharClassify::ccWord;
-	return charClass.GetClass(ch);
-}
-
-/**
- * Used by commmands that want to select whole words.
- * Finds the start of word at pos when delta < 0 or the end of the word when delta >= 0.
- */
-int Document::ExtendWordSelect(int pos, int delta, bool onlyWordCharacters) {
-	CharClassify::cc ccStart = CharClassify::ccWord;
-	if (delta < 0) {
-		if (!onlyWordCharacters)
-			ccStart = WordCharClass(cb.CharAt(pos-1));
-		while (pos > 0 && (WordCharClass(cb.CharAt(pos - 1)) == ccStart))
-			pos--;
-	} else {
-		if (!onlyWordCharacters)
-			ccStart = WordCharClass(cb.CharAt(pos));
-		while (pos < (Length()) && (WordCharClass(cb.CharAt(pos)) == ccStart))
-			pos++;
-	}
-	return MovePositionOutsideChar(pos, delta);
-}
-
-/**
- * Find the start of the next word in either a forward (delta >= 0) or backwards direction
- * (delta < 0).
- * This is looking for a transition between character classes although there is also some
- * additional movement to transit white space.
- * Used by cursor movement by word commands.
- */
-int Document::NextWordStart(int pos, int delta) {
-	if (delta < 0) {
-		while (pos > 0 && (WordCharClass(cb.CharAt(pos - 1)) == CharClassify::ccSpace))
-			pos--;
-		if (pos > 0) {
-			CharClassify::cc ccStart = WordCharClass(cb.CharAt(pos-1));
-			while (pos > 0 && (WordCharClass(cb.CharAt(pos - 1)) == ccStart)) {
-				pos--;
-			}
-		}
-	} else {
-		CharClassify::cc ccStart = WordCharClass(cb.CharAt(pos));
-		while (pos < (Length()) && (WordCharClass(cb.CharAt(pos)) == ccStart))
-			pos++;
-		while (pos < (Length()) && (WordCharClass(cb.CharAt(pos)) == CharClassify::ccSpace))
-			pos++;
-	}
-	return pos;
-}
-
-/**
- * Find the end of the next word in either a forward (delta >= 0) or backwards direction
- * (delta < 0).
- * This is looking for a transition between character classes although there is also some
- * additional movement to transit white space.
- * Used by cursor movement by word commands.
- */
-int Document::NextWordEnd(int pos, int delta) {
-	if (delta < 0) {
-		if (pos > 0) {
-			CharClassify::cc ccStart = WordCharClass(cb.CharAt(pos-1));
-			if (ccStart != CharClassify::ccSpace) {
-				while (pos > 0 && WordCharClass(cb.CharAt(pos - 1)) == ccStart) {
-					pos--;
-				}
-			}
-			while (pos > 0 && WordCharClass(cb.CharAt(pos - 1)) == CharClassify::ccSpace) {
-				pos--;
-			}
-		}
-	} else {
-		while (pos < Length() && WordCharClass(cb.CharAt(pos)) == CharClassify::ccSpace) {
-			pos++;
-		}
-		if (pos < Length()) {
-			CharClassify::cc ccStart = WordCharClass(cb.CharAt(pos));
-			while (pos < Length() && WordCharClass(cb.CharAt(pos)) == ccStart) {
-				pos++;
-			}
-		}
-	}
-	return pos;
-}
-
-/**
- * Check that the character at the given position is a word or punctuation character and that
- * the previous character is of a different character class.
- */
-bool Document::IsWordStartAt(int pos) {
-	if (pos > 0) {
-		CharClassify::cc ccPos = WordCharClass(CharAt(pos));
-		return (ccPos == CharClassify::ccWord || ccPos == CharClassify::ccPunctuation) &&
-			(ccPos != WordCharClass(CharAt(pos - 1)));
-	}
-	return true;
-}
-
-/**
- * Check that the character at the given position is a word or punctuation character and that
- * the next character is of a different character class.
- */
-bool Document::IsWordEndAt(int pos) {
-	if (pos < Length()) {
-		CharClassify::cc ccPrev = WordCharClass(CharAt(pos-1));
-		return (ccPrev == CharClassify::ccWord || ccPrev == CharClassify::ccPunctuation) &&
-			(ccPrev != WordCharClass(CharAt(pos)));
-	}
-	return true;
-}
-
-/**
- * Check that the given range is has transitions between character classes at both
- * ends and where the characters on the inside are word or punctuation characters.
- */
-bool Document::IsWordAt(int start, int end) {
-	return IsWordStartAt(start) && IsWordEndAt(end);
-}
-
-// The comparison and case changing functions here assume ASCII
-// or extended ASCII such as the normal Windows code page.
-
-static inline char MakeUpperCase(char ch) {
-	if (ch < 'a' || ch > 'z')
-		return ch;
-	else
-		return static_cast<char>(ch - 'a' + 'A');
-}
-
-static inline char MakeLowerCase(char ch) {
-	if (ch < 'A' || ch > 'Z')
-		return ch;
-	else
-		return static_cast<char>(ch - 'A' + 'a');
-}
-
-// Define a way for the Regular Expression code to access the document
-class DocumentIndexer : public CharacterIndexer {
-	Document *pdoc;
-	int end;
-public:
-	DocumentIndexer(Document *pdoc_, int end_) :
-		pdoc(pdoc_), end(end_) {
-	}
-
-	virtual ~DocumentIndexer() {
-	}
-
-	virtual char CharAt(int index) {
-		if (index < 0 || index >= end)
-			return 0;
-		else
-			return pdoc->CharAt(index);
-	}
-};
-
-/**
- * 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, bool regExp, bool posix,
-                        int *length) {
-	if (regExp) {
-		if (!pre)
-			pre = new RESearch(&charClass);
-		if (!pre)
-			return -1;
-
-		int increment = (minPos <= maxPos) ? 1 : -1;
-
-		int startPos = minPos;
-		int endPos = maxPos;
-
-		// Range endpoints should not be inside DBCS characters, but just in case, move them.
-		startPos = MovePositionOutsideChar(startPos, 1, false);
-		endPos = MovePositionOutsideChar(endPos, 1, false);
-
-		const char *errmsg = pre->Compile(s, *length, caseSensitive, posix);
-		if (errmsg) {
-			return -1;
-		}
-		// Find a variable in a property file: \$(\([A-Za-z0-9_.]+\))
-		// Replace first '.' with '-' in each property file variable reference:
-		//     Search: \$(\([A-Za-z0-9_-]+\)\.\([A-Za-z0-9_.]+\))
-		//     Replace: $(\1-\2)
-		int lineRangeStart = LineFromPosition(startPos);
-		int lineRangeEnd = LineFromPosition(endPos);
-		if ((increment == 1) &&
-			(startPos >= LineEnd(lineRangeStart)) &&
-			(lineRangeStart < lineRangeEnd)) {
-			// the start position is at end of line or between line end characters.
-			lineRangeStart++;
-			startPos = LineStart(lineRangeStart);
-		}
-		int pos = -1;
-		int lenRet = 0;
-		char searchEnd = s[*length - 1];
-		int lineRangeBreak = lineRangeEnd + increment;
-		for (int line = lineRangeStart; line != lineRangeBreak; line += increment) {
-			int startOfLine = LineStart(line);
-			int endOfLine = LineEnd(line);
-			if (increment == 1) {
-				if (line == lineRangeStart) {
-					if ((startPos != startOfLine) && (s[0] == '^'))
-						continue;	// Can't match start of line if start position after start of line
-					startOfLine = startPos;
-				}
-				if (line == lineRangeEnd) {
-					if ((endPos != endOfLine) && (searchEnd == '$'))
-						continue;	// Can't match end of line if end position before end of line
-					endOfLine = endPos;
-				}
-			} else {
-				if (line == lineRangeEnd) {
-					if ((endPos != startOfLine) && (s[0] == '^'))
-						continue;	// Can't match start of line if end position after start of line
-					startOfLine = endPos;
-				}
-				if (line == lineRangeStart) {
-					if ((startPos != endOfLine) && (searchEnd == '$'))
-						continue;	// Can't match end of line if start position before end of line
-					endOfLine = startPos;
-				}
-			}
-
-			DocumentIndexer di(this, endOfLine);
-			int success = pre->Execute(di, startOfLine, endOfLine);
-			if (success) {
-				pos = pre->bopat[0];
-				lenRet = pre->eopat[0] - pre->bopat[0];
-				if (increment == -1) {
-					// Check for the last match on this line.
-					int repetitions = 1000;	// Break out of infinite loop
-					while (success && (pre->eopat[0] <= endOfLine) && (repetitions--)) {
-						success = pre->Execute(di, pos+1, endOfLine);
-						if (success) {
-							if (pre->eopat[0] <= minPos) {
-								pos = pre->bopat[0];
-								lenRet = pre->eopat[0] - pre->bopat[0];
-							} else {
-								success = 0;
-							}
-						}
-					}
-				}
-				break;
-			}
-		}
-		*length = lenRet;
-		return pos;
-
-	} else {
-
-		bool forward = minPos <= maxPos;
-		int increment = forward ? 1 : -1;
-
-		// Range endpoints should not be inside DBCS characters, but just in case, move them.
-		int startPos = MovePositionOutsideChar(minPos, increment, false);
-		int endPos = MovePositionOutsideChar(maxPos, increment, false);
-
-		// Compute actual search ranges needed
-		int lengthFind = *length;
-		if (lengthFind == -1)
-			lengthFind = static_cast<int>(strlen(s));
-		int endSearch = endPos;
-		if (startPos <= endPos) {
-			endSearch = endPos - lengthFind + 1;
-		}
-		//Platform::DebugPrintf("Find %d %d %s %d\n", startPos, endPos, ft->lpstrText, lengthFind);
-		char firstChar = s[0];
-		if (!caseSensitive)
-			firstChar = static_cast<char>(MakeUpperCase(firstChar));
-		int pos = forward ? startPos : (startPos - 1);
-		while (forward ? (pos < endSearch) : (pos >= endSearch)) {
-			char ch = CharAt(pos);
-			if (caseSensitive) {
-				if (ch == firstChar) {
-					bool found = true;
-					if (pos + lengthFind > Platform::Maximum(startPos, endPos)) found = false;
-					for (int posMatch = 1; posMatch < lengthFind && found; posMatch++) {
-						ch = CharAt(pos + posMatch);
-						if (ch != s[posMatch])
-							found = false;
-					}
-					if (found) {
-						if ((!word && !wordStart) ||
-						        word && IsWordAt(pos, pos + lengthFind) ||
-						        wordStart && IsWordStartAt(pos))
-							return pos;
-					}
-				}
-			} else {
-				if (MakeUpperCase(ch) == firstChar) {
-					bool found = true;
-					if (pos + lengthFind > Platform::Maximum(startPos, endPos)) found = false;
-					for (int posMatch = 1; posMatch < lengthFind && found; posMatch++) {
-						ch = CharAt(pos + posMatch);
-						if (MakeUpperCase(ch) != MakeUpperCase(s[posMatch]))
-							found = false;
-					}
-					if (found) {
-						if ((!word && !wordStart) ||
-						        word && IsWordAt(pos, pos + lengthFind) ||
-						        wordStart && IsWordStartAt(pos))
-							return pos;
-					}
-				}
-			}
-			pos += increment;
-			if (dbcsCodePage && (pos >= 0)) {
-				// Ensure trying to match from start of character
-				pos = MovePositionOutsideChar(pos, increment, false);
-			}
-		}
-	}
-	//Platform::DebugPrintf("Not found\n");
-	return -1;
-}
-
-const char *Document::SubstituteByPosition(const char *text, int *length) {
-	if (!pre)
-		return 0;
-	delete []substituted;
-	substituted = 0;
-	DocumentIndexer di(this, Length());
-	if (!pre->GrabMatches(di))
-		return 0;
-	unsigned int lenResult = 0;
-	for (int i = 0; i < *length; i++) {
-		if (text[i] == '\\') {
-			if (text[i + 1] >= '1' && text[i + 1] <= '9') {
-				unsigned int patNum = text[i + 1] - '0';
-				lenResult += pre->eopat[patNum] - pre->bopat[patNum];
-				i++;
-			} else {
-				switch (text[i + 1]) {
-				case 'a':
-				case 'b':
-				case 'f':
-				case 'n':
-				case 'r':
-				case 't':
-				case 'v':
-					i++;
-				}
-				lenResult++;
-			}
-		} else {
-			lenResult++;
-		}
-	}
-	substituted = new char[lenResult + 1];
-	if (!substituted)
-		return 0;
-	char *o = substituted;
-	for (int j = 0; j < *length; j++) {
-		if (text[j] == '\\') {
-			if (text[j + 1] >= '1' && text[j + 1] <= '9') {
-				unsigned int patNum = text[j + 1] - '0';
-				unsigned int len = pre->eopat[patNum] - pre->bopat[patNum];
-				if (pre->pat[patNum])	// Will be null if try for a match that did not occur
-					memcpy(o, pre->pat[patNum], len);
-				o += len;
-				j++;
-			} else {
-				j++;
-				switch (text[j]) {
-				case 'a':
-					*o++ = '\a';
-					break;
-				case 'b':
-					*o++ = '\b';
-					break;
-				case 'f':
-					*o++ = '\f';
-					break;
-				case 'n':
-					*o++ = '\n';
-					break;
-				case 'r':
-					*o++ = '\r';
-					break;
-				case 't':
-					*o++ = '\t';
-					break;
-				case 'v':
-					*o++ = '\v';
-					break;
-				default:
-					*o++ = '\\';
-					j--;
-				}
-			}
-		} else {
-			*o++ = text[j];
-		}
-	}
-	*o = '\0';
-	*length = lenResult;
-	return substituted;
-}
-
-int Document::LinesTotal() {
-	return cb.Lines();
-}
-
-void Document::ChangeCase(Range r, bool makeUpperCase) {
-	for (int pos = r.start; pos < r.end;) {
-		int len = LenChar(pos);
-		if (len == 1) {
-			char ch = CharAt(pos);
-			if (makeUpperCase) {
-				if (IsLowerCase(ch)) {
-					ChangeChar(pos, static_cast<char>(MakeUpperCase(ch)));
-				}
-			} else {
-				if (IsUpperCase(ch)) {
-					ChangeChar(pos, static_cast<char>(MakeLowerCase(ch)));
-				}
-			}
-		}
-		pos += len;
-	}
-}
-
-void Document::SetDefaultCharClasses(bool includeWordClass) {
-    charClass.SetDefaultCharClasses(includeWordClass);
-}
-
-void Document::SetCharClasses(const unsigned char *chars, CharClassify::cc newCharClass) {
-    charClass.SetCharClasses(chars, newCharClass);
-}
-
-void Document::SetStylingBits(int bits) {
-	stylingBits = bits;
-	stylingBitsMask = 0;
-	for (int bit = 0; bit < stylingBits; bit++) {
-		stylingBitsMask <<= 1;
-		stylingBitsMask |= 1;
-	}
-}
-
-void Document::StartStyling(int position, char mask) {
-	stylingMask = mask;
-	endStyled = position;
-}
-
-bool Document::SetStyleFor(int length, char style) {
-	if (enteredCount != 0) {
-		return false;
-	} else {
-		enteredCount++;
-		style &= stylingMask;
-		int prevEndStyled = endStyled;
-		if (cb.SetStyleFor(endStyled, length, style, stylingMask)) {
-			DocModification mh(SC_MOD_CHANGESTYLE | SC_PERFORMED_USER,
-			                   prevEndStyled, length);
-			NotifyModified(mh);
-		}
-		endStyled += length;
-		enteredCount--;
-		return true;
-	}
-}
-
-bool Document::SetStyles(int length, char *styles) {
-	if (enteredCount != 0) {
-		return false;
-	} else {
-		enteredCount++;
-		bool didChange = false;
-		int startMod = 0;
-		int endMod = 0;
-		for (int iPos = 0; iPos < length; iPos++, endStyled++) {
-			PLATFORM_ASSERT(endStyled < Length());
-			if (cb.SetStyleAt(endStyled, styles[iPos], stylingMask)) {
-				if (!didChange) {
-					startMod = endStyled;
-				}
-				didChange = true;
-				endMod = endStyled;
-			}
-		}
-		if (didChange) {
-			DocModification mh(SC_MOD_CHANGESTYLE | SC_PERFORMED_USER,
-			                   startMod, endMod - startMod + 1);
-			NotifyModified(mh);
-		}
-		enteredCount--;
-		return true;
-	}
-}
-
-bool Document::EnsureStyledTo(int pos) {
-	if (pos > GetEndStyled()) {
-		IncrementStyleClock();
-		// Ask the watchers to style, and stop as soon as one responds.
-		for (int i = 0; pos > GetEndStyled() && i < lenWatchers; i++) {
-			watchers[i].watcher->NotifyStyleNeeded(this, watchers[i].userData, pos);
-		}
-	}
-	return pos <= GetEndStyled();
-}
-
-void Document::IncrementStyleClock() {
-	styleClock++;
-	if (styleClock > 0x100000) {
-		styleClock = 0;
-	}
-}
-
-bool Document::AddWatcher(DocWatcher *watcher, void *userData) {
-	for (int i = 0; i < lenWatchers; i++) {
-		if ((watchers[i].watcher == watcher) &&
-		        (watchers[i].userData == userData))
-			return false;
-	}
-	WatcherWithUserData *pwNew = new WatcherWithUserData[lenWatchers + 1];
-	if (!pwNew)
-		return false;
-	for (int j = 0; j < lenWatchers; j++)
-		pwNew[j] = watchers[j];
-	pwNew[lenWatchers].watcher = watcher;
-	pwNew[lenWatchers].userData = userData;
-	delete []watchers;
-	watchers = pwNew;
-	lenWatchers++;
-	return true;
-}
-
-bool Document::RemoveWatcher(DocWatcher *watcher, void *userData) {
-	for (int i = 0; i < lenWatchers; i++) {
-		if ((watchers[i].watcher == watcher) &&
-		        (watchers[i].userData == userData)) {
-			if (lenWatchers == 1) {
-				delete []watchers;
-				watchers = 0;
-				lenWatchers = 0;
-			} else {
-				WatcherWithUserData *pwNew = new WatcherWithUserData[lenWatchers];
-				if (!pwNew)
-					return false;
-				for (int j = 0; j < lenWatchers - 1; j++) {
-					pwNew[j] = (j < i) ? watchers[j] : watchers[j + 1];
-				}
-				delete []watchers;
-				watchers = pwNew;
-				lenWatchers--;
-			}
-			return true;
-		}
-	}
-	return false;
-}
-
-void Document::NotifyModifyAttempt() {
-	for (int i = 0; i < lenWatchers; i++) {
-		watchers[i].watcher->NotifyModifyAttempt(this, watchers[i].userData);
-	}
-}
-
-void Document::NotifySavePoint(bool atSavePoint) {
-	for (int i = 0; i < lenWatchers; i++) {
-		watchers[i].watcher->NotifySavePoint(this, watchers[i].userData, atSavePoint);
-	}
-}
-
-void Document::NotifyModified(DocModification mh) {
-	for (int i = 0; i < lenWatchers; i++) {
-		watchers[i].watcher->NotifyModified(this, mh, watchers[i].userData);
-	}
-}
-
-bool Document::IsWordPartSeparator(char ch) {
-	return (WordCharClass(ch) == CharClassify::ccWord) && IsPunctuation(ch);
-}
-
-int Document::WordPartLeft(int pos) {
-	if (pos > 0) {
-		--pos;
-		char startChar = cb.CharAt(pos);
-		if (IsWordPartSeparator(startChar)) {
-			while (pos > 0 && IsWordPartSeparator(cb.CharAt(pos))) {
-				--pos;
-			}
-		}
-		if (pos > 0) {
-			startChar = cb.CharAt(pos);
-			--pos;
-			if (IsLowerCase(startChar)) {
-				while (pos > 0 && IsLowerCase(cb.CharAt(pos)))
-					--pos;
-				if (!IsUpperCase(cb.CharAt(pos)) && !IsLowerCase(cb.CharAt(pos)))
-					++pos;
-			} else if (IsUpperCase(startChar)) {
-				while (pos > 0 && IsUpperCase(cb.CharAt(pos)))
-					--pos;
-				if (!IsUpperCase(cb.CharAt(pos)))
-					++pos;
-			} else if (IsADigit(startChar)) {
-				while (pos > 0 && IsADigit(cb.CharAt(pos)))
-					--pos;
-				if (!IsADigit(cb.CharAt(pos)))
-					++pos;
-			} else if (IsPunctuation(startChar)) {
-				while (pos > 0 && IsPunctuation(cb.CharAt(pos)))
-					--pos;
-				if (!IsPunctuation(cb.CharAt(pos)))
-					++pos;
-			} else if (isspacechar(startChar)) {
-				while (pos > 0 && isspacechar(cb.CharAt(pos)))
-					--pos;
-				if (!isspacechar(cb.CharAt(pos)))
-					++pos;
-			} else if (!isascii(startChar)) {
-				while (pos > 0 && !isascii(cb.CharAt(pos)))
-					--pos;
-				if (isascii(cb.CharAt(pos)))
-					++pos;
-			} else {
-				++pos;
-			}
-		}
-	}
-	return pos;
-}
-
-int Document::WordPartRight(int pos) {
-	char startChar = cb.CharAt(pos);
-	int length = Length();
-	if (IsWordPartSeparator(startChar)) {
-		while (pos < length && IsWordPartSeparator(cb.CharAt(pos)))
-			++pos;
-		startChar = cb.CharAt(pos);
-	}
-	if (!isascii(startChar)) {
-		while (pos < length && !isascii(cb.CharAt(pos)))
-			++pos;
-	} else if (IsLowerCase(startChar)) {
-		while (pos < length && IsLowerCase(cb.CharAt(pos)))
-			++pos;
-	} else if (IsUpperCase(startChar)) {
-		if (IsLowerCase(cb.CharAt(pos + 1))) {
-			++pos;
-			while (pos < length && IsLowerCase(cb.CharAt(pos)))
-				++pos;
-		} else {
-			while (pos < length && IsUpperCase(cb.CharAt(pos)))
-				++pos;
-		}
-		if (IsLowerCase(cb.CharAt(pos)) && IsUpperCase(cb.CharAt(pos - 1)))
-			--pos;
-	} else if (IsADigit(startChar)) {
-		while (pos < length && IsADigit(cb.CharAt(pos)))
-			++pos;
-	} else if (IsPunctuation(startChar)) {
-		while (pos < length && IsPunctuation(cb.CharAt(pos)))
-			++pos;
-	} else if (isspacechar(startChar)) {
-		while (pos < length && isspacechar(cb.CharAt(pos)))
-			++pos;
-	} else {
-		++pos;
-	}
-	return pos;
-}
-
-bool IsLineEndChar(char c) {
-	return (c == '\n' || c == '\r');
-}
-
-int Document::ExtendStyleRange(int pos, int delta, bool singleLine) {
-	int sStart = cb.StyleAt(pos);
-	if (delta < 0) {
-		while (pos > 0 && (cb.StyleAt(pos) == sStart) && (!singleLine || !IsLineEndChar(cb.CharAt(pos))) )
-			pos--;
-		pos++;
-	} else {
-		while (pos < (Length()) && (cb.StyleAt(pos) == sStart) && (!singleLine || !IsLineEndChar(cb.CharAt(pos))) )
-			pos++;
-	}
-	return pos;
-}
-
-static char BraceOpposite(char ch) {
-	switch (ch) {
-	case '(':
-		return ')';
-	case ')':
-		return '(';
-	case '[':
-		return ']';
-	case ']':
-		return '[';
-	case '{':
-		return '}';
-	case '}':
-		return '{';
-	case '<':
-		return '>';
-	case '>':
-		return '<';
-	default:
-		return '\0';
-	}
-}
-
-// TODO: should be able to extend styled region to find matching brace
-int Document::BraceMatch(int position, int /*maxReStyle*/) {
-	char chBrace = CharAt(position);
-	char chSeek = BraceOpposite(chBrace);
-	if (chSeek == '\0')
-		return - 1;
-	char styBrace = static_cast<char>(StyleAt(position) & stylingBitsMask);
-	int direction = -1;
-	if (chBrace == '(' || chBrace == '[' || chBrace == '{' || chBrace == '<')
-		direction = 1;
-	int depth = 1;
-	position = position + direction;
-	while ((position >= 0) && (position < Length())) {
-		position = MovePositionOutsideChar(position, direction);
-		char chAtPos = CharAt(position);
-		char styAtPos = static_cast<char>(StyleAt(position) & stylingBitsMask);
-		if ((position > GetEndStyled()) || (styAtPos == styBrace)) {
-			if (chAtPos == chBrace)
-				depth++;
-			if (chAtPos == chSeek)
-				depth--;
-			if (depth == 0)
-				return position;
-		}
-		position = position + direction;
-	}
-	return - 1;
-}
diff --git a/src/stc/scintilla/src/Document.h b/src/stc/scintilla/src/Document.h
deleted file mode 100644
index d774d5664e..0000000000
--- a/src/stc/scintilla/src/Document.h
+++ /dev/null
@@ -1,305 +0,0 @@
-// Scintilla source code edit control
-/** @file Document.h
- ** Text document that handles notifications, DBCS, styling, words and end of line.
- **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef DOCUMENT_H
-#define DOCUMENT_H
-
-/**
- * A Position is a position within a document between two characters or at the beginning or end.
- * Sometimes used as a character index where it identifies the character after the position.
- */
-typedef int Position;
-const Position invalidPosition = -1;
-
-/**
- * The range class represents a range of text in a document.
- * The two values are not sorted as one end may be more significant than the other
- * as is the case for the selection where the end position is the position of the caret.
- * If either position is invalidPosition then the range is invalid and most operations will fail.
- */
-class Range {
-public:
-	Position start;
-	Position end;
-
-	Range(Position pos=0) :
-		start(pos), end(pos) {
-	};
-	Range(Position start_, Position end_) :
-		start(start_), end(end_) {
-	};
-
-	bool Valid() const {
-		return (start != invalidPosition) && (end != invalidPosition);
-	}
-
-	// Is the position within the range?
-	bool Contains(Position pos) const {
-		if (start < end) {
-			return (pos >= start && pos <= end);
-		} else {
-			return (pos <= start && pos >= end);
-		}
-	}
-
-	// Is the character after pos within the range?
-	bool ContainsCharacter(Position pos) const {
-		if (start < end) {
-			return (pos >= start && pos < end);
-		} else {
-			return (pos < start && pos >= end);
-		}
-	}
-
-	bool Contains(Range other) const {
-		return Contains(other.start) && Contains(other.end);
-	}
-
-	bool Overlaps(Range other) const {
-		return
-		Contains(other.start) ||
-		Contains(other.end) ||
-		other.Contains(start) ||
-		other.Contains(end);
-	}
-};
-
-class DocWatcher;
-class DocModification;
-class RESearch;
-
-/**
- */
-class Document {
-
-public:
-	/** Used to pair watcher pointer with user data. */
-	class WatcherWithUserData {
-	public:
-		DocWatcher *watcher;
-		void *userData;
-		WatcherWithUserData() {
-			watcher = 0;
-			userData = 0;
-		}
-	};
-
-	enum charClassification { ccSpace, ccNewLine, ccWord, ccPunctuation };
-
-private:
-	int refCount;
-	CellBuffer cb;
-	CharClassify charClass;
-	char stylingMask;
-	int endStyled;
-	int styleClock;
-	int enteredCount;
-	int enteredReadOnlyCount;
-
-	WatcherWithUserData *watchers;
-	int lenWatchers;
-
-	bool matchesValid;
-	RESearch *pre;
-	char *substituted;
-
-public:
-	int stylingBits;
-	int stylingBitsMask;
-
-	int eolMode;
-	/// Can also be SC_CP_UTF8 to enable UTF-8 mode
-	int dbcsCodePage;
-	int tabInChars;
-	int indentInChars;
-	int actualIndentInChars;
-	bool useTabs;
-	bool tabIndents;
-	bool backspaceUnindents;
-
-	Document();
-	virtual ~Document();
-
-	int AddRef();
-	int Release();
-
-	int LineFromPosition(int pos);
-	int ClampPositionIntoDocument(int pos);
-	bool IsCrLf(int pos);
-	int LenChar(int pos);
-	int MovePositionOutsideChar(int pos, int moveDir, bool checkLineEnd=true);
-
-	// Gateways to modifying document
-	void ModifiedAt(int pos);
-	bool DeleteChars(int pos, int len);
-	bool InsertStyledString(int position, char *s, int insertLength);
-	int Undo();
-	int Redo();
-	bool CanUndo() { return cb.CanUndo(); }
-	bool CanRedo() { return cb.CanRedo(); }
-	void DeleteUndoHistory() { cb.DeleteUndoHistory(); }
-	bool SetUndoCollection(bool collectUndo) {
-		return cb.SetUndoCollection(collectUndo);
-	}
-	bool IsCollectingUndo() { return cb.IsCollectingUndo(); }
-	void BeginUndoAction() { cb.BeginUndoAction(); }
-	void EndUndoAction() { cb.EndUndoAction(); }
-	void SetSavePoint();
-	bool IsSavePoint() { return cb.IsSavePoint(); }
-
-	int GetLineIndentation(int line);
-	void SetLineIndentation(int line, int indent);
-	int GetLineIndentPosition(int line);
-	int GetColumn(int position);
-	int FindColumn(int line, int column);
-	void Indent(bool forwards, int lineBottom, int lineTop);
-	static char *TransformLineEnds(int *pLenOut, const char *s, size_t len, int eolMode);
-	void ConvertLineEnds(int eolModeSet);
-	void SetReadOnly(bool set) { cb.SetReadOnly(set); }
-	bool IsReadOnly() { return cb.IsReadOnly(); }
-
-	bool InsertChar(int pos, char ch);
-	bool InsertString(int position, const char *s);
-	bool InsertString(int position, const char *s, size_t insertLength);
-	void ChangeChar(int pos, char ch);
-	void DelChar(int pos);
-	void DelCharBack(int pos);
-
-	char CharAt(int position) { return cb.CharAt(position); }
-	void GetCharRange(char *buffer, int position, int lengthRetrieve) {
-		cb.GetCharRange(buffer, position, lengthRetrieve);
-	}
-	char StyleAt(int position) { return cb.StyleAt(position); }
-	int GetMark(int line) { return cb.GetMark(line); }
-	int AddMark(int line, int markerNum);
-	void AddMarkSet(int line, int valueSet);
-	void DeleteMark(int line, int markerNum);
-	void DeleteMarkFromHandle(int markerHandle);
-	void DeleteAllMarks(int markerNum);
-	int LineFromHandle(int markerHandle) { return cb.LineFromHandle(markerHandle); }
-	int LineStart(int line);
-	int LineEnd(int line);
-	int LineEndPosition(int position);
-	int VCHomePosition(int position);
-
-	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);
-
-	void Indent(bool forwards);
-	int ExtendWordSelect(int pos, int delta, bool onlyWordCharacters=false);
-	int NextWordStart(int pos, int delta);
-	int NextWordEnd(int pos, int delta);
-	int Length() { return cb.Length(); }
-	void Allocate(int newSize) { cb.Allocate(newSize*2); }
-	long FindText(int minPos, int maxPos, const char *s,
-		bool caseSensitive, bool word, bool wordStart, bool regExp, bool posix, int *length);
-	long FindText(int iMessage, unsigned long wParam, long lParam);
-	const char *SubstituteByPosition(const char *text, int *length);
-	int LinesTotal();
-
-	void ChangeCase(Range r, bool makeUpperCase);
-
-	void SetDefaultCharClasses(bool includeWordClass);
-	void SetCharClasses(const unsigned char *chars, CharClassify::cc newCharClass);
-	void SetStylingBits(int bits);
-	void StartStyling(int position, char mask);
-	bool SetStyleFor(int length, char style);
-	bool SetStyles(int length, char *styles);
-	int GetEndStyled() { return endStyled; }
-	bool EnsureStyledTo(int pos);
-	int GetStyleClock() { return styleClock; }
-	void IncrementStyleClock();
-
-	int SetLineState(int line, int state) { return cb.SetLineState(line, state); }
-	int GetLineState(int line) { return cb.GetLineState(line); }
-	int GetMaxLineState() { return cb.GetMaxLineState(); }
-
-	bool AddWatcher(DocWatcher *watcher, void *userData);
-	bool RemoveWatcher(DocWatcher *watcher, void *userData);
-	const WatcherWithUserData *GetWatchers() const { return watchers; }
-	int GetLenWatchers() const { return lenWatchers; }
-
-	bool IsWordPartSeparator(char ch);
-	int WordPartLeft(int pos);
-	int WordPartRight(int pos);
-	int ExtendStyleRange(int pos, int delta, bool singleLine = false);
-	bool IsWhiteLine(int line);
-	int ParaUp(int pos);
-	int ParaDown(int pos);
-	int IndentSize() { return actualIndentInChars; }
-	int BraceMatch(int position, int maxReStyle);
-
-private:
-	void CheckReadOnly();
-
-	CharClassify::cc WordCharClass(unsigned char ch);
-	bool IsWordStartAt(int pos);
-	bool IsWordEndAt(int pos);
-	bool IsWordAt(int start, int end);
-
-	void NotifyModifyAttempt();
-	void NotifySavePoint(bool atSavePoint);
-	void NotifyModified(DocModification mh);
-};
-
-/**
- * To optimise processing of document modifications by DocWatchers, a hint is passed indicating the
- * scope of the change.
- * If the DocWatcher is a document view then this can be used to optimise screen updating.
- */
-class DocModification {
-public:
-  	int modificationType;
-	int position;
- 	int length;
- 	int linesAdded;	/**< Negative if lines deleted. */
- 	const char *text;	/**< Only valid for changes to text, not for changes to style. */
- 	int line;
-	int foldLevelNow;
-	int foldLevelPrev;
-
-	DocModification(int modificationType_, int position_=0, int length_=0,
-		int linesAdded_=0, const char *text_=0, int line_=0) :
-		modificationType(modificationType_),
-		position(position_),
-		length(length_),
-		linesAdded(linesAdded_),
-		text(text_),
-		line(line_),
-		foldLevelNow(0),
-		foldLevelPrev(0) {}
-
-	DocModification(int modificationType_, const Action &act, int linesAdded_=0) :
-		modificationType(modificationType_),
-		position(act.position),
-		length(act.lenData),
-		linesAdded(linesAdded_),
-		text(act.data),
-		line(0),
-		foldLevelNow(0),
-		foldLevelPrev(0) {}
-};
-
-/**
- * A class that wants to receive notifications from a Document must be derived from DocWatcher
- * and implement the notification methods. It can then be added to the watcher list with AddWatcher.
- */
-class DocWatcher {
-public:
-	virtual ~DocWatcher() {}
-
-	virtual void NotifyModifyAttempt(Document *doc, void *userData) = 0;
-	virtual void NotifySavePoint(Document *doc, void *userData, bool atSavePoint) = 0;
-	virtual void NotifyModified(Document *doc, DocModification mh, void *userData) = 0;
-	virtual void NotifyDeleted(Document *doc, void *userData) = 0;
-	virtual void NotifyStyleNeeded(Document *doc, void *userData, int endPos) = 0;
-};
-
-#endif
diff --git a/src/stc/scintilla/src/DocumentAccessor.cxx b/src/stc/scintilla/src/DocumentAccessor.cxx
deleted file mode 100644
index c695c5f510..0000000000
--- a/src/stc/scintilla/src/DocumentAccessor.cxx
+++ /dev/null
@@ -1,187 +0,0 @@
-// Scintilla source code edit control
-/** @file DocumentAccessor.cxx
- ** Rapid easy access to contents of a Scintilla.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "SVector.h"
-#include "Accessor.h"
-#include "DocumentAccessor.h"
-#include "CellBuffer.h"
-#include "Scintilla.h"
-#include "CharClassify.h"
-#include "Document.h"
-
-DocumentAccessor::~DocumentAccessor() {
-}
-
-bool DocumentAccessor::InternalIsLeadByte(char ch) {
-	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 Platform::IsDBCSLeadByte(codePage, ch);
-}
-
-void DocumentAccessor::Fill(int position) {
-	if (lenDoc == -1)
-		lenDoc = pdoc->Length();
-	startPos = position - slopSize;
-	if (startPos + bufferSize > lenDoc)
-		startPos = lenDoc - bufferSize;
-	if (startPos < 0)
-		startPos = 0;
-	endPos = startPos + bufferSize;
-	if (endPos > lenDoc)
-		endPos = lenDoc;
-
-	pdoc->GetCharRange(buf, startPos, endPos-startPos);
-	buf[endPos-startPos] = '\0';
-}
-
-bool DocumentAccessor::Match(int pos, const char *s) {
-	for (int i=0; *s; i++) {
-		if (*s != SafeGetCharAt(pos+i))
-			return false;
-		s++;
-	}
-	return true;
-}
-
-char DocumentAccessor::StyleAt(int position) {
-	// Mask off all bits which aren't in the 'mask'.
-	return static_cast<char>(pdoc->StyleAt(position) & mask);
-}
-
-int DocumentAccessor::GetLine(int position) {
-	return pdoc->LineFromPosition(position);
-}
-
-int DocumentAccessor::LineStart(int line) {
-	return pdoc->LineStart(line);
-}
-
-int DocumentAccessor::LevelAt(int line) {
-	return pdoc->GetLevel(line);
-}
-
-int DocumentAccessor::Length() {
-	if (lenDoc == -1)
-		lenDoc = pdoc->Length();
-	return lenDoc;
-}
-
-int DocumentAccessor::GetLineState(int line) {
-	return pdoc->GetLineState(line);
-}
-
-int DocumentAccessor::SetLineState(int line, int state) {
-	return pdoc->SetLineState(line, state);
-}
-
-void DocumentAccessor::StartAt(unsigned int start, char chMask) {
-	// Store the mask specified for use with StyleAt.
-	mask = chMask;
-	pdoc->StartStyling(start, chMask);
-	startPosStyling = start;
-}
-
-void DocumentAccessor::StartSegment(unsigned int pos) {
-	startSeg = pos;
-}
-
-void DocumentAccessor::ColourTo(unsigned int pos, int chAttr) {
-	// Only perform styling if non empty range
-	if (pos != startSeg - 1) {
-		if (pos < startSeg) {
-			Platform::DebugPrintf("Bad colour positions %d - %d\n", startSeg, pos);
-		}
-
-		if (validLen + (pos - startSeg + 1) >= bufferSize)
-			Flush();
-		if (validLen + (pos - startSeg + 1) >= bufferSize) {
-			// Too big for buffer so send directly
-			pdoc->SetStyleFor(pos - startSeg + 1, static_cast<char>(chAttr));
-		} else {
-			if (chAttr != chWhile)
-				chFlags = 0;
-			chAttr |= chFlags;
-			for (unsigned int i = startSeg; i <= pos; i++) {
-				PLATFORM_ASSERT((startPosStyling + validLen) < Length());
-				styleBuf[validLen++] = static_cast<char>(chAttr);
-			}
-		}
-	}
-	startSeg = pos+1;
-}
-
-void DocumentAccessor::SetLevel(int line, int level) {
-	pdoc->SetLevel(line, level);
-}
-
-void DocumentAccessor::Flush() {
-	startPos = extremePosition;
-	lenDoc = -1;
-	if (validLen > 0) {
-		pdoc->SetStyles(validLen, styleBuf);
-		startPosStyling += validLen;
-		validLen = 0;
-	}
-}
-
-int DocumentAccessor::IndentAmount(int line, int *flags, PFNIsCommentLeader pfnIsCommentLeader) {
-	int end = Length();
-	int spaceFlags = 0;
-
-	// Determines the indentation level of the current line and also checks for consistent
-	// indentation compared to the previous line.
-	// Indentation is judged consistent when the indentation whitespace of each line lines
-	// the same or the indentation of one line is a prefix of the other.
-
-	int pos = LineStart(line);
-	char ch = (*this)[pos];
-	int indent = 0;
-	bool inPrevPrefix = line > 0;
-	int posPrev = inPrevPrefix ? LineStart(line-1) : 0;
-	while ((ch == ' ' || ch == '\t') && (pos < end)) {
-		if (inPrevPrefix) {
-			char chPrev = (*this)[posPrev++];
-			if (chPrev == ' ' || chPrev == '\t') {
-				if (chPrev != ch)
-					spaceFlags |= wsInconsistent;
-			} else {
-				inPrevPrefix = false;
-			}
-		}
-		if (ch == ' ') {
-			spaceFlags |= wsSpace;
-			indent++;
-		} else {	// Tab
-			spaceFlags |= wsTab;
-			if (spaceFlags & wsSpace)
-				spaceFlags |= wsSpaceTab;
-			indent = (indent / 8 + 1) * 8;
-		}
-		ch = (*this)[++pos];
-	}
-
-	*flags = spaceFlags;
-	indent += SC_FOLDLEVELBASE;
-	// if completely empty line or the start of a comment...
-	if ((ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r') ||
-		(pfnIsCommentLeader && (*pfnIsCommentLeader)(*this, pos, end-pos)) )
-		return indent | SC_FOLDLEVELWHITEFLAG;
-	else
-		return indent;
-}
-
diff --git a/src/stc/scintilla/src/DocumentAccessor.h b/src/stc/scintilla/src/DocumentAccessor.h
deleted file mode 100644
index 7406520452..0000000000
--- a/src/stc/scintilla/src/DocumentAccessor.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Scintilla source code edit control
-/** @file DocumentAccessor.h
- ** Implementation of BufferAccess and StylingAccess on a Scintilla
- ** rapid easy access to contents of a Scintilla.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-class Document;
-
-/**
- */
-class DocumentAccessor : public Accessor {
-	// Private so DocumentAccessor objects can not be copied
-	DocumentAccessor(const DocumentAccessor &source) : Accessor(), props(source.props) {}
-	DocumentAccessor &operator=(const DocumentAccessor &) { return *this; }
-
-protected:
-	Document *pdoc;
-	PropSet &props;
-	WindowID id;
-	int lenDoc;
-
-	char styleBuf[bufferSize];
-	int validLen;
-	char chFlags;
-	char chWhile;
-	unsigned int startSeg;
-	int startPosStyling;
-	int mask;
-
-	bool InternalIsLeadByte(char ch);
-	void Fill(int position);
-
-public:
-	DocumentAccessor(Document *pdoc_, PropSet &props_, WindowID id_=0) : 
-		Accessor(), pdoc(pdoc_), props(props_), id(id_),
-		lenDoc(-1), validLen(0), chFlags(0), chWhile(0), 
-		startSeg(0), startPosStyling(0),
-		mask(127) { // Initialize the mask to be big enough for any lexer.
-	}
-	~DocumentAccessor();
-	bool Match(int pos, const char *s);
-	char StyleAt(int position);
-	int GetLine(int position);
-	int LineStart(int line);
-	int LevelAt(int line);
-	int Length();
-	void Flush();
-	int GetLineState(int line);
-	int SetLineState(int line, int state);
-	int GetPropertyInt(const char *key, int defaultValue=0) { 
-		return props.GetInt(key, defaultValue); 
-	}
-	char *GetProperties() {
-		return props.ToString();
-	}
-	WindowID GetWindow() { return id; }
-
-	void StartAt(unsigned int start, char chMask=31);
-	void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; };
-	unsigned int GetStartSegment() { return startSeg; }
-	void StartSegment(unsigned int pos);
-	void ColourTo(unsigned int pos, int chAttr);
-	void SetLevel(int line, int level);
-	int IndentAmount(int line, int *flags, PFNIsCommentLeader pfnIsCommentLeader = 0);
-};
diff --git a/src/stc/scintilla/src/Editor.cxx b/src/stc/scintilla/src/Editor.cxx
deleted file mode 100644
index a69194f97e..0000000000
--- a/src/stc/scintilla/src/Editor.cxx
+++ /dev/null
@@ -1,7298 +0,0 @@
-// Scintilla source code edit control
-/** @file Editor.cxx
- ** Main code for the edit control.
- **/
-// Copyright 1998-2004 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include "Platform.h"
-
-#ifndef PLAT_QT
-#define INCLUDE_DEPRECATED_FEATURES
-#endif
-#include "Scintilla.h"
-
-#include "ContractionState.h"
-#include "SVector.h"
-#include "CellBuffer.h"
-#include "KeyMap.h"
-#include "Indicator.h"
-#include "XPM.h"
-#include "LineMarker.h"
-#include "Style.h"
-#include "ViewStyle.h"
-#include "CharClassify.h"
-#include "Document.h"
-#include "Editor.h"
-
-/*
-	return whether this modification represents an operation that
-	may reasonably be deferred (not done now OR [possibly] at all)
-*/
-static bool CanDeferToLastStep(const DocModification& mh) {
-	if (mh.modificationType & (SC_MOD_BEFOREINSERT|SC_MOD_BEFOREDELETE))
-		return true;	// CAN skip
-	if (!(mh.modificationType & (SC_PERFORMED_UNDO|SC_PERFORMED_REDO)))
-		return false;	// MUST do
-	if (mh.modificationType & SC_MULTISTEPUNDOREDO)
-		return true;	// CAN skip
-	return false;		// PRESUMABLY must do
-}
-
-static bool CanEliminate(const DocModification& mh) {
-	return
-		(mh.modificationType & (SC_MOD_BEFOREINSERT|SC_MOD_BEFOREDELETE)) != 0;
-}
-
-/*
-	return whether this modification represents the FINAL step
-	in a [possibly lengthy] multi-step Undo/Redo sequence
-*/
-static bool IsLastStep(const DocModification& mh) {
-	return
-		(mh.modificationType & (SC_PERFORMED_UNDO|SC_PERFORMED_REDO)) != 0
-		&& (mh.modificationType & SC_MULTISTEPUNDOREDO) != 0
-		&& (mh.modificationType & SC_LASTSTEPINUNDOREDO) != 0
-		&& (mh.modificationType & SC_MULTILINEUNDOREDO) != 0;
-}
-
-Caret::Caret() :
-active(false), on(false), period(500) {}
-
-Timer::Timer() :
-ticking(false), ticksToWait(0), tickerID(0) {}
-
-Idler::Idler() :
-state(false), idlerID(0) {}
-
-LineLayout::LineLayout(int maxLineLength_) :
-	lineStarts(0),
-	lenLineStarts(0),
-	lineNumber(-1),
-	inCache(false),
-	maxLineLength(-1),
-	numCharsInLine(0),
-	validity(llInvalid),
-	xHighlightGuide(0),
-	highlightColumn(0),
-	selStart(0),
-	selEnd(0),
-	containsCaret(false),
-	edgeColumn(0),
-	chars(0),
-	styles(0),
-	styleBitsSet(0),
-	indicators(0),
-	positions(0),
-	hsStart(0),
-	hsEnd(0),
-	widthLine(wrapWidthInfinite),
-	lines(1) {
-	Resize(maxLineLength_);
-}
-
-LineLayout::~LineLayout() {
-	Free();
-}
-
-void LineLayout::Resize(int maxLineLength_) {
-	if (maxLineLength_ > maxLineLength) {
-		Free();
-		chars = new char[maxLineLength_ + 1];
-		styles = new unsigned char[maxLineLength_ + 1];
-		indicators = new char[maxLineLength_ + 1];
-		// Extra position allocated as sometimes the Windows
-		// GetTextExtentExPoint API writes an extra element.
-		positions = new int[maxLineLength_ + 1 + 1];
-		maxLineLength = maxLineLength_;
-	}
-}
-
-void LineLayout::Free() {
-	delete []chars;
-	chars = 0;
-	delete []styles;
-	styles = 0;
-	delete []indicators;
-	indicators = 0;
-	delete []positions;
-	positions = 0;
-	delete []lineStarts;
-	lineStarts = 0;
-}
-
-void LineLayout::Invalidate(validLevel validity_) {
-	if (validity > validity_)
-		validity = validity_;
-}
-
-void LineLayout::SetLineStart(int line, int start) {
-	if ((line >= lenLineStarts) && (line != 0)) {
-		int newMaxLines = line + 20;
-		int *newLineStarts = new int[newMaxLines];
-		if (!newLineStarts)
-			return;
-		for (int i = 0; i < newMaxLines; i++) {
-			if (i < lenLineStarts)
-				newLineStarts[i] = lineStarts[i];
-			else
-				newLineStarts[i] = 0;
-		}
-		delete []lineStarts;
-		lineStarts = newLineStarts;
-		lenLineStarts = newMaxLines;
-	}
-	lineStarts[line] = start;
-}
-
-void LineLayout::SetBracesHighlight(Range rangeLine, Position braces[],
-                                    char bracesMatchStyle, int xHighlight) {
-	if (rangeLine.ContainsCharacter(braces[0])) {
-		int braceOffset = braces[0] - rangeLine.start;
-		if (braceOffset < numCharsInLine) {
-			bracePreviousStyles[0] = styles[braceOffset];
-			styles[braceOffset] = bracesMatchStyle;
-		}
-	}
-	if (rangeLine.ContainsCharacter(braces[1])) {
-		int braceOffset = braces[1] - rangeLine.start;
-		if (braceOffset < numCharsInLine) {
-			bracePreviousStyles[1] = styles[braceOffset];
-			styles[braceOffset] = bracesMatchStyle;
-		}
-	}
-	if ((braces[0] >= rangeLine.start && braces[1] <= rangeLine.end) ||
-	        (braces[1] >= rangeLine.start && braces[0] <= rangeLine.end)) {
-		xHighlightGuide = xHighlight;
-	}
-}
-
-void LineLayout::RestoreBracesHighlight(Range rangeLine, Position braces[]) {
-	if (rangeLine.ContainsCharacter(braces[0])) {
-		int braceOffset = braces[0] - rangeLine.start;
-		if (braceOffset < numCharsInLine) {
-			styles[braceOffset] = bracePreviousStyles[0];
-		}
-	}
-	if (rangeLine.ContainsCharacter(braces[1])) {
-		int braceOffset = braces[1] - rangeLine.start;
-		if (braceOffset < numCharsInLine) {
-			styles[braceOffset] = bracePreviousStyles[1];
-		}
-	}
-	xHighlightGuide = 0;
-}
-
-LineLayoutCache::LineLayoutCache() :
-	level(0), length(0), size(0), cache(0),
-	allInvalidated(false), styleClock(-1), useCount(0) {
-	Allocate(0);
-}
-
-LineLayoutCache::~LineLayoutCache() {
-	Deallocate();
-}
-
-void LineLayoutCache::Allocate(int length_) {
-	PLATFORM_ASSERT(cache == NULL);
-	allInvalidated = false;
-	length = length_;
-	size = length;
-	if (size > 1) {
-		size = (size / 16 + 1) * 16;
-	}
-	if (size > 0) {
-		cache = new LineLayout * [size];
-	}
-	for (int i = 0; i < size; i++)
-		cache[i] = 0;
-}
-
-void LineLayoutCache::AllocateForLevel(int linesOnScreen, int linesInDoc) {
-	PLATFORM_ASSERT(useCount == 0);
-	int lengthForLevel = 0;
-	if (level == llcCaret) {
-		lengthForLevel = 1;
-	} else if (level == llcPage) {
-		lengthForLevel = linesOnScreen + 1;
-	} else if (level == llcDocument) {
-		lengthForLevel = linesInDoc;
-	}
-	if (lengthForLevel > size) {
-		Deallocate();
-		Allocate(lengthForLevel);
-	} else {
-		if (lengthForLevel < length) {
-			for (int i = lengthForLevel; i < length; i++) {
-				delete cache[i];
-				cache[i] = 0;
-			}
-		}
-		length = lengthForLevel;
-	}
-	PLATFORM_ASSERT(length == lengthForLevel);
-	PLATFORM_ASSERT(cache != NULL || length == 0);
-}
-
-void LineLayoutCache::Deallocate() {
-	PLATFORM_ASSERT(useCount == 0);
-	for (int i = 0; i < length; i++)
-		delete cache[i];
-	delete []cache;
-	cache = 0;
-	length = 0;
-	size = 0;
-}
-
-void LineLayoutCache::Invalidate(LineLayout::validLevel validity_) {
-	if (cache && !allInvalidated) {
-		for (int i = 0; i < length; i++) {
-			if (cache[i]) {
-				cache[i]->Invalidate(validity_);
-			}
-		}
-		if (validity_ == LineLayout::llInvalid) {
-			allInvalidated = true;
-		}
-	}
-}
-
-void LineLayoutCache::SetLevel(int level_) {
-	allInvalidated = false;
-	if ((level_ != -1) && (level != level_)) {
-		level = level_;
-		Deallocate();
-	}
-}
-
-LineLayout *LineLayoutCache::Retrieve(int lineNumber, int lineCaret, int maxChars, int styleClock_,
-                                      int linesOnScreen, int linesInDoc) {
-	AllocateForLevel(linesOnScreen, linesInDoc);
-	if (styleClock != styleClock_) {
-		Invalidate(LineLayout::llCheckTextAndStyle);
-		styleClock = styleClock_;
-	}
-	allInvalidated = false;
-	int pos = -1;
-	LineLayout *ret = 0;
-	if (level == llcCaret) {
-		pos = 0;
-	} else if (level == llcPage) {
-		if (lineNumber == lineCaret) {
-			pos = 0;
-		} else if (length > 1) {
-			pos = 1 + (lineNumber % (length - 1));
-		}
-	} else if (level == llcDocument) {
-		pos = lineNumber;
-	}
-	if (pos >= 0) {
-		PLATFORM_ASSERT(useCount == 0);
-		if (cache && (pos < length)) {
-			if (cache[pos]) {
-				if ((cache[pos]->lineNumber != lineNumber) ||
-				        (cache[pos]->maxLineLength < maxChars)) {
-					delete cache[pos];
-					cache[pos] = 0;
-				}
-			}
-			if (!cache[pos]) {
-				cache[pos] = new LineLayout(maxChars);
-			}
-			if (cache[pos]) {
-				cache[pos]->lineNumber = lineNumber;
-				cache[pos]->inCache = true;
-				ret = cache[pos];
-				useCount++;
-			}
-		}
-	}
-
-	if (!ret) {
-		ret = new LineLayout(maxChars);
-		ret->lineNumber = lineNumber;
-	}
-
-	return ret;
-}
-
-void LineLayoutCache::Dispose(LineLayout *ll) {
-	allInvalidated = false;
-	if (ll) {
-		if (!ll->inCache) {
-			delete ll;
-		} else {
-			useCount--;
-		}
-	}
-}
-
-Editor::Editor() {
-	ctrlID = 0;
-
-	stylesValid = false;
-
-	printMagnification = 0;
-	printColourMode = SC_PRINT_NORMAL;
-	printWrapState = eWrapWord;
-	cursorMode = SC_CURSORNORMAL;
-	controlCharSymbol = 0;	/* Draw the control characters */
-
-	hasFocus = false;
-	hideSelection = false;
-	inOverstrike = false;
-	errorStatus = 0;
-	mouseDownCaptures = true;
-
-	bufferedDraw = true;
-	twoPhaseDraw = true;
-
-	lastClickTime = 0;
-	dwellDelay = SC_TIME_FOREVER;
-	ticksToDwell = SC_TIME_FOREVER;
-	dwelling = false;
-	ptMouseLast.x = 0;
-	ptMouseLast.y = 0;
-	inDragDrop = false;
-	dropWentOutside = false;
-	posDrag = invalidPosition;
-	posDrop = invalidPosition;
-	selectionType = selChar;
-
-	lastXChosen = 0;
-	lineAnchor = 0;
-	originalAnchorPos = 0;
-
-	selType = selStream;
-	moveExtendsSelection = false;
-	xStartSelect = 0;
-	xEndSelect = 0;
-	primarySelection = true;
-
-	caretXPolicy = CARET_SLOP | CARET_EVEN;
-	caretXSlop = 50;
-
-	caretYPolicy = CARET_EVEN;
-	caretYSlop = 0;
-
-	searchAnchor = 0;
-
-	xOffset = 0;
-	xCaretMargin = 50;
-	horizontalScrollBarVisible = true;
-	scrollWidth = 2000;
-	verticalScrollBarVisible = true;
-	endAtLastLine = true;
-	caretSticky = false;
-
-	pixmapLine = Surface::Allocate();
-	pixmapSelMargin = Surface::Allocate();
-	pixmapSelPattern = Surface::Allocate();
-	pixmapIndentGuide = Surface::Allocate();
-	pixmapIndentGuideHighlight = Surface::Allocate();
-
-	currentPos = 0;
-	anchor = 0;
-
-	targetStart = 0;
-	targetEnd = 0;
-	searchFlags = 0;
-
-	topLine = 0;
-	posTopLine = 0;
-
-	lengthForEncode = -1;
-
-	needUpdateUI = true;
-	braces[0] = invalidPosition;
-	braces[1] = invalidPosition;
-	bracesMatchStyle = STYLE_BRACEBAD;
-	highlightGuideColumn = 0;
-
-	theEdge = 0;
-
-	paintState = notPainting;
-
-	modEventMask = SC_MODEVENTMASKALL;
-
-	pdoc = new Document();
-	pdoc->AddRef();
-	pdoc->AddWatcher(this, 0);
-
-	recordingMacro = false;
-	foldFlags = 0;
-
-	wrapState = eWrapNone;
-	wrapWidth = LineLayout::wrapWidthInfinite;
-	wrapStart = wrapLineLarge;
-	wrapEnd = wrapLineLarge;
-	wrapVisualFlags = 0;
-	wrapVisualFlagsLocation = 0;
-	wrapVisualStartIndent = 0;
-	actualWrapVisualStartIndent = 0;
-
-	convertPastes = true;
-
-	hsStart = -1;
-	hsEnd = -1;
-
-	llc.SetLevel(LineLayoutCache::llcCaret);
-}
-
-Editor::~Editor() {
-	pdoc->RemoveWatcher(this, 0);
-	pdoc->Release();
-	pdoc = 0;
-	DropGraphics();
-	delete pixmapLine;
-	delete pixmapSelMargin;
-	delete pixmapSelPattern;
-	delete pixmapIndentGuide;
-	delete pixmapIndentGuideHighlight;
-}
-
-void Editor::Finalise() {
-	SetIdle(false);
-	CancelModes();
-}
-
-void Editor::DropGraphics() {
-	pixmapLine->Release();
-	pixmapSelMargin->Release();
-	pixmapSelPattern->Release();
-	pixmapIndentGuide->Release();
-	pixmapIndentGuideHighlight->Release();
-}
-
-void Editor::InvalidateStyleData() {
-	stylesValid = false;
-	palette.Release();
-	DropGraphics();
-	llc.Invalidate(LineLayout::llInvalid);
-	if (selType == selRectangle) {
-		xStartSelect = XFromPosition(anchor);
-		xEndSelect = XFromPosition(currentPos);
-	}
-}
-
-void Editor::InvalidateStyleRedraw() {
-	NeedWrapping();
-	InvalidateStyleData();
-	Redraw();
-}
-
-void Editor::RefreshColourPalette(Palette &pal, bool want) {
-	vs.RefreshColourPalette(pal, want);
-}
-
-void Editor::RefreshStyleData() {
-	if (!stylesValid) {
-		stylesValid = true;
-		AutoSurface surface(this);
-		if (surface) {
-			vs.Refresh(*surface);
-			RefreshColourPalette(palette, true);
-			palette.Allocate(wMain);
-			RefreshColourPalette(palette, false);
-		}
-		SetScrollBars();
-	}
-}
-
-PRectangle Editor::GetClientRectangle() {
-	return wMain.GetClientPosition();
-}
-
-PRectangle Editor::GetTextRectangle() {
-	PRectangle rc = GetClientRectangle();
-	rc.left += vs.fixedColumnWidth;
-	rc.right -= vs.rightMarginWidth;
-	return rc;
-}
-
-int Editor::LinesOnScreen() {
-	PRectangle rcClient = GetClientRectangle();
-	int htClient = rcClient.bottom - rcClient.top;
-	//Platform::DebugPrintf("lines on screen = %d\n", htClient / lineHeight + 1);
-	int n = htClient / vs.lineHeight;
-        if (n < 0)
-            n = 0;
-        return n;
-}
-
-int Editor::LinesToScroll() {
-	int retVal = LinesOnScreen() - 1;
-	if (retVal < 1)
-		return 1;
-	else
-		return retVal;
-}
-
-int Editor::MaxScrollPos() {
-	//Platform::DebugPrintf("Lines %d screen = %d maxScroll = %d\n",
-	//LinesTotal(), LinesOnScreen(), LinesTotal() - LinesOnScreen() + 1);
-	int retVal = cs.LinesDisplayed();
-	if (endAtLastLine) {
-		retVal -= LinesOnScreen();
-	} else {
-		retVal--;
-	}
-	if (retVal < 0) {
-		return 0;
-	} else {
-		return retVal;
-	}
-}
-
-static inline bool IsControlCharacter(int ch) {
-	// iscntrl returns true for lots of chars > 127 which are displayable
-	return ch >= 0 && ch < ' ';
-}
-
-const char *ControlCharacterString(unsigned char ch) {
-	const char *reps[] = {
-		"NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "BEL",
-		"BS", "HT", "LF", "VT", "FF", "CR", "SO", "SI",
-		"DLE", "DC1", "DC2", "DC3", "DC4", "NAK", "SYN", "ETB",
-		"CAN", "EM", "SUB", "ESC", "FS", "GS", "RS", "US"
-	};
-	if (ch < (sizeof(reps) / sizeof(reps[0]))) {
-		return reps[ch];
-	} else {
-		return "BAD";
-	}
-}
-
-/**
- * Convenience class to ensure LineLayout objects are always disposed.
- */
-class AutoLineLayout {
-	LineLayoutCache &llc;
-	LineLayout *ll;
-	AutoLineLayout &operator=(const AutoLineLayout &) { return * this; }
-public:
-	AutoLineLayout(LineLayoutCache &llc_, LineLayout *ll_) : llc(llc_), ll(ll_) {}
-	~AutoLineLayout() {
-		llc.Dispose(ll);
-		ll = 0;
-	}
-	LineLayout *operator->() const {
-		return ll;
-	}
-	operator LineLayout *() const {
-		return ll;
-	}
-	void Set(LineLayout *ll_) {
-		llc.Dispose(ll);
-		ll = ll_;
-	}
-};
-
-/**
- * Allows to iterate through the lines of a selection.
- * Althought it can be called for a stream selection, in most cases
- * it is inefficient and it should be used only for
- * a rectangular or a line selection.
- */
-class SelectionLineIterator {
-private:
-	Editor *ed;
-	int line;	///< Current line within the iteration.
-	bool forward;	///< True if iterating by increasing line number, false otherwise.
-	int selStart, selEnd;	///< Positions of the start and end of the selection relative to the start of the document.
-	int minX, maxX;	///< Left and right of selection rectangle.
-
-public:
-	int lineStart, lineEnd;	///< Line numbers, first and last lines of the selection.
-	int startPos, endPos;	///< Positions of the beginning and end of the selection on the current line.
-
-	void Reset() {
-		if (forward) {
-			line = lineStart;
-		} else {
-			line = lineEnd;
-		}
-	}
-
-	SelectionLineIterator(Editor *ed_, bool forward_ = true) : line(0), startPos(0), endPos(0) {
-		ed = ed_;
-		forward = forward_;
-		selStart = ed->SelectionStart();
-		selEnd = ed->SelectionEnd();
-		lineStart = ed->pdoc->LineFromPosition(selStart);
-		lineEnd = ed->pdoc->LineFromPosition(selEnd);
-		// Left of rectangle
-		minX = Platform::Minimum(ed->xStartSelect, ed->xEndSelect);
-		// Right of rectangle
-		maxX = Platform::Maximum(ed->xStartSelect, ed->xEndSelect);
-		Reset();
-	}
-	~SelectionLineIterator() {}
-
-	void SetAt(int line) {
-		if (line < lineStart || line > lineEnd) {
-			startPos = endPos = INVALID_POSITION;
-		} else {
-			if (ed->selType == ed->selRectangle) {
-				// Measure line and return character closest to minX
-				startPos = ed->PositionFromLineX(line, minX);
-				// Measure line and return character closest to maxX
-				endPos = ed->PositionFromLineX(line, maxX);
-			} else if (ed->selType == ed->selLines) {
-				startPos = ed->pdoc->LineStart(line);
-				endPos = ed->pdoc->LineStart(line + 1);
-			} else {	// Stream selection, here only for completion
-				if (line == lineStart) {
-					startPos = selStart;
-				} else {
-					startPos = ed->pdoc->LineStart(line);
-				}
-				if (line == lineEnd) {
-					endPos = selEnd;
-				} else {
-					endPos = ed->pdoc->LineStart(line + 1);
-				}
-			}
-		}
-	}
-	bool Iterate() {
-		SetAt(line);
-		if (forward) {
-			line++;
-		} else {
-			line--;
-		}
-		return startPos != INVALID_POSITION;
-	}
-};
-
-Point Editor::LocationFromPosition(int pos) {
-	Point pt;
-	RefreshStyleData();
-	if (pos == INVALID_POSITION)
-		return pt;
-	int line = pdoc->LineFromPosition(pos);
-	int lineVisible = cs.DisplayFromDoc(line);
-	//Platform::DebugPrintf("line=%d\n", line);
-	AutoSurface surface(this);
-	AutoLineLayout ll(llc, RetrieveLineLayout(line));
-	if (surface && ll) {
-		// -1 because of adding in for visible lines in following loop.
-		pt.y = (lineVisible - topLine - 1) * vs.lineHeight;
-		pt.x = 0;
-		unsigned int posLineStart = pdoc->LineStart(line);
-		LayoutLine(line, surface, vs, ll, wrapWidth);
-		int posInLine = pos - posLineStart;
-		// In case of very long line put x at arbitrary large position
-		if (posInLine > ll->maxLineLength) {
-			pt.x = ll->positions[ll->maxLineLength] - ll->positions[ll->LineStart(ll->lines)];
-		}
-
-		for (int subLine = 0; subLine < ll->lines; subLine++) {
-			if ((posInLine >= ll->LineStart(subLine)) && (posInLine <= ll->LineStart(subLine + 1))) {
-				pt.x = ll->positions[posInLine] - ll->positions[ll->LineStart(subLine)];
-				if (actualWrapVisualStartIndent != 0) {
-					int lineStart = ll->LineStart(subLine);
-					if (lineStart != 0)	// Wrapped
-						pt.x += actualWrapVisualStartIndent * vs.aveCharWidth;
-				}
-			}
-			if (posInLine >= ll->LineStart(subLine)) {
-				pt.y += vs.lineHeight;
-			}
-		}
-		pt.x += vs.fixedColumnWidth - xOffset;
-	}
-	return pt;
-}
-
-int Editor::XFromPosition(int pos) {
-	Point pt = LocationFromPosition(pos);
-	return pt.x - vs.fixedColumnWidth + xOffset;
-}
-
-int Editor::LineFromLocation(Point pt) {
-	return cs.DocFromDisplay(pt.y / vs.lineHeight + topLine);
-}
-
-void Editor::SetTopLine(int topLineNew) {
-	topLine = topLineNew;
-	posTopLine = pdoc->LineStart(cs.DocFromDisplay(topLine));
-}
-
-static inline bool IsEOLChar(char ch) {
-	return (ch == '\r') || (ch == '\n');
-}
-
-int Editor::PositionFromLocation(Point pt) {
-	RefreshStyleData();
-	pt.x = pt.x - vs.fixedColumnWidth + xOffset;
-	int visibleLine = pt.y / vs.lineHeight + topLine;
-	if (pt.y < 0) {	// Division rounds towards 0
-		visibleLine = (pt.y - (vs.lineHeight - 1)) / vs.lineHeight + topLine;
-	}
-	if (visibleLine < 0)
-		visibleLine = 0;
-	int lineDoc = cs.DocFromDisplay(visibleLine);
-	if (lineDoc >= pdoc->LinesTotal())
-		return pdoc->Length();
-	unsigned int posLineStart = pdoc->LineStart(lineDoc);
-	int retVal = posLineStart;
-	AutoSurface surface(this);
-	AutoLineLayout ll(llc, RetrieveLineLayout(lineDoc));
-	if (surface && ll) {
-		LayoutLine(lineDoc, surface, vs, ll, wrapWidth);
-		int lineStartSet = cs.DisplayFromDoc(lineDoc);
-		int subLine = visibleLine - lineStartSet;
-		if (subLine < ll->lines) {
-			int lineStart = ll->LineStart(subLine);
-			int lineEnd = ll->LineStart(subLine + 1);
-			int subLineStart = ll->positions[lineStart];
-
-			if (actualWrapVisualStartIndent != 0) {
-				if (lineStart != 0)	// Wrapped
-					pt.x -= actualWrapVisualStartIndent * vs.aveCharWidth;
-			}
-			for (int i = lineStart; i < lineEnd; i++) {
-				if (pt.x < (((ll->positions[i] + ll->positions[i + 1]) / 2) - subLineStart) ||
-				        IsEOLChar(ll->chars[i])) {
-					return pdoc->MovePositionOutsideChar(i + posLineStart, 1);
-				}
-			}
-			return lineEnd + posLineStart;
-		}
-		retVal = ll->numCharsInLine + posLineStart;
-	}
-	return retVal;
-}
-
-// Like PositionFromLocation but INVALID_POSITION returned when not near any text.
-int Editor::PositionFromLocationClose(Point pt) {
-	RefreshStyleData();
-	PRectangle rcClient = GetTextRectangle();
-	if (!rcClient.Contains(pt))
-		return INVALID_POSITION;
-	if (pt.x < vs.fixedColumnWidth)
-		return INVALID_POSITION;
-	if (pt.y < 0)
-		return INVALID_POSITION;
-	pt.x = pt.x - vs.fixedColumnWidth + xOffset;
-	int visibleLine = pt.y / vs.lineHeight + topLine;
-	if (pt.y < 0) {	// Division rounds towards 0
-		visibleLine = (pt.y - (vs.lineHeight - 1)) / vs.lineHeight + topLine;
-	}
-	int lineDoc = cs.DocFromDisplay(visibleLine);
-	if (lineDoc < 0)
-		return INVALID_POSITION;
-	if (lineDoc >= pdoc->LinesTotal())
-		return INVALID_POSITION;
-	AutoSurface surface(this);
-	AutoLineLayout ll(llc, RetrieveLineLayout(lineDoc));
-	if (surface && ll) {
-		LayoutLine(lineDoc, surface, vs, ll, wrapWidth);
-		unsigned int posLineStart = pdoc->LineStart(lineDoc);
-		int lineStartSet = cs.DisplayFromDoc(lineDoc);
-		int subLine = visibleLine - lineStartSet;
-		if (subLine < ll->lines) {
-			int lineStart = ll->LineStart(subLine);
-			int lineEnd = ll->LineStart(subLine + 1);
-			int subLineStart = ll->positions[lineStart];
-
-			if (actualWrapVisualStartIndent != 0) {
-				if (lineStart != 0)	// Wrapped
-					pt.x -= actualWrapVisualStartIndent * vs.aveCharWidth;
-			}
-			for (int i = lineStart; i < lineEnd; i++) {
-				if (pt.x < (((ll->positions[i] + ll->positions[i + 1]) / 2) - subLineStart) ||
-				        IsEOLChar(ll->chars[i])) {
-					return pdoc->MovePositionOutsideChar(i + posLineStart, 1);
-				}
-			}
-			if (pt.x < (ll->positions[lineEnd] - subLineStart)) {
-				return pdoc->MovePositionOutsideChar(lineEnd + posLineStart, 1);
-			}
-		}
-	}
-
-	return INVALID_POSITION;
-}
-
-/**
- * Find the document position corresponding to an x coordinate on a particular document line.
- * Ensure is between whole characters when document is in multi-byte or UTF-8 mode.
- */
-int Editor::PositionFromLineX(int lineDoc, int x) {
-	RefreshStyleData();
-	if (lineDoc >= pdoc->LinesTotal())
-		return pdoc->Length();
-	//Platform::DebugPrintf("Position of (%d,%d) line = %d top=%d\n", pt.x, pt.y, line, topLine);
-	AutoSurface surface(this);
-	AutoLineLayout ll(llc, RetrieveLineLayout(lineDoc));
-	int retVal = 0;
-	if (surface && ll) {
-		unsigned int posLineStart = pdoc->LineStart(lineDoc);
-		LayoutLine(lineDoc, surface, vs, ll, wrapWidth);
-		retVal = ll->numCharsInLine + posLineStart;
-		int subLine = 0;
-		int lineStart = ll->LineStart(subLine);
-		int lineEnd = ll->LineStart(subLine + 1);
-		int subLineStart = ll->positions[lineStart];
-
-		if (actualWrapVisualStartIndent != 0) {
-			if (lineStart != 0)	// Wrapped
-				x -= actualWrapVisualStartIndent * vs.aveCharWidth;
-		}
-		for (int i = lineStart; i < lineEnd; i++) {
-			if (x < (((ll->positions[i] + ll->positions[i + 1]) / 2) - subLineStart) ||
-			        IsEOLChar(ll->chars[i])) {
-				retVal = pdoc->MovePositionOutsideChar(i + posLineStart, 1);
-				break;
-			}
-		}
-	}
-	return retVal;
-}
-
-/**
- * If painting then abandon the painting because a wider redraw is needed.
- * @return true if calling code should stop drawing.
- */
-bool Editor::AbandonPaint() {
-	if ((paintState == painting) && !paintingAllText) {
-		paintState = paintAbandoned;
-	}
-	return paintState == paintAbandoned;
-}
-
-void Editor::RedrawRect(PRectangle rc) {
-	//Platform::DebugPrintf("Redraw %0d,%0d - %0d,%0d\n", rc.left, rc.top, rc.right, rc.bottom);
-
-	// Clip the redraw rectangle into the client area
-	PRectangle rcClient = GetClientRectangle();
-	if (rc.top < rcClient.top)
-		rc.top = rcClient.top;
-	if (rc.bottom > rcClient.bottom)
-		rc.bottom = rcClient.bottom;
-	if (rc.left < rcClient.left)
-		rc.left = rcClient.left;
-	if (rc.right > rcClient.right)
-		rc.right = rcClient.right;
-
-	if ((rc.bottom > rc.top) && (rc.right > rc.left)) {
-		wMain.InvalidateRectangle(rc);
-	}
-}
-
-void Editor::Redraw() {
-	//Platform::DebugPrintf("Redraw all\n");
-	PRectangle rcClient = GetClientRectangle();
-	wMain.InvalidateRectangle(rcClient);
-	//wMain.InvalidateAll();
-}
-
-void Editor::RedrawSelMargin(int line) {
-	if (!AbandonPaint()) {
-		if (vs.maskInLine) {
-			Redraw();
-		} else {
-			PRectangle rcSelMargin = GetClientRectangle();
-			rcSelMargin.right = vs.fixedColumnWidth;
-			if (line != -1) {
-				int position = pdoc->LineStart(line);
-				PRectangle rcLine = RectangleFromRange(position, position);
-				rcSelMargin.top = rcLine.top;
-				rcSelMargin.bottom = rcLine.bottom;
-			}
-			wMain.InvalidateRectangle(rcSelMargin);
-		}
-	}
-}
-
-PRectangle Editor::RectangleFromRange(int start, int end) {
-	int minPos = start;
-	if (minPos > end)
-		minPos = end;
-	int maxPos = start;
-	if (maxPos < end)
-		maxPos = end;
-	int minLine = cs.DisplayFromDoc(pdoc->LineFromPosition(minPos));
-	int lineDocMax = pdoc->LineFromPosition(maxPos);
-	int maxLine = cs.DisplayFromDoc(lineDocMax) + cs.GetHeight(lineDocMax) - 1;
-	PRectangle rcClient = GetTextRectangle();
-	PRectangle rc;
-	rc.left = vs.fixedColumnWidth;
-	rc.top = (minLine - topLine) * vs.lineHeight;
-	if (rc.top < 0)
-		rc.top = 0;
-	rc.right = rcClient.right;
-	rc.bottom = (maxLine - topLine + 1) * vs.lineHeight;
-	// Ensure PRectangle is within 16 bit space
-	rc.top = Platform::Clamp(rc.top, -32000, 32000);
-	rc.bottom = Platform::Clamp(rc.bottom, -32000, 32000);
-
-	return rc;
-}
-
-void Editor::InvalidateRange(int start, int end) {
-	RedrawRect(RectangleFromRange(start, end));
-}
-
-int Editor::CurrentPosition() {
-	return currentPos;
-}
-
-bool Editor::SelectionEmpty() {
-	return anchor == currentPos;
-}
-
-int Editor::SelectionStart() {
-	return Platform::Minimum(currentPos, anchor);
-}
-
-int Editor::SelectionEnd() {
-	return Platform::Maximum(currentPos, anchor);
-}
-
-void Editor::SetRectangularRange() {
-	if (selType == selRectangle) {
-		xStartSelect = XFromPosition(anchor);
-		xEndSelect = XFromPosition(currentPos);
-	}
-}
-
-void Editor::InvalidateSelection(int currentPos_, int anchor_) {
-	int firstAffected = anchor;
-	if (firstAffected > currentPos)
-		firstAffected = currentPos;
-	if (firstAffected > anchor_)
-		firstAffected = anchor_;
-	if (firstAffected > currentPos_)
-		firstAffected = currentPos_;
-	int lastAffected = anchor;
-	if (lastAffected < currentPos)
-		lastAffected = currentPos;
-	if (lastAffected < anchor_)
-		lastAffected = anchor_;
-	if (lastAffected < (currentPos_ + 1))	// +1 ensures caret repainted
-		lastAffected = (currentPos_ + 1);
-	needUpdateUI = true;
-	InvalidateRange(firstAffected, lastAffected);
-}
-
-void Editor::SetSelection(int currentPos_, int anchor_) {
-	currentPos_ = pdoc->ClampPositionIntoDocument(currentPos_);
-	anchor_ = pdoc->ClampPositionIntoDocument(anchor_);
-	if ((currentPos != currentPos_) || (anchor != anchor_)) {
-		InvalidateSelection(currentPos_, anchor_);
-		currentPos = currentPos_;
-		anchor = anchor_;
-	}
-	SetRectangularRange();
-	ClaimSelection();
-}
-
-void Editor::SetSelection(int currentPos_) {
-	currentPos_ = pdoc->ClampPositionIntoDocument(currentPos_);
-	if (currentPos != currentPos_) {
-		InvalidateSelection(currentPos_, currentPos_);
-		currentPos = currentPos_;
-	}
-	SetRectangularRange();
-	ClaimSelection();
-}
-
-void Editor::SetEmptySelection(int currentPos_) {
-	selType = selStream;
-	moveExtendsSelection = false;
-	SetSelection(currentPos_, currentPos_);
-}
-
-bool Editor::RangeContainsProtected(int start, int end) const {
-	if (vs.ProtectionActive()) {
-		if (start > end) {
-			int t = start;
-			start = end;
-			end = t;
-		}
-		int mask = pdoc->stylingBitsMask;
-		for (int pos = start; pos < end; pos++) {
-			if (vs.styles[pdoc->StyleAt(pos) & mask].IsProtected())
-				return true;
-		}
-	}
-	return false;
-}
-
-bool Editor::SelectionContainsProtected() {
-	// DONE, but untested...: make support rectangular selection
-	bool scp = false;
-	if (selType == selStream) {
-		scp = RangeContainsProtected(anchor, currentPos);
-	} else {
-		SelectionLineIterator lineIterator(this);
-		while (lineIterator.Iterate()) {
-			if (RangeContainsProtected(lineIterator.startPos, lineIterator.endPos)) {
-				scp = true;
-				break;
-			}
-		}
-	}
-	return scp;
-}
-
-/**
- * Asks document to find a good position and then moves out of any invisible positions.
- */
-int Editor::MovePositionOutsideChar(int pos, int moveDir, bool checkLineEnd) {
-	pos = pdoc->MovePositionOutsideChar(pos, moveDir, checkLineEnd);
-	if (vs.ProtectionActive()) {
-		int mask = pdoc->stylingBitsMask;
-		if (moveDir > 0) {
-			if ((pos > 0) && vs.styles[pdoc->StyleAt(pos - 1) & mask].IsProtected()) {
-				while ((pos < pdoc->Length()) &&
-				        (vs.styles[pdoc->StyleAt(pos) & mask].IsProtected()))
-					pos++;
-			}
-		} else if (moveDir < 0) {
-			if (vs.styles[pdoc->StyleAt(pos) & mask].IsProtected()) {
-				while ((pos > 0) &&
-				        (vs.styles[pdoc->StyleAt(pos - 1) & mask].IsProtected()))
-					pos--;
-			}
-		}
-	}
-	return pos;
-}
-
-int Editor::MovePositionTo(int newPos, selTypes sel, bool ensureVisible) {
-	int delta = newPos - currentPos;
-	newPos = pdoc->ClampPositionIntoDocument(newPos);
-	newPos = MovePositionOutsideChar(newPos, delta);
-	if (sel != noSel) {
-		selType = sel;
-	}
-	if (sel != noSel || moveExtendsSelection) {
-		SetSelection(newPos);
-	} else {
-		SetEmptySelection(newPos);
-	}
-	ShowCaretAtCurrentPosition();
-	if (ensureVisible) {
-		EnsureCaretVisible();
-	}
-	NotifyMove(newPos);
-	return 0;
-}
-
-int Editor::MovePositionSoVisible(int pos, int moveDir) {
-	pos = pdoc->ClampPositionIntoDocument(pos);
-	pos = MovePositionOutsideChar(pos, moveDir);
-	int lineDoc = pdoc->LineFromPosition(pos);
-	if (cs.GetVisible(lineDoc)) {
-		return pos;
-	} else {
-		int lineDisplay = cs.DisplayFromDoc(lineDoc);
-		if (moveDir > 0) {
-			// lineDisplay is already line before fold as lines in fold use display line of line after fold
-			lineDisplay = Platform::Clamp(lineDisplay, 0, cs.LinesDisplayed());
-			return pdoc->LineStart(cs.DocFromDisplay(lineDisplay));
-		} else {
-			lineDisplay = Platform::Clamp(lineDisplay - 1, 0, cs.LinesDisplayed());
-			return pdoc->LineEnd(cs.DocFromDisplay(lineDisplay));
-		}
-	}
-}
-
-/**
- * Choose the x position that the caret will try to stick to
- * as it moves up and down.
- */
-void Editor::SetLastXChosen() {
-	Point pt = LocationFromPosition(currentPos);
-	lastXChosen = pt.x;
-}
-
-void Editor::ScrollTo(int line, bool moveThumb) {
-	int topLineNew = Platform::Clamp(line, 0, MaxScrollPos());
-	if (topLineNew != topLine) {
-		// Try to optimise small scrolls
-		int linesToMove = topLine - topLineNew;
-		SetTopLine(topLineNew);
-		ShowCaretAtCurrentPosition();
-		// Perform redraw rather than scroll if many lines would be redrawn anyway.
-#ifndef UNDER_CE
-		if (abs(linesToMove) <= 10) {
-			ScrollText(linesToMove);
-		} else {
-			Redraw();
-		}
-#else
-		Redraw();
-#endif
-		if (moveThumb) {
-			SetVerticalScrollPos();
-		}
-	}
-}
-
-void Editor::ScrollText(int /* linesToMove */) {
-	//Platform::DebugPrintf("Editor::ScrollText %d\n", linesToMove);
-	Redraw();
-}
-
-void Editor::HorizontalScrollTo(int xPos) {
-	//Platform::DebugPrintf("HorizontalScroll %d\n", xPos);
-	if (xPos < 0)
-		xPos = 0;
-	if ((wrapState == eWrapNone) && (xOffset != xPos)) {
-		xOffset = xPos;
-		SetHorizontalScrollPos();
-		RedrawRect(GetClientRectangle());
-	}
-}
-
-void Editor::MoveCaretInsideView(bool ensureVisible) {
-	PRectangle rcClient = GetTextRectangle();
-	Point pt = LocationFromPosition(currentPos);
-	if (pt.y < rcClient.top) {
-		MovePositionTo(PositionFromLocation(
-		                   Point(lastXChosen, rcClient.top)),
-		               noSel, ensureVisible);
-	} else if ((pt.y + vs.lineHeight - 1) > rcClient.bottom) {
-		int yOfLastLineFullyDisplayed = rcClient.top + (LinesOnScreen() - 1) * vs.lineHeight;
-		MovePositionTo(PositionFromLocation(
-		                   Point(lastXChosen, rcClient.top + yOfLastLineFullyDisplayed)),
-		               noSel, ensureVisible);
-	}
-}
-
-int Editor::DisplayFromPosition(int pos) {
-	int lineDoc = pdoc->LineFromPosition(pos);
-	int lineDisplay = cs.DisplayFromDoc(lineDoc);
-	AutoSurface surface(this);
-	AutoLineLayout ll(llc, RetrieveLineLayout(lineDoc));
-	if (surface && ll) {
-		LayoutLine(lineDoc, surface, vs, ll, wrapWidth);
-		unsigned int posLineStart = pdoc->LineStart(lineDoc);
-		int posInLine = pos - posLineStart;
-		lineDisplay--; // To make up for first increment ahead.
-		for (int subLine = 0; subLine < ll->lines; subLine++) {
-			if (posInLine >= ll->LineStart(subLine)) {
-				lineDisplay++;
-			}
-		}
-	}
-	return lineDisplay;
-}
-
-/**
- * Ensure the caret is reasonably visible in context.
- *
-Caret policy in SciTE
-
-If slop is set, we can define a slop value.
-This value defines an unwanted zone (UZ) where the caret is... unwanted.
-This zone is defined as a number of pixels near the vertical margins,
-and as a number of lines near the horizontal margins.
-By keeping the caret away from the edges, it is seen within its context,
-so it is likely that the identifier that the caret is on can be completely seen,
-and that the current line is seen with some of the lines following it which are
-often dependent on that line.
-
-If strict is set, the policy is enforced... strictly.
-The caret is centred on the display if slop is not set,
-and cannot go in the UZ if slop is set.
-
-If jumps is set, the display is moved more energetically
-so the caret can move in the same direction longer before the policy is applied again.
-'3UZ' notation is used to indicate three time the size of the UZ as a distance to the margin.
-
-If even is not set, instead of having symmetrical UZs,
-the left and bottom UZs are extended up to right and top UZs respectively.
-This way, we favour the displaying of useful information: the begining of lines,
-where most code reside, and the lines after the caret, eg. the body of a function.
-
-     |        |       |      |                                            |
-slop | strict | jumps | even | Caret can go to the margin                 | When reaching limitÝ(caret going out of
-     |        |       |      |                                            | visibility or going into the UZ) display is...
------+--------+-------+------+--------------------------------------------+--------------------------------------------------------------
-  0  |   0    |   0   |   0  | Yes                                        | moved to put caret on top/on right
-  0  |   0    |   0   |   1  | Yes                                        | moved by one position
-  0  |   0    |   1   |   0  | Yes                                        | moved to put caret on top/on right
-  0  |   0    |   1   |   1  | Yes                                        | centred on the caret
-  0  |   1    |   -   |   0  | Caret is always on top/on right of display | -
-  0  |   1    |   -   |   1  | No, caret is always centred                | -
-  1  |   0    |   0   |   0  | Yes                                        | moved to put caret out of the asymmetrical UZ
-  1  |   0    |   0   |   1  | Yes                                        | moved to put caret out of the UZ
-  1  |   0    |   1   |   0  | Yes                                        | moved to put caret at 3UZ of the top or right margin
-  1  |   0    |   1   |   1  | Yes                                        | moved to put caret at 3UZ of the margin
-  1  |   1    |   -   |   0  | Caret is always at UZ of top/right margin  | -
-  1  |   1    |   0   |   1  | No, kept out of UZ                         | moved by one position
-  1  |   1    |   1   |   1  | No, kept out of UZ                         | moved to put caret at 3UZ of the margin
-*/
-void Editor::EnsureCaretVisible(bool useMargin, bool vert, bool horiz) {
-	//Platform::DebugPrintf("EnsureCaretVisible %d %s\n", xOffset, useMargin ? " margin" : " ");
-	PRectangle rcClient = GetTextRectangle();
-	//int rcClientFullWidth = rcClient.Width();
-	int posCaret = currentPos;
-	if (posDrag >= 0) {
-		posCaret = posDrag;
-	}
-	Point pt = LocationFromPosition(posCaret);
-	Point ptBottomCaret = pt;
-	ptBottomCaret.y += vs.lineHeight - 1;
-	int lineCaret = DisplayFromPosition(posCaret);
-	bool bSlop, bStrict, bJump, bEven;
-
-	// Vertical positioning
-	if (vert && (pt.y < rcClient.top || ptBottomCaret.y > rcClient.bottom || (caretYPolicy & CARET_STRICT) != 0)) {
-		int linesOnScreen = LinesOnScreen();
-		int halfScreen = Platform::Maximum(linesOnScreen - 1, 2) / 2;
-		int newTopLine = topLine;
-		bSlop = (caretYPolicy & CARET_SLOP) != 0;
-		bStrict = (caretYPolicy & CARET_STRICT) != 0;
-		bJump = (caretYPolicy & CARET_JUMPS) != 0;
-		bEven = (caretYPolicy & CARET_EVEN) != 0;
-
-		// It should be possible to scroll the window to show the caret,
-		// but this fails to remove the caret on GTK+
-		if (bSlop) {	// A margin is defined
-			int yMoveT, yMoveB;
-			if (bStrict) {
-				int yMarginT, yMarginB;
-				if (!useMargin) {
-					// In drag mode, avoid moves
-					// otherwise, a double click will select several lines.
-					yMarginT = yMarginB = 0;
-				} else {
-					// yMarginT must equal to caretYSlop, with a minimum of 1 and
-					// a maximum of slightly less than half the heigth of the text area.
-					yMarginT = Platform::Clamp(caretYSlop, 1, halfScreen);
-					if (bEven) {
-						yMarginB = yMarginT;
-					} else {
-						yMarginB = linesOnScreen - yMarginT - 1;
-					}
-				}
-				yMoveT = yMarginT;
-				if (bEven) {
-					if (bJump) {
-						yMoveT = Platform::Clamp(caretYSlop * 3, 1, halfScreen);
-					}
-					yMoveB = yMoveT;
-				} else {
-					yMoveB = linesOnScreen - yMoveT - 1;
-				}
-				if (lineCaret < topLine + yMarginT) {
-					// Caret goes too high
-					newTopLine = lineCaret - yMoveT;
-				} else if (lineCaret > topLine + linesOnScreen - 1 - yMarginB) {
-					// Caret goes too low
-					newTopLine = lineCaret - linesOnScreen + 1 + yMoveB;
-				}
-			} else {	// Not strict
-				yMoveT = bJump ? caretYSlop * 3 : caretYSlop;
-				yMoveT = Platform::Clamp(yMoveT, 1, halfScreen);
-				if (bEven) {
-					yMoveB = yMoveT;
-				} else {
-					yMoveB = linesOnScreen - yMoveT - 1;
-				}
-				if (lineCaret < topLine) {
-					// Caret goes too high
-					newTopLine = lineCaret - yMoveT;
-				} else if (lineCaret > topLine + linesOnScreen - 1) {
-					// Caret goes too low
-					newTopLine = lineCaret - linesOnScreen + 1 + yMoveB;
-				}
-			}
-		} else {	// No slop
-			if (!bStrict && !bJump) {
-				// Minimal move
-				if (lineCaret < topLine) {
-					// Caret goes too high
-					newTopLine = lineCaret;
-				} else if (lineCaret > topLine + linesOnScreen - 1) {
-					// Caret goes too low
-					if (bEven) {
-						newTopLine = lineCaret - linesOnScreen + 1;
-					} else {
-						newTopLine = lineCaret;
-					}
-				}
-			} else {	// Strict or going out of display
-				if (bEven) {
-					// Always center caret
-					newTopLine = lineCaret - halfScreen;
-				} else {
-					// Always put caret on top of display
-					newTopLine = lineCaret;
-				}
-			}
-		}
-		newTopLine = Platform::Clamp(newTopLine, 0, MaxScrollPos());
-		if (newTopLine != topLine) {
-			Redraw();
-			SetTopLine(newTopLine);
-			SetVerticalScrollPos();
-		}
-	}
-
-	// Horizontal positioning
-	if (horiz && (wrapState == eWrapNone)) {
-		int halfScreen = Platform::Maximum(rcClient.Width() - 4, 4) / 2;
-		int xOffsetNew = xOffset;
-		bSlop = (caretXPolicy & CARET_SLOP) != 0;
-		bStrict = (caretXPolicy & CARET_STRICT) != 0;
-		bJump = (caretXPolicy & CARET_JUMPS) != 0;
-		bEven = (caretXPolicy & CARET_EVEN) != 0;
-
-		if (bSlop) {	// A margin is defined
-			int xMoveL, xMoveR;
-			if (bStrict) {
-				int xMarginL, xMarginR;
-				if (!useMargin) {
-					// In drag mode, avoid moves unless very near of the margin
-					// otherwise, a simple click will select text.
-					xMarginL = xMarginR = 2;
-				} else {
-					// xMargin must equal to caretXSlop, with a minimum of 2 and
-					// a maximum of slightly less than half the width of the text area.
-					xMarginR = Platform::Clamp(caretXSlop, 2, halfScreen);
-					if (bEven) {
-						xMarginL = xMarginR;
-					} else {
-						xMarginL = rcClient.Width() - xMarginR - 4;
-					}
-				}
-				if (bJump && bEven) {
-					// Jump is used only in even mode
-					xMoveL = xMoveR = Platform::Clamp(caretXSlop * 3, 1, halfScreen);
-				} else {
-					xMoveL = xMoveR = 0;	// Not used, avoid a warning
-				}
-				if (pt.x < rcClient.left + xMarginL) {
-					// Caret is on the left of the display
-					if (bJump && bEven) {
-						xOffsetNew -= xMoveL;
-					} else {
-						// Move just enough to allow to display the caret
-						xOffsetNew -= (rcClient.left + xMarginL) - pt.x;
-					}
-				} else if (pt.x >= rcClient.right - xMarginR) {
-					// Caret is on the right of the display
-					if (bJump && bEven) {
-						xOffsetNew += xMoveR;
-					} else {
-						// Move just enough to allow to display the caret
-						xOffsetNew += pt.x - (rcClient.right - xMarginR) + 1;
-					}
-				}
-			} else {	// Not strict
-				xMoveR = bJump ? caretXSlop * 3 : caretXSlop;
-				xMoveR = Platform::Clamp(xMoveR, 1, halfScreen);
-				if (bEven) {
-					xMoveL = xMoveR;
-				} else {
-					xMoveL = rcClient.Width() - xMoveR - 4;
-				}
-				if (pt.x < rcClient.left) {
-					// Caret is on the left of the display
-					xOffsetNew -= xMoveL;
-				} else if (pt.x >= rcClient.right) {
-					// Caret is on the right of the display
-					xOffsetNew += xMoveR;
-				}
-			}
-		} else {	// No slop
-			if (bStrict ||
-			        (bJump && (pt.x < rcClient.left || pt.x >= rcClient.right))) {
-				// Strict or going out of display
-				if (bEven) {
-					// Center caret
-					xOffsetNew += pt.x - rcClient.left - halfScreen;
-				} else {
-					// Put caret on right
-					xOffsetNew += pt.x - rcClient.right + 1;
-				}
-			} else {
-				// Move just enough to allow to display the caret
-				if (pt.x < rcClient.left) {
-					// Caret is on the left of the display
-					if (bEven) {
-						xOffsetNew -= rcClient.left - pt.x;
-					} else {
-						xOffsetNew += pt.x - rcClient.right + 1;
-					}
-				} else if (pt.x >= rcClient.right) {
-					// Caret is on the right of the display
-					xOffsetNew += pt.x - rcClient.right + 1;
-				}
-			}
-		}
-		// In case of a jump (find result) largely out of display, adjust the offset to display the caret
-		if (pt.x + xOffset < rcClient.left + xOffsetNew) {
-			xOffsetNew = pt.x + xOffset - rcClient.left;
-		} else if (pt.x + xOffset >= rcClient.right + xOffsetNew) {
-			xOffsetNew = pt.x + xOffset - rcClient.right + 1;
-		}
-		if (xOffsetNew < 0) {
-			xOffsetNew = 0;
-		}
-		if (xOffset != xOffsetNew) {
-			xOffset = xOffsetNew;
-			if (xOffsetNew > 0) {
-				PRectangle rcText = GetTextRectangle();
-				if (horizontalScrollBarVisible == true &&
-				        rcText.Width() + xOffset > scrollWidth) {
-					scrollWidth = xOffset + rcText.Width();
-					SetScrollBars();
-				}
-			}
-			SetHorizontalScrollPos();
-			Redraw();
-		}
-	}
-	UpdateSystemCaret();
-}
-
-void Editor::ShowCaretAtCurrentPosition() {
-	if (hasFocus) {
-		caret.active = true;
-		caret.on = true;
-		SetTicking(true);
-	} else {
-		caret.active = false;
-		caret.on = false;
-	}
-	InvalidateCaret();
-}
-
-void Editor::DropCaret() {
-	caret.active = false;
-	InvalidateCaret();
-}
-
-void Editor::InvalidateCaret() {
-	if (posDrag >= 0)
-		InvalidateRange(posDrag, posDrag + 1);
-	else
-		InvalidateRange(currentPos, currentPos + 1);
-	UpdateSystemCaret();
-}
-
-void Editor::UpdateSystemCaret() {
-}
-
-void Editor::NeedWrapping(int docLineStart, int docLineEnd) {
-	docLineStart = Platform::Clamp(docLineStart, 0, pdoc->LinesTotal());
-	if (wrapStart > docLineStart) {
-		wrapStart = docLineStart;
-		llc.Invalidate(LineLayout::llPositions);
-	}
-	if (wrapEnd < docLineEnd) {
-		wrapEnd = docLineEnd;
-	}
-	wrapEnd = Platform::Clamp(wrapEnd, 0, pdoc->LinesTotal());
-	// Wrap lines during idle.
-	if ((wrapState != eWrapNone) && (wrapEnd != wrapStart)) {
-		SetIdle(true);
-	}
-}
-
-// Check if wrapping needed and perform any needed wrapping.
-// fullwrap: if true, all lines which need wrapping will be done,
-//           in this single call.
-// priorityWrapLineStart: If greater than zero, all lines starting from
-//           here to 1 page + 100 lines past will be wrapped (even if there are
-//           more lines under wrapping process in idle).
-// If it is neither fullwrap, nor priorityWrap, then 1 page + 100 lines will be
-// wrapped, if there are any wrapping going on in idle. (Generally this
-// condition is called only from idler).
-// Return true if wrapping occurred.
-bool Editor::WrapLines(bool fullWrap, int priorityWrapLineStart) {
-	// If there are any pending wraps, do them during idle if possible.
-	int linesInOneCall = LinesOnScreen() + 100;
-	if (wrapState != eWrapNone) {
-		if (wrapStart < wrapEnd) {
-			if (!SetIdle(true)) {
-				// Idle processing not supported so full wrap required.
-				fullWrap = true;
-			}
-		}
-		if (!fullWrap && priorityWrapLineStart >= 0 &&
-			// .. and if the paint window is outside pending wraps
-			(((priorityWrapLineStart + linesInOneCall) < wrapStart) ||
-			 (priorityWrapLineStart > wrapEnd))) {
-			// No priority wrap pending
-			return false;
-		}
-	}
-	int goodTopLine = topLine;
-	bool wrapOccurred = false;
-	if (wrapStart <= pdoc->LinesTotal()) {
-		if (wrapState == eWrapNone) {
-			if (wrapWidth != LineLayout::wrapWidthInfinite) {
-				wrapWidth = LineLayout::wrapWidthInfinite;
-				for (int lineDoc = 0; lineDoc < pdoc->LinesTotal(); lineDoc++) {
-					cs.SetHeight(lineDoc, 1);
-				}
-				wrapOccurred = true;
-			}
-			wrapStart = wrapLineLarge;
-			wrapEnd = wrapLineLarge;
-		} else {
-			if (wrapEnd >= pdoc->LinesTotal())
-				wrapEnd = pdoc->LinesTotal();
-			//ElapsedTime et;
-			int lineDocTop = cs.DocFromDisplay(topLine);
-			int subLineTop = topLine - cs.DisplayFromDoc(lineDocTop);
-			PRectangle rcTextArea = GetClientRectangle();
-			rcTextArea.left = vs.fixedColumnWidth;
-			rcTextArea.right -= vs.rightMarginWidth;
-			wrapWidth = rcTextArea.Width();
-			// Ensure all of the document is styled.
-			pdoc->EnsureStyledTo(pdoc->Length());
-			RefreshStyleData();
-			AutoSurface surface(this);
-			if (surface) {
-				bool priorityWrap = false;
-				int lastLineToWrap = wrapEnd;
-				int lineToWrap = wrapStart;
-				if (!fullWrap) {
-					if (priorityWrapLineStart >= 0) {
-						// This is a priority wrap.
-						lineToWrap = priorityWrapLineStart;
-						lastLineToWrap = priorityWrapLineStart + linesInOneCall;
-						priorityWrap = true;
-					} else {
-						// This is idle wrap.
-						lastLineToWrap = wrapStart + linesInOneCall;
-					}
-					if (lastLineToWrap >= wrapEnd)
-						lastLineToWrap = wrapEnd;
-				} // else do a fullWrap.
-
-				// Platform::DebugPrintf("Wraplines: full = %d, priorityStart = %d (wrapping: %d to %d)\n", fullWrap, priorityWrapLineStart, lineToWrap, lastLineToWrap);
-				// Platform::DebugPrintf("Pending wraps: %d to %d\n", wrapStart, wrapEnd);
-				while (lineToWrap < lastLineToWrap) {
-					AutoLineLayout ll(llc, RetrieveLineLayout(lineToWrap));
-					int linesWrapped = 1;
-					if (ll) {
-						LayoutLine(lineToWrap, surface, vs, ll, wrapWidth);
-						linesWrapped = ll->lines;
-					}
-					if (cs.SetHeight(lineToWrap, linesWrapped)) {
-						wrapOccurred = true;
-					}
-					lineToWrap++;
-				}
-				if (!priorityWrap)
-					wrapStart = lineToWrap;
-				// If wrapping is done, bring it to resting position
-				if (wrapStart >= wrapEnd) {
-					wrapStart = wrapLineLarge;
-					wrapEnd = wrapLineLarge;
-				}
-			}
-			goodTopLine = cs.DisplayFromDoc(lineDocTop);
-			if (subLineTop < cs.GetHeight(lineDocTop))
-				goodTopLine += subLineTop;
-			else
-				goodTopLine += cs.GetHeight(lineDocTop);
-			//double durWrap = et.Duration(true);
-			//Platform::DebugPrintf("Wrap:%9.6g \n", durWrap);
-		}
-	}
-	if (wrapOccurred) {
-		SetScrollBars();
-		SetTopLine(Platform::Clamp(goodTopLine, 0, MaxScrollPos()));
-		SetVerticalScrollPos();
-	}
-	return wrapOccurred;
-}
-
-void Editor::LinesJoin() {
-	if (!RangeContainsProtected(targetStart, targetEnd)) {
-		pdoc->BeginUndoAction();
-		bool prevNonWS = true;
-		for (int pos = targetStart; pos < targetEnd; pos++) {
-			if (IsEOLChar(pdoc->CharAt(pos))) {
-				targetEnd -= pdoc->LenChar(pos);
-				pdoc->DelChar(pos);
-				if (prevNonWS) {
-					// Ensure at least one space separating previous lines
-					pdoc->InsertChar(pos, ' ');
-				}
-			} else {
-				prevNonWS = pdoc->CharAt(pos) != ' ';
-			}
-		}
-		pdoc->EndUndoAction();
-	}
-}
-
-const char *StringFromEOLMode(int eolMode) {
-	if (eolMode == SC_EOL_CRLF) {
-		return "\r\n";
-	} else if (eolMode == SC_EOL_CR) {
-		return "\r";
-	} else {
-		return "\n";
-	}
-}
-
-void Editor::LinesSplit(int pixelWidth) {
-	if (!RangeContainsProtected(targetStart, targetEnd)) {
-		if (pixelWidth == 0) {
-			PRectangle rcText = GetTextRectangle();
-			pixelWidth = rcText.Width();
-		}
-		int lineStart = pdoc->LineFromPosition(targetStart);
-		int lineEnd = pdoc->LineFromPosition(targetEnd);
-		const char *eol = StringFromEOLMode(pdoc->eolMode);
-		pdoc->BeginUndoAction();
-		for (int line = lineStart; line <= lineEnd; line++) {
-			AutoSurface surface(this);
-			AutoLineLayout ll(llc, RetrieveLineLayout(line));
-			if (surface && ll) {
-				unsigned int posLineStart = pdoc->LineStart(line);
-				LayoutLine(line, surface, vs, ll, pixelWidth);
-				for (int subLine = 1; subLine < ll->lines; subLine++) {
-					pdoc->InsertString(posLineStart + (subLine - 1) * strlen(eol) +
-						ll->LineStart(subLine), eol);
-					targetEnd += static_cast<int>(strlen(eol));
-				}
-			}
-			lineEnd = pdoc->LineFromPosition(targetEnd);
-		}
-		pdoc->EndUndoAction();
-	}
-}
-
-int Editor::SubstituteMarkerIfEmpty(int markerCheck, int markerDefault) {
-	if (vs.markers[markerCheck].markType == SC_MARK_EMPTY)
-		return markerDefault;
-	return markerCheck;
-}
-
-// Avoid 64 bit compiler warnings.
-// Scintilla does not support text buffers larger than 2**31
-static int istrlen(const char *s) {
-	return static_cast<int>(strlen(s));
-}
-
-void Editor::PaintSelMargin(Surface *surfWindow, PRectangle &rc) {
-	if (vs.fixedColumnWidth == 0)
-		return;
-
-	PRectangle rcMargin = GetClientRectangle();
-	rcMargin.right = vs.fixedColumnWidth;
-
-	if (!rc.Intersects(rcMargin))
-		return;
-
-	Surface *surface;
-	if (bufferedDraw) {
-		surface = pixmapSelMargin;
-	} else {
-		surface = surfWindow;
-	}
-
-	PRectangle rcSelMargin = rcMargin;
-	rcSelMargin.right = rcMargin.left;
-
-	for (int margin = 0; margin < vs.margins; margin++) {
-		if (vs.ms[margin].width > 0) {
-
-			rcSelMargin.left = rcSelMargin.right;
-			rcSelMargin.right = rcSelMargin.left + vs.ms[margin].width;
-
-			if (vs.ms[margin].style != SC_MARGIN_NUMBER) {
-				/* alternate scheme:
-				if (vs.ms[margin].mask & SC_MASK_FOLDERS)
-					surface->FillRectangle(rcSelMargin, vs.styles[STYLE_DEFAULT].back.allocated);
-				else
-					// Required because of special way brush is created for selection margin
-					surface->FillRectangle(rcSelMargin, pixmapSelPattern);
-				*/
-				if (vs.ms[margin].mask & SC_MASK_FOLDERS)
-					// Required because of special way brush is created for selection margin
-					surface->FillRectangle(rcSelMargin, *pixmapSelPattern);
-				else {
-					ColourAllocated colour;
-					switch (vs.ms[margin].style) {
-					case SC_MARGIN_BACK:
-						colour = vs.styles[STYLE_DEFAULT].back.allocated;
-						break;
-					case SC_MARGIN_FORE:
-						colour = vs.styles[STYLE_DEFAULT].fore.allocated;
-						break;
-					default:
-						colour = vs.styles[STYLE_LINENUMBER].back.allocated;
-						break;
-					}
-					surface->FillRectangle(rcSelMargin, colour);
-				}
-			} else {
-				surface->FillRectangle(rcSelMargin, vs.styles[STYLE_LINENUMBER].back.allocated);
-			}
-
-			int visibleLine = topLine;
-			int yposScreen = 0;
-
-			// Work out whether the top line is whitespace located after a
-			// lessening of fold level which implies a 'fold tail' but which should not
-			// be displayed until the last of a sequence of whitespace.
-			bool needWhiteClosure = false;
-			int level = pdoc->GetLevel(cs.DocFromDisplay(topLine));
-			if (level & SC_FOLDLEVELWHITEFLAG) {
-				int lineBack = cs.DocFromDisplay(topLine);
-				int levelPrev = level;
-				while ((lineBack > 0) && (levelPrev & SC_FOLDLEVELWHITEFLAG)) {
-					lineBack--;
-					levelPrev = pdoc->GetLevel(lineBack);
-				}
-				if (!(levelPrev & SC_FOLDLEVELHEADERFLAG)) {
-					if ((level & SC_FOLDLEVELNUMBERMASK) < (levelPrev & SC_FOLDLEVELNUMBERMASK))
-						needWhiteClosure = true;
-				}
-			}
-
-			// Old code does not know about new markers needed to distinguish all cases
-			int folderOpenMid = SubstituteMarkerIfEmpty(SC_MARKNUM_FOLDEROPENMID,
-			                    SC_MARKNUM_FOLDEROPEN);
-			int folderEnd = SubstituteMarkerIfEmpty(SC_MARKNUM_FOLDEREND,
-			                                        SC_MARKNUM_FOLDER);
-
-			while ((visibleLine < cs.LinesDisplayed()) && yposScreen < rcMargin.bottom) {
-
-				PLATFORM_ASSERT(visibleLine < cs.LinesDisplayed());
-
-				int lineDoc = cs.DocFromDisplay(visibleLine);
-				PLATFORM_ASSERT(cs.GetVisible(lineDoc));
-				bool firstSubLine = visibleLine == cs.DisplayFromDoc(lineDoc);
-
-				// Decide which fold indicator should be displayed
-				level = pdoc->GetLevel(lineDoc);
-				int levelNext = pdoc->GetLevel(lineDoc + 1);
-				int marks = pdoc->GetMark(lineDoc);
-				if (!firstSubLine)
-					marks = 0;
-				int levelNum = level & SC_FOLDLEVELNUMBERMASK;
-				int levelNextNum = levelNext & SC_FOLDLEVELNUMBERMASK;
-				if (level & SC_FOLDLEVELHEADERFLAG) {
-					if (firstSubLine) {
-						if (cs.GetExpanded(lineDoc)) {
-							if (levelNum == SC_FOLDLEVELBASE)
-								marks |= 1 << SC_MARKNUM_FOLDEROPEN;
-							else
-								marks |= 1 << folderOpenMid;
-						} else {
-							if (levelNum == SC_FOLDLEVELBASE)
-								marks |= 1 << SC_MARKNUM_FOLDER;
-							else
-								marks |= 1 << folderEnd;
-						}
-					} else {
-						marks |= 1 << SC_MARKNUM_FOLDERSUB;
-					}
-					needWhiteClosure = false;
-				} else if (level & SC_FOLDLEVELWHITEFLAG) {
-					if (needWhiteClosure) {
-						if (levelNext & SC_FOLDLEVELWHITEFLAG) {
-							marks |= 1 << SC_MARKNUM_FOLDERSUB;
-						} else if (levelNum > SC_FOLDLEVELBASE) {
-							marks |= 1 << SC_MARKNUM_FOLDERMIDTAIL;
-							needWhiteClosure = false;
-						} else {
-							marks |= 1 << SC_MARKNUM_FOLDERTAIL;
-							needWhiteClosure = false;
-						}
-					} else if (levelNum > SC_FOLDLEVELBASE) {
-						if (levelNextNum < levelNum) {
-							if (levelNextNum > SC_FOLDLEVELBASE) {
-								marks |= 1 << SC_MARKNUM_FOLDERMIDTAIL;
-							} else {
-								marks |= 1 << SC_MARKNUM_FOLDERTAIL;
-							}
-						} else {
-							marks |= 1 << SC_MARKNUM_FOLDERSUB;
-						}
-					}
-				} else if (levelNum > SC_FOLDLEVELBASE) {
-					if (levelNextNum < levelNum) {
-						needWhiteClosure = false;
-						if (levelNext & SC_FOLDLEVELWHITEFLAG) {
-							marks |= 1 << SC_MARKNUM_FOLDERSUB;
-							needWhiteClosure = true;
-						} else if (levelNextNum > SC_FOLDLEVELBASE) {
-							marks |= 1 << SC_MARKNUM_FOLDERMIDTAIL;
-						} else {
-							marks |= 1 << SC_MARKNUM_FOLDERTAIL;
-						}
-					} else {
-						marks |= 1 << SC_MARKNUM_FOLDERSUB;
-					}
-				}
-
-				marks &= vs.ms[margin].mask;
-				PRectangle rcMarker = rcSelMargin;
-				rcMarker.top = yposScreen;
-				rcMarker.bottom = yposScreen + vs.lineHeight;
-				if (vs.ms[margin].style == SC_MARGIN_NUMBER) {
-					char number[100];
-					number[0] = '\0';
-					if (firstSubLine)
-						sprintf(number, "%d", lineDoc + 1);
-					if (foldFlags & SC_FOLDFLAG_LEVELNUMBERS) {
-						int lev = pdoc->GetLevel(lineDoc);
-						sprintf(number, "%c%c %03X %03X",
-							(lev & SC_FOLDLEVELHEADERFLAG) ? 'H' : '_',
-							(lev & SC_FOLDLEVELWHITEFLAG) ? 'W' : '_',
-							lev & SC_FOLDLEVELNUMBERMASK,
-							lev >> 16
-						);
-					}
-					PRectangle rcNumber = rcMarker;
-					// Right justify
-					int width = surface->WidthText(vs.styles[STYLE_LINENUMBER].font, number, istrlen(number));
-					int xpos = rcNumber.right - width - 3;
-					rcNumber.left = xpos;
-					surface->DrawTextNoClip(rcNumber, vs.styles[STYLE_LINENUMBER].font,
-					                        rcNumber.top + vs.maxAscent, number, istrlen(number),
-					                        vs.styles[STYLE_LINENUMBER].fore.allocated,
-					                        vs.styles[STYLE_LINENUMBER].back.allocated);
-				}
-
-				if (marks) {
-					for (int markBit = 0; (markBit < 32) && marks; markBit++) {
-						if (marks & 1) {
-							vs.markers[markBit].Draw(surface, rcMarker, vs.styles[STYLE_LINENUMBER].font);
-						}
-						marks >>= 1;
-					}
-				}
-
-				visibleLine++;
-				yposScreen += vs.lineHeight;
-			}
-		}
-	}
-
-	PRectangle rcBlankMargin = rcMargin;
-	rcBlankMargin.left = rcSelMargin.right;
-	surface->FillRectangle(rcBlankMargin, vs.styles[STYLE_DEFAULT].back.allocated);
-
-	if (bufferedDraw) {
-		surfWindow->Copy(rcMargin, Point(), *pixmapSelMargin);
-	}
-}
-
-void DrawTabArrow(Surface *surface, PRectangle rcTab, int ymid) {
-	int ydiff = (rcTab.bottom - rcTab.top) / 2;
-	int xhead = rcTab.right - 1 - ydiff;
-	if (xhead <= rcTab.left) {
-		ydiff -= rcTab.left - xhead - 1;
-		xhead = rcTab.left - 1;
-	}
-	if ((rcTab.left + 2) < (rcTab.right - 1))
-		surface->MoveTo(rcTab.left + 2, ymid);
-	else
-		surface->MoveTo(rcTab.right - 1, ymid);
-	surface->LineTo(rcTab.right - 1, ymid);
-	surface->LineTo(xhead, ymid - ydiff);
-	surface->MoveTo(rcTab.right - 1, ymid);
-	surface->LineTo(xhead, ymid + ydiff);
-}
-
-static bool IsSpaceOrTab(char ch) {
-	return ch == ' ' || ch == '\t';
-}
-
-LineLayout *Editor::RetrieveLineLayout(int lineNumber) {
-	int posLineStart = pdoc->LineStart(lineNumber);
-	int posLineEnd = pdoc->LineStart(lineNumber + 1);
-	int lineCaret = pdoc->LineFromPosition(currentPos);
-	return llc.Retrieve(lineNumber, lineCaret,
-	                    posLineEnd - posLineStart, pdoc->GetStyleClock(),
-	                    LinesOnScreen() + 1, pdoc->LinesTotal());
-}
-
-/**
- * Fill in the LineLayout data for the given line.
- * Copy the given @a line and its styles from the document into local arrays.
- * Also determine the x position at which each character starts.
- */
-void Editor::LayoutLine(int line, Surface *surface, ViewStyle &vstyle, LineLayout *ll, int width) {
-	if (!ll)
-		return;
-	PLATFORM_ASSERT(line < pdoc->LinesTotal());
-	int posLineStart = pdoc->LineStart(line);
-	int posLineEnd = pdoc->LineStart(line + 1);
-	// If the line is very long, limit the treatment to a length that should fit in the viewport
-	if (posLineEnd > (posLineStart + ll->maxLineLength)) {
-		posLineEnd = posLineStart + ll->maxLineLength;
-	}
-	if (ll->validity == LineLayout::llCheckTextAndStyle) {
-		int lineLength = posLineEnd - posLineStart;
-		if (!vstyle.viewEOL) {
-			int cid = posLineEnd - 1;
-			while ((cid > posLineStart) && IsEOLChar(pdoc->CharAt(cid))) {
-				cid--;
-				lineLength--;
-			}
-		}
-		if (lineLength == ll->numCharsInLine) {
-			// See if chars, styles, indicators, are all the same
-			bool allSame = true;
-			const int styleMask = pdoc->stylingBitsMask;
-			// Check base line layout
-			char styleByte = 0;
-			int numCharsInLine = 0;
-			while (numCharsInLine < lineLength) {
-				int charInDoc = numCharsInLine + posLineStart;
-				char chDoc = pdoc->CharAt(charInDoc);
-				styleByte = pdoc->StyleAt(charInDoc);
-				allSame = allSame &&
-					        (ll->styles[numCharsInLine] == static_cast<unsigned char>(styleByte & styleMask));
-				allSame = allSame &&
-					        (ll->indicators[numCharsInLine] == static_cast<char>(styleByte & ~styleMask));
-				if (vstyle.styles[ll->styles[numCharsInLine]].caseForce == Style::caseMixed)
-					allSame = allSame &&
-						        (ll->chars[numCharsInLine] == chDoc);
-				else if (vstyle.styles[ll->styles[numCharsInLine]].caseForce == Style::caseLower)
-					allSame = allSame &&
-						        (ll->chars[numCharsInLine] == static_cast<char>(tolower(chDoc)));
-				else	// Style::caseUpper
-					allSame = allSame &&
-						        (ll->chars[numCharsInLine] == static_cast<char>(toupper(chDoc)));
-				numCharsInLine++;
-			}
-			allSame = allSame && (ll->styles[numCharsInLine] == styleByte);	// For eolFilled
-			if (allSame) {
-				ll->validity = LineLayout::llPositions;
-			} else {
-				ll->validity = LineLayout::llInvalid;
-			}
-		} else {
-			ll->validity = LineLayout::llInvalid;
-		}
-	}
-	if (ll->validity == LineLayout::llInvalid) {
-		ll->widthLine = LineLayout::wrapWidthInfinite;
-		ll->lines = 1;
-		int numCharsInLine = 0;
-		if (vstyle.edgeState == EDGE_BACKGROUND) {
-			ll->edgeColumn = pdoc->FindColumn(line, theEdge);
-			if (ll->edgeColumn >= posLineStart) {
-				ll->edgeColumn -= posLineStart;
-			}
-		} else {
-			ll->edgeColumn = -1;
-		}
-
-		char styleByte = 0;
-		int styleMask = pdoc->stylingBitsMask;
-		ll->styleBitsSet = 0;
-		// Fill base line layout
-		for (int charInDoc = posLineStart; charInDoc < posLineEnd; charInDoc++) {
-			char chDoc = pdoc->CharAt(charInDoc);
-			styleByte = pdoc->StyleAt(charInDoc);
-			ll->styleBitsSet |= styleByte;
-			if (vstyle.viewEOL || (!IsEOLChar(chDoc))) {
-				ll->chars[numCharsInLine] = chDoc;
-				ll->styles[numCharsInLine] = static_cast<char>(styleByte & styleMask);
-				ll->indicators[numCharsInLine] = static_cast<char>(styleByte & ~styleMask);
-				if (vstyle.styles[ll->styles[numCharsInLine]].caseForce == Style::caseUpper)
-					ll->chars[numCharsInLine] = static_cast<char>(toupper(chDoc));
-				else if (vstyle.styles[ll->styles[numCharsInLine]].caseForce == Style::caseLower)
-					ll->chars[numCharsInLine] = static_cast<char>(tolower(chDoc));
-				numCharsInLine++;
-			}
-		}
-		ll->xHighlightGuide = 0;
-		// Extra element at the end of the line to hold end x position and act as
-		ll->chars[numCharsInLine] = 0;   // Also triggers processing in the loops as this is a control character
-		ll->styles[numCharsInLine] = styleByte;	// For eolFilled
-		ll->indicators[numCharsInLine] = 0;
-
-		// Layout the line, determining the position of each character,
-		// with an extra element at the end for the end of the line.
-		int startseg = 0;	// Start of the current segment, in char. number
-		int startsegx = 0;	// Start of the current segment, in pixels
-		ll->positions[0] = 0;
-		unsigned int tabWidth = vstyle.spaceWidth * pdoc->tabInChars;
-		bool lastSegItalics = false;
-		Font &ctrlCharsFont = vstyle.styles[STYLE_CONTROLCHAR].font;
-
-		int ctrlCharWidth[32] = {0};
-		bool isControlNext = IsControlCharacter(ll->chars[0]);
-		for (int charInLine = 0; charInLine < numCharsInLine; charInLine++) {
-			bool isControl = isControlNext;
-			isControlNext = IsControlCharacter(ll->chars[charInLine + 1]);
-			if ((ll->styles[charInLine] != ll->styles[charInLine + 1]) ||
-			        isControl || isControlNext) {
-				ll->positions[startseg] = 0;
-				if (vstyle.styles[ll->styles[charInLine]].visible) {
-					if (isControl) {
-						if (ll->chars[charInLine] == '\t') {
-							ll->positions[charInLine + 1] = ((((startsegx + 2) /
-							                                   tabWidth) + 1) * tabWidth) - startsegx;
-						} else if (controlCharSymbol < 32) {
-							if (ctrlCharWidth[ll->chars[charInLine]] == 0) {
-								const char *ctrlChar = ControlCharacterString(ll->chars[charInLine]);
-								// +3 For a blank on front and rounded edge each side:
-								ctrlCharWidth[ll->chars[charInLine]] =
-									surface->WidthText(ctrlCharsFont, ctrlChar, istrlen(ctrlChar)) + 3;
-							}
-							ll->positions[charInLine + 1] = ctrlCharWidth[ll->chars[charInLine]];
-						} else {
-							char cc[2] = { static_cast<char>(controlCharSymbol), '\0' };
-							surface->MeasureWidths(ctrlCharsFont, cc, 1,
-							                       ll->positions + startseg + 1);
-						}
-						lastSegItalics = false;
-					} else {	// Regular character
-						int lenSeg = charInLine - startseg + 1;
-						if ((lenSeg == 1) && (' ' == ll->chars[startseg])) {
-							lastSegItalics = false;
-							// Over half the segments are single characters and of these about half are space characters.
-							ll->positions[charInLine + 1] = vstyle.styles[ll->styles[charInLine]].spaceWidth;
-						} else {
-							lastSegItalics = vstyle.styles[ll->styles[charInLine]].italic;
-							surface->MeasureWidths(vstyle.styles[ll->styles[charInLine]].font, ll->chars + startseg,
-							                       lenSeg, ll->positions + startseg + 1);
-						}
-					}
-				} else {    // invisible
-					for (int posToZero = startseg; posToZero <= (charInLine + 1); posToZero++) {
-						ll->positions[posToZero] = 0;
-					}
-				}
-				for (int posToIncrease = startseg; posToIncrease <= (charInLine + 1); posToIncrease++) {
-					ll->positions[posToIncrease] += startsegx;
-				}
-				startsegx = ll->positions[charInLine + 1];
-				startseg = charInLine + 1;
-			}
-		}
-		// Small hack to make lines that end with italics not cut off the edge of the last character
-		if ((startseg > 0) && lastSegItalics) {
-			ll->positions[startseg] += 2;
-		}
-		ll->numCharsInLine = numCharsInLine;
-		ll->validity = LineLayout::llPositions;
-	}
-	// Hard to cope when too narrow, so just assume there is space
-	if (width < 20) {
-		width = 20;
-	}
-	if ((ll->validity == LineLayout::llPositions) || (ll->widthLine != width)) {
-		ll->widthLine = width;
-		if (width == LineLayout::wrapWidthInfinite) {
-			ll->lines = 1;
-		} else if (width > ll->positions[ll->numCharsInLine]) {
-			// Simple common case where line does not need wrapping.
-			ll->lines = 1;
-		} else {
-			if (wrapVisualFlags & SC_WRAPVISUALFLAG_END) {
-				width -= vstyle.aveCharWidth; // take into account the space for end wrap mark
-			}
-			ll->lines = 0;
-			// Calculate line start positions based upon width.
-			// For now this is simplistic - wraps on byte rather than character and
-			// in the middle of words. Should search for spaces or style changes.
-			int lastGoodBreak = 0;
-			int lastLineStart = 0;
-			int startOffset = 0;
-			int p = 0;
-			while (p < ll->numCharsInLine) {
-				if ((ll->positions[p + 1] - startOffset) >= width) {
-					if (lastGoodBreak == lastLineStart) {
-						// Try moving to start of last character
-						if (p > 0) {
-							lastGoodBreak = pdoc->MovePositionOutsideChar(p + posLineStart, -1)
-							                - posLineStart;
-						}
-						if (lastGoodBreak == lastLineStart) {
-							// Ensure at least one character on line.
-							lastGoodBreak = pdoc->MovePositionOutsideChar(lastGoodBreak + posLineStart + 1, 1)
-							                - posLineStart;
-						}
-					}
-					lastLineStart = lastGoodBreak;
-					ll->lines++;
-					ll->SetLineStart(ll->lines, lastGoodBreak);
-					startOffset = ll->positions[lastGoodBreak];
-					// take into account the space for start wrap mark and indent
-					startOffset -= actualWrapVisualStartIndent * vstyle.aveCharWidth;
-					p = lastGoodBreak + 1;
-					continue;
-				}
-				if (p > 0) {
-					if (wrapState == eWrapChar) {
-						lastGoodBreak = pdoc->MovePositionOutsideChar(p + posLineStart, -1)
-												- posLineStart;
-						p = pdoc->MovePositionOutsideChar(p + 1 + posLineStart, 1) - posLineStart;
-						continue;
-					} else if (ll->styles[p] != ll->styles[p - 1]) {
-						lastGoodBreak = p;
-					} else if (IsSpaceOrTab(ll->chars[p - 1]) && !IsSpaceOrTab(ll->chars[p])) {
-						lastGoodBreak = p;
-					}
-				}
-				p++;
-			}
-			ll->lines++;
-		}
-		ll->validity = LineLayout::llLines;
-	}
-}
-
-ColourAllocated Editor::SelectionBackground(ViewStyle &vsDraw) {
-	return primarySelection ? vsDraw.selbackground.allocated : vsDraw.selbackground2.allocated;
-}
-
-ColourAllocated Editor::TextBackground(ViewStyle &vsDraw, bool overrideBackground,
-                                       ColourAllocated background, bool inSelection, bool inHotspot, int styleMain, int i, LineLayout *ll) {
-	if (inSelection) {
-		if (vsDraw.selbackset && (vsDraw.selAlpha == SC_ALPHA_NOALPHA)) {
-			return SelectionBackground(vsDraw);
-		}
-	} else {
-		if ((vsDraw.edgeState == EDGE_BACKGROUND) &&
-		        (i >= ll->edgeColumn) &&
-		        !IsEOLChar(ll->chars[i]))
-			return vsDraw.edgecolour.allocated;
-		if (inHotspot && vsDraw.hotspotBackgroundSet)
-			return vsDraw.hotspotBackground.allocated;
-		if (overrideBackground)
-			return background;
-	}
-	return vsDraw.styles[styleMain].back.allocated;
-}
-
-void Editor::DrawIndentGuide(Surface *surface, int lineVisible, int lineHeight, int start, PRectangle rcSegment, bool highlight) {
-	Point from(0, ((lineVisible & 1) && (lineHeight & 1)) ? 1 : 0);
-	PRectangle rcCopyArea(start + 1, rcSegment.top, start + 2, rcSegment.bottom);
-	surface->Copy(rcCopyArea, from,
-	              highlight ? *pixmapIndentGuideHighlight : *pixmapIndentGuide);
-}
-
-void Editor::DrawWrapMarker(Surface *surface, PRectangle rcPlace,
-                            bool isEndMarker, ColourAllocated wrapColour) {
-	surface->PenColour(wrapColour);
-
-	enum { xa = 1 }; // gap before start
-	int w = rcPlace.right - rcPlace.left - xa - 1;
-
-	bool xStraight = isEndMarker;  // x-mirrored symbol for start marker
-	bool yStraight = true;
-	//bool yStraight= isEndMarker; // comment in for start marker y-mirrowed
-
-	int x0 = xStraight ? rcPlace.left : rcPlace.right - 1;
-	int y0 = yStraight ? rcPlace.top : rcPlace.bottom - 1;
-
-	int dy = (rcPlace.bottom - rcPlace.top) / 5;
-	int y = (rcPlace.bottom - rcPlace.top) / 2 + dy;
-
-	struct Relative {
-		Surface *surface;
-		int xBase;
-		int xDir;
-		int yBase;
-		int yDir;
-		void MoveTo(int xRelative, int yRelative) {
-		    surface->MoveTo(xBase + xDir * xRelative, yBase + yDir * yRelative);
-		}
-		void LineTo(int xRelative, int yRelative) {
-		    surface->LineTo(xBase + xDir * xRelative, yBase + yDir * yRelative);
-		}
-	};
-	Relative rel = {surface, x0, xStraight ? 1 : -1, y0, yStraight ? 1 : -1};
-
-	// arrow head
-	rel.MoveTo(xa, y);
-	rel.LineTo(xa + 2*w / 3, y - dy);
-	rel.MoveTo(xa, y);
-	rel.LineTo(xa + 2*w / 3, y + dy);
-
-	// arrow body
-	rel.MoveTo(xa, y);
-	rel.LineTo(xa + w, y);
-	rel.LineTo(xa + w, y - 2 * dy);
-	rel.LineTo(xa - 1,   // on windows lineto is exclusive endpoint, perhaps GTK not...
-	                y - 2 * dy);
-}
-
-static void SimpleAlphaRectangle(Surface *surface, PRectangle rc, ColourAllocated fill, int alpha) {
-	if (alpha != SC_ALPHA_NOALPHA) {
-		surface->AlphaRectangle(rc, 0, fill, alpha, fill, alpha, 0);
-	}
-}
-
-void Editor::DrawEOL(Surface *surface, ViewStyle &vsDraw, PRectangle rcLine, LineLayout *ll,
-                     int line, int lineEnd, int xStart, int subLine, int subLineStart,
-                     bool overrideBackground, ColourAllocated background,
-                     bool drawWrapMarkEnd, ColourAllocated wrapColour) {
-
-	int styleMask = pdoc->stylingBitsMask;
-	PRectangle rcSegment = rcLine;
-
-	// Fill in a PRectangle representing the end of line characters
-	int xEol = ll->positions[lineEnd] - subLineStart;
-	rcSegment.left = xEol + xStart;
-	rcSegment.right = xEol + vsDraw.aveCharWidth + xStart;
-	int posLineEnd = pdoc->LineStart(line + 1);
-	bool eolInSelection = (subLine == (ll->lines - 1)) &&
-	                      (posLineEnd > ll->selStart) && (posLineEnd <= ll->selEnd) && (ll->selStart != ll->selEnd);
-
-	if (eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (vsDraw.selAlpha == SC_ALPHA_NOALPHA)) {
-		surface->FillRectangle(rcSegment, SelectionBackground(vsDraw));
-	} else {
-		if (overrideBackground) {
-			surface->FillRectangle(rcSegment, background);
-		} else {
-			surface->FillRectangle(rcSegment, vsDraw.styles[ll->styles[ll->numCharsInLine] & styleMask].back.allocated);
-		}
-		if (eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (vsDraw.selAlpha != SC_ALPHA_NOALPHA)) {
-			SimpleAlphaRectangle(surface, rcSegment, SelectionBackground(vsDraw), vsDraw.selAlpha);
-		}
-	}
-
-	rcSegment.left = xEol + vsDraw.aveCharWidth + xStart;
-	rcSegment.right = rcLine.right;
-	if (overrideBackground) {
-		surface->FillRectangle(rcSegment, background);
-	} else if (vsDraw.styles[ll->styles[ll->numCharsInLine] & styleMask].eolFilled) {
-		surface->FillRectangle(rcSegment, vsDraw.styles[ll->styles[ll->numCharsInLine] & styleMask].back.allocated);
-	} else {
-		surface->FillRectangle(rcSegment, vsDraw.styles[STYLE_DEFAULT].back.allocated);
-	}
-
-	if (drawWrapMarkEnd) {
-		PRectangle rcPlace = rcSegment;
-
-		if (wrapVisualFlagsLocation & SC_WRAPVISUALFLAGLOC_END_BY_TEXT) {
-			rcPlace.left = xEol + xStart;
-			rcPlace.right = rcPlace.left + vsDraw.aveCharWidth;
-		} else {
-			// draw left of the right text margin, to avoid clipping by the current clip rect
-			rcPlace.right = rcLine.right - vs.rightMarginWidth;
-			rcPlace.left = rcPlace.right - vsDraw.aveCharWidth;
-		}
-		DrawWrapMarker(surface, rcPlace, true, wrapColour);
-	}
-}
-
-void Editor::DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVisible, int xStart,
-                      PRectangle rcLine, LineLayout *ll, int subLine) {
-
-	PRectangle rcSegment = rcLine;
-
-	// Using one font for all control characters so it can be controlled independently to ensure
-	// the box goes around the characters tightly. Seems to be no way to work out what height
-	// is taken by an individual character - internal leading gives varying results.
-	Font &ctrlCharsFont = vsDraw.styles[STYLE_CONTROLCHAR].font;
-
-	// See if something overrides the line background color:  Either if caret is on the line
-	// and background color is set for that, or if a marker is defined that forces its background
-	// color onto the line, or if a marker is defined but has no selection margin in which to
-	// display itself (as long as it's not an SC_MARK_EMPTY marker).  These are checked in order
-	// with the earlier taking precedence.  When multiple markers cause background override,
-	// the color for the highest numbered one is used.
-	bool overrideBackground = false;
-	ColourAllocated background;
-	if (caret.active && vsDraw.showCaretLineBackground && (vsDraw.caretLineAlpha == SC_ALPHA_NOALPHA) && ll->containsCaret) {
-		overrideBackground = true;
-		background = vsDraw.caretLineBackground.allocated;
-	}
-	if (!overrideBackground) {
-		int marks = pdoc->GetMark(line);
-		for (int markBit = 0; (markBit < 32) && marks; markBit++) {
-			if ((marks & 1) && (vsDraw.markers[markBit].markType == SC_MARK_BACKGROUND) &&
-				(vsDraw.markers[markBit].alpha == SC_ALPHA_NOALPHA)) {
-				background = vsDraw.markers[markBit].back.allocated;
-				overrideBackground = true;
-			}
-			marks >>= 1;
-		}
-	}
-	if (!overrideBackground) {
-		if (vsDraw.maskInLine) {
-			int marksMasked = pdoc->GetMark(line) & vsDraw.maskInLine;
-			if (marksMasked) {
-				for (int markBit = 0; (markBit < 32) && marksMasked; markBit++) {
-					if ((marksMasked & 1) && (vsDraw.markers[markBit].markType != SC_MARK_EMPTY) &&
-						(vsDraw.markers[markBit].alpha == SC_ALPHA_NOALPHA)) {
-						overrideBackground = true;
-						background = vsDraw.markers[markBit].back.allocated;
-					}
-					marksMasked >>= 1;
-				}
-			}
-		}
-	}
-
-	bool drawWhitespaceBackground = (vsDraw.viewWhitespace != wsInvisible) &&
-	                                (!overrideBackground) && (vsDraw.whitespaceBackgroundSet);
-
-	bool inIndentation = subLine == 0;	// Do not handle indentation except on first subline.
-	int indentWidth = pdoc->IndentSize() * vsDraw.spaceWidth;
-
-	int posLineStart = pdoc->LineStart(line);
-
-	int startseg = ll->LineStart(subLine);
-	int subLineStart = ll->positions[startseg];
-	int lineStart = 0;
-	int lineEnd = 0;
-	if (subLine < ll->lines) {
-		lineStart = ll->LineStart(subLine);
-		lineEnd = ll->LineStart(subLine + 1);
-	}
-
-	bool drawWrapMarkEnd = false;
-
-	if (wrapVisualFlags & SC_WRAPVISUALFLAG_END) {
-		if (subLine + 1 < ll->lines) {
-			drawWrapMarkEnd = ll->LineStart(subLine + 1) != 0;
-		}
-	}
-
-	if (actualWrapVisualStartIndent != 0) {
-
-		bool continuedWrapLine = false;
-		if (subLine < ll->lines) {
-			continuedWrapLine = ll->LineStart(subLine) != 0;
-		}
-
-		if (continuedWrapLine) {
-			// draw continuation rect
-			PRectangle rcPlace = rcSegment;
-
-			rcPlace.left = ll->positions[startseg] + xStart - subLineStart;
-			rcPlace.right = rcPlace.left + actualWrapVisualStartIndent * vsDraw.aveCharWidth;
-
-			// default bgnd here..
-			surface->FillRectangle(rcSegment, vsDraw.styles[STYLE_DEFAULT].back.allocated);
-
-			// main line style would be below but this would be inconsistent with end markers
-			// also would possibly not be the style at wrap point
-			//int styleMain = ll->styles[lineStart];
-			//surface->FillRectangle(rcPlace, vsDraw.styles[styleMain].back.allocated);
-
-			if (wrapVisualFlags & SC_WRAPVISUALFLAG_START) {
-
-				if (wrapVisualFlagsLocation & SC_WRAPVISUALFLAGLOC_START_BY_TEXT)
-					rcPlace.left = rcPlace.right - vsDraw.aveCharWidth;
-				else
-					rcPlace.right = rcPlace.left + vsDraw.aveCharWidth;
-
-				DrawWrapMarker(surface, rcPlace, false, vsDraw.whitespaceForeground.allocated);
-			}
-
-			xStart += actualWrapVisualStartIndent * vsDraw.aveCharWidth;
-		}
-	}
-
-	int i;
-
-	// Background drawing loop
-	for (i = lineStart; twoPhaseDraw && (i < lineEnd); i++) {
-
-		int iDoc = i + posLineStart;
-		// If there is the end of a style run for any reason
-		if ((ll->styles[i] != ll->styles[i + 1]) ||
-		        i == (lineEnd - 1) ||
-		        IsControlCharacter(ll->chars[i]) || IsControlCharacter(ll->chars[i + 1]) ||
-		        ((ll->selStart != ll->selEnd) && ((iDoc + 1 == ll->selStart) || (iDoc + 1 == ll->selEnd))) ||
-		        (i == (ll->edgeColumn - 1))) {
-			rcSegment.left = ll->positions[startseg] + xStart - subLineStart;
-			rcSegment.right = ll->positions[i + 1] + xStart - subLineStart;
-			// Only try to draw if really visible - enhances performance by not calling environment to
-			// draw strings that are completely past the right side of the window.
-			if ((rcSegment.left <= rcLine.right) && (rcSegment.right >= rcLine.left)) {
-				int styleMain = ll->styles[i];
-				bool inSelection = (iDoc >= ll->selStart) && (iDoc < ll->selEnd) && (ll->selStart != ll->selEnd);
-				bool inHotspot = (ll->hsStart != -1) && (iDoc >= ll->hsStart) && (iDoc < ll->hsEnd);
-				ColourAllocated textBack = TextBackground(vsDraw, overrideBackground, background, inSelection, inHotspot, styleMain, i, ll);
-				if (ll->chars[i] == '\t') {
-					// Tab display
-					if (drawWhitespaceBackground &&
-					        (!inIndentation || vsDraw.viewWhitespace == wsVisibleAlways))
-						textBack = vsDraw.whitespaceBackground.allocated;
-					surface->FillRectangle(rcSegment, textBack);
-				} else if (IsControlCharacter(ll->chars[i])) {
-					// Control character display
-					inIndentation = false;
-					surface->FillRectangle(rcSegment, textBack);
-				} else {
-					// Normal text display
-					surface->FillRectangle(rcSegment, textBack);
-					if (vsDraw.viewWhitespace != wsInvisible ||
-					        (inIndentation && vsDraw.viewIndentationGuides)) {
-						for (int cpos = 0; cpos <= i - startseg; cpos++) {
-							if (ll->chars[cpos + startseg] == ' ') {
-								if (drawWhitespaceBackground &&
-								        (!inIndentation || vsDraw.viewWhitespace == wsVisibleAlways)) {
-									PRectangle rcSpace(ll->positions[cpos + startseg] + xStart, rcSegment.top,
-									                   ll->positions[cpos + startseg + 1] + xStart, rcSegment.bottom);
-									surface->FillRectangle(rcSpace, vsDraw.whitespaceBackground.allocated);
-								}
-							} else {
-								inIndentation = false;
-							}
-						}
-					}
-				}
-			} else if (rcSegment.left > rcLine.right) {
-				break;
-			}
-			startseg = i + 1;
-		}
-	}
-
-	if (twoPhaseDraw) {
-		DrawEOL(surface, vsDraw, rcLine, ll, line, lineEnd,
-		        xStart, subLine, subLineStart, overrideBackground, background,
-		        drawWrapMarkEnd, vsDraw.whitespaceForeground.allocated);
-	}
-
-	inIndentation = subLine == 0;	// Do not handle indentation except on first subline.
-	startseg = ll->LineStart(subLine);
-	// Foreground drawing loop
-	for (i = lineStart; i < lineEnd; i++) {
-
-		int iDoc = i + posLineStart;
-		// If there is the end of a style run for any reason
-		if ((ll->styles[i] != ll->styles[i + 1]) ||
-		        i == (lineEnd - 1) ||
-		        IsControlCharacter(ll->chars[i]) || IsControlCharacter(ll->chars[i + 1]) ||
-		        ((ll->selStart != ll->selEnd) && ((iDoc + 1 == ll->selStart) || (iDoc + 1 == ll->selEnd))) ||
-		        (i == (ll->edgeColumn - 1))) {
-			rcSegment.left = ll->positions[startseg] + xStart - subLineStart;
-			rcSegment.right = ll->positions[i + 1] + xStart - subLineStart;
-			// Only try to draw if really visible - enhances performance by not calling environment to
-			// draw strings that are completely past the right side of the window.
-			if ((rcSegment.left <= rcLine.right) && (rcSegment.right >= rcLine.left)) {
-				int styleMain = ll->styles[i];
-				ColourAllocated textFore = vsDraw.styles[styleMain].fore.allocated;
-				Font &textFont = vsDraw.styles[styleMain].font;
-				//hotspot foreground
-				if (ll->hsStart != -1 && iDoc >= ll->hsStart && iDoc < hsEnd) {
-					if (vsDraw.hotspotForegroundSet)
-						textFore = vsDraw.hotspotForeground.allocated;
-				}
-				bool inSelection = (iDoc >= ll->selStart) && (iDoc < ll->selEnd) && (ll->selStart != ll->selEnd);
-				if (inSelection && (vsDraw.selforeset)) {
-					textFore = vsDraw.selforeground.allocated;
-				}
-				bool inHotspot = (ll->hsStart != -1) && (iDoc >= ll->hsStart) && (iDoc < ll->hsEnd);
-				ColourAllocated textBack = TextBackground(vsDraw, overrideBackground, background, inSelection, inHotspot, styleMain, i, ll);
-				if (ll->chars[i] == '\t') {
-					// Tab display
-					if (!twoPhaseDraw) {
-						if (drawWhitespaceBackground &&
-						        (!inIndentation || vsDraw.viewWhitespace == wsVisibleAlways))
-							textBack = vsDraw.whitespaceBackground.allocated;
-						surface->FillRectangle(rcSegment, textBack);
-					}
-					if ((vsDraw.viewWhitespace != wsInvisible) || ((inIndentation && vsDraw.viewIndentationGuides))) {
-						if (vsDraw.whitespaceForegroundSet)
-							textFore = vsDraw.whitespaceForeground.allocated;
-						surface->PenColour(textFore);
-					}
-					if (inIndentation && vsDraw.viewIndentationGuides) {
-						for (int xIG = ll->positions[i] / indentWidth * indentWidth; xIG < ll->positions[i + 1]; xIG += indentWidth) {
-							if (xIG >= ll->positions[i] && xIG > 0) {
-								DrawIndentGuide(surface, lineVisible, vsDraw.lineHeight, xIG + xStart, rcSegment,
-								                (ll->xHighlightGuide == xIG));
-							}
-						}
-					}
-					if (vsDraw.viewWhitespace != wsInvisible) {
-						if (!inIndentation || vsDraw.viewWhitespace == wsVisibleAlways) {
-							PRectangle rcTab(rcSegment.left + 1, rcSegment.top + 4,
-							                 rcSegment.right - 1, rcSegment.bottom - vsDraw.maxDescent);
-							DrawTabArrow(surface, rcTab, rcSegment.top + vsDraw.lineHeight / 2);
-						}
-					}
-				} else if (IsControlCharacter(ll->chars[i])) {
-					// Control character display
-					inIndentation = false;
-					if (controlCharSymbol < 32) {
-						// Draw the character
-						const char *ctrlChar = ControlCharacterString(ll->chars[i]);
-						if (!twoPhaseDraw) {
-							surface->FillRectangle(rcSegment, textBack);
-						}
-						int normalCharHeight = surface->Ascent(ctrlCharsFont) -
-						                       surface->InternalLeading(ctrlCharsFont);
-						PRectangle rcCChar = rcSegment;
-						rcCChar.left = rcCChar.left + 1;
-						rcCChar.top = rcSegment.top + vsDraw.maxAscent - normalCharHeight;
-						rcCChar.bottom = rcSegment.top + vsDraw.maxAscent + 1;
-						PRectangle rcCentral = rcCChar;
-						rcCentral.top++;
-						rcCentral.bottom--;
-						surface->FillRectangle(rcCentral, textFore);
-						PRectangle rcChar = rcCChar;
-						rcChar.left++;
-						rcChar.right--;
-						surface->DrawTextClipped(rcChar, ctrlCharsFont,
-						                         rcSegment.top + vsDraw.maxAscent, ctrlChar, istrlen(ctrlChar),
-						                         textBack, textFore);
-					} else {
-						char cc[2] = { static_cast<char>(controlCharSymbol), '\0' };
-						surface->DrawTextNoClip(rcSegment, ctrlCharsFont,
-						                        rcSegment.top + vsDraw.maxAscent,
-						                        cc, 1, textBack, textFore);
-					}
-				} else {
-					// Normal text display
-					if (vsDraw.styles[styleMain].visible) {
-						if (twoPhaseDraw) {
-							surface->DrawTextTransparent(rcSegment, textFont,
-							                             rcSegment.top + vsDraw.maxAscent, ll->chars + startseg,
-							                             i - startseg + 1, textFore);
-						} else {
-							surface->DrawTextNoClip(rcSegment, textFont,
-							                        rcSegment.top + vsDraw.maxAscent, ll->chars + startseg,
-							                        i - startseg + 1, textFore, textBack);
-						}
-					}
-					if (vsDraw.viewWhitespace != wsInvisible ||
-					        (inIndentation && vsDraw.viewIndentationGuides)) {
-						for (int cpos = 0; cpos <= i - startseg; cpos++) {
-							if (ll->chars[cpos + startseg] == ' ') {
-								if (vsDraw.viewWhitespace != wsInvisible) {
-									if (vsDraw.whitespaceForegroundSet)
-										textFore = vsDraw.whitespaceForeground.allocated;
-									if (!inIndentation || vsDraw.viewWhitespace == wsVisibleAlways) {
-										int xmid = (ll->positions[cpos + startseg] + ll->positions[cpos + startseg + 1]) / 2;
-										if (!twoPhaseDraw && drawWhitespaceBackground &&
-										        (!inIndentation || vsDraw.viewWhitespace == wsVisibleAlways)) {
-											textBack = vsDraw.whitespaceBackground.allocated;
-											PRectangle rcSpace(ll->positions[cpos + startseg] + xStart, rcSegment.top, ll->positions[cpos + startseg + 1] + xStart, rcSegment.bottom);
-											surface->FillRectangle(rcSpace, textBack);
-										}
-										PRectangle rcDot(xmid + xStart - subLineStart, rcSegment.top + vsDraw.lineHeight / 2, 0, 0);
-										rcDot.right = rcDot.left + 1;
-										rcDot.bottom = rcDot.top + 1;
-										surface->FillRectangle(rcDot, textFore);
-									}
-								}
-								if (inIndentation && vsDraw.viewIndentationGuides) {
-									int startSpace = ll->positions[cpos + startseg];
-									if (startSpace > 0 && (startSpace % indentWidth == 0)) {
-										DrawIndentGuide(surface, lineVisible, vsDraw.lineHeight, startSpace + xStart, rcSegment,
-										                (ll->xHighlightGuide == ll->positions[cpos + startseg]));
-									}
-								}
-							} else {
-								inIndentation = false;
-							}
-						}
-					}
-				}
-				if (ll->hsStart != -1 && vsDraw.hotspotUnderline && iDoc >= ll->hsStart && iDoc < ll->hsEnd ) {
-					PRectangle rcUL = rcSegment;
-					rcUL.top = rcUL.top + vsDraw.maxAscent + 1;
-					rcUL.bottom = rcUL.top + 1;
-					if (vsDraw.hotspotForegroundSet)
-						surface->FillRectangle(rcUL, vsDraw.hotspotForeground.allocated);
-					else
-						surface->FillRectangle(rcUL, textFore);
-				} else if (vsDraw.styles[styleMain].underline) {
-					PRectangle rcUL = rcSegment;
-					rcUL.top = rcUL.top + vsDraw.maxAscent + 1;
-					rcUL.bottom = rcUL.top + 1;
-					surface->FillRectangle(rcUL, textFore);
-				}
-			} else if (rcSegment.left > rcLine.right) {
-				break;
-			}
-			startseg = i + 1;
-		}
-	}
-
-	// Draw indicators
-	// foreach indicator...
-	for (int indicnum = 0, mask = 1 << pdoc->stylingBits; mask < 0x100; indicnum++) {
-		if (!(mask & ll->styleBitsSet)) {
-			mask <<= 1;
-			continue;
-		}
-		int startPos = -1;
-		// foreach style pos in line...
-		for (int indicPos = lineStart; indicPos <= lineEnd; indicPos++) {
-			// look for starts...
-			if (startPos < 0) {
-				// NOT in indicator run, looking for START
-				if (indicPos < lineEnd && (ll->indicators[indicPos] & mask))
-					startPos = indicPos;
-			}
-			// ... or ends
-			if (startPos >= 0) {
-				// IN indicator run, looking for END
-				if (indicPos >= lineEnd || !(ll->indicators[indicPos] & mask)) {
-					// AT end of indicator run, DRAW it!
-					PRectangle rcIndic(
-						ll->positions[startPos] + xStart - subLineStart,
-						rcLine.top + vsDraw.maxAscent,
-						ll->positions[indicPos] + xStart - subLineStart,
-						rcLine.top + vsDraw.maxAscent + 3);
-					vsDraw.indicators[indicnum].Draw(surface, rcIndic, rcLine);
-					// RESET control var
-					startPos = -1;
-				}
-			}
-		}
-		mask <<= 1;
-	}
-	// End of the drawing of the current line
-	if (!twoPhaseDraw) {
-		DrawEOL(surface, vsDraw, rcLine, ll, line, lineEnd,
-		        xStart, subLine, subLineStart, overrideBackground, background,
-		        drawWrapMarkEnd, vsDraw.whitespaceForeground.allocated);
-	}
-	if ((vsDraw.selAlpha != SC_ALPHA_NOALPHA) && (ll->selStart >= 0) && (ll->selEnd >= 0)) {
-		int startPosSel = (ll->selStart < posLineStart) ? posLineStart : ll->selStart;
-		int endPosSel = (ll->selEnd < (lineEnd + posLineStart)) ? ll->selEnd : (lineEnd + posLineStart);
-		if (startPosSel < endPosSel) {
-			rcSegment.left = xStart + ll->positions[startPosSel - posLineStart] - subLineStart;
-			rcSegment.right = xStart + ll->positions[endPosSel - posLineStart] - subLineStart;
-			SimpleAlphaRectangle(surface, rcSegment, SelectionBackground(vsDraw), vsDraw.selAlpha);
-		}
-	}
-
-	if (vsDraw.edgeState == EDGE_LINE) {
-		int edgeX = theEdge * vsDraw.spaceWidth;
-		rcSegment.left = edgeX + xStart;
-		rcSegment.right = rcSegment.left + 1;
-		surface->FillRectangle(rcSegment, vsDraw.edgecolour.allocated);
-	}
-
-	// Draw any translucent whole line states
-	rcSegment.left = xStart;
-	rcSegment.right = rcLine.right - 1;
-	if (caret.active && vsDraw.showCaretLineBackground && ll->containsCaret) {
-		SimpleAlphaRectangle(surface, rcSegment, vsDraw.caretLineBackground.allocated, vsDraw.caretLineAlpha);
-	}
-	int marks = pdoc->GetMark(line);
-	for (int markBit = 0; (markBit < 32) && marks; markBit++) {
-		if ((marks & 1) && (vsDraw.markers[markBit].markType == SC_MARK_BACKGROUND)) {
-			SimpleAlphaRectangle(surface, rcSegment, vsDraw.markers[markBit].back.allocated, vsDraw.markers[markBit].alpha);
-		}
-		marks >>= 1;
-	}
-	if (vsDraw.maskInLine) {
-		int marksMasked = pdoc->GetMark(line) & vsDraw.maskInLine;
-		if (marksMasked) {
-			for (int markBit = 0; (markBit < 32) && marksMasked; markBit++) {
-				if ((marksMasked & 1) && (vsDraw.markers[markBit].markType != SC_MARK_EMPTY)) {
-					SimpleAlphaRectangle(surface, rcSegment, vsDraw.markers[markBit].back.allocated, vsDraw.markers[markBit].alpha);
-				}
-				marksMasked >>= 1;
-			}
-		}
-	}
-}
-
-void Editor::RefreshPixMaps(Surface *surfaceWindow) {
-	if (!pixmapSelPattern->Initialised()) {
-		const int patternSize = 8;
-		pixmapSelPattern->InitPixMap(patternSize, patternSize, surfaceWindow, wMain.GetID());
-		// This complex procedure is to reproduce the checkerboard dithered pattern used by windows
-		// for scroll bars and Visual Studio for its selection margin. The colour of this pattern is half
-		// way between the chrome colour and the chrome highlight colour making a nice transition
-		// between the window chrome and the content area. And it works in low colour depths.
-		PRectangle rcPattern(0, 0, patternSize, patternSize);
-
-		// Initialize default colours based on the chrome colour scheme.  Typically the highlight is white.
-		ColourAllocated colourFMFill = vs.selbar.allocated;
-		ColourAllocated colourFMStripes = vs.selbarlight.allocated;
-
-		if (!(vs.selbarlight.desired == ColourDesired(0xff, 0xff, 0xff))) {
-			// User has chosen an unusual chrome colour scheme so just use the highlight edge colour.
-			// (Typically, the highlight colour is white.)
-			colourFMFill = vs.selbarlight.allocated;
-		}
-
-		if (vs.foldmarginColourSet) {
-			// override default fold margin colour
-			colourFMFill = vs.foldmarginColour.allocated;
-		}
-		if (vs.foldmarginHighlightColourSet) {
-			// override default fold margin highlight colour
-			colourFMStripes = vs.foldmarginHighlightColour.allocated;
-		}
-
-		pixmapSelPattern->FillRectangle(rcPattern, colourFMFill);
-		pixmapSelPattern->PenColour(colourFMStripes);
-		for (int stripe = 0; stripe < patternSize; stripe++) {
-			// Alternating 1 pixel stripes is same as checkerboard.
-			pixmapSelPattern->MoveTo(0, stripe * 2);
-			pixmapSelPattern->LineTo(patternSize, stripe * 2 - patternSize);
-		}
-	}
-
-	if (!pixmapIndentGuide->Initialised()) {
-		// 1 extra pixel in height so can handle odd/even positions and so produce a continuous line
-		pixmapIndentGuide->InitPixMap(1, vs.lineHeight + 1, surfaceWindow, wMain.GetID());
-		pixmapIndentGuideHighlight->InitPixMap(1, vs.lineHeight + 1, surfaceWindow, wMain.GetID());
-		PRectangle rcIG(0, 0, 1, vs.lineHeight);
-		pixmapIndentGuide->FillRectangle(rcIG, vs.styles[STYLE_INDENTGUIDE].back.allocated);
-		pixmapIndentGuide->PenColour(vs.styles[STYLE_INDENTGUIDE].fore.allocated);
-		pixmapIndentGuideHighlight->FillRectangle(rcIG, vs.styles[STYLE_BRACELIGHT].back.allocated);
-		pixmapIndentGuideHighlight->PenColour(vs.styles[STYLE_BRACELIGHT].fore.allocated);
-		for (int stripe = 1; stripe < vs.lineHeight + 1; stripe += 2) {
-			pixmapIndentGuide->MoveTo(0, stripe);
-			pixmapIndentGuide->LineTo(2, stripe);
-			pixmapIndentGuideHighlight->MoveTo(0, stripe);
-			pixmapIndentGuideHighlight->LineTo(2, stripe);
-		}
-	}
-
-	if (bufferedDraw) {
-		if (!pixmapLine->Initialised()) {
-			PRectangle rcClient = GetClientRectangle();
-			pixmapLine->InitPixMap(rcClient.Width(), vs.lineHeight,
-			                       surfaceWindow, wMain.GetID());
-			pixmapSelMargin->InitPixMap(vs.fixedColumnWidth,
-			                            rcClient.Height(), surfaceWindow, wMain.GetID());
-		}
-	}
-}
-
-void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) {
-	//Platform::DebugPrintf("Paint:%1d (%3d,%3d) ... (%3d,%3d)\n",
-	//	paintingAllText, rcArea.left, rcArea.top, rcArea.right, rcArea.bottom);
-
-	RefreshStyleData();
-	RefreshPixMaps(surfaceWindow);
-
-	PRectangle rcClient = GetClientRectangle();
-	//Platform::DebugPrintf("Client: (%3d,%3d) ... (%3d,%3d)   %d\n",
-	//	rcClient.left, rcClient.top, rcClient.right, rcClient.bottom);
-
-	surfaceWindow->SetPalette(&palette, true);
-	pixmapLine->SetPalette(&palette, !hasFocus);
-
-	int screenLinePaintFirst = rcArea.top / vs.lineHeight;
-	// The area to be painted plus one extra line is styled.
-	// The extra line is to determine when a style change, such as starting a comment flows on to other lines.
-	int lineStyleLast = topLine + (rcArea.bottom - 1) / vs.lineHeight + 1;
-	//Platform::DebugPrintf("Paint lines = %d .. %d\n", topLine + screenLinePaintFirst, lineStyleLast);
-	int endPosPaint = pdoc->Length();
-	if (lineStyleLast < cs.LinesDisplayed())
-		endPosPaint = pdoc->LineStart(cs.DocFromDisplay(lineStyleLast + 1));
-
-	int xStart = vs.fixedColumnWidth - xOffset;
-	int ypos = 0;
-	if (!bufferedDraw)
-		ypos += screenLinePaintFirst * vs.lineHeight;
-	int yposScreen = screenLinePaintFirst * vs.lineHeight;
-
-	// Ensure we are styled as far as we are painting.
-	pdoc->EnsureStyledTo(endPosPaint);
-	bool paintAbandonedByStyling = paintState == paintAbandoned;
-	if (needUpdateUI) {
-		NotifyUpdateUI();
-		needUpdateUI = false;
-		RefreshStyleData();
-		RefreshPixMaps(surfaceWindow);
-	}
-
-	// Call priority lines wrap on a window of lines which are likely
-	// to rendered with the following paint (that is wrap the visible
-	// 	lines first).
-	int startLineToWrap = cs.DocFromDisplay(topLine) - 5;
-	if (startLineToWrap < 0)
-		startLineToWrap = -1;
-	if (WrapLines(false, startLineToWrap)) {
-		// The wrapping process has changed the height of some lines so
-		// abandon this paint for a complete repaint.
-		if (AbandonPaint()) {
-			return;
-		}
-		RefreshPixMaps(surfaceWindow);	// In case pixmaps invalidated by scrollbar change
-	}
-	PLATFORM_ASSERT(pixmapSelPattern->Initialised());
-
-	PaintSelMargin(surfaceWindow, rcArea);
-
-	PRectangle rcRightMargin = rcClient;
-	rcRightMargin.left = rcRightMargin.right - vs.rightMarginWidth;
-	if (rcArea.Intersects(rcRightMargin)) {
-		surfaceWindow->FillRectangle(rcRightMargin, vs.styles[STYLE_DEFAULT].back.allocated);
-	}
-
-	if (paintState == paintAbandoned) {
-		// Either styling or NotifyUpdateUI noticed that painting is needed
-		// outside the current painting rectangle
-		//Platform::DebugPrintf("Abandoning paint\n");
-		if (wrapState != eWrapNone) {
-			if (paintAbandonedByStyling) {
-				// Styling has spilled over a line end, such as occurs by starting a multiline
-				// comment. The width of subsequent text may have changed, so rewrap.
-				NeedWrapping(cs.DocFromDisplay(topLine));
-			}
-		}
-		return;
-	}
-	//Platform::DebugPrintf("start display %d, offset = %d\n", pdoc->Length(), xOffset);
-
-	// Do the painting
-	if (rcArea.right > vs.fixedColumnWidth) {
-
-		Surface *surface = surfaceWindow;
-		if (bufferedDraw) {
-			surface = pixmapLine;
-			PLATFORM_ASSERT(pixmapLine->Initialised());
-		}
-		surface->SetUnicodeMode(IsUnicodeMode());
-		surface->SetDBCSMode(CodePage());
-
-		int visibleLine = topLine + screenLinePaintFirst;
-
-		int posCaret = currentPos;
-		if (posDrag >= 0)
-			posCaret = posDrag;
-		int lineCaret = pdoc->LineFromPosition(posCaret);
-
-		// Remove selection margin from drawing area so text will not be drawn
-		// on it in unbuffered mode.
-		PRectangle rcTextArea = rcClient;
-		rcTextArea.left = vs.fixedColumnWidth;
-		rcTextArea.right -= vs.rightMarginWidth;
-		surfaceWindow->SetClip(rcTextArea);
-
-		// Loop on visible lines
-		//double durLayout = 0.0;
-		//double durPaint = 0.0;
-		//double durCopy = 0.0;
-		//ElapsedTime etWhole;
-		int lineDocPrevious = -1;	// Used to avoid laying out one document line multiple times
-		AutoLineLayout ll(llc, 0);
-		SelectionLineIterator lineIterator(this);
-		while (visibleLine < cs.LinesDisplayed() && yposScreen < rcArea.bottom) {
-
-			int lineDoc = cs.DocFromDisplay(visibleLine);
-			// Only visible lines should be handled by the code within the loop
-			PLATFORM_ASSERT(cs.GetVisible(lineDoc));
-			int lineStartSet = cs.DisplayFromDoc(lineDoc);
-			int subLine = visibleLine - lineStartSet;
-
-			// Copy this line and its styles from the document into local arrays
-			// and determine the x position at which each character starts.
-			//ElapsedTime et;
-			if (lineDoc != lineDocPrevious) {
-				ll.Set(0);
-				// For rectangular selection this accesses the layout cache so should be after layout returned.
-				lineIterator.SetAt(lineDoc);
-				ll.Set(RetrieveLineLayout(lineDoc));
-				LayoutLine(lineDoc, surface, vs, ll, wrapWidth);
-				lineDocPrevious = lineDoc;
-			}
-			//durLayout += et.Duration(true);
-
-			if (ll) {
-				if (selType == selStream) {
-					ll->selStart = SelectionStart();
-					ll->selEnd = SelectionEnd();
-				} else {
-					ll->selStart = lineIterator.startPos;
-					ll->selEnd = lineIterator.endPos;
-				}
-				ll->containsCaret = lineDoc == lineCaret;
-				if (hideSelection) {
-					ll->selStart = -1;
-					ll->selEnd = -1;
-					ll->containsCaret = false;
-				}
-
-				GetHotSpotRange(ll->hsStart, ll->hsEnd);
-
-				PRectangle rcLine = rcClient;
-				rcLine.top = ypos;
-				rcLine.bottom = ypos + vs.lineHeight;
-
-				Range rangeLine(pdoc->LineStart(lineDoc), pdoc->LineStart(lineDoc + 1));
-				// Highlight the current braces if any
-				ll->SetBracesHighlight(rangeLine, braces, static_cast<char>(bracesMatchStyle),
-				                       highlightGuideColumn * vs.spaceWidth);
-
-				// Draw the line
-				DrawLine(surface, vs, lineDoc, visibleLine, xStart, rcLine, ll, subLine);
-				//durPaint += et.Duration(true);
-
-				// Restore the previous styles for the brace highlights in case layout is in cache.
-				ll->RestoreBracesHighlight(rangeLine, braces);
-
-				bool expanded = cs.GetExpanded(lineDoc);
-				if ((foldFlags & SC_FOLDFLAG_BOX) == 0) {
-					// Paint the line above the fold
-					if ((expanded && (foldFlags & SC_FOLDFLAG_LINEBEFORE_EXPANDED))
-					        ||
-					        (!expanded && (foldFlags & SC_FOLDFLAG_LINEBEFORE_CONTRACTED))) {
-						if (pdoc->GetLevel(lineDoc) & SC_FOLDLEVELHEADERFLAG) {
-							PRectangle rcFoldLine = rcLine;
-							rcFoldLine.bottom = rcFoldLine.top + 1;
-							surface->FillRectangle(rcFoldLine, vs.styles[STYLE_DEFAULT].fore.allocated);
-						}
-					}
-					// Paint the line below the fold
-					if ((expanded && (foldFlags & SC_FOLDFLAG_LINEAFTER_EXPANDED))
-					        ||
-					        (!expanded && (foldFlags & SC_FOLDFLAG_LINEAFTER_CONTRACTED))) {
-						if (pdoc->GetLevel(lineDoc) & SC_FOLDLEVELHEADERFLAG) {
-							PRectangle rcFoldLine = rcLine;
-							rcFoldLine.top = rcFoldLine.bottom - 1;
-							surface->FillRectangle(rcFoldLine, vs.styles[STYLE_DEFAULT].fore.allocated);
-						}
-					}
-				} else {
-					int FoldLevelCurr = (pdoc->GetLevel(lineDoc) & SC_FOLDLEVELNUMBERMASK) - SC_FOLDLEVELBASE;
-					int FoldLevelPrev = (pdoc->GetLevel(lineDoc - 1) & SC_FOLDLEVELNUMBERMASK) - SC_FOLDLEVELBASE;
-					int FoldLevelFlags = (pdoc->GetLevel(lineDoc) & ~SC_FOLDLEVELNUMBERMASK) & ~(0xFFF0000);
-					int indentationStep = pdoc->IndentSize();
-					// Draw line above fold
-					if ((FoldLevelPrev < FoldLevelCurr)
-					        ||
-					        (FoldLevelFlags & SC_FOLDLEVELBOXHEADERFLAG
-					         &&
-					         (pdoc->GetLevel(lineDoc - 1) & SC_FOLDLEVELBOXFOOTERFLAG) == 0)) {
-						PRectangle rcFoldLine = rcLine;
-						rcFoldLine.bottom = rcFoldLine.top + 1;
-						rcFoldLine.left += xStart + FoldLevelCurr * vs.spaceWidth * indentationStep - 1;
-						surface->FillRectangle(rcFoldLine, vs.styles[STYLE_DEFAULT].fore.allocated);
-					}
-
-					// Line below the fold (or below a contracted fold)
-					if (FoldLevelFlags & SC_FOLDLEVELBOXFOOTERFLAG
-					        ||
-					        (!expanded && (foldFlags & SC_FOLDFLAG_LINEAFTER_CONTRACTED))) {
-						PRectangle rcFoldLine = rcLine;
-						rcFoldLine.top = rcFoldLine.bottom - 1;
-						rcFoldLine.left += xStart + (FoldLevelCurr) * vs.spaceWidth * indentationStep - 1;
-						surface->FillRectangle(rcFoldLine, vs.styles[STYLE_DEFAULT].fore.allocated);
-					}
-
-					PRectangle rcBoxLine = rcLine;
-					// Draw vertical line for every fold level
-					for (int i = 0; i <= FoldLevelCurr; i++) {
-						rcBoxLine.left = xStart + i * vs.spaceWidth * indentationStep - 1;
-						rcBoxLine.right = rcBoxLine.left + 1;
-						surface->FillRectangle(rcBoxLine, vs.styles[STYLE_DEFAULT].fore.allocated);
-					}
-				}
-
-				// Draw the Caret
-				if (lineDoc == lineCaret) {
-					int offset = Platform::Minimum(posCaret - rangeLine.start, ll->maxLineLength);
-					if ((offset >= ll->LineStart(subLine)) &&
-					        ((offset < ll->LineStart(subLine + 1)) || offset == ll->numCharsInLine)) {
-						int xposCaret = ll->positions[offset] - ll->positions[ll->LineStart(subLine)] + xStart;
-
-						if (actualWrapVisualStartIndent != 0) {
-							int lineStart = ll->LineStart(subLine);
-							if (lineStart != 0)	// Wrapped
-								xposCaret += actualWrapVisualStartIndent * vs.aveCharWidth;
-						}
-						int widthOverstrikeCaret;
-						if (posCaret == pdoc->Length())	{   // At end of document
-							widthOverstrikeCaret = vs.aveCharWidth;
-						} else if ((posCaret - rangeLine.start) >= ll->numCharsInLine) {	// At end of line
-							widthOverstrikeCaret = vs.aveCharWidth;
-						} else {
-							widthOverstrikeCaret = ll->positions[offset + 1] - ll->positions[offset];
-						}
-						if (widthOverstrikeCaret < 3)	// Make sure its visible
-							widthOverstrikeCaret = 3;
-						if (((caret.active && caret.on) || (posDrag >= 0)) && xposCaret >= 0) {
-							PRectangle rcCaret = rcLine;
-							int caretWidthOffset = 0;
-							if ((offset > 0) && (vs.caretWidth > 1))
-								caretWidthOffset = 1;	// Move back so overlaps both character cells.
-							if (posDrag >= 0) {
-								rcCaret.left = xposCaret - caretWidthOffset;
-								rcCaret.right = rcCaret.left + vs.caretWidth;
-							} else {
-								if (inOverstrike) {
-									rcCaret.top = rcCaret.bottom - 2;
-									rcCaret.left = xposCaret + 1;
-									rcCaret.right = rcCaret.left + widthOverstrikeCaret - 1;
-								} else {
-									rcCaret.left = xposCaret - caretWidthOffset;
-									rcCaret.right = rcCaret.left + vs.caretWidth;
-								}
-							}
-							surface->FillRectangle(rcCaret, vs.caretcolour.allocated);
-						}
-					}
-				}
-
-				if (bufferedDraw) {
-					Point from(vs.fixedColumnWidth, 0);
-					PRectangle rcCopyArea(vs.fixedColumnWidth, yposScreen,
-					                      rcClient.right, yposScreen + vs.lineHeight);
-					surfaceWindow->Copy(rcCopyArea, from, *pixmapLine);
-				}
-				//durCopy += et.Duration(true);
-			}
-
-			if (!bufferedDraw) {
-				ypos += vs.lineHeight;
-			}
-
-			yposScreen += vs.lineHeight;
-			visibleLine++;
-			//gdk_flush();
-		}
-		ll.Set(0);
-		//if (durPaint < 0.00000001)
-		//	durPaint = 0.00000001;
-
-		// Right column limit indicator
-		PRectangle rcBeyondEOF = rcClient;
-		rcBeyondEOF.left = vs.fixedColumnWidth;
-		rcBeyondEOF.right = rcBeyondEOF.right;
-		rcBeyondEOF.top = (cs.LinesDisplayed() - topLine) * vs.lineHeight;
-		if (rcBeyondEOF.top < rcBeyondEOF.bottom) {
-			surfaceWindow->FillRectangle(rcBeyondEOF, vs.styles[STYLE_DEFAULT].back.allocated);
-			if (vs.edgeState == EDGE_LINE) {
-				int edgeX = theEdge * vs.spaceWidth;
-				rcBeyondEOF.left = edgeX + xStart;
-				rcBeyondEOF.right = rcBeyondEOF.left + 1;
-				surfaceWindow->FillRectangle(rcBeyondEOF, vs.edgecolour.allocated);
-			}
-		}
-		//Platform::DebugPrintf(
-		//"Layout:%9.6g    Paint:%9.6g    Ratio:%9.6g   Copy:%9.6g   Total:%9.6g\n",
-		//durLayout, durPaint, durLayout / durPaint, durCopy, etWhole.Duration());
-		NotifyPainted();
-	}
-}
-
-// Space (3 space characters) between line numbers and text when printing.
-#define lineNumberPrintSpace "   "
-
-ColourDesired InvertedLight(ColourDesired orig) {
-	unsigned int r = orig.GetRed();
-	unsigned int g = orig.GetGreen();
-	unsigned int b = orig.GetBlue();
-	unsigned int l = (r + g + b) / 3; 	// There is a better calculation for this that matches human eye
-	unsigned int il = 0xff - l;
-	if (l == 0)
-		return ColourDesired(0xff, 0xff, 0xff);
-	r = r * il / l;
-	g = g * il / l;
-	b = b * il / l;
-	return ColourDesired(Platform::Minimum(r, 0xff), Platform::Minimum(g, 0xff), Platform::Minimum(b, 0xff));
-}
-
-// This is mostly copied from the Paint method but with some things omitted
-// such as the margin markers, line numbers, selection and caret
-// Should be merged back into a combined Draw method.
-long Editor::FormatRange(bool draw, RangeToFormat *pfr) {
-	if (!pfr)
-		return 0;
-
-	AutoSurface surface(pfr->hdc, this);
-	if (!surface)
-		return 0;
-	AutoSurface surfaceMeasure(pfr->hdcTarget, this);
-	if (!surfaceMeasure) {
-		return 0;
-	}
-
-	ViewStyle vsPrint(vs);
-
-	// Modify the view style for printing as do not normally want any of the transient features to be printed
-	// Printing supports only the line number margin.
-	int lineNumberIndex = -1;
-	for (int margin = 0; margin < ViewStyle::margins; margin++) {
-		if ((vsPrint.ms[margin].style == SC_MARGIN_NUMBER) && (vsPrint.ms[margin].width > 0)) {
-			lineNumberIndex = margin;
-		} else {
-			vsPrint.ms[margin].width = 0;
-		}
-	}
-	vsPrint.showMarkedLines = false;
-	vsPrint.fixedColumnWidth = 0;
-	vsPrint.zoomLevel = printMagnification;
-	vsPrint.viewIndentationGuides = false;
-	// Don't show the selection when printing
-	vsPrint.selbackset = false;
-	vsPrint.selforeset = false;
-	vsPrint.selAlpha = SC_ALPHA_NOALPHA;
-	vsPrint.whitespaceBackgroundSet = false;
-	vsPrint.whitespaceForegroundSet = false;
-	vsPrint.showCaretLineBackground = false;
-
-	// Set colours for printing according to users settings
-	for (int sty = 0;sty <= STYLE_MAX;sty++) {
-		if (printColourMode == SC_PRINT_INVERTLIGHT) {
-			vsPrint.styles[sty].fore.desired = InvertedLight(vsPrint.styles[sty].fore.desired);
-			vsPrint.styles[sty].back.desired = InvertedLight(vsPrint.styles[sty].back.desired);
-		} else if (printColourMode == SC_PRINT_BLACKONWHITE) {
-			vsPrint.styles[sty].fore.desired = ColourDesired(0, 0, 0);
-			vsPrint.styles[sty].back.desired = ColourDesired(0xff, 0xff, 0xff);
-		} else if (printColourMode == SC_PRINT_COLOURONWHITE) {
-			vsPrint.styles[sty].back.desired = ColourDesired(0xff, 0xff, 0xff);
-		} else if (printColourMode == SC_PRINT_COLOURONWHITEDEFAULTBG) {
-			if (sty <= STYLE_DEFAULT) {
-				vsPrint.styles[sty].back.desired = ColourDesired(0xff, 0xff, 0xff);
-			}
-		}
-	}
-	// White background for the line numbers
-	vsPrint.styles[STYLE_LINENUMBER].back.desired = ColourDesired(0xff, 0xff, 0xff);
-
-	vsPrint.Refresh(*surfaceMeasure);
-	// Ensure colours are set up
-	vsPrint.RefreshColourPalette(palette, true);
-	vsPrint.RefreshColourPalette(palette, false);
-	// Determining width must hapen after fonts have been realised in Refresh
-	int lineNumberWidth = 0;
-	if (lineNumberIndex >= 0) {
-		lineNumberWidth = surfaceMeasure->WidthText(vsPrint.styles[STYLE_LINENUMBER].font,
-		                  "99999" lineNumberPrintSpace, 5 + istrlen(lineNumberPrintSpace));
-		vsPrint.ms[lineNumberIndex].width = lineNumberWidth;
-	}
-
-	int linePrintStart = pdoc->LineFromPosition(pfr->chrg.cpMin);
-	int linePrintLast = linePrintStart + (pfr->rc.bottom - pfr->rc.top) / vsPrint.lineHeight - 1;
-	if (linePrintLast < linePrintStart)
-		linePrintLast = linePrintStart;
-	int linePrintMax = pdoc->LineFromPosition(pfr->chrg.cpMax);
-	if (linePrintLast > linePrintMax)
-		linePrintLast = linePrintMax;
-	//Platform::DebugPrintf("Formatting lines=[%0d,%0d,%0d] top=%0d bottom=%0d line=%0d %0d\n",
-	//      linePrintStart, linePrintLast, linePrintMax, pfr->rc.top, pfr->rc.bottom, vsPrint.lineHeight,
-	//      surfaceMeasure->Height(vsPrint.styles[STYLE_LINENUMBER].font));
-	int endPosPrint = pdoc->Length();
-	if (linePrintLast < pdoc->LinesTotal())
-		endPosPrint = pdoc->LineStart(linePrintLast + 1);
-
-	// Ensure we are styled to where we are formatting.
-	pdoc->EnsureStyledTo(endPosPrint);
-
-	int xStart = vsPrint.fixedColumnWidth + pfr->rc.left + lineNumberWidth;
-	int ypos = pfr->rc.top;
-
-	int lineDoc = linePrintStart;
-
-	int nPrintPos = pfr->chrg.cpMin;
-	int visibleLine = 0;
-	int widthPrint = pfr->rc.Width() - lineNumberWidth;
-	if (printWrapState == eWrapNone)
-		widthPrint = LineLayout::wrapWidthInfinite;
-
-	while (lineDoc <= linePrintLast && ypos < pfr->rc.bottom) {
-
-		// When printing, the hdc and hdcTarget may be the same, so
-		// changing the state of surfaceMeasure may change the underlying
-		// state of surface. Therefore, any cached state is discarded before
-		// using each surface.
-		surfaceMeasure->FlushCachedState();
-
-		// Copy this line and its styles from the document into local arrays
-		// and determine the x position at which each character starts.
-		LineLayout ll(8000);
-		LayoutLine(lineDoc, surfaceMeasure, vsPrint, &ll, widthPrint);
-
-		ll.selStart = -1;
-		ll.selEnd = -1;
-		ll.containsCaret = false;
-
-		PRectangle rcLine;
-		rcLine.left = pfr->rc.left + lineNumberWidth;
-		rcLine.top = ypos;
-		rcLine.right = pfr->rc.right - 1;
-		rcLine.bottom = ypos + vsPrint.lineHeight;
-
-		// When document line is wrapped over multiple display lines, find where
-		// to start printing from to ensure a particular position is on the first
-		// line of the page.
-		if (visibleLine == 0) {
-			int startWithinLine = nPrintPos - pdoc->LineStart(lineDoc);
-			for (int iwl = 0; iwl < ll.lines - 1; iwl++) {
-				if (ll.LineStart(iwl) <= startWithinLine && ll.LineStart(iwl + 1) >= startWithinLine) {
-					visibleLine = -iwl;
-				}
-			}
-
-			if (ll.lines > 1 && startWithinLine >= ll.LineStart(ll.lines - 1)) {
-				visibleLine = -(ll.lines - 1);
-			}
-		}
-
-		if (draw && lineNumberWidth &&
-		        (ypos + vsPrint.lineHeight <= pfr->rc.bottom) &&
-		        (visibleLine >= 0)) {
-			char number[100];
-			sprintf(number, "%d" lineNumberPrintSpace, lineDoc + 1);
-			PRectangle rcNumber = rcLine;
-			rcNumber.right = rcNumber.left + lineNumberWidth;
-			// Right justify
-			rcNumber.left -= surfaceMeasure->WidthText(
-			                     vsPrint.styles[STYLE_LINENUMBER].font, number, istrlen(number));
-			surface->FlushCachedState();
-			surface->DrawTextNoClip(rcNumber, vsPrint.styles[STYLE_LINENUMBER].font,
-			                        ypos + vsPrint.maxAscent, number, istrlen(number),
-			                        vsPrint.styles[STYLE_LINENUMBER].fore.allocated,
-			                        vsPrint.styles[STYLE_LINENUMBER].back.allocated);
-		}
-
-		// Draw the line
-		surface->FlushCachedState();
-
-		for (int iwl = 0; iwl < ll.lines; iwl++) {
-			if (ypos + vsPrint.lineHeight <= pfr->rc.bottom) {
-				if (visibleLine >= 0) {
-					if (draw) {
-						rcLine.top = ypos;
-						rcLine.bottom = ypos + vsPrint.lineHeight;
-						DrawLine(surface, vsPrint, lineDoc, visibleLine, xStart, rcLine, &ll, iwl);
-					}
-					ypos += vsPrint.lineHeight;
-				}
-				visibleLine++;
-				if (iwl == ll.lines - 1)
-					nPrintPos = pdoc->LineStart(lineDoc + 1);
-				else
-					nPrintPos += ll.LineStart(iwl + 1) - ll.LineStart(iwl);
-			}
-		}
-
-		++lineDoc;
-	}
-
-	return nPrintPos;
-}
-
-int Editor::TextWidth(int style, const char *text) {
-	RefreshStyleData();
-	AutoSurface surface(this);
-	if (surface) {
-		return surface->WidthText(vs.styles[style].font, text, istrlen(text));
-	} else {
-		return 1;
-	}
-}
-
-// Empty method is overridden on GTK+ to show / hide scrollbars
-void Editor::ReconfigureScrollBars() {}
-
-void Editor::SetScrollBars() {
-	RefreshStyleData();
-
-	int nMax = MaxScrollPos();
-	int nPage = LinesOnScreen();
-	bool modified = ModifyScrollBars(nMax + nPage - 1, nPage);
-	if (modified) {
-		DwellEnd(true);
-	}
-
-	// TODO: ensure always showing as many lines as possible
-	// May not be, if, for example, window made larger
-	if (topLine > MaxScrollPos()) {
-		SetTopLine(Platform::Clamp(topLine, 0, MaxScrollPos()));
-		SetVerticalScrollPos();
-		Redraw();
-	}
-	if (modified) {
-		if (!AbandonPaint())
-			Redraw();
-	}
-	//Platform::DebugPrintf("end max = %d page = %d\n", nMax, nPage);
-}
-
-void Editor::ChangeSize() {
-	DropGraphics();
-	SetScrollBars();
-	if (wrapState != eWrapNone) {
-		PRectangle rcTextArea = GetClientRectangle();
-		rcTextArea.left = vs.fixedColumnWidth;
-		rcTextArea.right -= vs.rightMarginWidth;
-		if (wrapWidth != rcTextArea.Width()) {
-			NeedWrapping();
-			Redraw();
-		}
-	}
-}
-
-void Editor::AddChar(char ch) {
-	char s[2];
-	s[0] = ch;
-	s[1] = '\0';
-	AddCharUTF(s, 1);
-}
-
-void Editor::AddCharUTF(char *s, unsigned int len, bool treatAsDBCS) {
-	bool wasSelection = currentPos != anchor;
-	ClearSelection();
-	bool charReplaceAction = false;
-	if (inOverstrike && !wasSelection && !RangeContainsProtected(currentPos, currentPos + 1)) {
-		if (currentPos < (pdoc->Length())) {
-			if (!IsEOLChar(pdoc->CharAt(currentPos))) {
-				charReplaceAction = true;
-				pdoc->BeginUndoAction();
-				pdoc->DelChar(currentPos);
-			}
-		}
-	}
-	if (pdoc->InsertString(currentPos, s, len)) {
-		SetEmptySelection(currentPos + len);
-	}
-	if (charReplaceAction) {
-		pdoc->EndUndoAction();
-	}
-	EnsureCaretVisible();
-	// Avoid blinking during rapid typing:
-	ShowCaretAtCurrentPosition();
-	if (!caretSticky) {
-		SetLastXChosen();
-	}
-
-	if (treatAsDBCS) {
-		NotifyChar((static_cast<unsigned char>(s[0]) << 8) |
-		           static_cast<unsigned char>(s[1]));
-	} else {
-		int byte = static_cast<unsigned char>(s[0]);
-		if ((byte < 0xC0) || (1 == len)) {
-			// Handles UTF-8 characters between 0x01 and 0x7F and single byte
-			// characters when not in UTF-8 mode.
-			// Also treats \0 and naked trail bytes 0x80 to 0xBF as valid
-			// characters representing themselves.
-		} else {
-			// Unroll 1 to 3 byte UTF-8 sequences.  See reference data at:
-			// http://www.cl.cam.ac.uk/~mgk25/unicode.html
-			// http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt
-			if (byte < 0xE0) {
-				int byte2 = static_cast<unsigned char>(s[1]);
-				if ((byte2 & 0xC0) == 0x80) {
-					// Two-byte-character lead-byte followed by a trail-byte.
-					byte = (((byte & 0x1F) << 6) | (byte2 & 0x3F));
-				}
-				// A two-byte-character lead-byte not followed by trail-byte
-				// represents itself.
-			} else if (byte < 0xF0) {
-				int byte2 = static_cast<unsigned char>(s[1]);
-				int byte3 = static_cast<unsigned char>(s[2]);
-				if (((byte2 & 0xC0) == 0x80) && ((byte3 & 0xC0) == 0x80)) {
-					// Three-byte-character lead byte followed by two trail bytes.
-					byte = (((byte & 0x0F) << 12) | ((byte2 & 0x3F) << 6) |
-					        (byte3 & 0x3F));
-				}
-				// A three-byte-character lead-byte not followed by two trail-bytes
-				// represents itself.
-			}
-		}
-		NotifyChar(byte);
-	}
-}
-
-void Editor::ClearSelection() {
-	if (!SelectionContainsProtected()) {
-		int startPos = SelectionStart();
-		if (selType == selStream) {
-			unsigned int chars = SelectionEnd() - startPos;
-			if (0 != chars) {
-				pdoc->BeginUndoAction();
-				pdoc->DeleteChars(startPos, chars);
-				pdoc->EndUndoAction();
-			}
-		} else {
-			pdoc->BeginUndoAction();
-			SelectionLineIterator lineIterator(this, false);
-			while (lineIterator.Iterate()) {
-				startPos = lineIterator.startPos;
-				unsigned int chars = lineIterator.endPos - startPos;
-				if (0 != chars) {
-					pdoc->DeleteChars(startPos, chars);
-				}
-			}
-			pdoc->EndUndoAction();
-			selType = selStream;
-		}
-		SetEmptySelection(startPos);
-	}
-}
-
-void Editor::ClearAll() {
-	pdoc->BeginUndoAction();
-	if (0 != pdoc->Length()) {
-		pdoc->DeleteChars(0, pdoc->Length());
-	}
-	if (!pdoc->IsReadOnly()) {
-		cs.Clear();
-	}
-	pdoc->EndUndoAction();
-	anchor = 0;
-	currentPos = 0;
-	SetTopLine(0);
-	SetVerticalScrollPos();
-	InvalidateStyleRedraw();
-}
-
-void Editor::ClearDocumentStyle() {
-	pdoc->StartStyling(0, '\377');
-	pdoc->SetStyleFor(pdoc->Length(), 0);
-	cs.ShowAll();
-	pdoc->ClearLevels();
-}
-
-void Editor::Cut() {
-	if (!pdoc->IsReadOnly() && !SelectionContainsProtected()) {
-		Copy();
-		ClearSelection();
-	}
-}
-
-void Editor::PasteRectangular(int pos, const char *ptr, int len) {
-	if (pdoc->IsReadOnly() || SelectionContainsProtected()) {
-		return;
-	}
-	currentPos = pos;
-	int xInsert = XFromPosition(currentPos);
-	int line = pdoc->LineFromPosition(currentPos);
-	bool prevCr = false;
-	pdoc->BeginUndoAction();
-	for (int i = 0; i < len; i++) {
-		if (IsEOLChar(ptr[i])) {
-			if ((ptr[i] == '\r') || (!prevCr))
-				line++;
-			if (line >= pdoc->LinesTotal()) {
-				if (pdoc->eolMode != SC_EOL_LF)
-					pdoc->InsertChar(pdoc->Length(), '\r');
-				if (pdoc->eolMode != SC_EOL_CR)
-					pdoc->InsertChar(pdoc->Length(), '\n');
-			}
-			// Pad the end of lines with spaces if required
-			currentPos = PositionFromLineX(line, xInsert);
-			if ((XFromPosition(currentPos) < xInsert) && (i + 1 < len)) {
-				for (int i = 0; i < xInsert - XFromPosition(currentPos); i++) {
-					pdoc->InsertChar(currentPos, ' ');
-					currentPos++;
-				}
-			}
-			prevCr = ptr[i] == '\r';
-		} else {
-			pdoc->InsertString(currentPos, ptr + i, 1);
-			currentPos++;
-			prevCr = false;
-		}
-	}
-	pdoc->EndUndoAction();
-	SetEmptySelection(pos);
-}
-
-bool Editor::CanPaste() {
-	return !pdoc->IsReadOnly() && !SelectionContainsProtected();
-}
-
-void Editor::Clear() {
-	if (currentPos == anchor) {
-		if (!RangeContainsProtected(currentPos, currentPos + 1)) {
-			DelChar();
-		}
-	} else {
-		ClearSelection();
-	}
-	SetEmptySelection(currentPos);
-}
-
-void Editor::SelectAll() {
-	SetSelection(0, pdoc->Length());
-	Redraw();
-}
-
-void Editor::Undo() {
-	if (pdoc->CanUndo()) {
-		InvalidateCaret();
-		int newPos = pdoc->Undo();
-		if (newPos >= 0)
-			SetEmptySelection(newPos);
-		EnsureCaretVisible();
-	}
-}
-
-void Editor::Redo() {
-	if (pdoc->CanRedo()) {
-		int newPos = pdoc->Redo();
-		if (newPos >= 0)
-			SetEmptySelection(newPos);
-		EnsureCaretVisible();
-	}
-}
-
-void Editor::DelChar() {
-	if (!RangeContainsProtected(currentPos, currentPos + 1)) {
-		pdoc->DelChar(currentPos);
-	}
-	// Avoid blinking during rapid typing:
-	ShowCaretAtCurrentPosition();
-}
-
-void Editor::DelCharBack(bool allowLineStartDeletion) {
-	if (currentPos == anchor) {
-		if (!RangeContainsProtected(currentPos - 1, currentPos)) {
-			int lineCurrentPos = pdoc->LineFromPosition(currentPos);
-			if (allowLineStartDeletion || (pdoc->LineStart(lineCurrentPos) != currentPos)) {
-				if (pdoc->GetColumn(currentPos) <= pdoc->GetLineIndentation(lineCurrentPos) &&
-				        pdoc->GetColumn(currentPos) > 0 && pdoc->backspaceUnindents) {
-					pdoc->BeginUndoAction();
-					int indentation = pdoc->GetLineIndentation(lineCurrentPos);
-					int indentationStep = pdoc->IndentSize();
-					if (indentation % indentationStep == 0) {
-						pdoc->SetLineIndentation(lineCurrentPos, indentation - indentationStep);
-					} else {
-						pdoc->SetLineIndentation(lineCurrentPos, indentation - (indentation % indentationStep));
-					}
-					SetEmptySelection(pdoc->GetLineIndentPosition(lineCurrentPos));
-					pdoc->EndUndoAction();
-				} else {
-					pdoc->DelCharBack(currentPos);
-				}
-			}
-		}
-	} else {
-		ClearSelection();
-		SetEmptySelection(currentPos);
-	}
-	// Avoid blinking during rapid typing:
-	ShowCaretAtCurrentPosition();
-}
-
-void Editor::NotifyFocus(bool) {}
-
-void Editor::NotifyStyleToNeeded(int endStyleNeeded) {
-	SCNotification scn = {0};
-	scn.nmhdr.code = SCN_STYLENEEDED;
-	scn.position = endStyleNeeded;
-	NotifyParent(scn);
-}
-
-void Editor::NotifyStyleNeeded(Document*, void *, int endStyleNeeded) {
-	NotifyStyleToNeeded(endStyleNeeded);
-}
-
-void Editor::NotifyChar(int ch) {
-	SCNotification scn = {0};
-	scn.nmhdr.code = SCN_CHARADDED;
-	scn.ch = ch;
-	NotifyParent(scn);
-	if (recordingMacro) {
-		char txt[2];
-		txt[0] = static_cast<char>(ch);
-		txt[1] = '\0';
-		NotifyMacroRecord(SCI_REPLACESEL, 0, reinterpret_cast<sptr_t>(txt));
-	}
-}
-
-void Editor::NotifySavePoint(bool isSavePoint) {
-	SCNotification scn = {0};
-	if (isSavePoint) {
-		scn.nmhdr.code = SCN_SAVEPOINTREACHED;
-	} else {
-		scn.nmhdr.code = SCN_SAVEPOINTLEFT;
-	}
-	NotifyParent(scn);
-}
-
-void Editor::NotifyModifyAttempt() {
-	SCNotification scn = {0};
-	scn.nmhdr.code = SCN_MODIFYATTEMPTRO;
-	NotifyParent(scn);
-}
-
-void Editor::NotifyDoubleClick(Point, bool) {
-	SCNotification scn = {0};
-	scn.nmhdr.code = SCN_DOUBLECLICK;
-	NotifyParent(scn);
-}
-
-void Editor::NotifyHotSpotDoubleClicked(int position, bool shift, bool ctrl, bool alt) {
-	SCNotification scn = {0};
-	scn.nmhdr.code = SCN_HOTSPOTDOUBLECLICK;
-	scn.position = position;
-	scn.modifiers = (shift ? SCI_SHIFT : 0) | (ctrl ? SCI_CTRL : 0) |
-	                (alt ? SCI_ALT : 0);
-	NotifyParent(scn);
-}
-
-void Editor::NotifyHotSpotClicked(int position, bool shift, bool ctrl, bool alt) {
-	SCNotification scn = {0};
-	scn.nmhdr.code = SCN_HOTSPOTCLICK;
-	scn.position = position;
-	scn.modifiers = (shift ? SCI_SHIFT : 0) | (ctrl ? SCI_CTRL : 0) |
-	                (alt ? SCI_ALT : 0);
-	NotifyParent(scn);
-}
-
-void Editor::NotifyUpdateUI() {
-	SCNotification scn = {0};
-	scn.nmhdr.code = SCN_UPDATEUI;
-	NotifyParent(scn);
-}
-
-void Editor::NotifyPainted() {
-	SCNotification scn = {0};
-	scn.nmhdr.code = SCN_PAINTED;
-	NotifyParent(scn);
-}
-
-bool Editor::NotifyMarginClick(Point pt, bool shift, bool ctrl, bool alt) {
-	int marginClicked = -1;
-	int x = 0;
-	for (int margin = 0; margin < ViewStyle::margins; margin++) {
-		if ((pt.x > x) && (pt.x < x + vs.ms[margin].width))
-			marginClicked = margin;
-		x += vs.ms[margin].width;
-	}
-	if ((marginClicked >= 0) && vs.ms[marginClicked].sensitive) {
-		SCNotification scn = {0};
-		scn.nmhdr.code = SCN_MARGINCLICK;
-		scn.modifiers = (shift ? SCI_SHIFT : 0) | (ctrl ? SCI_CTRL : 0) |
-		                (alt ? SCI_ALT : 0);
-		scn.position = pdoc->LineStart(LineFromLocation(pt));
-		scn.margin = marginClicked;
-		NotifyParent(scn);
-		return true;
-	} else {
-		return false;
-	}
-}
-
-void Editor::NotifyNeedShown(int pos, int len) {
-	SCNotification scn = {0};
-	scn.nmhdr.code = SCN_NEEDSHOWN;
-	scn.position = pos;
-	scn.length = len;
-	NotifyParent(scn);
-}
-
-void Editor::NotifyDwelling(Point pt, bool state) {
-	SCNotification scn = {0};
-	scn.nmhdr.code = state ? SCN_DWELLSTART : SCN_DWELLEND;
-	scn.position = PositionFromLocationClose(pt);
-	scn.x = pt.x;
-	scn.y = pt.y;
-	NotifyParent(scn);
-}
-
-void Editor::NotifyZoom() {
-	SCNotification scn = {0};
-	scn.nmhdr.code = SCN_ZOOM;
-	NotifyParent(scn);
-}
-
-// Notifications from document
-void Editor::NotifyModifyAttempt(Document*, void *) {
-	//Platform::DebugPrintf("** Modify Attempt\n");
-	NotifyModifyAttempt();
-}
-
-void Editor::NotifyMove(int position) {
-	SCNotification scn = {0};
-	scn.nmhdr.code = SCN_POSCHANGED;
-	scn.position = position;
-	NotifyParent(scn);
-}
-
-void Editor::NotifySavePoint(Document*, void *, bool atSavePoint) {
-	//Platform::DebugPrintf("** Save Point %s\n", atSavePoint ? "On" : "Off");
-	NotifySavePoint(atSavePoint);
-}
-
-void Editor::CheckModificationForWrap(DocModification mh) {
-	if (mh.modificationType & (SC_MOD_INSERTTEXT|SC_MOD_DELETETEXT)) {
-		llc.Invalidate(LineLayout::llCheckTextAndStyle);
-		if (wrapState != eWrapNone) {
-			int lineDoc = pdoc->LineFromPosition(mh.position);
-			int lines = Platform::Maximum(0, mh.linesAdded);
-			NeedWrapping(lineDoc, lineDoc + lines + 1);
-		}
-	}
-}
-
-// Move a position so it is still after the same character as before the insertion.
-static inline int MovePositionForInsertion(int position, int startInsertion, int length) {
-	if (position > startInsertion) {
-		return position + length;
-	}
-	return position;
-}
-
-// Move a position so it is still after the same character as before the deletion if that
-// character is still present else after the previous surviving character.
-static inline int MovePositionForDeletion(int position, int startDeletion, int length) {
-	if (position > startDeletion) {
-		int endDeletion = startDeletion + length;
-		if (position > endDeletion) {
-			return position - length;
-		} else {
-			return startDeletion;
-		}
-	} else {
-		return position;
-	}
-}
-
-void Editor::NotifyModified(Document*, DocModification mh, void *) {
-	needUpdateUI = true;
-	if (paintState == painting) {
-		CheckForChangeOutsidePaint(Range(mh.position, mh.position + mh.length));
-	}
-	if (mh.modificationType & SC_MOD_CHANGESTYLE) {
-		pdoc->IncrementStyleClock();
-		if (paintState == notPainting) {
-			if (mh.position < pdoc->LineStart(topLine)) {
-				// Styling performed before this view
-				Redraw();
-			} else {
-				InvalidateRange(mh.position, mh.position + mh.length);
-			}
-		}
-		llc.Invalidate(LineLayout::llCheckTextAndStyle);
-	} else {
-		// Move selection and brace highlights
-		if (mh.modificationType & SC_MOD_INSERTTEXT) {
-			currentPos = MovePositionForInsertion(currentPos, mh.position, mh.length);
-			anchor = MovePositionForInsertion(anchor, mh.position, mh.length);
-			braces[0] = MovePositionForInsertion(braces[0], mh.position, mh.length);
-			braces[1] = MovePositionForInsertion(braces[1], mh.position, mh.length);
-		} else if (mh.modificationType & SC_MOD_DELETETEXT) {
-			currentPos = MovePositionForDeletion(currentPos, mh.position, mh.length);
-			anchor = MovePositionForDeletion(anchor, mh.position, mh.length);
-			braces[0] = MovePositionForDeletion(braces[0], mh.position, mh.length);
-			braces[1] = MovePositionForDeletion(braces[1], mh.position, mh.length);
-		}
-		if (cs.LinesDisplayed() < cs.LinesInDoc()) {
-			// Some lines are hidden so may need shown.
-			// TODO: check if the modified area is hidden.
-			if (mh.modificationType & SC_MOD_BEFOREINSERT) {
-				NotifyNeedShown(mh.position, 0);
-			} else if (mh.modificationType & SC_MOD_BEFOREDELETE) {
-				NotifyNeedShown(mh.position, mh.length);
-			}
-		}
-		if (mh.linesAdded != 0) {
-			// Update contraction state for inserted and removed lines
-			// lineOfPos should be calculated in context of state before modification, shouldn't it
-			int lineOfPos = pdoc->LineFromPosition(mh.position);
-			if (mh.linesAdded > 0) {
-				cs.InsertLines(lineOfPos, mh.linesAdded);
-			} else {
-				cs.DeleteLines(lineOfPos, -mh.linesAdded);
-			}
-		}
-		CheckModificationForWrap(mh);
-		if (mh.linesAdded != 0) {
-			// Avoid scrolling of display if change before current display
-			if (mh.position < posTopLine && !CanDeferToLastStep(mh)) {
-				int newTop = Platform::Clamp(topLine + mh.linesAdded, 0, MaxScrollPos());
-				if (newTop != topLine) {
-					SetTopLine(newTop);
-					SetVerticalScrollPos();
-				}
-			}
-
-			//Platform::DebugPrintf("** %x Doc Changed\n", this);
-			// TODO: could invalidate from mh.startModification to end of screen
-			//InvalidateRange(mh.position, mh.position + mh.length);
-			if (paintState == notPainting && !CanDeferToLastStep(mh)) {
-				Redraw();
-			}
-		} else {
-			//Platform::DebugPrintf("** %x Line Changed %d .. %d\n", this,
-			//	mh.position, mh.position + mh.length);
-			if (paintState == notPainting && mh.length && !CanEliminate(mh)) {
-				InvalidateRange(mh.position, mh.position + mh.length);
-			}
-		}
-	}
-
-	if (mh.linesAdded != 0 && !CanDeferToLastStep(mh)) {
-		SetScrollBars();
-	}
-
-	if (mh.modificationType & SC_MOD_CHANGEMARKER) {
-		if ((paintState == notPainting) || !PaintContainsMargin()) {
-			if (mh.modificationType & SC_MOD_CHANGEFOLD) {
-				// Fold changes can affect the drawing of following lines so redraw whole margin
-				RedrawSelMargin();
-			} else {
-				RedrawSelMargin(mh.line);
-			}
-		}
-	}
-
-	// NOW pay the piper WRT "deferred" visual updates
-	if (IsLastStep(mh)) {
-		SetScrollBars();
-		Redraw();
-	}
-
-	// If client wants to see this modification
-	if (mh.modificationType & modEventMask) {
-		if ((mh.modificationType & SC_MOD_CHANGESTYLE) == 0) {
-			// Real modification made to text of document.
-			NotifyChange();	// Send EN_CHANGE
-		}
-
-		SCNotification scn = {0};
-		scn.nmhdr.code = SCN_MODIFIED;
-		scn.position = mh.position;
-		scn.modificationType = mh.modificationType;
-		scn.text = mh.text;
-		scn.length = mh.length;
-		scn.linesAdded = mh.linesAdded;
-		scn.line = mh.line;
-		scn.foldLevelNow = mh.foldLevelNow;
-		scn.foldLevelPrev = mh.foldLevelPrev;
-		NotifyParent(scn);
-	}
-}
-
-void Editor::NotifyDeleted(Document *, void *) {
-	/* Do nothing */
-}
-
-void Editor::NotifyMacroRecord(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
-
-	// Enumerates all macroable messages
-	switch (iMessage) {
-	case SCI_CUT:
-	case SCI_COPY:
-	case SCI_PASTE:
-	case SCI_CLEAR:
-	case SCI_REPLACESEL:
-	case SCI_ADDTEXT:
-	case SCI_INSERTTEXT:
-	case SCI_APPENDTEXT:
-	case SCI_CLEARALL:
-	case SCI_SELECTALL:
-	case SCI_GOTOLINE:
-	case SCI_GOTOPOS:
-	case SCI_SEARCHANCHOR:
-	case SCI_SEARCHNEXT:
-	case SCI_SEARCHPREV:
-	case SCI_LINEDOWN:
-	case SCI_LINEDOWNEXTEND:
-	case SCI_PARADOWN:
-	case SCI_PARADOWNEXTEND:
-	case SCI_LINEUP:
-	case SCI_LINEUPEXTEND:
-	case SCI_PARAUP:
-	case SCI_PARAUPEXTEND:
-	case SCI_CHARLEFT:
-	case SCI_CHARLEFTEXTEND:
-	case SCI_CHARRIGHT:
-	case SCI_CHARRIGHTEXTEND:
-	case SCI_WORDLEFT:
-	case SCI_WORDLEFTEXTEND:
-	case SCI_WORDRIGHT:
-	case SCI_WORDRIGHTEXTEND:
-	case SCI_WORDPARTLEFT:
-	case SCI_WORDPARTLEFTEXTEND:
-	case SCI_WORDPARTRIGHT:
-	case SCI_WORDPARTRIGHTEXTEND:
-	case SCI_WORDLEFTEND:
-	case SCI_WORDLEFTENDEXTEND:
-	case SCI_WORDRIGHTEND:
-	case SCI_WORDRIGHTENDEXTEND:
-	case SCI_HOME:
-	case SCI_HOMEEXTEND:
-	case SCI_LINEEND:
-	case SCI_LINEENDEXTEND:
-	case SCI_HOMEWRAP:
-	case SCI_HOMEWRAPEXTEND:
-	case SCI_LINEENDWRAP:
-	case SCI_LINEENDWRAPEXTEND:
-	case SCI_DOCUMENTSTART:
-	case SCI_DOCUMENTSTARTEXTEND:
-	case SCI_DOCUMENTEND:
-	case SCI_DOCUMENTENDEXTEND:
-	case SCI_STUTTEREDPAGEUP:
-	case SCI_STUTTEREDPAGEUPEXTEND:
-	case SCI_STUTTEREDPAGEDOWN:
-	case SCI_STUTTEREDPAGEDOWNEXTEND:
-	case SCI_PAGEUP:
-	case SCI_PAGEUPEXTEND:
-	case SCI_PAGEDOWN:
-	case SCI_PAGEDOWNEXTEND:
-	case SCI_EDITTOGGLEOVERTYPE:
-	case SCI_CANCEL:
-	case SCI_DELETEBACK:
-	case SCI_TAB:
-	case SCI_BACKTAB:
-	case SCI_FORMFEED:
-	case SCI_VCHOME:
-	case SCI_VCHOMEEXTEND:
-	case SCI_VCHOMEWRAP:
-	case SCI_VCHOMEWRAPEXTEND:
-	case SCI_DELWORDLEFT:
-	case SCI_DELWORDRIGHT:
-	case SCI_DELLINELEFT:
-	case SCI_DELLINERIGHT:
-	case SCI_LINECOPY:
-	case SCI_LINECUT:
-	case SCI_LINEDELETE:
-	case SCI_LINETRANSPOSE:
-	case SCI_LINEDUPLICATE:
-	case SCI_LOWERCASE:
-	case SCI_UPPERCASE:
-	case SCI_LINESCROLLDOWN:
-	case SCI_LINESCROLLUP:
-	case SCI_DELETEBACKNOTLINE:
-	case SCI_HOMEDISPLAY:
-	case SCI_HOMEDISPLAYEXTEND:
-	case SCI_LINEENDDISPLAY:
-	case SCI_LINEENDDISPLAYEXTEND:
-	case SCI_SETSELECTIONMODE:
-	case SCI_LINEDOWNRECTEXTEND:
-	case SCI_LINEUPRECTEXTEND:
-	case SCI_CHARLEFTRECTEXTEND:
-	case SCI_CHARRIGHTRECTEXTEND:
-	case SCI_HOMERECTEXTEND:
-	case SCI_VCHOMERECTEXTEND:
-	case SCI_LINEENDRECTEXTEND:
-	case SCI_PAGEUPRECTEXTEND:
-	case SCI_PAGEDOWNRECTEXTEND:
-	case SCI_SELECTIONDUPLICATE:
-		break;
-
-	// Filter out all others like display changes. Also, newlines are redundant
-	// with char insert messages.
-	case SCI_NEWLINE:
-	default:
-		//		printf("Filtered out %ld of macro recording\n", iMessage);
-		return ;
-	}
-
-	// Send notification
-	SCNotification scn = {0};
-	scn.nmhdr.code = SCN_MACRORECORD;
-	scn.message = iMessage;
-	scn.wParam = wParam;
-	scn.lParam = lParam;
-	NotifyParent(scn);
-}
-
-/**
- * Force scroll and keep position relative to top of window.
- *
- * If stuttered = true and not already at first/last row, move to first/last row of window.
- * If stuttered = true and already at first/last row, scroll as normal.
- */
-void Editor::PageMove(int direction, selTypes sel, bool stuttered) {
-	int topLineNew, newPos;
-
-	// I consider only the caretYSlop, and ignore the caretYPolicy-- is that a problem?
-	int currentLine = pdoc->LineFromPosition(currentPos);
-	int topStutterLine = topLine + caretYSlop;
-	int bottomStutterLine = topLine + LinesToScroll() - caretYSlop;
-
-	if (stuttered && (direction < 0 && currentLine > topStutterLine)) {
-		topLineNew = topLine;
-		newPos = PositionFromLocation(Point(lastXChosen, vs.lineHeight * caretYSlop));
-
-	} else if (stuttered && (direction > 0 && currentLine < bottomStutterLine)) {
-		topLineNew = topLine;
-		newPos = PositionFromLocation(Point(lastXChosen, vs.lineHeight * (LinesToScroll() - caretYSlop)));
-
-	} else {
-		Point pt = LocationFromPosition(currentPos);
-
-		topLineNew = Platform::Clamp(
-	                     topLine + direction * LinesToScroll(), 0, MaxScrollPos());
-		newPos = PositionFromLocation(
-	                 Point(lastXChosen, pt.y + direction * (vs.lineHeight * LinesToScroll())));
-	}
-
-	if (topLineNew != topLine) {
-		SetTopLine(topLineNew);
-		MovePositionTo(newPos, sel);
-		Redraw();
-		SetVerticalScrollPos();
-	} else {
-		MovePositionTo(newPos, sel);
-	}
-}
-
-void Editor::ChangeCaseOfSelection(bool makeUpperCase) {
-	pdoc->BeginUndoAction();
-	int startCurrent = currentPos;
-	int startAnchor = anchor;
-	if (selType == selStream) {
-		pdoc->ChangeCase(Range(SelectionStart(), SelectionEnd()),
-		                 makeUpperCase);
-		SetSelection(startCurrent, startAnchor);
-	} else {
-		SelectionLineIterator lineIterator(this, false);
-		while (lineIterator.Iterate()) {
-			pdoc->ChangeCase(
-			    Range(lineIterator.startPos, lineIterator.endPos),
-			    makeUpperCase);
-		}
-		// Would be nicer to keep the rectangular selection but this is complex
-		SetEmptySelection(startCurrent);
-	}
-	pdoc->EndUndoAction();
-}
-
-void Editor::LineTranspose() {
-	int line = pdoc->LineFromPosition(currentPos);
-	if (line > 0) {
-		int startPrev = pdoc->LineStart(line - 1);
-		int endPrev = pdoc->LineEnd(line - 1);
-		int start = pdoc->LineStart(line);
-		int end = pdoc->LineEnd(line);
-		int startNext = pdoc->LineStart(line + 1);
-		if (end < pdoc->Length()) {
-			end = startNext;
-			char *thisLine = CopyRange(start, end);
-			pdoc->DeleteChars(start, end - start);
-			if (pdoc->InsertString(startPrev, thisLine, end - start)) {
-				MovePositionTo(startPrev + end - start);
-			}
-			delete []thisLine;
-		} else {
-			// Last line so line has no line end
-			char *thisLine = CopyRange(start, end);
-			char *prevEnd = CopyRange(endPrev, start);
-			pdoc->DeleteChars(endPrev, end - endPrev);
-			pdoc->InsertString(startPrev, thisLine, end - start);
-			if (pdoc->InsertString(startPrev + end - start, prevEnd, start - endPrev)) {
-				MovePositionTo(startPrev + end - endPrev);
-			}
-			delete []thisLine;
-			delete []prevEnd;
-		}
-
-	}
-}
-
-void Editor::Duplicate(bool forLine) {
-	int start = SelectionStart();
-	int end = SelectionEnd();
-	if (start == end) {
-		forLine = true;
-	}
-	if (forLine) {
-		int line = pdoc->LineFromPosition(currentPos);
-		start = pdoc->LineStart(line);
-		end = pdoc->LineEnd(line);
-	}
-	char *text = CopyRange(start, end);
-	if (forLine) {
-		const char *eol = StringFromEOLMode(pdoc->eolMode);
-		pdoc->InsertString(end, eol);
-		pdoc->InsertString(end + istrlen(eol), text, end - start);
-	} else {
-		pdoc->InsertString(end, text, end - start);
-	}
-	delete []text;
-}
-
-void Editor::CancelModes() {
-	moveExtendsSelection = false;
-}
-
-void Editor::NewLine() {
-	ClearSelection();
-	const char *eol = "\n";
-	if (pdoc->eolMode == SC_EOL_CRLF) {
-		eol = "\r\n";
-	} else if (pdoc->eolMode == SC_EOL_CR) {
-		eol = "\r";
-	} // else SC_EOL_LF -> "\n" already set
-	if (pdoc->InsertString(currentPos, eol)) {
-		SetEmptySelection(currentPos + istrlen(eol));
-		while (*eol) {
-			NotifyChar(*eol);
-			eol++;
-		}
-	}
-	SetLastXChosen();
-	EnsureCaretVisible();
-	// Avoid blinking during rapid typing:
-	ShowCaretAtCurrentPosition();
-}
-
-void Editor::CursorUpOrDown(int direction, selTypes sel) {
-	Point pt = LocationFromPosition(currentPos);
-	int posNew = PositionFromLocation(
-	                 Point(lastXChosen, pt.y + direction * vs.lineHeight));
-	if (direction < 0) {
-		// Line wrapping may lead to a location on the same line, so
-		// seek back if that is the case.
-		// There is an equivalent case when moving down which skips
-		// over a line but as that does not trap the user it is fine.
-		Point ptNew = LocationFromPosition(posNew);
-		while ((posNew > 0) && (pt.y == ptNew.y)) {
-			posNew--;
-			ptNew = LocationFromPosition(posNew);
-		}
-	}
-	MovePositionTo(posNew, sel);
-}
-
-void Editor::ParaUpOrDown(int direction, selTypes sel) {
-	int lineDoc, savedPos = currentPos;
-	do {
-		MovePositionTo(direction > 0 ? pdoc->ParaDown(currentPos) : pdoc->ParaUp(currentPos), sel);
-		lineDoc = pdoc->LineFromPosition(currentPos);
-		if (direction > 0) {
-			if (currentPos >= pdoc->Length() && !cs.GetVisible(lineDoc)) {
-				if (sel == noSel) {
-					MovePositionTo(pdoc->LineEndPosition(savedPos));
-				}
-				break;
-			}
-		}
-	} while (!cs.GetVisible(lineDoc));
-}
-
-int Editor::StartEndDisplayLine(int pos, bool start) {
-	RefreshStyleData();
-	int line = pdoc->LineFromPosition(pos);
-	AutoSurface surface(this);
-	AutoLineLayout ll(llc, RetrieveLineLayout(line));
-	int posRet = INVALID_POSITION;
-	if (surface && ll) {
-		unsigned int posLineStart = pdoc->LineStart(line);
-		LayoutLine(line, surface, vs, ll, wrapWidth);
-		int posInLine = pos - posLineStart;
-		if (posInLine <= ll->maxLineLength) {
-			for (int subLine = 0; subLine < ll->lines; subLine++) {
-				if ((posInLine >= ll->LineStart(subLine)) && (posInLine <= ll->LineStart(subLine + 1))) {
-					if (start) {
-						posRet = ll->LineStart(subLine) + posLineStart;
-					} else {
-						if (subLine == ll->lines - 1)
-							posRet = ll->LineStart(subLine + 1) + posLineStart;
-						else
-							posRet = ll->LineStart(subLine + 1) + posLineStart - 1;
-					}
-				}
-			}
-		}
-	}
-	if (posRet == INVALID_POSITION) {
-		return pos;
-	} else {
-		return posRet;
-	}
-}
-
-int Editor::KeyCommand(unsigned int iMessage) {
-	switch (iMessage) {
-	case SCI_LINEDOWN:
-		CursorUpOrDown(1);
-		break;
-	case SCI_LINEDOWNEXTEND:
-		CursorUpOrDown(1, selStream);
-		break;
-	case SCI_LINEDOWNRECTEXTEND:
-		CursorUpOrDown(1, selRectangle);
-		break;
-	case SCI_PARADOWN:
-		ParaUpOrDown(1);
-		break;
-	case SCI_PARADOWNEXTEND:
-		ParaUpOrDown(1, selStream);
-		break;
-	case SCI_LINESCROLLDOWN:
-		ScrollTo(topLine + 1);
-		MoveCaretInsideView(false);
-		break;
-	case SCI_LINEUP:
-		CursorUpOrDown(-1);
-		break;
-	case SCI_LINEUPEXTEND:
-		CursorUpOrDown(-1, selStream);
-		break;
-	case SCI_LINEUPRECTEXTEND:
-		CursorUpOrDown(-1, selRectangle);
-		break;
-	case SCI_PARAUP:
-		ParaUpOrDown(-1);
-		break;
-	case SCI_PARAUPEXTEND:
-		ParaUpOrDown(-1, selStream);
-		break;
-	case SCI_LINESCROLLUP:
-		ScrollTo(topLine - 1);
-		MoveCaretInsideView(false);
-		break;
-	case SCI_CHARLEFT:
-		if (SelectionEmpty() || moveExtendsSelection) {
-			MovePositionTo(MovePositionSoVisible(currentPos - 1, -1));
-		} else {
-			MovePositionTo(SelectionStart());
-		}
-		SetLastXChosen();
-		break;
-	case SCI_CHARLEFTEXTEND:
-		MovePositionTo(MovePositionSoVisible(currentPos - 1, -1), selStream);
-		SetLastXChosen();
-		break;
-	case SCI_CHARLEFTRECTEXTEND:
-		MovePositionTo(MovePositionSoVisible(currentPos - 1, -1), selRectangle);
-		SetLastXChosen();
-		break;
-	case SCI_CHARRIGHT:
-		if (SelectionEmpty() || moveExtendsSelection) {
-			MovePositionTo(MovePositionSoVisible(currentPos + 1, 1));
-		} else {
-			MovePositionTo(SelectionEnd());
-		}
-		SetLastXChosen();
-		break;
-	case SCI_CHARRIGHTEXTEND:
-		MovePositionTo(MovePositionSoVisible(currentPos + 1, 1), selStream);
-		SetLastXChosen();
-		break;
-	case SCI_CHARRIGHTRECTEXTEND:
-		MovePositionTo(MovePositionSoVisible(currentPos + 1, 1), selRectangle);
-		SetLastXChosen();
-		break;
-	case SCI_WORDLEFT:
-		MovePositionTo(MovePositionSoVisible(pdoc->NextWordStart(currentPos, -1), -1));
-		SetLastXChosen();
-		break;
-	case SCI_WORDLEFTEXTEND:
-		MovePositionTo(MovePositionSoVisible(pdoc->NextWordStart(currentPos, -1), -1), selStream);
-		SetLastXChosen();
-		break;
-	case SCI_WORDRIGHT:
-		MovePositionTo(MovePositionSoVisible(pdoc->NextWordStart(currentPos, 1), 1));
-		SetLastXChosen();
-		break;
-	case SCI_WORDRIGHTEXTEND:
-		MovePositionTo(MovePositionSoVisible(pdoc->NextWordStart(currentPos, 1), 1), selStream);
-		SetLastXChosen();
-		break;
-
-	case SCI_WORDLEFTEND:
-		MovePositionTo(MovePositionSoVisible(pdoc->NextWordEnd(currentPos, -1), -1));
-		SetLastXChosen();
-		break;
-	case SCI_WORDLEFTENDEXTEND:
-		MovePositionTo(MovePositionSoVisible(pdoc->NextWordEnd(currentPos, -1), -1), selStream);
-		SetLastXChosen();
-		break;
-	case SCI_WORDRIGHTEND:
-		MovePositionTo(MovePositionSoVisible(pdoc->NextWordEnd(currentPos, 1), 1));
-		SetLastXChosen();
-		break;
-	case SCI_WORDRIGHTENDEXTEND:
-		MovePositionTo(MovePositionSoVisible(pdoc->NextWordEnd(currentPos, 1), 1), selStream);
-		SetLastXChosen();
-		break;
-
-	case SCI_HOME:
-		MovePositionTo(pdoc->LineStart(pdoc->LineFromPosition(currentPos)));
-		SetLastXChosen();
-		break;
-	case SCI_HOMEEXTEND:
-		MovePositionTo(pdoc->LineStart(pdoc->LineFromPosition(currentPos)), selStream);
-		SetLastXChosen();
-		break;
-	case SCI_HOMERECTEXTEND:
-		MovePositionTo(pdoc->LineStart(pdoc->LineFromPosition(currentPos)), selRectangle);
-		SetLastXChosen();
-		break;
-	case SCI_LINEEND:
-		MovePositionTo(pdoc->LineEndPosition(currentPos));
-		SetLastXChosen();
-		break;
-	case SCI_LINEENDEXTEND:
-		MovePositionTo(pdoc->LineEndPosition(currentPos), selStream);
-		SetLastXChosen();
-		break;
-	case SCI_LINEENDRECTEXTEND:
-		MovePositionTo(pdoc->LineEndPosition(currentPos), selRectangle);
-		SetLastXChosen();
-		break;
-	case SCI_HOMEWRAP: {
-			int homePos = MovePositionSoVisible(StartEndDisplayLine(currentPos, true), -1);
-			if (currentPos <= homePos)
-				homePos = pdoc->LineStart(pdoc->LineFromPosition(currentPos));
-			MovePositionTo(homePos);
-			SetLastXChosen();
-		}
-		break;
-	case SCI_HOMEWRAPEXTEND: {
-			int homePos = MovePositionSoVisible(StartEndDisplayLine(currentPos, true), -1);
-			if (currentPos <= homePos)
-				homePos = pdoc->LineStart(pdoc->LineFromPosition(currentPos));
-			MovePositionTo(homePos, selStream);
-			SetLastXChosen();
-		}
-		break;
-	case SCI_LINEENDWRAP: {
-			int endPos = MovePositionSoVisible(StartEndDisplayLine(currentPos, false), 1);
-			int realEndPos = pdoc->LineEndPosition(currentPos);
-			if (endPos > realEndPos      // if moved past visible EOLs
-				|| currentPos >= endPos) // if at end of display line already
-				endPos = realEndPos;
-			MovePositionTo(endPos);
-			SetLastXChosen();
-		}
-		break;
-	case SCI_LINEENDWRAPEXTEND: {
-			int endPos = MovePositionSoVisible(StartEndDisplayLine(currentPos, false), 1);
-			int realEndPos = pdoc->LineEndPosition(currentPos);
-			if (endPos > realEndPos      // if moved past visible EOLs
-				|| currentPos >= endPos) // if at end of display line already
-				endPos = realEndPos;
-			MovePositionTo(endPos, selStream);
-			SetLastXChosen();
-		}
-		break;
-	case SCI_DOCUMENTSTART:
-		MovePositionTo(0);
-		SetLastXChosen();
-		break;
-	case SCI_DOCUMENTSTARTEXTEND:
-		MovePositionTo(0, selStream);
-		SetLastXChosen();
-		break;
-	case SCI_DOCUMENTEND:
-		MovePositionTo(pdoc->Length());
-		SetLastXChosen();
-		break;
-	case SCI_DOCUMENTENDEXTEND:
-		MovePositionTo(pdoc->Length(), selStream);
-		SetLastXChosen();
-		break;
-	case SCI_STUTTEREDPAGEUP:
-		PageMove(-1, noSel, true);
-		break;
-	case SCI_STUTTEREDPAGEUPEXTEND:
-		PageMove(-1, selStream, true);
-		break;
-	case SCI_STUTTEREDPAGEDOWN:
-		PageMove(1, noSel, true);
-		break;
-	case SCI_STUTTEREDPAGEDOWNEXTEND:
-		PageMove(1, selStream, true);
-		break;
-	case SCI_PAGEUP:
-		PageMove(-1);
-		break;
-	case SCI_PAGEUPEXTEND:
-		PageMove(-1, selStream);
-		break;
-	case SCI_PAGEUPRECTEXTEND:
-		PageMove(-1, selRectangle);
-		break;
-	case SCI_PAGEDOWN:
-		PageMove(1);
-		break;
-	case SCI_PAGEDOWNEXTEND:
-		PageMove(1, selStream);
-		break;
-	case SCI_PAGEDOWNRECTEXTEND:
-		PageMove(1, selRectangle);
-		break;
-	case SCI_EDITTOGGLEOVERTYPE:
-		inOverstrike = !inOverstrike;
-		DropCaret();
-		ShowCaretAtCurrentPosition();
-		NotifyUpdateUI();
-		break;
-	case SCI_CANCEL:            	// Cancel any modes - handled in subclass
-		// Also unselect text
-		CancelModes();
-		break;
-	case SCI_DELETEBACK:
-		DelCharBack(true);
-		if (!caretSticky) {
-			SetLastXChosen();
-		}
-		EnsureCaretVisible();
-		break;
-	case SCI_DELETEBACKNOTLINE:
-		DelCharBack(false);
-		if (!caretSticky) {
-			SetLastXChosen();
-		}
-		EnsureCaretVisible();
-		break;
-	case SCI_TAB:
-		Indent(true);
-		if (!caretSticky) {
-			SetLastXChosen();
-		}
-		EnsureCaretVisible();
-		break;
-	case SCI_BACKTAB:
-		Indent(false);
-		if (!caretSticky) {
-			SetLastXChosen();
-		}
-		EnsureCaretVisible();
-		break;
-	case SCI_NEWLINE:
-		NewLine();
-		break;
-	case SCI_FORMFEED:
-		AddChar('\f');
-		break;
-	case SCI_VCHOME:
-		MovePositionTo(pdoc->VCHomePosition(currentPos));
-		SetLastXChosen();
-		break;
-	case SCI_VCHOMEEXTEND:
-		MovePositionTo(pdoc->VCHomePosition(currentPos), selStream);
-		SetLastXChosen();
-		break;
-	case SCI_VCHOMERECTEXTEND:
-		MovePositionTo(pdoc->VCHomePosition(currentPos), selRectangle);
-		SetLastXChosen();
-		break;
-	case SCI_VCHOMEWRAP: {
-			int homePos = pdoc->VCHomePosition(currentPos);
-			int viewLineStart = MovePositionSoVisible(StartEndDisplayLine(currentPos, true), -1);
-			if ((viewLineStart < currentPos) && (viewLineStart > homePos))
-				homePos = viewLineStart;
-
-			MovePositionTo(homePos);
-			SetLastXChosen();
-		}
-		break;
-	case SCI_VCHOMEWRAPEXTEND: {
-			int homePos = pdoc->VCHomePosition(currentPos);
-			int viewLineStart = MovePositionSoVisible(StartEndDisplayLine(currentPos, true), -1);
-			if ((viewLineStart < currentPos) && (viewLineStart > homePos))
-				homePos = viewLineStart;
-
-			MovePositionTo(homePos, selStream);
-			SetLastXChosen();
-		}
-		break;
-	case SCI_ZOOMIN:
-		if (vs.zoomLevel < 20) {
-			vs.zoomLevel++;
-			InvalidateStyleRedraw();
-			NotifyZoom();
-		}
-		break;
-	case SCI_ZOOMOUT:
-		if (vs.zoomLevel > -10) {
-			vs.zoomLevel--;
-			InvalidateStyleRedraw();
-			NotifyZoom();
-		}
-		break;
-	case SCI_DELWORDLEFT: {
-			int startWord = pdoc->NextWordStart(currentPos, -1);
-			pdoc->DeleteChars(startWord, currentPos - startWord);
-			SetLastXChosen();
-		}
-		break;
-	case SCI_DELWORDRIGHT: {
-			int endWord = pdoc->NextWordStart(currentPos, 1);
-			pdoc->DeleteChars(currentPos, endWord - currentPos);
-		}
-		break;
-	case SCI_DELLINELEFT: {
-			int line = pdoc->LineFromPosition(currentPos);
-			int start = pdoc->LineStart(line);
-			pdoc->DeleteChars(start, currentPos - start);
-			SetLastXChosen();
-		}
-		break;
-	case SCI_DELLINERIGHT: {
-			int line = pdoc->LineFromPosition(currentPos);
-			int end = pdoc->LineEnd(line);
-			pdoc->DeleteChars(currentPos, end - currentPos);
-		}
-		break;
-	case SCI_LINECOPY: {
-			int lineStart = pdoc->LineFromPosition(SelectionStart());
-			int lineEnd = pdoc->LineFromPosition(SelectionEnd());
-			CopyRangeToClipboard(pdoc->LineStart(lineStart),
-				pdoc->LineStart(lineEnd + 1));
-		}
-		break;
-	case SCI_LINECUT: {
-			int lineStart = pdoc->LineFromPosition(SelectionStart());
-			int lineEnd = pdoc->LineFromPosition(SelectionEnd());
-			int start = pdoc->LineStart(lineStart);
-			int end = pdoc->LineStart(lineEnd + 1);
-			SetSelection(start, end);
-			Cut();
-			SetLastXChosen();
-		}
-		break;
-	case SCI_LINEDELETE: {
-			int line = pdoc->LineFromPosition(currentPos);
-			int start = pdoc->LineStart(line);
-			int end = pdoc->LineStart(line + 1);
-			pdoc->DeleteChars(start, end - start);
-		}
-		break;
-	case SCI_LINETRANSPOSE:
-		LineTranspose();
-		break;
-	case SCI_LINEDUPLICATE:
-		Duplicate(true);
-		break;
-	case SCI_SELECTIONDUPLICATE:
-		Duplicate(false);
-		break;
-	case SCI_LOWERCASE:
-		ChangeCaseOfSelection(false);
-		break;
-	case SCI_UPPERCASE:
-		ChangeCaseOfSelection(true);
-		break;
-	case SCI_WORDPARTLEFT:
-		MovePositionTo(MovePositionSoVisible(pdoc->WordPartLeft(currentPos), -1));
-		SetLastXChosen();
-		break;
-	case SCI_WORDPARTLEFTEXTEND:
-		MovePositionTo(MovePositionSoVisible(pdoc->WordPartLeft(currentPos), -1), selStream);
-		SetLastXChosen();
-		break;
-	case SCI_WORDPARTRIGHT:
-		MovePositionTo(MovePositionSoVisible(pdoc->WordPartRight(currentPos), 1));
-		SetLastXChosen();
-		break;
-	case SCI_WORDPARTRIGHTEXTEND:
-		MovePositionTo(MovePositionSoVisible(pdoc->WordPartRight(currentPos), 1), selStream);
-		SetLastXChosen();
-		break;
-	case SCI_HOMEDISPLAY:
-		MovePositionTo(MovePositionSoVisible(
-		                   StartEndDisplayLine(currentPos, true), -1));
-		SetLastXChosen();
-		break;
-	case SCI_HOMEDISPLAYEXTEND:
-		MovePositionTo(MovePositionSoVisible(
-		                   StartEndDisplayLine(currentPos, true), -1), selStream);
-		SetLastXChosen();
-		break;
-	case SCI_LINEENDDISPLAY:
-		MovePositionTo(MovePositionSoVisible(
-		                   StartEndDisplayLine(currentPos, false), 1));
-		SetLastXChosen();
-		break;
-	case SCI_LINEENDDISPLAYEXTEND:
-		MovePositionTo(MovePositionSoVisible(
-		                   StartEndDisplayLine(currentPos, false), 1), selStream);
-		SetLastXChosen();
-		break;
-	}
-	return 0;
-}
-
-int Editor::KeyDefault(int, int) {
-	return 0;
-}
-
-int Editor::KeyDown(int key, bool shift, bool ctrl, bool alt, bool *consumed) {
-	DwellEnd(false);
-	int modifiers = (shift ? SCI_SHIFT : 0) | (ctrl ? SCI_CTRL : 0) |
-	                (alt ? SCI_ALT : 0);
-	int msg = kmap.Find(key, modifiers);
-	if (msg) {
-		if (consumed)
-			*consumed = true;
-		return WndProc(msg, 0, 0);
-	} else {
-		if (consumed)
-			*consumed = false;
-		return KeyDefault(key, modifiers);
-	}
-}
-
-void Editor::SetWhitespaceVisible(int view) {
-	vs.viewWhitespace = static_cast<WhiteSpaceVisibility>(view);
-}
-
-int Editor::GetWhitespaceVisible() {
-	return vs.viewWhitespace;
-}
-
-void Editor::Indent(bool forwards) {
-	//Platform::DebugPrintf("INdent %d\n", forwards);
-	int lineOfAnchor = pdoc->LineFromPosition(anchor);
-	int lineCurrentPos = pdoc->LineFromPosition(currentPos);
-	if (lineOfAnchor == lineCurrentPos) {
-		if (forwards) {
-			pdoc->BeginUndoAction();
-			ClearSelection();
-			if (pdoc->GetColumn(currentPos) <= pdoc->GetColumn(pdoc->GetLineIndentPosition(lineCurrentPos)) &&
-			        pdoc->tabIndents) {
-				int indentation = pdoc->GetLineIndentation(lineCurrentPos);
-				int indentationStep = pdoc->IndentSize();
-				pdoc->SetLineIndentation(lineCurrentPos, indentation + indentationStep - indentation % indentationStep);
-				SetEmptySelection(pdoc->GetLineIndentPosition(lineCurrentPos));
-			} else {
-				if (pdoc->useTabs) {
-					pdoc->InsertChar(currentPos, '\t');
-					SetEmptySelection(currentPos + 1);
-				} else {
-					int numSpaces = (pdoc->tabInChars) -
-					                (pdoc->GetColumn(currentPos) % (pdoc->tabInChars));
-					if (numSpaces < 1)
-						numSpaces = pdoc->tabInChars;
-					for (int i = 0; i < numSpaces; i++) {
-						pdoc->InsertChar(currentPos + i, ' ');
-					}
-					SetEmptySelection(currentPos + numSpaces);
-				}
-			}
-			pdoc->EndUndoAction();
-		} else {
-			if (pdoc->GetColumn(currentPos) <= pdoc->GetLineIndentation(lineCurrentPos) &&
-			        pdoc->tabIndents) {
-				pdoc->BeginUndoAction();
-				int indentation = pdoc->GetLineIndentation(lineCurrentPos);
-				int indentationStep = pdoc->IndentSize();
-				pdoc->SetLineIndentation(lineCurrentPos, indentation - indentationStep);
-				SetEmptySelection(pdoc->GetLineIndentPosition(lineCurrentPos));
-				pdoc->EndUndoAction();
-			} else {
-				int newColumn = ((pdoc->GetColumn(currentPos) - 1) / pdoc->tabInChars) *
-				                pdoc->tabInChars;
-				if (newColumn < 0)
-					newColumn = 0;
-				int newPos = currentPos;
-				while (pdoc->GetColumn(newPos) > newColumn)
-					newPos--;
-				SetEmptySelection(newPos);
-			}
-		}
-	} else {
-		int anchorPosOnLine = anchor - pdoc->LineStart(lineOfAnchor);
-		int currentPosPosOnLine = currentPos - pdoc->LineStart(lineCurrentPos);
-		// Multiple lines selected so indent / dedent
-		int lineTopSel = Platform::Minimum(lineOfAnchor, lineCurrentPos);
-		int lineBottomSel = Platform::Maximum(lineOfAnchor, lineCurrentPos);
-		if (pdoc->LineStart(lineBottomSel) == anchor || pdoc->LineStart(lineBottomSel) == currentPos)
-			lineBottomSel--;  	// If not selecting any characters on a line, do not indent
-		pdoc->BeginUndoAction();
-		pdoc->Indent(forwards, lineBottomSel, lineTopSel);
-		pdoc->EndUndoAction();
-		if (lineOfAnchor < lineCurrentPos) {
-			if (currentPosPosOnLine == 0)
-				SetSelection(pdoc->LineStart(lineCurrentPos), pdoc->LineStart(lineOfAnchor));
-			else
-				SetSelection(pdoc->LineStart(lineCurrentPos + 1), pdoc->LineStart(lineOfAnchor));
-		} else {
-			if (anchorPosOnLine == 0)
-				SetSelection(pdoc->LineStart(lineCurrentPos), pdoc->LineStart(lineOfAnchor));
-			else
-				SetSelection(pdoc->LineStart(lineCurrentPos), pdoc->LineStart(lineOfAnchor + 1));
-		}
-	}
-}
-
-/**
- * Search of a text in the document, in the given range.
- * @return The position of the found text, -1 if not found.
- */
-long Editor::FindText(
-	uptr_t wParam,		///< Search modes : @c SCFIND_MATCHCASE, @c SCFIND_WHOLEWORD,
-						///< @c SCFIND_WORDSTART, @c SCFIND_REGEXP or @c SCFIND_POSIX.
-	sptr_t lParam) {	///< @c TextToFind structure: The text to search for in the given range.
-
-	TextToFind *ft = reinterpret_cast<TextToFind *>(lParam);
-	int lengthFound = istrlen(ft->lpstrText);
-	int pos = pdoc->FindText(ft->chrg.cpMin, ft->chrg.cpMax, ft->lpstrText,
-	                         (wParam & SCFIND_MATCHCASE) != 0,
-	                         (wParam & SCFIND_WHOLEWORD) != 0,
-	                         (wParam & SCFIND_WORDSTART) != 0,
-	                         (wParam & SCFIND_REGEXP) != 0,
-	                         (wParam & SCFIND_POSIX) != 0,
-	                         &lengthFound);
-	if (pos != -1) {
-		ft->chrgText.cpMin = pos;
-		ft->chrgText.cpMax = pos + lengthFound;
-	}
-	return pos;
-}
-
-/**
- * Relocatable search support : Searches relative to current selection
- * point and sets the selection to the found text range with
- * each search.
- */
-/**
- * Anchor following searches at current selection start: This allows
- * multiple incremental interactive searches to be macro recorded
- * while still setting the selection to found text so the find/select
- * operation is self-contained.
- */
-void Editor::SearchAnchor() {
-	searchAnchor = SelectionStart();
-}
-
-/**
- * Find text from current search anchor: Must call @c SearchAnchor first.
- * Used for next text and previous text requests.
- * @return The position of the found text, -1 if not found.
- */
-long Editor::SearchText(
-    unsigned int iMessage,		///< Accepts both @c SCI_SEARCHNEXT and @c SCI_SEARCHPREV.
-    uptr_t wParam,				///< Search modes : @c SCFIND_MATCHCASE, @c SCFIND_WHOLEWORD,
-								///< @c SCFIND_WORDSTART, @c SCFIND_REGEXP or @c SCFIND_POSIX.
-    sptr_t lParam) {			///< The text to search for.
-
-	const char *txt = reinterpret_cast<char *>(lParam);
-	int pos;
-	int lengthFound = istrlen(txt);
-	if (iMessage == SCI_SEARCHNEXT) {
-		pos = pdoc->FindText(searchAnchor, pdoc->Length(), txt,
-		                     (wParam & SCFIND_MATCHCASE) != 0,
-		                     (wParam & SCFIND_WHOLEWORD) != 0,
-		                     (wParam & SCFIND_WORDSTART) != 0,
-		                     (wParam & SCFIND_REGEXP) != 0,
-		                     (wParam & SCFIND_POSIX) != 0,
-		                     &lengthFound);
-	} else {
-		pos = pdoc->FindText(searchAnchor, 0, txt,
-		                     (wParam & SCFIND_MATCHCASE) != 0,
-		                     (wParam & SCFIND_WHOLEWORD) != 0,
-		                     (wParam & SCFIND_WORDSTART) != 0,
-		                     (wParam & SCFIND_REGEXP) != 0,
-		                     (wParam & SCFIND_POSIX) != 0,
-		                     &lengthFound);
-	}
-
-	if (pos != -1) {
-		SetSelection(pos, pos + lengthFound);
-	}
-
-	return pos;
-}
-
-/**
- * Search for text in the target range of the document.
- * @return The position of the found text, -1 if not found.
- */
-long Editor::SearchInTarget(const char *text, int length) {
-	int lengthFound = length;
-	int pos = pdoc->FindText(targetStart, targetEnd, text,
-	                         (searchFlags & SCFIND_MATCHCASE) != 0,
-	                         (searchFlags & SCFIND_WHOLEWORD) != 0,
-	                         (searchFlags & SCFIND_WORDSTART) != 0,
-	                         (searchFlags & SCFIND_REGEXP) != 0,
-	                         (searchFlags & SCFIND_POSIX) != 0,
-	                         &lengthFound);
-	if (pos != -1) {
-		targetStart = pos;
-		targetEnd = pos + lengthFound;
-	}
-	return pos;
-}
-
-void Editor::GoToLine(int lineNo) {
-	if (lineNo > pdoc->LinesTotal())
-		lineNo = pdoc->LinesTotal();
-	if (lineNo < 0)
-		lineNo = 0;
-	SetEmptySelection(pdoc->LineStart(lineNo));
-	ShowCaretAtCurrentPosition();
-	EnsureCaretVisible();
-}
-
-static bool Close(Point pt1, Point pt2) {
-	if (abs(pt1.x - pt2.x) > 3)
-		return false;
-	if (abs(pt1.y - pt2.y) > 3)
-		return false;
-	return true;
-}
-
-char *Editor::CopyRange(int start, int end) {
-	char *text = 0;
-	if (start < end) {
-		int len = end - start;
-		text = new char[len + 1];
-		if (text) {
-			for (int i = 0; i < len; i++) {
-				text[i] = pdoc->CharAt(start + i);
-			}
-			text[len] = '\0';
-		}
-	}
-	return text;
-}
-
-void Editor::CopySelectionFromRange(SelectionText *ss, int start, int end) {
-	ss->Set(CopyRange(start, end), end - start + 1,
-		pdoc->dbcsCodePage, vs.styles[STYLE_DEFAULT].characterSet, false);
-}
-
-void Editor::CopySelectionRange(SelectionText *ss) {
-	if (selType == selStream) {
-		CopySelectionFromRange(ss, SelectionStart(), SelectionEnd());
-	} else {
-		char *text = 0;
-		int size = 0;
-		SelectionLineIterator lineIterator(this);
-		while (lineIterator.Iterate()) {
-			size += lineIterator.endPos - lineIterator.startPos;
-			if (selType != selLines) {
-				size++;
-				if (pdoc->eolMode == SC_EOL_CRLF) {
-					size++;
-				}
-			}
-		}
-		if (size > 0) {
-			text = new char[size + 1];
-			if (text) {
-				int j = 0;
-				lineIterator.Reset();
-				while (lineIterator.Iterate()) {
-					for (int i = lineIterator.startPos;
-						 i < lineIterator.endPos;
-						 i++) {
-						text[j++] = pdoc->CharAt(i);
-					}
-					if (selType != selLines) {
-						if (pdoc->eolMode != SC_EOL_LF) {
-							text[j++] = '\r';
-						}
-						if (pdoc->eolMode != SC_EOL_CR) {
-							text[j++] = '\n';
-						}
-					}
-				}
-				text[size] = '\0';
-			}
-		}
-		ss->Set(text, size + 1, pdoc->dbcsCodePage,
-			vs.styles[STYLE_DEFAULT].characterSet, selType == selRectangle);
-	}
-}
-
-void Editor::CopyRangeToClipboard(int start, int end) {
-	start = pdoc->ClampPositionIntoDocument(start);
-	end = pdoc->ClampPositionIntoDocument(end);
-	SelectionText selectedText;
-	selectedText.Set(CopyRange(start, end), end - start + 1,
-		pdoc->dbcsCodePage, vs.styles[STYLE_DEFAULT].characterSet, false);
-	CopyToClipboard(selectedText);
-}
-
-void Editor::CopyText(int length, const char *text) {
-	SelectionText selectedText;
-	selectedText.Copy(text, length + 1,
-		pdoc->dbcsCodePage, vs.styles[STYLE_DEFAULT].characterSet, false);
-	CopyToClipboard(selectedText);
-}
-
-void Editor::SetDragPosition(int newPos) {
-	if (newPos >= 0) {
-		newPos = MovePositionOutsideChar(newPos, 1);
-		posDrop = newPos;
-	}
-	if (posDrag != newPos) {
-		caret.on = true;
-		SetTicking(true);
-		InvalidateCaret();
-		posDrag = newPos;
-		InvalidateCaret();
-	}
-}
-
-void Editor::DisplayCursor(Window::Cursor c) {
-	if (cursorMode == SC_CURSORNORMAL)
-		wMain.SetCursor(c);
-	else
-		wMain.SetCursor(static_cast<Window::Cursor>(cursorMode));
-}
-
-void Editor::StartDrag() {
-	// Always handled by subclasses
-	//SetMouseCapture(true);
-	//DisplayCursor(Window::cursorArrow);
-}
-
-void Editor::DropAt(int position, const char *value, bool moving, bool rectangular) {
-	//Platform::DebugPrintf("DropAt %d\n", inDragDrop);
-	if (inDragDrop)
-		dropWentOutside = false;
-
-	int positionWasInSelection = PositionInSelection(position);
-
-	bool positionOnEdgeOfSelection =
-	    (position == SelectionStart()) || (position == SelectionEnd());
-
-	if ((!inDragDrop) || !(0 == positionWasInSelection) ||
-	        (positionOnEdgeOfSelection && !moving)) {
-
-		int selStart = SelectionStart();
-		int selEnd = SelectionEnd();
-
-		pdoc->BeginUndoAction();
-
-		int positionAfterDeletion = position;
-		if (inDragDrop && moving) {
-			// Remove dragged out text
-			if (rectangular || selType == selLines) {
-				SelectionLineIterator lineIterator(this);
-				while (lineIterator.Iterate()) {
-					if (position >= lineIterator.startPos) {
-						if (position > lineIterator.endPos) {
-							positionAfterDeletion -= lineIterator.endPos - lineIterator.startPos;
-						} else {
-							positionAfterDeletion -= position - lineIterator.startPos;
-						}
-					}
-				}
-			} else {
-				if (position > selStart) {
-					positionAfterDeletion -= selEnd - selStart;
-				}
-			}
-			ClearSelection();
-		}
-		position = positionAfterDeletion;
-
-		if (rectangular) {
-			PasteRectangular(position, value, istrlen(value));
-			pdoc->EndUndoAction();
-			// Should try to select new rectangle but it may not be a rectangle now so just select the drop position
-			SetEmptySelection(position);
-		} else {
-			position = MovePositionOutsideChar(position, currentPos - position);
-			if (pdoc->InsertString(position, value)) {
-				SetSelection(position + istrlen(value), position);
-			}
-			pdoc->EndUndoAction();
-		}
-	} else if (inDragDrop) {
-		SetEmptySelection(position);
-	}
-}
-
-/**
- * @return -1 if given position is before the selection,
- *          1 if position is after the selection,
- *          0 if position is inside the selection,
- */
-int Editor::PositionInSelection(int pos) {
-	pos = MovePositionOutsideChar(pos, currentPos - pos);
-	if (pos < SelectionStart()) {
-		return -1;
-	}
-	if (pos > SelectionEnd()) {
-		return 1;
-	}
-	if (selType == selStream) {
-		return 0;
-	} else {
-		SelectionLineIterator lineIterator(this);
-		lineIterator.SetAt(pdoc->LineFromPosition(pos));
-		if (pos < lineIterator.startPos) {
-			return -1;
-		} else if (pos > lineIterator.endPos) {
-			return 1;
-		} else {
-			return 0;
-		}
-	}
-}
-
-bool Editor::PointInSelection(Point pt) {
-	int pos = PositionFromLocation(pt);
-	if (0 == PositionInSelection(pos)) {
-		// Probably inside, but we must make a finer test
-		int selStart, selEnd;
-		if (selType == selStream) {
-			selStart = SelectionStart();
-			selEnd = SelectionEnd();
-		} else {
-			SelectionLineIterator lineIterator(this);
-			lineIterator.SetAt(pdoc->LineFromPosition(pos));
-			selStart = lineIterator.startPos;
-			selEnd = lineIterator.endPos;
-		}
-		if (pos == selStart) {
-			// see if just before selection
-			Point locStart = LocationFromPosition(pos);
-			if (pt.x < locStart.x) {
-				return false;
-			}
-		}
-		if (pos == selEnd) {
-			// see if just after selection
-			Point locEnd = LocationFromPosition(pos);
-			if (pt.x > locEnd.x) {
-				return false;
-			}
-		}
-		return true;
-	}
-	return false;
-}
-
-bool Editor::PointInSelMargin(Point pt) {
-	// Really means: "Point in a margin"
-	if (vs.fixedColumnWidth > 0) {	// There is a margin
-		PRectangle rcSelMargin = GetClientRectangle();
-		rcSelMargin.right = vs.fixedColumnWidth - vs.leftMarginWidth;
-		return rcSelMargin.Contains(pt);
-	} else {
-		return false;
-	}
-}
-
-void Editor::LineSelection(int lineCurrent_, int lineAnchor_) {
-	if (lineAnchor_ < lineCurrent_) {
-		SetSelection(pdoc->LineStart(lineCurrent_ + 1),
-		             pdoc->LineStart(lineAnchor_));
-	} else if (lineAnchor_ > lineCurrent_) {
-		SetSelection(pdoc->LineStart(lineCurrent_),
-		             pdoc->LineStart(lineAnchor_ + 1));
-	} else { // Same line, select it
-		SetSelection(pdoc->LineStart(lineAnchor_ + 1),
-		             pdoc->LineStart(lineAnchor_));
-	}
-}
-
-void Editor::DwellEnd(bool mouseMoved) {
-	if (mouseMoved)
-		ticksToDwell = dwellDelay;
-	else
-		ticksToDwell = SC_TIME_FOREVER;
-	if (dwelling && (dwellDelay < SC_TIME_FOREVER)) {
-		dwelling = false;
-		NotifyDwelling(ptMouseLast, dwelling);
-	}
-}
-
-void Editor::ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt) {
-	//Platform::DebugPrintf("Scintilla:ButtonDown %d %d = %d alt=%d\n", curTime, lastClickTime, curTime - lastClickTime, alt);
-	ptMouseLast = pt;
-	int newPos = PositionFromLocation(pt);
-	newPos = MovePositionOutsideChar(newPos, currentPos - newPos);
-	inDragDrop = false;
-	moveExtendsSelection = false;
-
-	bool processed = NotifyMarginClick(pt, shift, ctrl, alt);
-	if (processed)
-		return;
-
-	bool inSelMargin = PointInSelMargin(pt);
-	if (shift & !inSelMargin) {
-		SetSelection(newPos);
-	}
-	if (((curTime - lastClickTime) < Platform::DoubleClickTime()) && Close(pt, lastClick)) {
-		//Platform::DebugPrintf("Double click %d %d = %d\n", curTime, lastClickTime, curTime - lastClickTime);
-		SetMouseCapture(true);
-		SetEmptySelection(newPos);
-		bool doubleClick = false;
-		// Stop mouse button bounce changing selection type
-		if (!Platform::MouseButtonBounce() || curTime != lastClickTime) {
-			if (selectionType == selChar) {
-				selectionType = selWord;
-				doubleClick = true;
-			} else if (selectionType == selWord) {
-				selectionType = selLine;
-			} else {
-				selectionType = selChar;
-				originalAnchorPos = currentPos;
-			}
-		}
-
-		if (selectionType == selWord) {
-			if (currentPos >= originalAnchorPos) {	// Moved forward
-				SetSelection(pdoc->ExtendWordSelect(currentPos, 1),
-				             pdoc->ExtendWordSelect(originalAnchorPos, -1));
-			} else {	// Moved backward
-				SetSelection(pdoc->ExtendWordSelect(currentPos, -1),
-				             pdoc->ExtendWordSelect(originalAnchorPos, 1));
-			}
-		} else if (selectionType == selLine) {
-			lineAnchor = LineFromLocation(pt);
-			SetSelection(pdoc->LineStart(lineAnchor + 1), pdoc->LineStart(lineAnchor));
-			//Platform::DebugPrintf("Triple click: %d - %d\n", anchor, currentPos);
-		} else {
-			SetEmptySelection(currentPos);
-		}
-		//Platform::DebugPrintf("Double click: %d - %d\n", anchor, currentPos);
-		if (doubleClick) {
-			NotifyDoubleClick(pt, shift);
-			if (PositionIsHotspot(newPos))
-				NotifyHotSpotDoubleClicked(newPos, shift, ctrl, alt);
-		}
-	} else {	// Single click
-		if (inSelMargin) {
-			selType = selStream;
-			if (ctrl) {
-				SelectAll();
-				lastClickTime = curTime;
-				return;
-			}
-			if (!shift) {
-				lineAnchor = LineFromLocation(pt);
-				// Single click in margin: select whole line
-				LineSelection(lineAnchor, lineAnchor);
-				SetSelection(pdoc->LineStart(lineAnchor + 1),
-				             pdoc->LineStart(lineAnchor));
-			} else {
-				// Single shift+click in margin: select from line anchor to clicked line
-				if (anchor > currentPos)
-					lineAnchor = pdoc->LineFromPosition(anchor - 1);
-				else
-					lineAnchor = pdoc->LineFromPosition(anchor);
-				int lineStart = LineFromLocation(pt);
-				LineSelection(lineStart, lineAnchor);
-				//lineAnchor = lineStart; // Keep the same anchor for ButtonMove
-			}
-
-			SetDragPosition(invalidPosition);
-			SetMouseCapture(true);
-			selectionType = selLine;
-		} else {
-			if (PointIsHotspot(pt)) {
-				NotifyHotSpotClicked(newPos, shift, ctrl, alt);
-			}
-			if (!shift) {
-				inDragDrop = PointInSelection(pt) && !SelectionEmpty();
-			}
-			if (inDragDrop) {
-				SetMouseCapture(false);
-				SetDragPosition(newPos);
-				CopySelectionRange(&drag);
-				StartDrag();
-			} else {
-				SetDragPosition(invalidPosition);
-				SetMouseCapture(true);
-				if (!shift) {
-					SetEmptySelection(newPos);
-				}
-				selType = alt ? selRectangle : selStream;
-				selectionType = selChar;
-				originalAnchorPos = currentPos;
-				SetRectangularRange();
-			}
-		}
-	}
-	lastClickTime = curTime;
-	lastXChosen = pt.x;
-	ShowCaretAtCurrentPosition();
-}
-
-bool Editor::PositionIsHotspot(int position) {
-	return vs.styles[pdoc->StyleAt(position) & pdoc->stylingBitsMask].hotspot;
-}
-
-bool Editor::PointIsHotspot(Point pt) {
-	int pos = PositionFromLocationClose(pt);
-	if (pos == INVALID_POSITION)
-		return false;
-	return PositionIsHotspot(pos);
-}
-
-void Editor::SetHotSpotRange(Point *pt) {
-	if (pt) {
-		int pos = PositionFromLocation(*pt);
-
-		// If we don't limit this to word characters then the
-		// range can encompass more than the run range and then
-		// the underline will not be drawn properly.
-		int hsStart_ = pdoc->ExtendStyleRange(pos, -1, vs.hotspotSingleLine);
-		int hsEnd_ = pdoc->ExtendStyleRange(pos, 1, vs.hotspotSingleLine);
-
-		// Only invalidate the range if the hotspot range has changed...
-		if (hsStart_ != hsStart || hsEnd_ != hsEnd) {
-			if (hsStart != -1) {
-				InvalidateRange(hsStart, hsEnd);
-			}
-			hsStart = hsStart_;
-			hsEnd = hsEnd_;
-			InvalidateRange(hsStart, hsEnd);
-		}
-	} else {
-		if (hsStart != -1) {
-			int hsStart_ = hsStart;
-			int hsEnd_ = hsEnd;
-			hsStart = -1;
-			hsEnd = -1;
-			InvalidateRange(hsStart_, hsEnd_);
-		} else {
-			hsStart = -1;
-			hsEnd = -1;
-		}
-	}
-}
-
-void Editor::GetHotSpotRange(int& hsStart_, int& hsEnd_) {
-	hsStart_ = hsStart;
-	hsEnd_ = hsEnd;
-}
-
-void Editor::ButtonMove(Point pt) {
-	if ((ptMouseLast.x != pt.x) || (ptMouseLast.y != pt.y)) {
-		DwellEnd(true);
-	}
-	ptMouseLast = pt;
-	//Platform::DebugPrintf("Move %d %d\n", pt.x, pt.y);
-	if (HaveMouseCapture()) {
-
-		// Slow down autoscrolling/selection
-		autoScrollTimer.ticksToWait -= timer.tickSize;
-		if (autoScrollTimer.ticksToWait > 0)
-			return;
-		autoScrollTimer.ticksToWait = autoScrollDelay;
-
-		// Adjust selection
-		int movePos = PositionFromLocation(pt);
-		movePos = MovePositionOutsideChar(movePos, currentPos - movePos);
-		if (posDrag >= 0) {
-			SetDragPosition(movePos);
-		} else {
-			if (selectionType == selChar) {
-				SetSelection(movePos);
-			} else if (selectionType == selWord) {
-				// Continue selecting by word
-				if (movePos == originalAnchorPos) {	// Didn't move
-					// No need to do anything. Previously this case was lumped
-					// in with "Moved forward", but that can be harmful in this
-					// case: a handler for the NotifyDoubleClick re-adjusts
-					// the selection for a fancier definition of "word" (for
-					// example, in Perl it is useful to include the leading
-					// '$', '%' or '@' on variables for word selection). In this
-					// the ButtonMove() called via Tick() for auto-scrolling
-					// could result in the fancier word selection adjustment
-					// being unmade.
-				} else if (movePos > originalAnchorPos) {	// Moved forward
-					SetSelection(pdoc->ExtendWordSelect(movePos, 1),
-					             pdoc->ExtendWordSelect(originalAnchorPos, -1));
-				} else {	// Moved backward
-					SetSelection(pdoc->ExtendWordSelect(movePos, -1),
-					             pdoc->ExtendWordSelect(originalAnchorPos, 1));
-				}
-			} else {
-				// Continue selecting by line
-				int lineMove = LineFromLocation(pt);
-				LineSelection(lineMove, lineAnchor);
-			}
-		}
-		// While dragging to make rectangular selection, we don't want the current
-		// position to jump to the end of smaller or empty lines.
-		//xEndSelect = pt.x - vs.fixedColumnWidth + xOffset;
-		xEndSelect = XFromPosition(movePos);
-
-		// Autoscroll
-		PRectangle rcClient = GetClientRectangle();
-		if (pt.y > rcClient.bottom) {
-			int lineMove = cs.DisplayFromDoc(LineFromLocation(pt));
-			if (lineMove < 0) {
-				lineMove = cs.DisplayFromDoc(pdoc->LinesTotal() - 1);
-			}
-			ScrollTo(lineMove - LinesOnScreen() + 5);
-			Redraw();
-		} else if (pt.y < rcClient.top) {
-			int lineMove = cs.DisplayFromDoc(LineFromLocation(pt));
-			ScrollTo(lineMove - 5);
-			Redraw();
-		}
-		EnsureCaretVisible(false, false, true);
-
-		if (hsStart != -1 && !PositionIsHotspot(movePos))
-			SetHotSpotRange(NULL);
-
-	} else {
-		if (vs.fixedColumnWidth > 0) {	// There is a margin
-			if (PointInSelMargin(pt)) {
-				DisplayCursor(Window::cursorReverseArrow);
-				return; 	// No need to test for selection
-			}
-		}
-		// Display regular (drag) cursor over selection
-		if (PointInSelection(pt) && !SelectionEmpty()) {
-			DisplayCursor(Window::cursorArrow);
-		} else if (PointIsHotspot(pt)) {
-			DisplayCursor(Window::cursorHand);
-			SetHotSpotRange(&pt);
-		} else {
-			DisplayCursor(Window::cursorText);
-			SetHotSpotRange(NULL);
-		}
-	}
-}
-
-void Editor::ButtonUp(Point pt, unsigned int curTime, bool ctrl) {
-	//Platform::DebugPrintf("ButtonUp %d\n", HaveMouseCapture());
-	if (HaveMouseCapture()) {
-		if (PointInSelMargin(pt)) {
-			DisplayCursor(Window::cursorReverseArrow);
-		} else {
-			DisplayCursor(Window::cursorText);
-			SetHotSpotRange(NULL);
-		}
-		ptMouseLast = pt;
-		SetMouseCapture(false);
-		int newPos = PositionFromLocation(pt);
-		newPos = MovePositionOutsideChar(newPos, currentPos - newPos);
-		if (inDragDrop) {
-			int selStart = SelectionStart();
-			int selEnd = SelectionEnd();
-			if (selStart < selEnd) {
-				if (drag.len) {
-					if (ctrl) {
-						if (pdoc->InsertString(newPos, drag.s, drag.len)) {
-							SetSelection(newPos, newPos + drag.len);
-						}
-					} else if (newPos < selStart) {
-						pdoc->DeleteChars(selStart, drag.len);
-						if (pdoc->InsertString(newPos, drag.s, drag.len)) {
-							SetSelection(newPos, newPos + drag.len);
-						}
-					} else if (newPos > selEnd) {
-						pdoc->DeleteChars(selStart, drag.len);
-						newPos -= drag.len;
-						if (pdoc->InsertString(newPos, drag.s, drag.len)) {
-							SetSelection(newPos, newPos + drag.len);
-						}
-					} else {
-						SetEmptySelection(newPos);
-					}
-					drag.Free();
-				}
-				selectionType = selChar;
-			}
-		} else {
-			if (selectionType == selChar) {
-				SetSelection(newPos);
-			}
-		}
-		SetRectangularRange();
-		lastClickTime = curTime;
-		lastClick = pt;
-		lastXChosen = pt.x;
-		if (selType == selStream) {
-			SetLastXChosen();
-		}
-		inDragDrop = false;
-		EnsureCaretVisible(false);
-	}
-}
-
-// Called frequently to perform background UI including
-// caret blinking and automatic scrolling.
-void Editor::Tick() {
-	if (HaveMouseCapture()) {
-		// Auto scroll
-		ButtonMove(ptMouseLast);
-	}
-	if (caret.period > 0) {
-		timer.ticksToWait -= timer.tickSize;
-		if (timer.ticksToWait <= 0) {
-			caret.on = !caret.on;
-			timer.ticksToWait = caret.period;
-			if (caret.active) {
-				InvalidateCaret();
-			}
-		}
-	}
-	if ((dwellDelay < SC_TIME_FOREVER) &&
-	        (ticksToDwell > 0) &&
-	        (!HaveMouseCapture())) {
-		ticksToDwell -= timer.tickSize;
-		if (ticksToDwell <= 0) {
-			dwelling = true;
-			NotifyDwelling(ptMouseLast, dwelling);
-		}
-	}
-}
-
-bool Editor::Idle() {
-
-	bool idleDone;
-
-	bool wrappingDone = wrapState == eWrapNone;
-
-	if (!wrappingDone) {
-		// Wrap lines during idle.
-		WrapLines(false, -1);
-		// No more wrapping
-		if (wrapStart == wrapEnd)
-			wrappingDone = true;
-	}
-
-	// Add more idle things to do here, but make sure idleDone is
-	// set correctly before the function returns. returning
-	// false will stop calling this idle funtion until SetIdle() is
-	// called again.
-
-	idleDone = wrappingDone; // && thatDone && theOtherThingDone...
-
-	return !idleDone;
-}
-
-void Editor::SetFocusState(bool focusState) {
-	hasFocus = focusState;
-	NotifyFocus(hasFocus);
-	if (hasFocus) {
-		ShowCaretAtCurrentPosition();
-	} else {
-		CancelModes();
-		DropCaret();
-	}
-}
-
-bool Editor::PaintContains(PRectangle rc) {
-	return rcPaint.Contains(rc);
-}
-
-bool Editor::PaintContainsMargin() {
-	PRectangle rcSelMargin = GetClientRectangle();
-	rcSelMargin.right = vs.fixedColumnWidth;
-	return PaintContains(rcSelMargin);
-}
-
-void Editor::CheckForChangeOutsidePaint(Range r) {
-	if (paintState == painting && !paintingAllText) {
-		//Platform::DebugPrintf("Checking range in paint %d-%d\n", r.start, r.end);
-		if (!r.Valid())
-			return;
-
-		PRectangle rcRange = RectangleFromRange(r.start, r.end);
-		PRectangle rcText = GetTextRectangle();
-		if (rcRange.top < rcText.top) {
-			rcRange.top = rcText.top;
-		}
-		if (rcRange.bottom > rcText.bottom) {
-			rcRange.bottom = rcText.bottom;
-		}
-
-		if (!PaintContains(rcRange)) {
-			AbandonPaint();
-		}
-	}
-}
-
-void Editor::SetBraceHighlight(Position pos0, Position pos1, int matchStyle) {
-	if ((pos0 != braces[0]) || (pos1 != braces[1]) || (matchStyle != bracesMatchStyle)) {
-		if ((braces[0] != pos0) || (matchStyle != bracesMatchStyle)) {
-			CheckForChangeOutsidePaint(Range(braces[0]));
-			CheckForChangeOutsidePaint(Range(pos0));
-			braces[0] = pos0;
-		}
-		if ((braces[1] != pos1) || (matchStyle != bracesMatchStyle)) {
-			CheckForChangeOutsidePaint(Range(braces[1]));
-			CheckForChangeOutsidePaint(Range(pos1));
-			braces[1] = pos1;
-		}
-		bracesMatchStyle = matchStyle;
-		if (paintState == notPainting) {
-			Redraw();
-		}
-	}
-}
-
-void Editor::SetDocPointer(Document *document) {
-	//Platform::DebugPrintf("** %x setdoc to %x\n", pdoc, document);
-	pdoc->RemoveWatcher(this, 0);
-	pdoc->Release();
-	if (document == NULL) {
-		pdoc = new Document();
-	} else {
-		pdoc = document;
-	}
-	pdoc->AddRef();
-
-	// Ensure all positions within document
-	selType = selStream;
-	currentPos = 0;
-	anchor = 0;
-	targetStart = 0;
-	targetEnd = 0;
-
-	braces[0] = invalidPosition;
-	braces[1] = invalidPosition;
-
-	// Reset the contraction state to fully shown.
-	cs.Clear();
-	cs.InsertLines(0, pdoc->LinesTotal() - 1);
-	llc.Deallocate();
-	NeedWrapping();
-
-	pdoc->AddWatcher(this, 0);
-	SetScrollBars();
-	Redraw();
-}
-
-/**
- * Recursively expand a fold, making lines visible except where they have an unexpanded parent.
- */
-void Editor::Expand(int &line, bool doExpand) {
-	int lineMaxSubord = pdoc->GetLastChild(line);
-	line++;
-	while (line <= lineMaxSubord) {
-		if (doExpand)
-			cs.SetVisible(line, line, true);
-		int level = pdoc->GetLevel(line);
-		if (level & SC_FOLDLEVELHEADERFLAG) {
-			if (doExpand && cs.GetExpanded(line)) {
-				Expand(line, true);
-			} else {
-				Expand(line, false);
-			}
-		} else {
-			line++;
-		}
-	}
-}
-
-void Editor::ToggleContraction(int line) {
-	if (line >= 0) {
-		if ((pdoc->GetLevel(line) & SC_FOLDLEVELHEADERFLAG) == 0) {
-			line = pdoc->GetFoldParent(line);
-			if (line < 0)
-				return;
-		}
-
-		if (cs.GetExpanded(line)) {
-			int lineMaxSubord = pdoc->GetLastChild(line);
-			cs.SetExpanded(line, 0);
-			if (lineMaxSubord > line) {
-				cs.SetVisible(line + 1, lineMaxSubord, false);
-
-				int lineCurrent = pdoc->LineFromPosition(currentPos);
-				if (lineCurrent > line && lineCurrent <= lineMaxSubord) {
-					// This does not re-expand the fold
-					EnsureCaretVisible();
-				}
-
-				SetScrollBars();
-				Redraw();
-			}
-
-		} else {
-			if (!(cs.GetVisible(line))) {
-				EnsureLineVisible(line, false);
-				GoToLine(line);
-			}
-			cs.SetExpanded(line, 1);
-			Expand(line, true);
-			SetScrollBars();
-			Redraw();
-		}
-	}
-}
-
-/**
- * Recurse up from this line to find any folds that prevent this line from being visible
- * and unfold them all.
- */
-void Editor::EnsureLineVisible(int lineDoc, bool enforcePolicy) {
-
-	// In case in need of wrapping to ensure DisplayFromDoc works.
-	WrapLines(true, -1);
-
-	if (!cs.GetVisible(lineDoc)) {
-		int lineParent = pdoc->GetFoldParent(lineDoc);
-		if (lineParent >= 0) {
-			if (lineDoc != lineParent)
-				EnsureLineVisible(lineParent, enforcePolicy);
-			if (!cs.GetExpanded(lineParent)) {
-				cs.SetExpanded(lineParent, 1);
-				Expand(lineParent, true);
-			}
-		}
-		SetScrollBars();
-		Redraw();
-	}
-	if (enforcePolicy) {
-		int lineDisplay = cs.DisplayFromDoc(lineDoc);
-		if (visiblePolicy & VISIBLE_SLOP) {
-			if ((topLine > lineDisplay) || ((visiblePolicy & VISIBLE_STRICT) && (topLine + visibleSlop > lineDisplay))) {
-				SetTopLine(Platform::Clamp(lineDisplay - visibleSlop, 0, MaxScrollPos()));
-				SetVerticalScrollPos();
-				Redraw();
-			} else if ((lineDisplay > topLine + LinesOnScreen() - 1) ||
-			           ((visiblePolicy & VISIBLE_STRICT) && (lineDisplay > topLine + LinesOnScreen() - 1 - visibleSlop))) {
-				SetTopLine(Platform::Clamp(lineDisplay - LinesOnScreen() + 1 + visibleSlop, 0, MaxScrollPos()));
-				SetVerticalScrollPos();
-				Redraw();
-			}
-		} else {
-			if ((topLine > lineDisplay) || (lineDisplay > topLine + LinesOnScreen() - 1) || (visiblePolicy & VISIBLE_STRICT)) {
-				SetTopLine(Platform::Clamp(lineDisplay - LinesOnScreen() / 2 + 1, 0, MaxScrollPos()));
-				SetVerticalScrollPos();
-				Redraw();
-			}
-		}
-	}
-}
-
-int Editor::ReplaceTarget(bool replacePatterns, const char *text, int length) {
-	pdoc->BeginUndoAction();
-	if (length == -1)
-		length = istrlen(text);
-	if (replacePatterns) {
-		text = pdoc->SubstituteByPosition(text, &length);
-		if (!text)
-			return 0;
-	}
-	if (targetStart != targetEnd)
-		pdoc->DeleteChars(targetStart, targetEnd - targetStart);
-	targetEnd = targetStart;
-	pdoc->InsertString(targetStart, text, length);
-	targetEnd = targetStart + length;
-	pdoc->EndUndoAction();
-	return length;
-}
-
-bool Editor::IsUnicodeMode() const {
-	return pdoc && (SC_CP_UTF8 == pdoc->dbcsCodePage);
-}
-
-int Editor::CodePage() const {
-	if (pdoc)
-		return pdoc->dbcsCodePage;
-	else
-		return 0;
-}
-
-int Editor::WrapCount(int line) {
-	AutoSurface surface(this);
-	AutoLineLayout ll(llc, RetrieveLineLayout(line));
-
-	if (surface && ll) {
-		LayoutLine(line, surface, vs, ll, wrapWidth);
-		return ll->lines;
-	} else {
-		return 1;
-	}
-}
-
-static bool ValidMargin(unsigned long wParam) {
-	return wParam < ViewStyle::margins;
-}
-
-static char *CharPtrFromSPtr(sptr_t lParam) {
-	return reinterpret_cast<char *>(lParam);
-}
-
-sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
-	//Platform::DebugPrintf("S start wnd proc %d %d %d\n",iMessage, wParam, lParam);
-
-	// Optional macro recording hook
-	if (recordingMacro)
-		NotifyMacroRecord(iMessage, wParam, lParam);
-
-	switch (iMessage) {
-
-	case SCI_GETTEXT: {
-			if (lParam == 0)
-				return pdoc->Length() + 1;
-			if (wParam == 0)
-				return 0;
-			char *ptr = CharPtrFromSPtr(lParam);
-			unsigned int iChar = 0;
-			for (; iChar < wParam - 1; iChar++)
-				ptr[iChar] = pdoc->CharAt(iChar);
-			ptr[iChar] = '\0';
-			return iChar;
-		}
-
-	case SCI_SETTEXT: {
-			if (lParam == 0)
-				return 0;
-			pdoc->BeginUndoAction();
-			pdoc->DeleteChars(0, pdoc->Length());
-			SetEmptySelection(0);
-			pdoc->InsertString(0, CharPtrFromSPtr(lParam));
-			pdoc->EndUndoAction();
-			return 1;
-		}
-
-	case SCI_GETTEXTLENGTH:
-		return pdoc->Length();
-
-	case SCI_CUT:
-		Cut();
-		SetLastXChosen();
-		break;
-
-	case SCI_COPY:
-		Copy();
-		break;
-
-	case SCI_COPYRANGE:
-		CopyRangeToClipboard(wParam, lParam);
-		break;
-
-	case SCI_COPYTEXT:
-		CopyText(wParam, CharPtrFromSPtr(lParam));
-		break;
-
-	case SCI_PASTE:
-		Paste();
-		if (!caretSticky) {
-			SetLastXChosen();
-		}
-		EnsureCaretVisible();
-		break;
-
-	case SCI_CLEAR:
-		Clear();
-		SetLastXChosen();
-		EnsureCaretVisible();
-		break;
-
-	case SCI_UNDO:
-		Undo();
-		SetLastXChosen();
-		break;
-
-	case SCI_CANUNDO:
-		return (pdoc->CanUndo() && !pdoc->IsReadOnly()) ? 1 : 0;
-
-	case SCI_EMPTYUNDOBUFFER:
-		pdoc->DeleteUndoHistory();
-		return 0;
-
-	case SCI_GETFIRSTVISIBLELINE:
-		return topLine;
-
-	case SCI_GETLINE: {	// Risk of overwriting the end of the buffer
-			int lineStart = pdoc->LineStart(wParam);
-			int lineEnd = pdoc->LineStart(wParam + 1);
-			if (lParam == 0) {
-				return lineEnd - lineStart;
-			}
-			char *ptr = CharPtrFromSPtr(lParam);
-			int iPlace = 0;
-			for (int iChar = lineStart; iChar < lineEnd; iChar++) {
-				ptr[iPlace++] = pdoc->CharAt(iChar);
-			}
-			return iPlace;
-		}
-
-	case SCI_GETLINECOUNT:
-		if (pdoc->LinesTotal() == 0)
-			return 1;
-		else
-			return pdoc->LinesTotal();
-
-	case SCI_GETMODIFY:
-		return !pdoc->IsSavePoint();
-
-	case SCI_SETSEL: {
-			int nStart = static_cast<int>(wParam);
-			int nEnd = static_cast<int>(lParam);
-			if (nEnd < 0)
-				nEnd = pdoc->Length();
-			if (nStart < 0)
-				nStart = nEnd; 	// Remove selection
-			selType = selStream;
-			SetSelection(nEnd, nStart);
-			EnsureCaretVisible();
-		}
-		break;
-
-	case SCI_GETSELTEXT: {
-			if (lParam == 0) {
-				if (selType == selStream) {
-					return 1 + SelectionEnd() - SelectionStart();
-				} else {
-					// TODO: why is selLines handled the slow way?
-					int size = 0;
-					int extraCharsPerLine = 0;
-					if (selType != selLines)
-						extraCharsPerLine = (pdoc->eolMode == SC_EOL_CRLF) ? 2 : 1;
-					SelectionLineIterator lineIterator(this);
-					while (lineIterator.Iterate()) {
-						size += lineIterator.endPos + extraCharsPerLine - lineIterator.startPos;
-					}
-
-					return 1 + size;
-				}
-			}
-			SelectionText selectedText;
-			CopySelectionRange(&selectedText);
-			char *ptr = CharPtrFromSPtr(lParam);
-			int iChar = 0;
-			if (selectedText.len) {
-				for (; iChar < selectedText.len; iChar++)
-					ptr[iChar] = selectedText.s[iChar];
-			} else {
-				ptr[0] = '\0';
-			}
-			return iChar;
-		}
-
-	case SCI_LINEFROMPOSITION:
-		if (static_cast<int>(wParam) < 0)
-			return 0;
-		return pdoc->LineFromPosition(wParam);
-
-	case SCI_POSITIONFROMLINE:
-		if (static_cast<int>(wParam) < 0)
-			wParam = pdoc->LineFromPosition(SelectionStart());
-		if (wParam == 0)
-			return 0; 	// Even if there is no text, there is a first line that starts at 0
-		if (static_cast<int>(wParam) > pdoc->LinesTotal())
-			return -1;
-		//if (wParam > pdoc->LineFromPosition(pdoc->Length()))	// Useful test, anyway...
-		//	return -1;
-		return pdoc->LineStart(wParam);
-
-		// Replacement of the old Scintilla interpretation of EM_LINELENGTH
-	case SCI_LINELENGTH:
-		if ((static_cast<int>(wParam) < 0) ||
-		        (static_cast<int>(wParam) > pdoc->LineFromPosition(pdoc->Length())))
-			return 0;
-		return pdoc->LineStart(wParam + 1) - pdoc->LineStart(wParam);
-
-	case SCI_REPLACESEL: {
-			if (lParam == 0)
-				return 0;
-			pdoc->BeginUndoAction();
-			ClearSelection();
-			char *replacement = CharPtrFromSPtr(lParam);
-			pdoc->InsertString(currentPos, replacement);
-			pdoc->EndUndoAction();
-			SetEmptySelection(currentPos + istrlen(replacement));
-			EnsureCaretVisible();
-		}
-		break;
-
-	case SCI_SETTARGETSTART:
-		targetStart = wParam;
-		break;
-
-	case SCI_GETTARGETSTART:
-		return targetStart;
-
-	case SCI_SETTARGETEND:
-		targetEnd = wParam;
-		break;
-
-	case SCI_GETTARGETEND:
-		return targetEnd;
-
-	case SCI_TARGETFROMSELECTION:
-		if (currentPos < anchor) {
-			targetStart = currentPos;
-			targetEnd = anchor;
-		} else {
-			targetStart = anchor;
-			targetEnd = currentPos;
-		}
-		break;
-
-	case SCI_REPLACETARGET:
-		PLATFORM_ASSERT(lParam);
-		return ReplaceTarget(false, CharPtrFromSPtr(lParam), wParam);
-
-	case SCI_REPLACETARGETRE:
-		PLATFORM_ASSERT(lParam);
-		return ReplaceTarget(true, CharPtrFromSPtr(lParam), wParam);
-
-	case SCI_SEARCHINTARGET:
-		PLATFORM_ASSERT(lParam);
-		return SearchInTarget(CharPtrFromSPtr(lParam), wParam);
-
-	case SCI_SETSEARCHFLAGS:
-		searchFlags = wParam;
-		break;
-
-	case SCI_GETSEARCHFLAGS:
-		return searchFlags;
-
-	case SCI_POSITIONBEFORE:
-		return pdoc->MovePositionOutsideChar(wParam-1, -1, true);
-
-	case SCI_POSITIONAFTER:
-		return pdoc->MovePositionOutsideChar(wParam+1, 1, true);
-
-	case SCI_LINESCROLL:
-		ScrollTo(topLine + lParam);
-		HorizontalScrollTo(xOffset + wParam * vs.spaceWidth);
-		return 1;
-
-	case SCI_SETXOFFSET:
-		xOffset = wParam;
-		SetHorizontalScrollPos();
-		Redraw();
-		break;
-
-	case SCI_GETXOFFSET:
-		return xOffset;
-
-	case SCI_CHOOSECARETX:
-		SetLastXChosen();
-		break;
-
-	case SCI_SCROLLCARET:
-		EnsureCaretVisible();
-		break;
-
-	case SCI_SETREADONLY:
-		pdoc->SetReadOnly(wParam != 0);
-		return 1;
-
-	case SCI_GETREADONLY:
-		return pdoc->IsReadOnly();
-
-	case SCI_CANPASTE:
-		return CanPaste();
-
-	case SCI_POINTXFROMPOSITION:
-		if (lParam < 0) {
-			return 0;
-		} else {
-			Point pt = LocationFromPosition(lParam);
-			return pt.x;
-		}
-
-	case SCI_POINTYFROMPOSITION:
-		if (lParam < 0) {
-			return 0;
-		} else {
-			Point pt = LocationFromPosition(lParam);
-			return pt.y;
-		}
-
-	case SCI_FINDTEXT:
-		return FindText(wParam, lParam);
-
-	case SCI_GETTEXTRANGE: {
-			if (lParam == 0)
-				return 0;
-			TextRange *tr = reinterpret_cast<TextRange *>(lParam);
-			int cpMax = tr->chrg.cpMax;
-			if (cpMax == -1)
-				cpMax = pdoc->Length();
-			PLATFORM_ASSERT(cpMax <= pdoc->Length());
-			int len = cpMax - tr->chrg.cpMin; 	// No -1 as cpMin and cpMax are referring to inter character positions
-			pdoc->GetCharRange(tr->lpstrText, tr->chrg.cpMin, len);
-			// Spec says copied text is terminated with a NUL
-			tr->lpstrText[len] = '\0';
-			return len; 	// Not including NUL
-		}
-
-	case SCI_HIDESELECTION:
-		hideSelection = wParam != 0;
-		Redraw();
-		break;
-
-	case SCI_FORMATRANGE:
-		return FormatRange(wParam != 0, reinterpret_cast<RangeToFormat *>(lParam));
-
-	case SCI_GETMARGINLEFT:
-		return vs.leftMarginWidth;
-
-	case SCI_GETMARGINRIGHT:
-		return vs.rightMarginWidth;
-
-	case SCI_SETMARGINLEFT:
-		vs.leftMarginWidth = lParam;
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_SETMARGINRIGHT:
-		vs.rightMarginWidth = lParam;
-		InvalidateStyleRedraw();
-		break;
-
-		// Control specific mesages
-
-	case SCI_ADDTEXT: {
-			if (lParam == 0)
-				return 0;
-			pdoc->InsertString(CurrentPosition(), CharPtrFromSPtr(lParam), wParam);
-			SetEmptySelection(currentPos + wParam);
-			return 0;
-		}
-
-	case SCI_ADDSTYLEDTEXT: {
-			if (lParam == 0)
-				return 0;
-			pdoc->InsertStyledString(CurrentPosition() * 2, CharPtrFromSPtr(lParam), wParam);
-			SetEmptySelection(currentPos + wParam / 2);
-			return 0;
-		}
-
-	case SCI_INSERTTEXT: {
-			if (lParam == 0)
-				return 0;
-			int insertPos = wParam;
-			if (static_cast<int>(wParam) == -1)
-				insertPos = CurrentPosition();
-			int newCurrent = CurrentPosition();
-			char *sz = CharPtrFromSPtr(lParam);
-			pdoc->InsertString(insertPos, sz);
-			if (newCurrent > insertPos)
-				newCurrent += istrlen(sz);
-			SetEmptySelection(newCurrent);
-			return 0;
-		}
-
-	case SCI_APPENDTEXT:
-		pdoc->InsertString(pdoc->Length(), CharPtrFromSPtr(lParam), wParam);
-		return 0;
-
-	case SCI_CLEARALL:
-		ClearAll();
-		return 0;
-
-	case SCI_CLEARDOCUMENTSTYLE:
-		ClearDocumentStyle();
-		return 0;
-
-	case SCI_SETUNDOCOLLECTION:
-		pdoc->SetUndoCollection(wParam != 0);
-		return 0;
-
-	case SCI_GETUNDOCOLLECTION:
-		return pdoc->IsCollectingUndo();
-
-	case SCI_BEGINUNDOACTION:
-		pdoc->BeginUndoAction();
-		return 0;
-
-	case SCI_ENDUNDOACTION:
-		pdoc->EndUndoAction();
-		return 0;
-
-	case SCI_GETCARETPERIOD:
-		return caret.period;
-
-	case SCI_SETCARETPERIOD:
-		caret.period = wParam;
-		break;
-
-	case SCI_SETWORDCHARS: {
-			pdoc->SetDefaultCharClasses(false);
-			if (lParam == 0)
-				return 0;
-			pdoc->SetCharClasses(reinterpret_cast<unsigned char *>(lParam), CharClassify::ccWord);
-		}
-		break;
-
-	case SCI_SETWHITESPACECHARS: {
-			if (lParam == 0)
-				return 0;
-			pdoc->SetCharClasses(reinterpret_cast<unsigned char *>(lParam), CharClassify::ccSpace);
-		}
-		break;
-
-	case SCI_SETCHARSDEFAULT:
-		pdoc->SetDefaultCharClasses(true);
-		break;
-
-	case SCI_GETLENGTH:
-		return pdoc->Length();
-
-	case SCI_ALLOCATE:
-		pdoc->Allocate(wParam);
-		break;
-
-	case SCI_GETCHARAT:
-		return pdoc->CharAt(wParam);
-
-	case SCI_SETCURRENTPOS:
-		SetSelection(wParam, anchor);
-		break;
-
-	case SCI_GETCURRENTPOS:
-		return currentPos;
-
-	case SCI_SETANCHOR:
-		SetSelection(currentPos, wParam);
-		break;
-
-	case SCI_GETANCHOR:
-		return anchor;
-
-	case SCI_SETSELECTIONSTART:
-		SetSelection(Platform::Maximum(currentPos, wParam), wParam);
-		break;
-
-	case SCI_GETSELECTIONSTART:
-		return Platform::Minimum(anchor, currentPos);
-
-	case SCI_SETSELECTIONEND:
-		SetSelection(wParam, Platform::Minimum(anchor, wParam));
-		break;
-
-	case SCI_GETSELECTIONEND:
-		return Platform::Maximum(anchor, currentPos);
-
-	case SCI_SETPRINTMAGNIFICATION:
-		printMagnification = wParam;
-		break;
-
-	case SCI_GETPRINTMAGNIFICATION:
-		return printMagnification;
-
-	case SCI_SETPRINTCOLOURMODE:
-		printColourMode = wParam;
-		break;
-
-	case SCI_GETPRINTCOLOURMODE:
-		return printColourMode;
-
-	case SCI_SETPRINTWRAPMODE:
-		printWrapState = (wParam == SC_WRAP_WORD) ? eWrapWord : eWrapNone;
-		break;
-
-	case SCI_GETPRINTWRAPMODE:
-		return printWrapState;
-
-	case SCI_GETSTYLEAT:
-		if (static_cast<int>(wParam) >= pdoc->Length())
-			return 0;
-		else
-			return pdoc->StyleAt(wParam);
-
-	case SCI_REDO:
-		Redo();
-		break;
-
-	case SCI_SELECTALL:
-		SelectAll();
-		break;
-
-	case SCI_SETSAVEPOINT:
-		pdoc->SetSavePoint();
-		break;
-
-	case SCI_GETSTYLEDTEXT: {
-			if (lParam == 0)
-				return 0;
-			TextRange *tr = reinterpret_cast<TextRange *>(lParam);
-			int iPlace = 0;
-			for (int iChar = tr->chrg.cpMin; iChar < tr->chrg.cpMax; iChar++) {
-				tr->lpstrText[iPlace++] = pdoc->CharAt(iChar);
-				tr->lpstrText[iPlace++] = pdoc->StyleAt(iChar);
-			}
-			tr->lpstrText[iPlace] = '\0';
-			tr->lpstrText[iPlace + 1] = '\0';
-			return iPlace;
-		}
-
-	case SCI_CANREDO:
-		return (pdoc->CanRedo() && !pdoc->IsReadOnly()) ? 1 : 0;
-
-	case SCI_MARKERLINEFROMHANDLE:
-		return pdoc->LineFromHandle(wParam);
-
-	case SCI_MARKERDELETEHANDLE:
-		pdoc->DeleteMarkFromHandle(wParam);
-		break;
-
-	case SCI_GETVIEWWS:
-		return vs.viewWhitespace;
-
-	case SCI_SETVIEWWS:
-		vs.viewWhitespace = static_cast<WhiteSpaceVisibility>(wParam);
-		Redraw();
-		break;
-
-	case SCI_POSITIONFROMPOINT:
-		return PositionFromLocation(Point(wParam, lParam));
-
-	case SCI_POSITIONFROMPOINTCLOSE:
-		return PositionFromLocationClose(Point(wParam, lParam));
-
-	case SCI_GOTOLINE:
-		GoToLine(wParam);
-		break;
-
-	case SCI_GOTOPOS:
-		SetEmptySelection(wParam);
-		EnsureCaretVisible();
-		Redraw();
-		break;
-
-	case SCI_GETCURLINE: {
-			int lineCurrentPos = pdoc->LineFromPosition(currentPos);
-			int lineStart = pdoc->LineStart(lineCurrentPos);
-			unsigned int lineEnd = pdoc->LineStart(lineCurrentPos + 1);
-			if (lParam == 0) {
-				return 1 + lineEnd - lineStart;
-			}
-			PLATFORM_ASSERT(wParam > 0);
-			char *ptr = CharPtrFromSPtr(lParam);
-			unsigned int iPlace = 0;
-			for (unsigned int iChar = lineStart; iChar < lineEnd && iPlace < wParam - 1; iChar++) {
-				ptr[iPlace++] = pdoc->CharAt(iChar);
-			}
-			ptr[iPlace] = '\0';
-			return currentPos - lineStart;
-		}
-
-	case SCI_GETENDSTYLED:
-		return pdoc->GetEndStyled();
-
-	case SCI_GETEOLMODE:
-		return pdoc->eolMode;
-
-	case SCI_SETEOLMODE:
-		pdoc->eolMode = wParam;
-		break;
-
-	case SCI_STARTSTYLING:
-		pdoc->StartStyling(wParam, static_cast<char>(lParam));
-		break;
-
-	case SCI_SETSTYLING:
-		pdoc->SetStyleFor(wParam, static_cast<char>(lParam));
-		break;
-
-	case SCI_SETSTYLINGEX:             // Specify a complete styling buffer
-		if (lParam == 0)
-			return 0;
-		pdoc->SetStyles(wParam, CharPtrFromSPtr(lParam));
-		break;
-
-	case SCI_SETBUFFEREDDRAW:
-		bufferedDraw = wParam != 0;
-		break;
-
-	case SCI_GETBUFFEREDDRAW:
-		return bufferedDraw;
-
-	case SCI_GETTWOPHASEDRAW:
-		return twoPhaseDraw;
-
-	case SCI_SETTWOPHASEDRAW:
-		twoPhaseDraw = wParam != 0;
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_SETTABWIDTH:
-		if (wParam > 0) {
-			pdoc->tabInChars = wParam;
-			if (pdoc->indentInChars == 0)
-				pdoc->actualIndentInChars = pdoc->tabInChars;
-		}
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_GETTABWIDTH:
-		return pdoc->tabInChars;
-
-	case SCI_SETINDENT:
-		pdoc->indentInChars = wParam;
-		if (pdoc->indentInChars != 0)
-			pdoc->actualIndentInChars = pdoc->indentInChars;
-		else
-			pdoc->actualIndentInChars = pdoc->tabInChars;
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_GETINDENT:
-		return pdoc->indentInChars;
-
-	case SCI_SETUSETABS:
-		pdoc->useTabs = wParam != 0;
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_GETUSETABS:
-		return pdoc->useTabs;
-
-	case SCI_SETLINEINDENTATION:
-		pdoc->SetLineIndentation(wParam, lParam);
-		break;
-
-	case SCI_GETLINEINDENTATION:
-		return pdoc->GetLineIndentation(wParam);
-
-	case SCI_GETLINEINDENTPOSITION:
-		return pdoc->GetLineIndentPosition(wParam);
-
-	case SCI_SETTABINDENTS:
-		pdoc->tabIndents = wParam != 0;
-		break;
-
-	case SCI_GETTABINDENTS:
-		return pdoc->tabIndents;
-
-	case SCI_SETBACKSPACEUNINDENTS:
-		pdoc->backspaceUnindents = wParam != 0;
-		break;
-
-	case SCI_GETBACKSPACEUNINDENTS:
-		return pdoc->backspaceUnindents;
-
-	case SCI_SETMOUSEDWELLTIME:
-		dwellDelay = wParam;
-		ticksToDwell = dwellDelay;
-		break;
-
-	case SCI_GETMOUSEDWELLTIME:
-		return dwellDelay;
-
-	case SCI_WORDSTARTPOSITION:
-		return pdoc->ExtendWordSelect(wParam, -1, lParam != 0);
-
-	case SCI_WORDENDPOSITION:
-		return pdoc->ExtendWordSelect(wParam, 1, lParam != 0);
-
-	case SCI_SETWRAPMODE:
-		switch (wParam) {
-		case SC_WRAP_WORD:
-			wrapState = eWrapWord;
-			break;
-		case SC_WRAP_CHAR:
-			wrapState = eWrapChar;
-			break;
-		default:
-			wrapState = eWrapNone;
-			break;
-		}
-		xOffset = 0;
-		InvalidateStyleRedraw();
-		ReconfigureScrollBars();
-		break;
-
-	case SCI_GETWRAPMODE:
-		return wrapState;
-
-	case SCI_SETWRAPVISUALFLAGS:
-		wrapVisualFlags = wParam;
-		actualWrapVisualStartIndent = wrapVisualStartIndent;
-		if ((wrapVisualFlags & SC_WRAPVISUALFLAG_START) && (actualWrapVisualStartIndent == 0))
-			actualWrapVisualStartIndent = 1; // must indent to show start visual
-		InvalidateStyleRedraw();
-		ReconfigureScrollBars();
-		break;
-
-	case SCI_GETWRAPVISUALFLAGS:
-		return wrapVisualFlags;
-
-	case SCI_SETWRAPVISUALFLAGSLOCATION:
-		wrapVisualFlagsLocation = wParam;
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_GETWRAPVISUALFLAGSLOCATION:
-		return wrapVisualFlagsLocation;
-
-	case SCI_SETWRAPSTARTINDENT:
-		wrapVisualStartIndent = wParam;
-		actualWrapVisualStartIndent = wrapVisualStartIndent;
-		if ((wrapVisualFlags & SC_WRAPVISUALFLAG_START) && (actualWrapVisualStartIndent == 0))
-			actualWrapVisualStartIndent = 1; // must indent to show start visual
-		InvalidateStyleRedraw();
-		ReconfigureScrollBars();
-		break;
-
-	case SCI_GETWRAPSTARTINDENT:
-		return wrapVisualStartIndent;
-
-	case SCI_SETLAYOUTCACHE:
-		llc.SetLevel(wParam);
-		break;
-
-	case SCI_GETLAYOUTCACHE:
-		return llc.GetLevel();
-
-	case SCI_SETSCROLLWIDTH:
-		PLATFORM_ASSERT(wParam > 0);
-		if ((wParam > 0) && (wParam != static_cast<unsigned int >(scrollWidth))) {
-			scrollWidth = wParam;
-			SetScrollBars();
-		}
-		break;
-
-	case SCI_GETSCROLLWIDTH:
-		return scrollWidth;
-
-	case SCI_LINESJOIN:
-		LinesJoin();
-		break;
-
-	case SCI_LINESSPLIT:
-		LinesSplit(wParam);
-		break;
-
-	case SCI_TEXTWIDTH:
-		PLATFORM_ASSERT(wParam <= STYLE_MAX);
-		PLATFORM_ASSERT(lParam);
-		return TextWidth(wParam, CharPtrFromSPtr(lParam));
-
-	case SCI_TEXTHEIGHT:
-		return vs.lineHeight;
-
-	case SCI_SETENDATLASTLINE:
-		PLATFORM_ASSERT((wParam == 0) || (wParam == 1));
-		if (endAtLastLine != (wParam != 0)) {
-			endAtLastLine = wParam != 0;
-			SetScrollBars();
-		}
-		break;
-
-	case SCI_GETENDATLASTLINE:
-		return endAtLastLine;
-
-	case SCI_SETCARETSTICKY:
-		PLATFORM_ASSERT((wParam == 0) || (wParam == 1));
-		if (caretSticky != (wParam != 0)) {
-			caretSticky = wParam != 0;
-		}
-		break;
-
-	case SCI_GETCARETSTICKY:
-		return caretSticky;
-
-	case SCI_TOGGLECARETSTICKY:
-		caretSticky = !caretSticky;
-		break;
-
-	case SCI_GETCOLUMN:
-		return pdoc->GetColumn(wParam);
-
-	case SCI_FINDCOLUMN:
-		return pdoc->FindColumn(wParam, lParam);
-
-	case SCI_SETHSCROLLBAR :
-		if (horizontalScrollBarVisible != (wParam != 0)) {
-			horizontalScrollBarVisible = wParam != 0;
-			SetScrollBars();
-			ReconfigureScrollBars();
-		}
-		break;
-
-	case SCI_GETHSCROLLBAR:
-		return horizontalScrollBarVisible;
-
-	case SCI_SETVSCROLLBAR:
-		if (verticalScrollBarVisible != (wParam != 0)) {
-			verticalScrollBarVisible = wParam != 0;
-			SetScrollBars();
-			ReconfigureScrollBars();
-		}
-		break;
-
-	case SCI_GETVSCROLLBAR:
-		return verticalScrollBarVisible;
-
-	case SCI_SETINDENTATIONGUIDES:
-		vs.viewIndentationGuides = wParam != 0;
-		Redraw();
-		break;
-
-	case SCI_GETINDENTATIONGUIDES:
-		return vs.viewIndentationGuides;
-
-	case SCI_SETHIGHLIGHTGUIDE:
-		if ((highlightGuideColumn != static_cast<int>(wParam)) || (wParam > 0)) {
-			highlightGuideColumn = wParam;
-			Redraw();
-		}
-		break;
-
-	case SCI_GETHIGHLIGHTGUIDE:
-		return highlightGuideColumn;
-
-	case SCI_GETLINEENDPOSITION:
-		return pdoc->LineEnd(wParam);
-
-	case SCI_SETCODEPAGE:
-		if (ValidCodePage(wParam)) {
-			pdoc->dbcsCodePage = wParam;
-			InvalidateStyleRedraw();
-		}
-		break;
-
-	case SCI_GETCODEPAGE:
-		return pdoc->dbcsCodePage;
-
-	case SCI_SETUSEPALETTE:
-		palette.allowRealization = wParam != 0;
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_GETUSEPALETTE:
-		return palette.allowRealization;
-
-		// Marker definition and setting
-	case SCI_MARKERDEFINE:
-		if (wParam <= MARKER_MAX)
-			vs.markers[wParam].markType = lParam;
-		InvalidateStyleData();
-		RedrawSelMargin();
-		break;
-	case SCI_MARKERSETFORE:
-		if (wParam <= MARKER_MAX)
-			vs.markers[wParam].fore.desired = ColourDesired(lParam);
-		InvalidateStyleData();
-		RedrawSelMargin();
-		break;
-	case SCI_MARKERSETBACK:
-		if (wParam <= MARKER_MAX)
-			vs.markers[wParam].back.desired = ColourDesired(lParam);
-		InvalidateStyleData();
-		RedrawSelMargin();
-		break;
-	case SCI_MARKERSETALPHA:
-		if (wParam <= MARKER_MAX)
-			vs.markers[wParam].alpha = lParam;
-		InvalidateStyleRedraw();
-		break;
-	case SCI_MARKERADD: {
-			int markerID = pdoc->AddMark(wParam, lParam);
-			return markerID;
-		}
-	case SCI_MARKERADDSET:
-		if (lParam != 0)
-			pdoc->AddMarkSet(wParam, lParam);
-		break;
-
-	case SCI_MARKERDELETE:
-		pdoc->DeleteMark(wParam, lParam);
-		break;
-
-	case SCI_MARKERDELETEALL:
-		pdoc->DeleteAllMarks(static_cast<int>(wParam));
-		break;
-
-	case SCI_MARKERGET:
-		return pdoc->GetMark(wParam);
-
-	case SCI_MARKERNEXT: {
-			int lt = pdoc->LinesTotal();
-			for (int iLine = wParam; iLine < lt; iLine++) {
-				if ((pdoc->GetMark(iLine) & lParam) != 0)
-					return iLine;
-			}
-		}
-		return -1;
-
-	case SCI_MARKERPREVIOUS: {
-			for (int iLine = wParam; iLine >= 0; iLine--) {
-				if ((pdoc->GetMark(iLine) & lParam) != 0)
-					return iLine;
-			}
-		}
-		return -1;
-
-	case SCI_MARKERDEFINEPIXMAP:
-		if (wParam <= MARKER_MAX) {
-			vs.markers[wParam].SetXPM(CharPtrFromSPtr(lParam));
-		};
-		InvalidateStyleData();
-		RedrawSelMargin();
-		break;
-
-	case SCI_SETMARGINTYPEN:
-		if (ValidMargin(wParam)) {
-			vs.ms[wParam].style = lParam;
-			InvalidateStyleRedraw();
-		}
-		break;
-
-	case SCI_GETMARGINTYPEN:
-		if (ValidMargin(wParam))
-			return vs.ms[wParam].style;
-		else
-			return 0;
-
-	case SCI_SETMARGINWIDTHN:
-		if (ValidMargin(wParam)) {
-			// Short-circuit if the width is unchanged, to avoid unnecessary redraw.
-			if (vs.ms[wParam].width != lParam) {
-				vs.ms[wParam].width = lParam;
-				InvalidateStyleRedraw();
-			}
-		}
-		break;
-
-	case SCI_GETMARGINWIDTHN:
-		if (ValidMargin(wParam))
-			return vs.ms[wParam].width;
-		else
-			return 0;
-
-	case SCI_SETMARGINMASKN:
-		if (ValidMargin(wParam)) {
-			vs.ms[wParam].mask = lParam;
-			InvalidateStyleRedraw();
-		}
-		break;
-
-	case SCI_GETMARGINMASKN:
-		if (ValidMargin(wParam))
-			return vs.ms[wParam].mask;
-		else
-			return 0;
-
-	case SCI_SETMARGINSENSITIVEN:
-		if (ValidMargin(wParam)) {
-			vs.ms[wParam].sensitive = lParam != 0;
-			InvalidateStyleRedraw();
-		}
-		break;
-
-	case SCI_GETMARGINSENSITIVEN:
-		if (ValidMargin(wParam))
-			return vs.ms[wParam].sensitive ? 1 : 0;
-		else
-			return 0;
-
-	case SCI_STYLECLEARALL:
-		vs.ClearStyles();
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_STYLESETFORE:
-		if (wParam <= STYLE_MAX) {
-			vs.styles[wParam].fore.desired = ColourDesired(lParam);
-			InvalidateStyleRedraw();
-		}
-		break;
-	case SCI_STYLESETBACK:
-		if (wParam <= STYLE_MAX) {
-			vs.styles[wParam].back.desired = ColourDesired(lParam);
-			InvalidateStyleRedraw();
-		}
-		break;
-	case SCI_STYLESETBOLD:
-		if (wParam <= STYLE_MAX) {
-			vs.styles[wParam].bold = lParam != 0;
-			InvalidateStyleRedraw();
-		}
-		break;
-	case SCI_STYLESETITALIC:
-		if (wParam <= STYLE_MAX) {
-			vs.styles[wParam].italic = lParam != 0;
-			InvalidateStyleRedraw();
-		}
-		break;
-	case SCI_STYLESETEOLFILLED:
-		if (wParam <= STYLE_MAX) {
-			vs.styles[wParam].eolFilled = lParam != 0;
-			InvalidateStyleRedraw();
-		}
-		break;
-	case SCI_STYLESETSIZE:
-		if (wParam <= STYLE_MAX) {
-			vs.styles[wParam].size = lParam;
-			InvalidateStyleRedraw();
-		}
-		break;
-	case SCI_STYLESETFONT:
-		if (lParam == 0)
-			return 0;
-		if (wParam <= STYLE_MAX) {
-			vs.SetStyleFontName(wParam, CharPtrFromSPtr(lParam));
-			InvalidateStyleRedraw();
-		}
-		break;
-	case SCI_STYLESETUNDERLINE:
-		if (wParam <= STYLE_MAX) {
-			vs.styles[wParam].underline = lParam != 0;
-			InvalidateStyleRedraw();
-		}
-		break;
-	case SCI_STYLESETCASE:
-		if (wParam <= STYLE_MAX) {
-			vs.styles[wParam].caseForce = static_cast<Style::ecaseForced>(lParam);
-			InvalidateStyleRedraw();
-		}
-		break;
-	case SCI_STYLESETCHARACTERSET:
-		if (wParam <= STYLE_MAX) {
-			vs.styles[wParam].characterSet = lParam;
-			InvalidateStyleRedraw();
-		}
-		break;
-	case SCI_STYLESETVISIBLE:
-		if (wParam <= STYLE_MAX) {
-			vs.styles[wParam].visible = lParam != 0;
-			InvalidateStyleRedraw();
-		}
-		break;
-	case SCI_STYLESETCHANGEABLE:
-		if (wParam <= STYLE_MAX) {
-			vs.styles[wParam].changeable = lParam != 0;
-			InvalidateStyleRedraw();
-		}
-		break;
-	case SCI_STYLESETHOTSPOT:
-		if (wParam <= STYLE_MAX) {
-			vs.styles[wParam].hotspot = lParam != 0;
-			InvalidateStyleRedraw();
-		}
-		break;
-
-	case SCI_STYLERESETDEFAULT:
-		vs.ResetDefaultStyle();
-		InvalidateStyleRedraw();
-		break;
-	case SCI_SETSTYLEBITS:
-		pdoc->SetStylingBits(wParam);
-		break;
-
-	case SCI_GETSTYLEBITS:
-		return pdoc->stylingBits;
-
-	case SCI_SETLINESTATE:
-		return pdoc->SetLineState(wParam, lParam);
-
-	case SCI_GETLINESTATE:
-		return pdoc->GetLineState(wParam);
-
-	case SCI_GETMAXLINESTATE:
-		return pdoc->GetMaxLineState();
-
-	case SCI_GETCARETLINEVISIBLE:
-		return vs.showCaretLineBackground;
-	case SCI_SETCARETLINEVISIBLE:
-		vs.showCaretLineBackground = wParam != 0;
-		InvalidateStyleRedraw();
-		break;
-	case SCI_GETCARETLINEBACK:
-		return vs.caretLineBackground.desired.AsLong();
-	case SCI_SETCARETLINEBACK:
-		vs.caretLineBackground.desired = wParam;
-		InvalidateStyleRedraw();
-		break;
-	case SCI_GETCARETLINEBACKALPHA:
-		return vs.caretLineAlpha;
-	case SCI_SETCARETLINEBACKALPHA:
-		vs.caretLineAlpha = wParam;
-		InvalidateStyleRedraw();
-		break;
-
-		// Folding messages
-
-	case SCI_VISIBLEFROMDOCLINE:
-		return cs.DisplayFromDoc(wParam);
-
-	case SCI_DOCLINEFROMVISIBLE:
-		return cs.DocFromDisplay(wParam);
-
-	case SCI_WRAPCOUNT:
-		return WrapCount(wParam);
-
-	case SCI_SETFOLDLEVEL: {
-			int prev = pdoc->SetLevel(wParam, lParam);
-			if (prev != lParam)
-				RedrawSelMargin();
-			return prev;
-		}
-
-	case SCI_GETFOLDLEVEL:
-		return pdoc->GetLevel(wParam);
-
-	case SCI_GETLASTCHILD:
-		return pdoc->GetLastChild(wParam, lParam);
-
-	case SCI_GETFOLDPARENT:
-		return pdoc->GetFoldParent(wParam);
-
-	case SCI_SHOWLINES:
-		cs.SetVisible(wParam, lParam, true);
-		SetScrollBars();
-		Redraw();
-		break;
-
-	case SCI_HIDELINES:
-		cs.SetVisible(wParam, lParam, false);
-		SetScrollBars();
-		Redraw();
-		break;
-
-	case SCI_GETLINEVISIBLE:
-		return cs.GetVisible(wParam);
-
-	case SCI_SETFOLDEXPANDED:
-		if (cs.SetExpanded(wParam, lParam != 0)) {
-			RedrawSelMargin();
-		}
-		break;
-
-	case SCI_GETFOLDEXPANDED:
-		return cs.GetExpanded(wParam);
-
-	case SCI_SETFOLDFLAGS:
-		foldFlags = wParam;
-		Redraw();
-		break;
-
-	case SCI_TOGGLEFOLD:
-		ToggleContraction(wParam);
-		break;
-
-	case SCI_ENSUREVISIBLE:
-		EnsureLineVisible(wParam, false);
-		break;
-
-	case SCI_ENSUREVISIBLEENFORCEPOLICY:
-		EnsureLineVisible(wParam, true);
-		break;
-
-	case SCI_SEARCHANCHOR:
-		SearchAnchor();
-		break;
-
-	case SCI_SEARCHNEXT:
-	case SCI_SEARCHPREV:
-		return SearchText(iMessage, wParam, lParam);
-
-#ifdef INCLUDE_DEPRECATED_FEATURES
-	case SCI_SETCARETPOLICY:  	// Deprecated
-		caretXPolicy = caretYPolicy = wParam;
-		caretXSlop = caretYSlop = lParam;
-		break;
-#endif
-
-	case SCI_SETXCARETPOLICY:
-		caretXPolicy = wParam;
-		caretXSlop = lParam;
-		break;
-
-	case SCI_SETYCARETPOLICY:
-		caretYPolicy = wParam;
-		caretYSlop = lParam;
-		break;
-
-	case SCI_SETVISIBLEPOLICY:
-		visiblePolicy = wParam;
-		visibleSlop = lParam;
-		break;
-
-	case SCI_LINESONSCREEN:
-		return LinesOnScreen();
-
-	case SCI_SETSELFORE:
-		vs.selforeset = wParam != 0;
-		vs.selforeground.desired = ColourDesired(lParam);
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_SETSELBACK:
-		vs.selbackset = wParam != 0;
-		vs.selbackground.desired = ColourDesired(lParam);
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_SETSELALPHA:
-		vs.selAlpha = wParam;
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_GETSELALPHA:
-		return vs.selAlpha;
-
-	case SCI_SETWHITESPACEFORE:
-		vs.whitespaceForegroundSet = wParam != 0;
-		vs.whitespaceForeground.desired = ColourDesired(lParam);
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_SETWHITESPACEBACK:
-		vs.whitespaceBackgroundSet = wParam != 0;
-		vs.whitespaceBackground.desired = ColourDesired(lParam);
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_SETCARETFORE:
-		vs.caretcolour.desired = ColourDesired(wParam);
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_GETCARETFORE:
-		return vs.caretcolour.desired.AsLong();
-
-	case SCI_SETCARETWIDTH:
-		if (wParam <= 0)
-			vs.caretWidth = 0;
-		else if (wParam >= 3)
-			vs.caretWidth = 3;
-		else
-			vs.caretWidth = wParam;
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_GETCARETWIDTH:
-		return vs.caretWidth;
-
-	case SCI_ASSIGNCMDKEY:
-		kmap.AssignCmdKey(Platform::LowShortFromLong(wParam),
-		                  Platform::HighShortFromLong(wParam), lParam);
-		break;
-
-	case SCI_CLEARCMDKEY:
-		kmap.AssignCmdKey(Platform::LowShortFromLong(wParam),
-		                  Platform::HighShortFromLong(wParam), SCI_NULL);
-		break;
-
-	case SCI_CLEARALLCMDKEYS:
-		kmap.Clear();
-		break;
-
-	case SCI_INDICSETSTYLE:
-		if (wParam <= INDIC_MAX) {
-			vs.indicators[wParam].style = lParam;
-			InvalidateStyleRedraw();
-		}
-		break;
-
-	case SCI_INDICGETSTYLE:
-		return (wParam <= INDIC_MAX) ? vs.indicators[wParam].style : 0;
-
-	case SCI_INDICSETFORE:
-		if (wParam <= INDIC_MAX) {
-			vs.indicators[wParam].fore.desired = ColourDesired(lParam);
-			InvalidateStyleRedraw();
-		}
-		break;
-
-	case SCI_INDICGETFORE:
-		return (wParam <= INDIC_MAX) ? vs.indicators[wParam].fore.desired.AsLong() : 0;
-
-	case SCI_LINEDOWN:
-	case SCI_LINEDOWNEXTEND:
-	case SCI_PARADOWN:
-	case SCI_PARADOWNEXTEND:
-	case SCI_LINEUP:
-	case SCI_LINEUPEXTEND:
-	case SCI_PARAUP:
-	case SCI_PARAUPEXTEND:
-	case SCI_CHARLEFT:
-	case SCI_CHARLEFTEXTEND:
-	case SCI_CHARRIGHT:
-	case SCI_CHARRIGHTEXTEND:
-	case SCI_WORDLEFT:
-	case SCI_WORDLEFTEXTEND:
-	case SCI_WORDRIGHT:
-	case SCI_WORDRIGHTEXTEND:
-	case SCI_WORDLEFTEND:
-	case SCI_WORDLEFTENDEXTEND:
-	case SCI_WORDRIGHTEND:
-	case SCI_WORDRIGHTENDEXTEND:
-	case SCI_HOME:
-	case SCI_HOMEEXTEND:
-	case SCI_LINEEND:
-	case SCI_LINEENDEXTEND:
-	case SCI_HOMEWRAP:
-	case SCI_HOMEWRAPEXTEND:
-	case SCI_LINEENDWRAP:
-	case SCI_LINEENDWRAPEXTEND:
-	case SCI_DOCUMENTSTART:
-	case SCI_DOCUMENTSTARTEXTEND:
-	case SCI_DOCUMENTEND:
-	case SCI_DOCUMENTENDEXTEND:
-
-	case SCI_STUTTEREDPAGEUP:
-	case SCI_STUTTEREDPAGEUPEXTEND:
-	case SCI_STUTTEREDPAGEDOWN:
-	case SCI_STUTTEREDPAGEDOWNEXTEND:
-
-	case SCI_PAGEUP:
-	case SCI_PAGEUPEXTEND:
-	case SCI_PAGEDOWN:
-	case SCI_PAGEDOWNEXTEND:
-	case SCI_EDITTOGGLEOVERTYPE:
-	case SCI_CANCEL:
-	case SCI_DELETEBACK:
-	case SCI_TAB:
-	case SCI_BACKTAB:
-	case SCI_NEWLINE:
-	case SCI_FORMFEED:
-	case SCI_VCHOME:
-	case SCI_VCHOMEEXTEND:
-	case SCI_VCHOMEWRAP:
-	case SCI_VCHOMEWRAPEXTEND:
-	case SCI_ZOOMIN:
-	case SCI_ZOOMOUT:
-	case SCI_DELWORDLEFT:
-	case SCI_DELWORDRIGHT:
-	case SCI_DELLINELEFT:
-	case SCI_DELLINERIGHT:
-	case SCI_LINECOPY:
-	case SCI_LINECUT:
-	case SCI_LINEDELETE:
-	case SCI_LINETRANSPOSE:
-	case SCI_LINEDUPLICATE:
-	case SCI_LOWERCASE:
-	case SCI_UPPERCASE:
-	case SCI_LINESCROLLDOWN:
-	case SCI_LINESCROLLUP:
-	case SCI_WORDPARTLEFT:
-	case SCI_WORDPARTLEFTEXTEND:
-	case SCI_WORDPARTRIGHT:
-	case SCI_WORDPARTRIGHTEXTEND:
-	case SCI_DELETEBACKNOTLINE:
-	case SCI_HOMEDISPLAY:
-	case SCI_HOMEDISPLAYEXTEND:
-	case SCI_LINEENDDISPLAY:
-	case SCI_LINEENDDISPLAYEXTEND:
-	case SCI_LINEDOWNRECTEXTEND:
-	case SCI_LINEUPRECTEXTEND:
-	case SCI_CHARLEFTRECTEXTEND:
-	case SCI_CHARRIGHTRECTEXTEND:
-	case SCI_HOMERECTEXTEND:
-	case SCI_VCHOMERECTEXTEND:
-	case SCI_LINEENDRECTEXTEND:
-	case SCI_PAGEUPRECTEXTEND:
-	case SCI_PAGEDOWNRECTEXTEND:
-	case SCI_SELECTIONDUPLICATE:
-		return KeyCommand(iMessage);
-
-	case SCI_BRACEHIGHLIGHT:
-		SetBraceHighlight(static_cast<int>(wParam), lParam, STYLE_BRACELIGHT);
-		break;
-
-	case SCI_BRACEBADLIGHT:
-		SetBraceHighlight(static_cast<int>(wParam), -1, STYLE_BRACEBAD);
-		break;
-
-	case SCI_BRACEMATCH:
-		// wParam is position of char to find brace for,
-		// lParam is maximum amount of text to restyle to find it
-		return pdoc->BraceMatch(wParam, lParam);
-
-	case SCI_GETVIEWEOL:
-		return vs.viewEOL;
-
-	case SCI_SETVIEWEOL:
-		vs.viewEOL = wParam != 0;
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_SETZOOM:
-		vs.zoomLevel = wParam;
-		InvalidateStyleRedraw();
-		NotifyZoom();
-		break;
-
-	case SCI_GETZOOM:
-		return vs.zoomLevel;
-
-	case SCI_GETEDGECOLUMN:
-		return theEdge;
-
-	case SCI_SETEDGECOLUMN:
-		theEdge = wParam;
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_GETEDGEMODE:
-		return vs.edgeState;
-
-	case SCI_SETEDGEMODE:
-		vs.edgeState = wParam;
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_GETEDGECOLOUR:
-		return vs.edgecolour.desired.AsLong();
-
-	case SCI_SETEDGECOLOUR:
-		vs.edgecolour.desired = ColourDesired(wParam);
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_GETDOCPOINTER:
-		return reinterpret_cast<sptr_t>(pdoc);
-
-	case SCI_SETDOCPOINTER:
-		CancelModes();
-		SetDocPointer(reinterpret_cast<Document *>(lParam));
-		return 0;
-
-	case SCI_CREATEDOCUMENT: {
-			Document *doc = new Document();
-			if (doc) {
-				doc->AddRef();
-			}
-			return reinterpret_cast<sptr_t>(doc);
-		}
-
-	case SCI_ADDREFDOCUMENT:
-		(reinterpret_cast<Document *>(lParam))->AddRef();
-		break;
-
-	case SCI_RELEASEDOCUMENT:
-		(reinterpret_cast<Document *>(lParam))->Release();
-		break;
-
-	case SCI_SETMODEVENTMASK:
-		modEventMask = wParam;
-		return 0;
-
-	case SCI_GETMODEVENTMASK:
-		return modEventMask;
-
-	case SCI_CONVERTEOLS:
-		pdoc->ConvertLineEnds(wParam);
-		SetSelection(currentPos, anchor);	// Ensure selection inside document
-		return 0;
-
-	case SCI_SETLENGTHFORENCODE:
-		lengthForEncode = wParam;
-		return 0;
-
-	case SCI_SELECTIONISRECTANGLE:
-		return selType == selRectangle ? 1 : 0;
-
-	case SCI_SETSELECTIONMODE: {
-			switch (wParam) {
-			case SC_SEL_STREAM:
-				moveExtendsSelection = !moveExtendsSelection || (selType != selStream);
-				selType = selStream;
-				break;
-			case SC_SEL_RECTANGLE:
-				moveExtendsSelection = !moveExtendsSelection || (selType != selRectangle);
-				selType = selRectangle;
-				break;
-			case SC_SEL_LINES:
-				moveExtendsSelection = !moveExtendsSelection || (selType != selLines);
-				selType = selLines;
-				break;
-			default:
-				moveExtendsSelection = !moveExtendsSelection || (selType != selStream);
-				selType = selStream;
-			}
-			InvalidateSelection(currentPos, anchor);
-		}
-	case SCI_GETSELECTIONMODE:
-		switch (selType) {
-		case selStream:
-			return SC_SEL_STREAM;
-		case selRectangle:
-			return SC_SEL_RECTANGLE;
-		case selLines:
-			return SC_SEL_LINES;
-		default:	// ?!
-			return SC_SEL_STREAM;
-		}
-	case SCI_GETLINESELSTARTPOSITION: {
-			SelectionLineIterator lineIterator(this);
-			lineIterator.SetAt(wParam);
-			return lineIterator.startPos;
-		}
-	case SCI_GETLINESELENDPOSITION: {
-			SelectionLineIterator lineIterator(this);
-			lineIterator.SetAt(wParam);
-			return lineIterator.endPos;
-		}
-
-	case SCI_SETOVERTYPE:
-		inOverstrike = wParam != 0;
-		break;
-
-	case SCI_GETOVERTYPE:
-		return inOverstrike ? 1 : 0;
-
-	case SCI_SETFOCUS:
-		SetFocusState(wParam != 0);
-		break;
-
-	case SCI_GETFOCUS:
-		return hasFocus;
-
-	case SCI_SETSTATUS:
-		errorStatus = wParam;
-		break;
-
-	case SCI_GETSTATUS:
-		return errorStatus;
-
-	case SCI_SETMOUSEDOWNCAPTURES:
-		mouseDownCaptures = wParam != 0;
-		break;
-
-	case SCI_GETMOUSEDOWNCAPTURES:
-		return mouseDownCaptures;
-
-	case SCI_SETCURSOR:
-		cursorMode = wParam;
-		DisplayCursor(Window::cursorText);
-		break;
-
-	case SCI_GETCURSOR:
-		return cursorMode;
-
-	case SCI_SETCONTROLCHARSYMBOL:
-		controlCharSymbol = wParam;
-		break;
-
-	case SCI_GETCONTROLCHARSYMBOL:
-		return controlCharSymbol;
-
-	case SCI_STARTRECORD:
-		recordingMacro = true;
-		return 0;
-
-	case SCI_STOPRECORD:
-		recordingMacro = false;
-		return 0;
-
-	case SCI_MOVECARETINSIDEVIEW:
-		MoveCaretInsideView();
-		break;
-
-	case SCI_SETFOLDMARGINCOLOUR:
-		vs.foldmarginColourSet = wParam != 0;
-		vs.foldmarginColour.desired = ColourDesired(lParam);
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_SETFOLDMARGINHICOLOUR:
-		vs.foldmarginHighlightColourSet = wParam != 0;
-		vs.foldmarginHighlightColour.desired = ColourDesired(lParam);
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_SETHOTSPOTACTIVEFORE:
-		vs.hotspotForegroundSet = wParam != 0;
-		vs.hotspotForeground.desired = ColourDesired(lParam);
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_SETHOTSPOTACTIVEBACK:
-		vs.hotspotBackgroundSet = wParam != 0;
-		vs.hotspotBackground.desired = ColourDesired(lParam);
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_SETHOTSPOTACTIVEUNDERLINE:
-		vs.hotspotUnderline = wParam != 0;
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_SETHOTSPOTSINGLELINE:
-		vs.hotspotSingleLine = wParam != 0;
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_SETPASTECONVERTENDINGS:
-		convertPastes = wParam != 0;
-		break;
-
-	case SCI_GETPASTECONVERTENDINGS:
-		return convertPastes ? 1 : 0;
-
-	default:
-		return DefWndProc(iMessage, wParam, lParam);
-	}
-	//Platform::DebugPrintf("end wnd proc\n");
-	return 0l;
-}
diff --git a/src/stc/scintilla/src/Editor.h b/src/stc/scintilla/src/Editor.h
deleted file mode 100644
index fe7be268ae..0000000000
--- a/src/stc/scintilla/src/Editor.h
+++ /dev/null
@@ -1,582 +0,0 @@
-// Scintilla source code edit control
-/** @file Editor.h
- ** Defines the main editor class.
- **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef EDITOR_H
-#define EDITOR_H
-
-/**
- */
-class Caret {
-public:
-	bool active;
-	bool on;
-	int period;
-
-	Caret();
-};
-
-/**
- */
-class Timer {
-public:
-	bool ticking;
-	int ticksToWait;
-	enum {tickSize = 100};
-	TickerID tickerID;
-
-	Timer();
-};
-
-/**
- */
-class Idler {
-public:
-	bool state;
-	IdlerID idlerID;
-
-	Idler();
-};
-
-/**
- */
-class LineLayout {
-private:
-	friend class LineLayoutCache;
-	int *lineStarts;
-	int lenLineStarts;
-	/// Drawing is only performed for @a maxLineLength characters on each line.
-	int lineNumber;
-	bool inCache;
-public:
-	enum { wrapWidthInfinite = 0x7ffffff };
-	int maxLineLength;
-	int numCharsInLine;
-	enum validLevel { llInvalid, llCheckTextAndStyle, llPositions, llLines } validity;
-	int xHighlightGuide;
-	bool highlightColumn;
-	int selStart;
-	int selEnd;
-	bool containsCaret;
-	int edgeColumn;
-	char *chars;
-	unsigned char *styles;
-	int styleBitsSet;
-	char *indicators;
-	int *positions;
-	char bracePreviousStyles[2];
-
-	// Hotspot support
-	int hsStart;
-	int hsEnd;
-
-	// Wrapped line support
-	int widthLine;
-	int lines;
-
-	LineLayout(int maxLineLength_);
-	virtual ~LineLayout();
-	void Resize(int maxLineLength_);
-	void Free();
-	void Invalidate(validLevel validity_);
-	int LineStart(int line) {
-		if (line <= 0) {
-			return 0;
-		} else if ((line >= lines) || !lineStarts) {
-			return numCharsInLine;
-		} else {
-			return lineStarts[line];
-		}
-	}
-	void SetLineStart(int line, int start);
-	void SetBracesHighlight(Range rangeLine, Position braces[],
-		char bracesMatchStyle, int xHighlight);
-	void RestoreBracesHighlight(Range rangeLine, Position braces[]);
-};
-
-/**
- */
-class LineLayoutCache {
-	int level;
-	int length;
-	int size;
-	LineLayout **cache;
-	bool allInvalidated;
-	int styleClock;
-	int useCount;
-	void Allocate(int length_);
-	void AllocateForLevel(int linesOnScreen, int linesInDoc);
-public:
-	LineLayoutCache();
-	virtual ~LineLayoutCache();
-	void Deallocate();
-	enum {
-		llcNone=SC_CACHE_NONE,
-		llcCaret=SC_CACHE_CARET,
-		llcPage=SC_CACHE_PAGE,
-		llcDocument=SC_CACHE_DOCUMENT
-	};
-	void Invalidate(LineLayout::validLevel validity_);
-	void SetLevel(int level_);
-	int GetLevel() { return level; }
-	LineLayout *Retrieve(int lineNumber, int lineCaret, int maxChars, int styleClock_,
-		int linesOnScreen, int linesInDoc);
-	void Dispose(LineLayout *ll);
-};
-
-/**
- * Hold a piece of text selected for copying or dragging.
- * The text is expected to hold a terminating '\0' and this is counted in len.
- */
-class SelectionText {
-public:
-	char *s;
-	int len;
-	bool rectangular;
-	int codePage;
-	int characterSet;
-	SelectionText() : s(0), len(0), rectangular(false), codePage(0), characterSet(0) {}
-	~SelectionText() {
-		Free();
-	}
-	void Free() {
-		Set(0, 0, 0, 0, false);
-	}
-	void Set(char *s_, int len_, int codePage_, int characterSet_, bool rectangular_) {
-		delete []s;
-		s = s_;
-		if (s)
-			len = len_;
-		else
-			len = 0;
-		codePage = codePage_;
-		characterSet = characterSet_;
-		rectangular = rectangular_;
-	}
-	void Copy(const char *s_, int len_, int codePage_, int characterSet_, bool rectangular_) {
-		delete []s;
-		s = new char[len_];
-		if (s) {
-			len = len_;
-			for (int i = 0; i < len_; i++) {
-				s[i] = s_[i];
-			}
-		} else {
-			len = 0;
-		}
-		codePage = codePage_;
-		characterSet = characterSet_;
-		rectangular = rectangular_;
-	}
-	void Copy(const SelectionText &other) {
-		Copy(other.s, other.len, other.codePage, other.characterSet, other.rectangular);
-	}
-};
-
-/**
- */
-class Editor : public DocWatcher {
-	// Private so Editor objects can not be copied
-	Editor(const Editor &) : DocWatcher() {}
-	Editor &operator=(const Editor &) { return *this; }
-
-protected:	// ScintillaBase subclass needs access to much of Editor
-
-	/** On GTK+, Scintilla is a container widget holding two scroll bars
-	 * whereas on Windows there is just one window with both scroll bars turned on. */
-	Window wMain;	///< The Scintilla parent window
-
-	/** Style resources may be expensive to allocate so are cached between uses.
-	 * When a style attribute is changed, this cache is flushed. */
-	bool stylesValid;
-	ViewStyle vs;
-	Palette palette;
-
-	int printMagnification;
-	int printColourMode;
-	int printWrapState;
-	int cursorMode;
-	int controlCharSymbol;
-
-	bool hasFocus;
-	bool hideSelection;
-	bool inOverstrike;
-	int errorStatus;
-	bool mouseDownCaptures;
-
-	/** In bufferedDraw mode, graphics operations are drawn to a pixmap and then copied to
-	 * the screen. This avoids flashing but is about 30% slower. */
-	bool bufferedDraw;
-	/** In twoPhaseDraw mode, drawing is performed in two phases, first the background
-	* and then the foreground. This avoids chopping off characters that overlap the next run. */
-	bool twoPhaseDraw;
-
-	int xOffset;		///< Horizontal scrolled amount in pixels
-	int xCaretMargin;	///< Ensure this many pixels visible on both sides of caret
-	bool horizontalScrollBarVisible;
-	int scrollWidth;
-	bool verticalScrollBarVisible;
-	bool endAtLastLine;
-	bool caretSticky;
-
-	Surface *pixmapLine;
-	Surface *pixmapSelMargin;
-	Surface *pixmapSelPattern;
-	Surface *pixmapIndentGuide;
-	Surface *pixmapIndentGuideHighlight;
-
-	LineLayoutCache llc;
-
-	KeyMap kmap;
-
-	Caret caret;
-	Timer timer;
-	Timer autoScrollTimer;
-	enum { autoScrollDelay = 200 };
-
-	Idler idler;
-
-	Point lastClick;
-	unsigned int lastClickTime;
-	int dwellDelay;
-	int ticksToDwell;
-	bool dwelling;
-	enum { selChar, selWord, selLine } selectionType;
-	Point ptMouseLast;
-	bool inDragDrop;
-	bool dropWentOutside;
-	int posDrag;
-	int posDrop;
-	int lastXChosen;
-	int lineAnchor;
-	int originalAnchorPos;
-	int currentPos;
-	int anchor;
-	int targetStart;
-	int targetEnd;
-	int searchFlags;
-	int topLine;
-	int posTopLine;
-	int lengthForEncode;
-
-	bool needUpdateUI;
-	Position braces[2];
-	int bracesMatchStyle;
-	int highlightGuideColumn;
-
-	int theEdge;
-
-	enum { notPainting, painting, paintAbandoned } paintState;
-	PRectangle rcPaint;
-	bool paintingAllText;
-
-	int modEventMask;
-
-	SelectionText drag;
-	enum selTypes { noSel, selStream, selRectangle, selLines };
-	selTypes selType;
-	bool moveExtendsSelection;
-	int xStartSelect;	///< x position of start of rectangular selection
-	int xEndSelect;		///< x position of end of rectangular selection
-	bool primarySelection;
-
-	int caretXPolicy;
-	int caretXSlop;	///< Ensure this many pixels visible on both sides of caret
-
-	int caretYPolicy;
-	int caretYSlop;	///< Ensure this many lines visible on both sides of caret
-
-	int visiblePolicy;
-	int visibleSlop;
-
-	int searchAnchor;
-
-	bool recordingMacro;
-
-	int foldFlags;
-	ContractionState cs;
-
-	// Hotspot support
-	int hsStart;
-	int hsEnd;
-
-	// Wrapping support
-	enum { eWrapNone, eWrapWord, eWrapChar } wrapState;
-	enum { wrapLineLarge = 0x7ffffff };
-	int wrapWidth;
-	int wrapStart;
-	int wrapEnd;
-	int wrapVisualFlags;
-	int wrapVisualFlagsLocation;
-	int wrapVisualStartIndent;
-	int actualWrapVisualStartIndent;
-
-	bool convertPastes;
-
-	Document *pdoc;
-
-	Editor();
-	virtual ~Editor();
-	virtual void Initialise() = 0;
-	virtual void Finalise();
-
-	void InvalidateStyleData();
-	void InvalidateStyleRedraw();
-	virtual void RefreshColourPalette(Palette &pal, bool want);
-	void RefreshStyleData();
-	void DropGraphics();
-
-	virtual PRectangle GetClientRectangle();
-	PRectangle GetTextRectangle();
-
-	int LinesOnScreen();
-	int LinesToScroll();
-	int MaxScrollPos();
-	Point LocationFromPosition(int pos);
-	int XFromPosition(int pos);
-	int PositionFromLocation(Point pt);
-	int PositionFromLocationClose(Point pt);
-	int PositionFromLineX(int line, int x);
-	int LineFromLocation(Point pt);
-	void SetTopLine(int topLineNew);
-
-	bool AbandonPaint();
-	void RedrawRect(PRectangle rc);
-	void Redraw();
-	void RedrawSelMargin(int line=-1);
-	PRectangle RectangleFromRange(int start, int end);
-	void InvalidateRange(int start, int end);
-
-	int CurrentPosition();
-	bool SelectionEmpty();
-	int SelectionStart();
-	int SelectionEnd();
-	void SetRectangularRange();
-	void InvalidateSelection(int currentPos_, int anchor_);
-	void SetSelection(int currentPos_, int anchor_);
-	void SetSelection(int currentPos_);
-	void SetEmptySelection(int currentPos_);
-	bool RangeContainsProtected(int start, int end) const;
-	bool SelectionContainsProtected();
-	int MovePositionOutsideChar(int pos, int moveDir, bool checkLineEnd=true);
-	int MovePositionTo(int newPos, selTypes sel=noSel, bool ensureVisible=true);
-	int MovePositionSoVisible(int pos, int moveDir);
-	void SetLastXChosen();
-
-	void ScrollTo(int line, bool moveThumb=true);
-	virtual void ScrollText(int linesToMove);
-	void HorizontalScrollTo(int xPos);
-	void MoveCaretInsideView(bool ensureVisible=true);
-	int DisplayFromPosition(int pos);
-	void EnsureCaretVisible(bool useMargin=true, bool vert=true, bool horiz=true);
-	void ShowCaretAtCurrentPosition();
-	void DropCaret();
-	void InvalidateCaret();
-	virtual void UpdateSystemCaret();
-
-	void NeedWrapping(int docLineStart = 0, int docLineEnd = wrapLineLarge);
-	bool WrapLines(bool fullWrap, int priorityWrapLineStart);
-	void LinesJoin();
-	void LinesSplit(int pixelWidth);
-
-	int SubstituteMarkerIfEmpty(int markerCheck, int markerDefault);
-	void PaintSelMargin(Surface *surface, PRectangle &rc);
-	LineLayout *RetrieveLineLayout(int lineNumber);
-	void LayoutLine(int line, Surface *surface, ViewStyle &vstyle, LineLayout *ll,
-		int width=LineLayout::wrapWidthInfinite);
-	ColourAllocated SelectionBackground(ViewStyle &vsDraw);
-	ColourAllocated TextBackground(ViewStyle &vsDraw, bool overrideBackground, ColourAllocated background, bool inSelection, bool inHotspot, int styleMain, int i, LineLayout *ll);
-	void DrawIndentGuide(Surface *surface, int lineVisible, int lineHeight, int start, PRectangle rcSegment, bool highlight);
-	void DrawWrapMarker(Surface *surface, PRectangle rcPlace, bool isEndMarker, ColourAllocated wrapColour);
-	void DrawEOL(Surface *surface, ViewStyle &vsDraw, PRectangle rcLine, LineLayout *ll,
-		int line, int lineEnd, int xStart, int subLine, int subLineStart,
-		bool overrideBackground, ColourAllocated background,
-		bool drawWrapMark, ColourAllocated wrapColour);
-	void DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVisible, int xStart,
-		PRectangle rcLine, LineLayout *ll, int subLine=0);
-	void RefreshPixMaps(Surface *surfaceWindow);
-	void Paint(Surface *surfaceWindow, PRectangle rcArea);
-	long FormatRange(bool draw, RangeToFormat *pfr);
-	int TextWidth(int style, const char *text);
-
-	virtual void SetVerticalScrollPos() = 0;
-	virtual void SetHorizontalScrollPos() = 0;
-	virtual bool ModifyScrollBars(int nMax, int nPage) = 0;
-	virtual void ReconfigureScrollBars();
-	void SetScrollBars();
-	void ChangeSize();
-
-	void AddChar(char ch);
-	virtual void AddCharUTF(char *s, unsigned int len, bool treatAsDBCS=false);
-	void ClearSelection();
-	void ClearAll();
-    	void ClearDocumentStyle();
-	void Cut();
-	void PasteRectangular(int pos, const char *ptr, int len);
-	virtual void Copy() = 0;
-	virtual bool CanPaste();
-	virtual void Paste() = 0;
-	void Clear();
-	void SelectAll();
-	void Undo();
-	void Redo();
-	void DelChar();
-	void DelCharBack(bool allowLineStartDeletion);
-	virtual void ClaimSelection() = 0;
-
-	virtual void NotifyChange() = 0;
-	virtual void NotifyFocus(bool focus);
-	virtual int GetCtrlID() { return ctrlID; }
-	virtual void NotifyParent(SCNotification scn) = 0;
-	virtual void NotifyStyleToNeeded(int endStyleNeeded);
-	void NotifyChar(int ch);
-	void NotifyMove(int position);
-	void NotifySavePoint(bool isSavePoint);
-	void NotifyModifyAttempt();
-	virtual void NotifyDoubleClick(Point pt, bool shift);
-	void NotifyHotSpotClicked(int position, bool shift, bool ctrl, bool alt);
-	void NotifyHotSpotDoubleClicked(int position, bool shift, bool ctrl, bool alt);
-	void NotifyUpdateUI();
-	void NotifyPainted();
-	bool NotifyMarginClick(Point pt, bool shift, bool ctrl, bool alt);
-	void NotifyNeedShown(int pos, int len);
-	void NotifyDwelling(Point pt, bool state);
-	void NotifyZoom();
-
-	void NotifyModifyAttempt(Document *document, void *userData);
-	void NotifySavePoint(Document *document, void *userData, bool atSavePoint);
-	void CheckModificationForWrap(DocModification mh);
-	void NotifyModified(Document *document, DocModification mh, void *userData);
-	void NotifyDeleted(Document *document, void *userData);
-	void NotifyStyleNeeded(Document *doc, void *userData, int endPos);
-	void NotifyMacroRecord(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
-
-	void PageMove(int direction, selTypes sel=noSel, bool stuttered = false);
-	void ChangeCaseOfSelection(bool makeUpperCase);
-	void LineTranspose();
-	void Duplicate(bool forLine);
-	virtual void CancelModes();
-	void NewLine();
-	void CursorUpOrDown(int direction, selTypes sel=noSel);
-	void ParaUpOrDown(int direction, selTypes sel=noSel);
-	int StartEndDisplayLine(int pos, bool start);
-	virtual int KeyCommand(unsigned int iMessage);
-	virtual int KeyDefault(int /* key */, int /*modifiers*/);
-	int KeyDown(int key, bool shift, bool ctrl, bool alt, bool *consumed=0);
-
-	int GetWhitespaceVisible();
-	void SetWhitespaceVisible(int view);
-
-	void Indent(bool forwards);
-
-	long FindText(uptr_t wParam, sptr_t lParam);
-	void SearchAnchor();
-	long SearchText(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
-	long SearchInTarget(const char *text, int length);
-	void GoToLine(int lineNo);
-
-	virtual void CopyToClipboard(const SelectionText &selectedText) = 0;
-	char *CopyRange(int start, int end);
-	void CopySelectionFromRange(SelectionText *ss, int start, int end);
-	void CopySelectionRange(SelectionText *ss);
-	void CopyRangeToClipboard(int start, int end);
-	void CopyText(int length, const char *text);
-	void SetDragPosition(int newPos);
-	virtual void DisplayCursor(Window::Cursor c);
-	virtual void StartDrag();
-	void DropAt(int position, const char *value, bool moving, bool rectangular);
-	/** PositionInSelection returns 0 if position in selection, -1 if position before selection, and 1 if after.
-	 * Before means either before any line of selection or before selection on its line, with a similar meaning to after. */
-	int PositionInSelection(int pos);
-	bool PointInSelection(Point pt);
-	bool PointInSelMargin(Point pt);
-	void LineSelection(int lineCurrent_, int lineAnchor_);
-	void DwellEnd(bool mouseMoved);
-	virtual void ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt);
-	void ButtonMove(Point pt);
-	void ButtonUp(Point pt, unsigned int curTime, bool ctrl);
-
-	void Tick();
-	bool Idle();
-	virtual void SetTicking(bool on) = 0;
-	virtual bool SetIdle(bool) { return false; }
-	virtual void SetMouseCapture(bool on) = 0;
-	virtual bool HaveMouseCapture() = 0;
-	void SetFocusState(bool focusState);
-
-	virtual bool PaintContains(PRectangle rc);
-	bool PaintContainsMargin();
-	void CheckForChangeOutsidePaint(Range r);
-	void SetBraceHighlight(Position pos0, Position pos1, int matchStyle);
-
-	void SetDocPointer(Document *document);
-
-	void Expand(int &line, bool doExpand);
-	void ToggleContraction(int line);
-	void EnsureLineVisible(int lineDoc, bool enforcePolicy);
-	int ReplaceTarget(bool replacePatterns, const char *text, int length=-1);
-
-	bool PositionIsHotspot(int position);
-	bool PointIsHotspot(Point pt);
-	void SetHotSpotRange(Point *pt);
-	void GetHotSpotRange(int& hsStart, int& hsEnd);
-
-	int CodePage() const;
-	virtual bool ValidCodePage(int /* codePage */) const { return true; }
-	int WrapCount(int line);
-
-	virtual sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) = 0;
-
-public:
-	// Public so the COM thunks can access it.
-	bool IsUnicodeMode() const;
-	// Public so scintilla_send_message can use it.
-	virtual sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
-	// Public so scintilla_set_id can use it.
-	int ctrlID;
-	friend class AutoSurface;
-	friend class SelectionLineIterator;
-};
-
-/**
- * A smart pointer class to ensure Surfaces are set up and deleted correctly.
- */
-class AutoSurface {
-private:
-	Surface *surf;
-public:
-	AutoSurface(Editor *ed) : surf(0) {
-		if (ed->wMain.GetID()) {
-			surf = Surface::Allocate();
-			if (surf) {
-				surf->Init(ed->wMain.GetID());
-				surf->SetUnicodeMode(SC_CP_UTF8 == ed->CodePage());
-				surf->SetDBCSMode(ed->CodePage());
-			}
-		}
-	}
-	AutoSurface(SurfaceID sid, Editor *ed) : surf(0) {
-		if (ed->wMain.GetID()) {
-			surf = Surface::Allocate();
-			if (surf) {
-				surf->Init(sid, ed->wMain.GetID());
-				surf->SetUnicodeMode(SC_CP_UTF8 == ed->CodePage());
-				surf->SetDBCSMode(ed->CodePage());
-			}
-		}
-	}
-	~AutoSurface() {
-		delete surf;
-	}
-	Surface *operator->() const {
-		return surf;
-	}
-	operator Surface *() const {
-		return surf;
-	}
-};
-
-#endif
diff --git a/src/stc/scintilla/src/ExternalLexer.cxx b/src/stc/scintilla/src/ExternalLexer.cxx
deleted file mode 100644
index acf45bc2d5..0000000000
--- a/src/stc/scintilla/src/ExternalLexer.cxx
+++ /dev/null
@@ -1,259 +0,0 @@
-// Scintilla source code edit control
-/** @file ExternalLexer.cxx
- ** Support external lexers in DLLs.
- **/
-// Copyright 2001 Simon Steele <ss@pnotepad.org>, portions copyright Neil Hodgson.
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-
-#include "SciLexer.h"
-#include "PropSet.h"
-#include "Accessor.h"
-#include "DocumentAccessor.h"
-#include "KeyWords.h"
-#include "ExternalLexer.h"
-
-LexerManager *LexerManager::theInstance = NULL;
-
-//------------------------------------------
-//
-// ExternalLexerModule
-//
-//------------------------------------------
-
-char **WordListsToStrings(WordList *val[]) {
-	int dim = 0;
-	while (val[dim])
-		dim++;
-	char **wls = new char * [dim + 1];
-	for (int i = 0;i < dim;i++) {
-		SString words;
-		words = "";
-		for (int n = 0; n < val[i]->len; n++) {
-			words += val[i]->words[n];
-			if (n != val[i]->len - 1)
-				words += " ";
-		}
-		wls[i] = new char[words.length() + 1];
-		strcpy(wls[i], words.c_str());
-	}
-	wls[dim] = 0;
-	return wls;
-}
-
-void DeleteWLStrings(char *strs[]) {
-	int dim = 0;
-	while (strs[dim]) {
-		delete strs[dim];
-		dim++;
-	}
-	delete [] strs;
-}
-
-void ExternalLexerModule::Lex(unsigned int startPos, int lengthDoc, int initStyle,
-                              WordList *keywordlists[], Accessor &styler) const {
-	if (!fneLexer)
-		return ;
-
-	char **kwds = WordListsToStrings(keywordlists);
-	char *ps = styler.GetProperties();
-
-	// The accessor passed in is always a DocumentAccessor so this cast and the subsequent
-	// access will work. Can not use the stricter dynamic_cast as that requires RTTI.
-	DocumentAccessor &da = static_cast<DocumentAccessor &>(styler);
-	WindowID wID = da.GetWindow();
-
-	fneLexer(externalLanguage, startPos, lengthDoc, initStyle, kwds, wID, ps);
-
-	delete ps;
-	DeleteWLStrings(kwds);
-}
-
-void ExternalLexerModule::Fold(unsigned int startPos, int lengthDoc, int initStyle,
-                               WordList *keywordlists[], Accessor &styler) const {
-	if (!fneFolder)
-		return ;
-
-	char **kwds = WordListsToStrings(keywordlists);
-	char *ps = styler.GetProperties();
-
-	// The accessor passed in is always a DocumentAccessor so this cast and the subsequent
-	// access will work. Can not use the stricter dynamic_cast as that requires RTTI.
-	DocumentAccessor &da = static_cast<DocumentAccessor &>(styler);
-	WindowID wID = da.GetWindow();
-
-	fneFolder(externalLanguage, startPos, lengthDoc, initStyle, kwds, wID, ps);
-
-	delete ps;
-	DeleteWLStrings(kwds);
-}
-
-void ExternalLexerModule::SetExternal(ExtLexerFunction fLexer, ExtFoldFunction fFolder, int index) {
-	fneLexer = fLexer;
-	fneFolder = fFolder;
-	externalLanguage = index;
-}
-
-//------------------------------------------
-//
-// LexerLibrary
-//
-//------------------------------------------
-
-LexerLibrary::LexerLibrary(const char* ModuleName) {
-	// Initialise some members...
-	first = NULL;
-	last = NULL;
-
-	// Load the DLL
-	lib = DynamicLibrary::Load(ModuleName);
-	if (lib->IsValid()) {
-		m_sModuleName = ModuleName;
-		//Cannot use reinterpret_cast because: ANSI C++ forbids casting between pointers to functions and objects
-		GetLexerCountFn GetLexerCount = (GetLexerCountFn)(sptr_t)lib->FindFunction("GetLexerCount");
-
-		if (GetLexerCount) {
-			ExternalLexerModule *lex;
-			LexerMinder *lm;
-
-			// Find functions in the DLL
-			GetLexerNameFn GetLexerName = (GetLexerNameFn)(sptr_t)lib->FindFunction("GetLexerName");
-			ExtLexerFunction Lexer = (ExtLexerFunction)(sptr_t)lib->FindFunction("Lex");
-			ExtFoldFunction Folder = (ExtFoldFunction)(sptr_t)lib->FindFunction("Fold");
-
-			// Assign a buffer for the lexer name.
-			char lexname[100];
-			strcpy(lexname, "");
-
-			int nl = GetLexerCount();
-
-			for (int i = 0; i < nl; i++) {
-				GetLexerName(i, lexname, 100);
-				lex = new ExternalLexerModule(SCLEX_AUTOMATIC, NULL, lexname, NULL);
-
-				// Create a LexerMinder so we don't leak the ExternalLexerModule...
-				lm = new LexerMinder;
-				lm->self = lex;
-				lm->next = NULL;
-				if (first != NULL) {
-					last->next = lm;
-					last = lm;
-				} else {
-					first = lm;
-					last = lm;
-				}
-
-				// The external lexer needs to know how to call into its DLL to
-				// do its lexing and folding, we tell it here. Folder may be null.
-				lex->SetExternal(Lexer, Folder, i);
-			}
-		}
-	}
-	next = NULL;
-}
-
-LexerLibrary::~LexerLibrary() {
-	Release();
-	delete lib;
-}
-
-void LexerLibrary::Release() {
-	//TODO maintain a list of lexers created, and delete them!
-	LexerMinder *lm;
-	LexerMinder *next;
-	lm = first;
-	while (NULL != lm) {
-		next = lm->next;
-		delete lm->self;
-		delete lm;
-		lm = next;
-	}
-
-	first = NULL;
-	last = NULL;
-}
-
-//------------------------------------------
-//
-// LexerManager
-//
-//------------------------------------------
-
-/// Return the single LexerManager instance...
-LexerManager *LexerManager::GetInstance() {
-	if(!theInstance)
-		theInstance = new LexerManager;
-	return theInstance;
-}
-
-/// Delete any LexerManager instance...
-void LexerManager::DeleteInstance()
-{
-	if(theInstance) {
-		delete theInstance;
-		theInstance = NULL;
-	}
-}
-
-/// protected constructor - this is a singleton...
-LexerManager::LexerManager() {
-	first = NULL;
-	last = NULL;
-}
-
-LexerManager::~LexerManager() {
-	Clear();
-}
-
-void LexerManager::Load(const char* path)
-{
-	LoadLexerLibrary(path);
-}
-
-void LexerManager::LoadLexerLibrary(const char* module)
-{
-	LexerLibrary *lib = new LexerLibrary(module);
-	if (NULL != first) {
-		last->next = lib;
-		last = lib;
-	} else {
-		first = lib;
-		last = lib;
-	}
-}
-
-void LexerManager::Clear()
-{
-	if (NULL != first) {
-		LexerLibrary *cur = first;
-		LexerLibrary *next;
-		while (cur) {
-			next = cur->next;
-			delete cur;
-			cur = next;
-		}
-		first = NULL;
-		last = NULL;
-	}
-}
-
-//------------------------------------------
-//
-// LexerManager
-//
-//------------------------------------------
-
-LMMinder::~LMMinder()
-{
-	LexerManager::DeleteInstance();
-}
-
-LMMinder minder;
diff --git a/src/stc/scintilla/src/ExternalLexer.h b/src/stc/scintilla/src/ExternalLexer.h
deleted file mode 100644
index 6308fc28be..0000000000
--- a/src/stc/scintilla/src/ExternalLexer.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// Scintilla source code edit control
-/** @file ExternalLexer.h
- ** Support external lexers in DLLs.
- **/
-// Copyright 2001 Simon Steele <ss@pnotepad.org>, portions copyright Neil Hodgson.
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef EXTERNALLEXER_H
-#define EXTERNALLEXER_H
-
-#if PLAT_WIN
-#define EXT_LEXER_DECL __stdcall
-#else
-#define EXT_LEXER_DECL 
-#endif
-
-// External Lexer function definitions...
-typedef void (EXT_LEXER_DECL *ExtLexerFunction)(unsigned int lexer, unsigned int startPos, int length, int initStyle,
-                  char *words[], WindowID window, char *props);
-typedef void (EXT_LEXER_DECL *ExtFoldFunction)(unsigned int lexer, unsigned int startPos, int length, int initStyle,
-                  char *words[], WindowID window, char *props);
-typedef void* (EXT_LEXER_DECL *GetLexerFunction)(unsigned int Index);
-typedef int (EXT_LEXER_DECL *GetLexerCountFn)();
-typedef void (EXT_LEXER_DECL *GetLexerNameFn)(unsigned int Index, char *name, int buflength);
-
-//class DynamicLibrary;
-
-/// Sub-class of LexerModule to use an external lexer.
-class ExternalLexerModule : protected LexerModule {
-protected:
-	ExtLexerFunction fneLexer;
-	ExtFoldFunction fneFolder;
-	int externalLanguage;
-	char name[100];
-public:
-	ExternalLexerModule(int language_, LexerFunction fnLexer_, 
-		const char *languageName_=0, LexerFunction fnFolder_=0) : LexerModule(language_, fnLexer_, 0, fnFolder_){
-		strncpy(name, languageName_, sizeof(name));
-		languageName = name;
-	};
-	virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,
-					WordList *keywordlists[], Accessor &styler) const;
-	virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle,
-					WordList *keywordlists[], Accessor &styler) const;
-	virtual void SetExternal(ExtLexerFunction fLexer, ExtFoldFunction fFolder, int index);
-};
-
-/// LexerMinder points to an ExternalLexerModule - so we don't leak them.
-class LexerMinder {
-public:
-	ExternalLexerModule *self;
-	LexerMinder *next;
-};
-
-/// LexerLibrary exists for every External Lexer DLL, contains LexerMinders.
-class LexerLibrary {
-	DynamicLibrary	*lib;
-	LexerMinder		*first;
-	LexerMinder		*last;
-
-public:
-	LexerLibrary(const char* ModuleName);
-	~LexerLibrary();
-	void Release();
-	
-	LexerLibrary	*next;
-	SString			m_sModuleName;
-};
-
-/// LexerManager manages external lexers, contains LexerLibrarys.
-class LexerManager {
-public:
-	~LexerManager();
-	
-	static LexerManager *GetInstance();
-	static void DeleteInstance();
-	
-	void Load(const char* path);
-	void Clear();
-
-private:
-	LexerManager();
-	static LexerManager *theInstance;
-
-	void LoadLexerLibrary(const char* module);
-	LexerLibrary *first;
-	LexerLibrary *last;
-};
-
-class LMMinder {
-public:
-	~LMMinder();
-};
-
-#endif
diff --git a/src/stc/scintilla/src/Indicator.cxx b/src/stc/scintilla/src/Indicator.cxx
deleted file mode 100644
index 7624a4a525..0000000000
--- a/src/stc/scintilla/src/Indicator.cxx
+++ /dev/null
@@ -1,77 +0,0 @@
-// Scintilla source code edit control
-/** @file Indicator.cxx
- ** Defines the style of indicators which are text decorations such as underlining.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-#include "Indicator.h"
-
-void Indicator::Draw(Surface *surface, const PRectangle &rc, const PRectangle &rcLine) {
-	surface->PenColour(fore.allocated);
-	int ymid = (rc.bottom + rc.top) / 2;
-	if (style == INDIC_SQUIGGLE) {
-		surface->MoveTo(rc.left, rc.top);
-		int x = rc.left + 2;
-		int y = 2;
-		while (x < rc.right) {
-			surface->LineTo(x, rc.top + y);
-			x += 2;
-			y = 2 - y;
-		}
-		surface->LineTo(rc.right, rc.top + y);	// Finish the line
-	} else if (style == INDIC_TT) {
-		surface->MoveTo(rc.left, ymid);
-		int x = rc.left + 5;
-		while (x < rc.right) {
-			surface->LineTo(x, ymid);
-			surface->MoveTo(x-3, ymid);
-			surface->LineTo(x-3, ymid+2);
-			x++;
-			surface->MoveTo(x, ymid);
-			x += 5;
-		}
-		surface->LineTo(rc.right, ymid);	// Finish the line
-		if (x - 3 <= rc.right) {
-			surface->MoveTo(x-3, ymid);
-			surface->LineTo(x-3, ymid+2);
-		}
-	} else if (style == INDIC_DIAGONAL) {
-		int x = rc.left;
-		while (x < rc.right) {
-			surface->MoveTo(x, rc.top+2);
-			int endX = x+3;
-			int endY = rc.top - 1;
-			if (endX > rc.right) {
-				endY += endX - rc.right;
-				endX = rc.right;
-			}
-			surface->LineTo(endX, endY);
-			x += 4;
-		}
-	} else if (style == INDIC_STRIKE) {
-		surface->MoveTo(rc.left, rc.top - 4);
-		surface->LineTo(rc.right, rc.top - 4);
-	} else if (style == INDIC_HIDDEN) {
-		// Draw nothing
-	} else if (style == INDIC_BOX) {
-		surface->MoveTo(rc.left, ymid+1);
-		surface->LineTo(rc.right, ymid+1);
-		surface->LineTo(rc.right, rcLine.top+1);
-		surface->LineTo(rc.left, rcLine.top+1);
-		surface->LineTo(rc.left, ymid+1);
-	} else if (style == INDIC_ROUNDBOX) {
-		PRectangle rcBox = rcLine;
-		rcBox.top = rcLine.top + 1;
-		rcBox.left = rc.left;
-		rcBox.right = rc.right;
-		surface->AlphaRectangle(rcBox, 1, fore.allocated, 30, fore.allocated, 50, 0);
-	} else {	// Either INDIC_PLAIN or unknown
-		surface->MoveTo(rc.left, ymid);
-		surface->LineTo(rc.right, ymid);
-	}
-}
-
diff --git a/src/stc/scintilla/src/Indicator.h b/src/stc/scintilla/src/Indicator.h
deleted file mode 100644
index 716db1051f..0000000000
--- a/src/stc/scintilla/src/Indicator.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Scintilla source code edit control
-/** @file Indicator.h
- ** Defines the style of indicators which are text decorations such as underlining.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef INDICATOR_H
-#define INDICATOR_H
-
-/**
- */
-class Indicator {
-public:
-	int style;
-	ColourPair fore;
-	Indicator() : style(INDIC_PLAIN), fore(ColourDesired(0,0,0)) {
-	}
-	void Draw(Surface *surface, const PRectangle &rc, const PRectangle &rcLine);
-};
-
-#endif
diff --git a/src/stc/scintilla/src/KeyMap.cxx b/src/stc/scintilla/src/KeyMap.cxx
deleted file mode 100644
index bfa6e2d789..0000000000
--- a/src/stc/scintilla/src/KeyMap.cxx
+++ /dev/null
@@ -1,148 +0,0 @@
-// Scintilla source code edit control
-/** @file KeyMap.cxx
- ** Defines a mapping between keystrokes and commands.
- **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-
-#include "KeyMap.h"
-
-KeyMap::KeyMap() : kmap(0), len(0), alloc(0) {
-	for (int i = 0; MapDefault[i].key; i++) {
-		AssignCmdKey(MapDefault[i].key,
-			MapDefault[i].modifiers,
-			MapDefault[i].msg);
-	}
-}
-
-KeyMap::~KeyMap() {
-	Clear();
-}
-
-void KeyMap::Clear() {
-	delete []kmap;
-	kmap = 0;
-	len = 0;
-	alloc = 0;
-}
-
-void KeyMap::AssignCmdKey(int key, int modifiers, unsigned int msg) {
-	if ((len+1) >= alloc) {
-		KeyToCommand *ktcNew = new KeyToCommand[alloc + 5];
-		if (!ktcNew)
-			return;
-		for (int k = 0; k < len; k++)
-			ktcNew[k] = kmap[k];
-		alloc += 5;
-		delete []kmap;
-		kmap = ktcNew;
-	}
-	for (int keyIndex = 0; keyIndex < len; keyIndex++) {
-		if ((key == kmap[keyIndex].key) && (modifiers == kmap[keyIndex].modifiers)) {
-			kmap[keyIndex].msg = msg;
-			return;
-		}
-	}
-	kmap[len].key = key;
-	kmap[len].modifiers = modifiers;
-	kmap[len].msg = msg;
-	len++;
-}
-
-unsigned int 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;
-		}
-	}
-	return 0;
-}
-
-const KeyToCommand KeyMap::MapDefault[] = {
-    {SCK_DOWN,		SCI_NORM,	SCI_LINEDOWN},
-    {SCK_DOWN,		SCI_SHIFT,	SCI_LINEDOWNEXTEND},
-    {SCK_DOWN,		SCI_CTRL,	SCI_LINESCROLLDOWN},
-    {SCK_DOWN,		SCI_ASHIFT,	SCI_LINEDOWNRECTEXTEND},
-    {SCK_UP,		SCI_NORM,	SCI_LINEUP},
-    {SCK_UP,			SCI_SHIFT,	SCI_LINEUPEXTEND},
-    {SCK_UP,			SCI_CTRL,	SCI_LINESCROLLUP},
-    {SCK_UP,		SCI_ASHIFT,	SCI_LINEUPRECTEXTEND},
-    {'[',			SCI_CTRL,		SCI_PARAUP},
-    {'[',			SCI_CSHIFT,	SCI_PARAUPEXTEND},
-    {']',			SCI_CTRL,		SCI_PARADOWN},
-    {']',			SCI_CSHIFT,	SCI_PARADOWNEXTEND},
-    {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_LEFT,		SCI_ASHIFT,	SCI_CHARLEFTRECTEXTEND},
-    {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_RIGHT,		SCI_ASHIFT,	SCI_CHARRIGHTRECTEXTEND},
-    {'/',		SCI_CTRL,		SCI_WORDPARTLEFT},
-    {'/',		SCI_CSHIFT,	SCI_WORDPARTLEFTEXTEND},
-    {'\\',		SCI_CTRL,		SCI_WORDPARTRIGHT},
-    {'\\',		SCI_CSHIFT,	SCI_WORDPARTRIGHTEXTEND},
-    {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_HOME, 		SCI_ALT, 	SCI_HOMEDISPLAY},
-//    {SCK_HOME,		SCI_ASHIFT,	SCI_HOMEDISPLAYEXTEND},
-    {SCK_HOME,		SCI_ASHIFT,	SCI_VCHOMERECTEXTEND},
-    {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_END, 		SCI_ALT, 	SCI_LINEENDDISPLAY},
-//    {SCK_END,		SCI_ASHIFT,	SCI_LINEENDDISPLAYEXTEND},
-    {SCK_END,		SCI_ASHIFT,	SCI_LINEENDRECTEXTEND},
-    {SCK_PRIOR,		SCI_NORM,	SCI_PAGEUP},
-    {SCK_PRIOR,		SCI_SHIFT, 	SCI_PAGEUPEXTEND},
-    {SCK_PRIOR,		SCI_ASHIFT,	SCI_PAGEUPRECTEXTEND},
-    {SCK_NEXT, 		SCI_NORM, 	SCI_PAGEDOWN},
-    {SCK_NEXT, 		SCI_SHIFT, 	SCI_PAGEDOWNEXTEND},
-    {SCK_NEXT,		SCI_ASHIFT,	SCI_PAGEDOWNRECTEXTEND},
-    {SCK_DELETE, 	SCI_NORM,	SCI_CLEAR},
-    {SCK_DELETE, 	SCI_SHIFT,	SCI_CUT},
-    {SCK_DELETE, 	SCI_CTRL,	SCI_DELWORDRIGHT},
-    {SCK_DELETE,	SCI_CSHIFT,	SCI_DELLINERIGHT},
-    {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},
-    {SCK_BACK,		SCI_CSHIFT,	SCI_DELLINELEFT},
-    {'Z', 			SCI_CTRL,	SCI_UNDO},
-    {'Y', 			SCI_CTRL,	SCI_REDO},
-    {'X', 			SCI_CTRL,	SCI_CUT},
-    {'C', 			SCI_CTRL,	SCI_COPY},
-    {'V', 			SCI_CTRL,	SCI_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_RETURN, 	SCI_SHIFT,	SCI_NEWLINE},
-    {SCK_ADD, 		SCI_CTRL,	SCI_ZOOMIN},
-    {SCK_SUBTRACT,	SCI_CTRL,	SCI_ZOOMOUT},
-    {SCK_DIVIDE,	SCI_CTRL,	SCI_SETZOOM},
-    //'L', 			SCI_CTRL,		SCI_FORMFEED,
-    {'L', 			SCI_CTRL,	SCI_LINECUT},
-    {'L', 			SCI_CSHIFT,	SCI_LINEDELETE},
-    {'T', 			SCI_CSHIFT,	SCI_LINECOPY},
-    {'T', 			SCI_CTRL,	SCI_LINETRANSPOSE},
-    {'D', 			SCI_CTRL,	SCI_SELECTIONDUPLICATE},
-    {'U', 			SCI_CTRL,	SCI_LOWERCASE},
-    {'U', 			SCI_CSHIFT,	SCI_UPPERCASE},
-    {0,0,0},
-};
-
diff --git a/src/stc/scintilla/src/KeyMap.h b/src/stc/scintilla/src/KeyMap.h
deleted file mode 100644
index 364df684f6..0000000000
--- a/src/stc/scintilla/src/KeyMap.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Scintilla source code edit control
-/** @file KeyMap.h
- ** Defines a mapping between keystrokes and commands.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef KEYTOCOMMAND_H
-#define KEYTOCOMMAND_H
-
-#define SCI_NORM 0
-#define SCI_SHIFT SCMOD_SHIFT
-#define SCI_CTRL SCMOD_CTRL
-#define SCI_ALT SCMOD_ALT
-#define SCI_CSHIFT (SCI_CTRL | SCI_SHIFT)
-#define SCI_ASHIFT (SCI_ALT | SCI_SHIFT)
-
-/**
- */
-class KeyToCommand {
-public:
-	int key;
-	int modifiers;
-	unsigned int msg;
-};
-
-/**
- */
-class KeyMap {
-	KeyToCommand *kmap;
-	int len;
-	int alloc;
-	static const KeyToCommand MapDefault[];
-
-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
-};
-
-#endif
diff --git a/src/stc/scintilla/src/KeyWords.cxx b/src/stc/scintilla/src/KeyWords.cxx
deleted file mode 100644
index f82eb7df67..0000000000
--- a/src/stc/scintilla/src/KeyWords.cxx
+++ /dev/null
@@ -1,221 +0,0 @@
-// Scintilla source code edit control
-/** @file KeyWords.cxx
- ** Colourise for particular languages.
- **/
-// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-const LexerModule *LexerModule::base = 0;
-int LexerModule::nextLanguage = SCLEX_AUTOMATIC+1;
-
-LexerModule::LexerModule(int language_,
-	LexerFunction fnLexer_,
-	const char *languageName_,
-	LexerFunction fnFolder_,
-	const char * const wordListDescriptions_[],
-	int styleBits_) :
-	language(language_),
-	fnLexer(fnLexer_),
-	fnFolder(fnFolder_),
-	wordListDescriptions(wordListDescriptions_),
-	styleBits(styleBits_),
-	languageName(languageName_) {
-	next = base;
-	base = this;
-	if (language == SCLEX_AUTOMATIC) {
-		language = nextLanguage;
-		nextLanguage++;
-	}
-}
-
-int LexerModule::GetNumWordLists() const {
-	if (wordListDescriptions == NULL) {
-		return -1;
-	} else {
-		int numWordLists = 0;
-
-		while (wordListDescriptions[numWordLists]) {
-			++numWordLists;
-		}
-
-		return numWordLists;
-	}
-}
-
-const char *LexerModule::GetWordListDescription(int index) const {
-	static const char *emptyStr = "";
-
-	PLATFORM_ASSERT(index < GetNumWordLists());
-	if (index >= GetNumWordLists()) {
-		return emptyStr;
-	} else {
-		return wordListDescriptions[index];
- 	}
-}
-
-int LexerModule::GetStyleBitsNeeded() const {
-	return styleBits;
-}
-
-const LexerModule *LexerModule::Find(int language) {
-	const LexerModule *lm = base;
-	while (lm) {
-		if (lm->language == language) {
-			return lm;
-		}
-		lm = lm->next;
-	}
-	return 0;
-}
-
-const LexerModule *LexerModule::Find(const char *languageName) {
-	if (languageName) {
-		const LexerModule *lm = base;
-		while (lm) {
-			if (lm->languageName && 0 == strcmp(lm->languageName, languageName)) {
-				return lm;
-			}
-			lm = lm->next;
-		}
-	}
-	return 0;
-}
-
-void LexerModule::Lex(unsigned int startPos, int lengthDoc, int initStyle,
-	  WordList *keywordlists[], Accessor &styler) const {
-	if (fnLexer)
-		fnLexer(startPos, lengthDoc, initStyle, keywordlists, styler);
-}
-
-void LexerModule::Fold(unsigned int startPos, int lengthDoc, int initStyle,
-	  WordList *keywordlists[], Accessor &styler) const {
-	if (fnFolder) {
-		int lineCurrent = styler.GetLine(startPos);
-		// Move back one line in case deletion wrecked current line fold state
-		if (lineCurrent > 0) {
-			lineCurrent--;
-			int newStartPos = styler.LineStart(lineCurrent);
-			lengthDoc += startPos - newStartPos;
-			startPos = newStartPos;
-			initStyle = 0;
-			if (startPos > 0) {
-				initStyle = styler.StyleAt(startPos - 1);
-			}
-		}
-		fnFolder(startPos, lengthDoc, initStyle, keywordlists, styler);
-	}
-}
-
-// Alternative historical name for Scintilla_LinkLexers
-int wxForceScintillaLexers(void) {
-	return Scintilla_LinkLexers();
-}
-
-// To add or remove a lexer, add or remove its file and run LexGen.py.
-
-// Force a reference to all of the Scintilla lexers so that the linker will
-// not remove the code of the lexers.
-int Scintilla_LinkLexers() {
-	static int forcer = 0;
-
-// Shorten the code that declares a lexer and ensures it is linked in by calling a method.
-#define LINK_LEXER(lexer) extern LexerModule lexer; forcer += lexer.GetLanguage();
-
-//++Autogenerated -- run src/LexGen.py to regenerate
-//**\(\tLINK_LEXER(\*);\n\)
-	LINK_LEXER(lmAda);
-	LINK_LEXER(lmAns1);
-	LINK_LEXER(lmAPDL);
-	LINK_LEXER(lmAsm);
-	LINK_LEXER(lmASP);
-	LINK_LEXER(lmAU3);
-	LINK_LEXER(lmAVE);
-	LINK_LEXER(lmBaan);
-	LINK_LEXER(lmBash);
-	LINK_LEXER(lmBatch);
-	LINK_LEXER(lmBlitzBasic);
-	LINK_LEXER(lmBullant);
-	LINK_LEXER(lmCaml);
-	LINK_LEXER(lmClw);
-	LINK_LEXER(lmClwNoCase);
-	LINK_LEXER(lmConf);
-	LINK_LEXER(lmCPP);
-	LINK_LEXER(lmCPPNoCase);
-	LINK_LEXER(lmCsound);
-	LINK_LEXER(lmCss);
-	LINK_LEXER(lmDiff);
-	LINK_LEXER(lmEiffel);
-	LINK_LEXER(lmEiffelkw);
-	LINK_LEXER(lmErlang);
-	LINK_LEXER(lmErrorList);
-	LINK_LEXER(lmESCRIPT);
-	LINK_LEXER(lmF77);
-	LINK_LEXER(lmFlagShip);
-	LINK_LEXER(lmForth);
-	LINK_LEXER(lmFortran);
-	LINK_LEXER(lmFreeBasic);
-	LINK_LEXER(lmGui4Cli);
-	LINK_LEXER(lmHaskell);
-	LINK_LEXER(lmHTML);
-	LINK_LEXER(lmInno);
-	LINK_LEXER(lmKix);
-	LINK_LEXER(lmLatex);
-	LINK_LEXER(lmLISP);
-	LINK_LEXER(lmLot);
-	LINK_LEXER(lmLout);
-	LINK_LEXER(lmLua);
-	LINK_LEXER(lmMake);
-	LINK_LEXER(lmMatlab);
-	LINK_LEXER(lmMETAPOST);
-	LINK_LEXER(lmMMIXAL);
-	LINK_LEXER(lmMSSQL);
-	LINK_LEXER(lmNncrontab);
-	LINK_LEXER(lmNsis);
-	LINK_LEXER(lmNull);
-	LINK_LEXER(lmOctave);
-	LINK_LEXER(lmOpal);
-	LINK_LEXER(lmPascal);
-	LINK_LEXER(lmPB);
-	LINK_LEXER(lmPerl);
-	LINK_LEXER(lmPHP);
-	LINK_LEXER(lmPHPSCRIPT);
-	LINK_LEXER(lmPOV);
-	LINK_LEXER(lmProps);
-	LINK_LEXER(lmPS);
-	LINK_LEXER(lmPureBasic);
-	LINK_LEXER(lmPython);
-	LINK_LEXER(lmREBOL);
-	LINK_LEXER(lmRuby);
-	LINK_LEXER(lmScriptol);
-	LINK_LEXER(lmSmalltalk);
-	LINK_LEXER(lmSpecman);
-	LINK_LEXER(lmSpice);
-	LINK_LEXER(lmSQL);
-	LINK_LEXER(lmTADS3);
-	LINK_LEXER(lmTCL);
-	LINK_LEXER(lmTeX);
-	LINK_LEXER(lmVB);
-	LINK_LEXER(lmVBScript);
-	LINK_LEXER(lmVerilog);
-	LINK_LEXER(lmVHDL);
-	LINK_LEXER(lmXML);
-	LINK_LEXER(lmYAML);
-
-//--Autogenerated -- end of automatically generated section
-
-	return 1;
-}
diff --git a/src/stc/scintilla/src/LexAPDL.cxx b/src/stc/scintilla/src/LexAPDL.cxx
deleted file mode 100644
index 1cf263e501..0000000000
--- a/src/stc/scintilla/src/LexAPDL.cxx
+++ /dev/null
@@ -1,136 +0,0 @@
-// Scintilla source code edit control
-/** @file LexAPDL.cxx
- ** Lexer for APDL. Based on the lexer for Assembler by The Black Horus.
- ** By Hadar Raz.
- **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-
-static inline bool IsAWordChar(const int ch) {
-	return (ch < 0x80 && (isalnum(ch) || ch == '_'));
-}
-
-static inline bool IsAnOperator(char ch) {
-	// '.' left out as it is used to make up numbers
-	if (ch == '*' || ch == '/' || ch == '-' || ch == '+' ||
-		ch == '(' || ch == ')' || ch == '=' || ch == '^' ||
-		ch == '[' || ch == ']' || ch == '<' || ch == '&' ||
-		ch == '>' || ch == ',' || ch == '|' || ch == '~' ||
-		ch == '$' || ch == ':' || ch == '%')
-		return true;
-	return false;
-}
-
-static void ColouriseAPDLDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-                            Accessor &styler) {
-
-	int stringStart = ' ';
-
-	WordList &processors = *keywordlists[0];
-	WordList &commands = *keywordlists[1];
-	WordList &slashcommands = *keywordlists[2];
-	WordList &starcommands = *keywordlists[3];
-	WordList &arguments = *keywordlists[4];
-	WordList &functions = *keywordlists[5];
-
-	// Do not leak onto next line
-	initStyle = SCE_APDL_DEFAULT;
-	StyleContext sc(startPos, length, initStyle, styler);
-
-	for (; sc.More(); sc.Forward()) {
-		// Determine if the current state should terminate.
-		if (sc.state == SCE_APDL_NUMBER) {
-			if (!(IsADigit(sc.ch) || sc.ch == '.' || (sc.ch == 'e' || sc.ch == 'E') ||
-				((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E')))) {
-				sc.SetState(SCE_APDL_DEFAULT);
-			}
-		} else if (sc.state == SCE_APDL_COMMENT) {
-			if (sc.atLineEnd) {
-				sc.SetState(SCE_APDL_DEFAULT);
-			}
-		} else if (sc.state == SCE_APDL_COMMENTBLOCK) {
-			if (sc.atLineEnd) {
-				if (sc.ch == '\r') {
-				sc.Forward();
-				}
-				sc.ForwardSetState(SCE_APDL_DEFAULT);
-			}
-		} else if (sc.state == SCE_APDL_STRING) {
-			if (sc.atLineEnd) {
-				sc.SetState(SCE_APDL_DEFAULT);
-			} else if ((sc.ch == '\'' && stringStart == '\'') || (sc.ch == '\"' && stringStart == '\"')) {
-				sc.ForwardSetState(SCE_APDL_DEFAULT);
-			}
-		} else if (sc.state == SCE_APDL_WORD) {
-			if (!IsAWordChar(sc.ch)) {
-				char s[100];
-				sc.GetCurrentLowered(s, sizeof(s));
-				if (processors.InList(s)) {
-					sc.ChangeState(SCE_APDL_PROCESSOR);
-				} else if (slashcommands.InList(s)) {
-					sc.ChangeState(SCE_APDL_SLASHCOMMAND);
-				} else if (starcommands.InList(s)) {
-					sc.ChangeState(SCE_APDL_STARCOMMAND);
-				} else if (commands.InList(s)) {
-					sc.ChangeState(SCE_APDL_COMMAND);
-				} else if (arguments.InList(s)) {
-					sc.ChangeState(SCE_APDL_ARGUMENT);
-				} else if (functions.InList(s)) {
-					sc.ChangeState(SCE_APDL_FUNCTION);
-				}
-				sc.SetState(SCE_APDL_DEFAULT);
-			}
-		} else if (sc.state == SCE_APDL_OPERATOR) {
-			if (!IsAnOperator(static_cast<char>(sc.ch))) {
-			    sc.SetState(SCE_APDL_DEFAULT);
-			}
-		}
-
-		// Determine if a new state should be entered.
-		if (sc.state == SCE_APDL_DEFAULT) {
-			if (sc.ch == '!' && sc.chNext == '!') {
-				sc.SetState(SCE_APDL_COMMENTBLOCK);
-			} else if (sc.ch == '!') {
-				sc.SetState(SCE_APDL_COMMENT);
-			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
-				sc.SetState(SCE_APDL_NUMBER);
-			} else if (sc.ch == '\'' || sc.ch == '\"') {
-				sc.SetState(SCE_APDL_STRING);
-				stringStart = sc.ch;
-			} else if (IsAWordChar(sc.ch) || ((sc.ch == '*' || sc.ch == '/') && !isgraph(sc.chPrev))) {
-				sc.SetState(SCE_APDL_WORD);
-			} else if (IsAnOperator(static_cast<char>(sc.ch))) {
-				sc.SetState(SCE_APDL_OPERATOR);
-			}
-		}
-	}
-	sc.Complete();
-}
-
-static const char * const apdlWordListDesc[] = {
-    "processors",
-    "commands",
-    "slashommands",
-    "starcommands",
-    "arguments",
-    "functions",
-    0
-};
-
-LexerModule lmAPDL(SCLEX_APDL, ColouriseAPDLDoc, "apdl", 0, apdlWordListDesc);
diff --git a/src/stc/scintilla/src/LexAU3.cxx b/src/stc/scintilla/src/LexAU3.cxx
deleted file mode 100644
index 2bc2e0f4bc..0000000000
--- a/src/stc/scintilla/src/LexAU3.cxx
+++ /dev/null
@@ -1,891 +0,0 @@
-// Scintilla source code edit control
-// @file LexAU3.cxx
-// Lexer for AutoIt3  http://www.hiddensoft.com/autoit3
-// by Jos van der Zande, jvdzande@yahoo.com 
-//
-// Changes:
-// March 28, 2004 - Added the standard Folding code
-// April 21, 2004 - Added Preprosessor Table + Syntax Highlighting
-//                  Fixed Number highlighting
-//                  Changed default isoperator to IsAOperator to have a better match to AutoIt3
-//                  Fixed "#comments_start" -> "#comments-start"  
-//                  Fixed "#comments_end" -> "#comments-end"  
-//                  Fixed Sendkeys in Strings when not terminated with }
-//                  Added support for Sendkey strings that have second parameter e.g. {UP 5} or {a down}
-// April 26, 2004 - Fixed # pre-processor statement inside of comment block would invalidly change the color.
-//                  Added logic for #include <xyz.au3> to treat the <> as string
-//                  Added underscore to IsAOperator.
-// May 17, 2004   - Changed the folding logic from indent to keyword folding.
-//                  Added Folding logic for blocks of single-commentlines or commentblock.
-//                        triggered by: fold.comment=1
-//                  Added Folding logic for preprocessor blocks triggered by fold.preprocessor=1
-//                  Added Special for #region - #endregion syntax highlight and folding.
-// May 30, 2004   - Fixed issue with continuation lines on If statements.
-// June 5, 2004   - Added comma to Operators for better readability.
-//                  Added fold.compact support set with fold.compact=1
-//                  Changed folding inside of #cs-#ce. Default is no keyword folding inside comment blocks when fold.comment=1
-//                        it will now only happen when fold.comment=2.
-// Sep 5, 2004    - Added logic to handle colourizing words on the last line. 
-//                        Typed Characters now show as "default" till they match any table.
-// Oct 10, 2004   - Added logic to show Comments in "Special" directives. 
-// Nov  1, 2004   - Added better testing for Numbers supporting x and e notation.
-// Nov 28, 2004   - Added logic to handle continuation lines for syntax highlighting.
-// Jan 10, 2005   - Added Abbreviations Keyword used for expansion
-// Mar 24, 2005   - Updated Abbreviations Keywords to fix when followed by Operator.
-// Apr 18, 2005   - Updated #CE/#Comment-End logic to take a linecomment ";" into account
-//                - Added folding support for With...EndWith
-//                - Added support for a DOT in variable names
-//                - Fixed Underscore in CommentBlock
-// May 23, 2005   - Fixed the SentKey lexing in case of a missing }
-// Aug 11, 2005   - Fixed possible bug with s_save length > 100.
-// Aug 23, 2005   - Added Switch/endswitch support to the folding logic.
-// Sep 27, 2005   - Fixed the SentKey lexing logic in case of multiple sentkeys.
-// Mar 12, 2006   - Fixed issue with <> coloring as String in stead of Operator in rare occasions.
-// Apr  8, 2006   - Added support for AutoIt3 Standard UDF library (SCE_AU3_UDF)
-//
-// Copyright for Scintilla: 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-// Scintilla source code edit control
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static inline bool IsTypeCharacter(const int ch)
-{
-    return ch == '$';
-}
-static inline bool IsAWordChar(const int ch)
-{
-    return (ch < 0x80) && (isalnum(ch) || ch == '_');
-}
-
-static inline bool IsAWordStart(const int ch)
-{
-    return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '@' || ch == '#' || ch == '$' || ch == '.');
-}
-
-static inline bool IsAOperator(char ch) {
-	if (isascii(ch) && isalnum(ch))
-		return false;
-	if (ch == '+' || ch == '-' || ch == '*' || ch == '/' ||
-	    ch == '&' || ch == '^' || ch == '=' || ch == '<' || ch == '>' ||
-	    ch == '(' || ch == ')' || ch == '[' || ch == ']' || ch == ',' )
-		return true;
-	return false;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// GetSendKey() filters the portion before and after a/multiple space(s)
-// and return the first portion to be looked-up in the table
-// also check if the second portion is valid... (up,down.on.off,toggle or a number)
-///////////////////////////////////////////////////////////////////////////////
-
-static int GetSendKey(const char *szLine, char *szKey)
-{
-	int		nFlag	= 0;
-	int		nStartFound	= 0;
-	int		nKeyPos	= 0;
-	int		nSpecPos= 0;
-	int		nSpecNum= 1;
-	int		nPos	= 0;
-	char	cTemp;
-	char	szSpecial[100];
-
-	// split the portion of the sendkey in the part before and after the spaces
-	while ( ( (cTemp = szLine[nPos]) != '\0'))
-	{
-		// skip leading Ctrl/Shift/Alt state
-		if (cTemp == '{') {
-			nStartFound = 1;
-		}
-		//
-		if (nStartFound == 1) {
-			if ((cTemp == ' ') && (nFlag == 0) ) // get the stuff till first space
-			{
-				nFlag = 1;
-				// Add } to the end of the first bit for table lookup later.
-				szKey[nKeyPos++] = '}';
-			}
-			else if (cTemp == ' ')
-			{
-				// skip other spaces 
-			}
-			else if (nFlag == 0)
-			{
-				// save first portion into var till space or } is hit
-				szKey[nKeyPos++] = cTemp;
-			}
-			else if ((nFlag == 1) && (cTemp != '}'))
-			{
-				// Save second portion into var...
-				szSpecial[nSpecPos++] = cTemp;
-				// check if Second portion is all numbers for repeat fuction
-				if (isdigit(cTemp) == false) {nSpecNum = 0;} 
-			}
-		}
-		nPos++;									// skip to next char
-
-	} // End While
-
-
-	// Check if the second portion is either a number or one of these keywords
-	szKey[nKeyPos] = '\0';
-	szSpecial[nSpecPos] = '\0';
-	if (strcmp(szSpecial,"down")== 0    || strcmp(szSpecial,"up")== 0  ||
-		strcmp(szSpecial,"on")== 0      || strcmp(szSpecial,"off")== 0 || 
-		strcmp(szSpecial,"toggle")== 0  || nSpecNum == 1 )
-	{
-		nFlag = 0;
-	}
-	else
-	{
-		nFlag = 1;
-	}
-	return nFlag;  // 1 is bad, 0 is good 
-
-} // GetSendKey() 
-
-//
-// Routine to check the last "none comment" character on a line to see if its a continuation
-// 
-static bool IsContinuationLine(unsigned int szLine, Accessor &styler)
-{
-	int nsPos = styler.LineStart(szLine);
-	int nePos = styler.LineStart(szLine+1) - 2;
-	//int stylech = styler.StyleAt(nsPos);
-	while (nsPos < nePos)
-	{
-		//stylech = styler.StyleAt(nePos);
-		int stylech = styler.StyleAt(nsPos);
-		if (!(stylech == SCE_AU3_COMMENT)) {
-			char ch = styler.SafeGetCharAt(nePos);
-			if (!isspacechar(ch)) {
-				if (ch == '_')
-					return true;
-				else
-					return false;
-			}
-		}
-		nePos--; // skip to next char
-	} // End While
-	return false;
-} // IsContinuationLine()
-
-//
-// syntax highlighting logic
-static void ColouriseAU3Doc(unsigned int startPos, 
-							int length, int initStyle,
-							WordList *keywordlists[],
-							Accessor &styler) {
-
-    WordList &keywords = *keywordlists[0];
-    WordList &keywords2 = *keywordlists[1];
-    WordList &keywords3 = *keywordlists[2];
-    WordList &keywords4 = *keywordlists[3];
-    WordList &keywords5 = *keywordlists[4];
-    WordList &keywords6 = *keywordlists[5];
-    WordList &keywords7 = *keywordlists[6];
-    WordList &keywords8 = *keywordlists[7];
-	// find the first previous line without continuation character at the end
-	int lineCurrent = styler.GetLine(startPos);
-	int s_startPos = startPos;
-	// When not inside a Block comment: find First line without _
-	if (!(initStyle==SCE_AU3_COMMENTBLOCK)) {
-		while ((lineCurrent > 0 && IsContinuationLine(lineCurrent,styler)) ||
-			   (lineCurrent > 1 && IsContinuationLine(lineCurrent-1,styler))) {
-			lineCurrent--;
-			startPos = styler.LineStart(lineCurrent); // get start position
-			initStyle =  0;                           // reset the start style to 0 
-		}
-	}
-	// Set the new length to include it from the start and set the start position
-	length = length + s_startPos - startPos;      // correct the total length to process
-    styler.StartAt(startPos);
-	
-    StyleContext sc(startPos, length, initStyle, styler);
-	char si;     // string indicator "=1 '=2
-	char ni;     // Numeric indicator error=9 normal=0 normal+dec=1 hex=2 Enot=3
-	char ci;     // comment indicator 0=not linecomment(;) 
-	char s_save[100];
-	si=0;  
-	ni=0;
-	ci=0;
-	//$$$
-    for (; sc.More(); sc.Forward()) {
-		char s[100];
-		sc.GetCurrentLowered(s, sizeof(s));
-		// **********************************************
-		// save the total current word for eof processing 
-		if (IsAWordChar(sc.ch) || sc.ch == '}') 
-		{
-			strcpy(s_save,s);
-			int tp = strlen(s_save);
-			if (tp < 99) {
-				s_save[tp] = static_cast<char>(tolower(sc.ch));
-				s_save[tp+1] = '\0';
-			}
-		}
-		// **********************************************
-		//
-		switch (sc.state)
-        {
-            case SCE_AU3_COMMENTBLOCK:
-            {
-				//Reset at line end
-				if (sc.atLineEnd) {
-					ci=0;
-					sc.SetState(SCE_AU3_COMMENTBLOCK);
-				}
-				//skip rest of line when a ; is encountered
-				if (sc.chPrev == ';') {
-					ci=2;
-					sc.SetState(SCE_AU3_COMMENTBLOCK);
-				}
-				// skip rest of the line
-				if (ci==2) 
-					break;
-				// check when first character is detected on the line 
-				if (ci==0) {
-					if (IsAWordStart(static_cast<char>(sc.ch)) || IsAOperator(static_cast<char>(sc.ch))) {
-						ci=1;
-						sc.SetState(SCE_AU3_COMMENTBLOCK);
-					}
-					break;
-				}
-				if (!(IsAWordChar(sc.ch) || (sc.ch == '-' && strcmp(s, "#comments") == 0))) {
-					if ((strcmp(s, "#ce")== 0 || strcmp(s, "#comments-end")== 0)) 
-						sc.SetState(SCE_AU3_COMMENT);  // set to comment line for the rest of the line
-					else
-						ci=2;  // line doesn't begin with #CE so skip the rest of the line
-				}
-                break;
-			}
-            case SCE_AU3_COMMENT:
-            {
-                if (sc.atLineEnd) {sc.SetState(SCE_AU3_DEFAULT);}
-                break;
-            }
-            case SCE_AU3_OPERATOR:
-            {
-                // check if its a COMobject 
-				if (sc.chPrev == '.' && IsAWordChar(sc.ch)) {
-					sc.SetState(SCE_AU3_COMOBJ);
-				}	
-				else {
-					sc.SetState(SCE_AU3_DEFAULT);
-				}
-                break;
-            }
-            case SCE_AU3_SPECIAL:
-            {
-                if (sc.ch == ';') {sc.SetState(SCE_AU3_COMMENT);}
-				if (sc.atLineEnd) {sc.SetState(SCE_AU3_DEFAULT);}
-                break;
-            }
-            case SCE_AU3_KEYWORD:
-            {
-                if (!(IsAWordChar(sc.ch) || (sc.ch == '-' && (strcmp(s, "#comments") == 0 || strcmp(s, "#include") == 0))))
-                {
-                    if (!IsTypeCharacter(sc.ch))
-                    {
-						if (strcmp(s, "#cs")== 0 || strcmp(s, "#comments-start")== 0 )
-						{
-							sc.ChangeState(SCE_AU3_COMMENTBLOCK);
-							sc.SetState(SCE_AU3_COMMENTBLOCK);
-						}
-						else if (keywords.InList(s)) {
-							sc.ChangeState(SCE_AU3_KEYWORD);
-							sc.SetState(SCE_AU3_DEFAULT);
-						}
-						else if (keywords2.InList(s)) {
-							sc.ChangeState(SCE_AU3_FUNCTION);
-							sc.SetState(SCE_AU3_DEFAULT);
-						}
-						else if (keywords3.InList(s)) {
-							sc.ChangeState(SCE_AU3_MACRO);
-							sc.SetState(SCE_AU3_DEFAULT);
-						}
-						else if (keywords5.InList(s)) {
-							sc.ChangeState(SCE_AU3_PREPROCESSOR);
-							sc.SetState(SCE_AU3_DEFAULT);
-							if (strcmp(s, "#include")== 0)
-							{
-								si = 3;   // use to determine string start for #inlude <>
-							}
-						}
-						else if (keywords6.InList(s)) {
-							sc.ChangeState(SCE_AU3_SPECIAL);
-							sc.SetState(SCE_AU3_SPECIAL);
-						}
-						else if ((keywords7.InList(s)) && (!IsAOperator(static_cast<char>(sc.ch)))) {
-							sc.ChangeState(SCE_AU3_EXPAND);
-							sc.SetState(SCE_AU3_DEFAULT);
-						}
-						else if (keywords8.InList(s)) {
-							sc.ChangeState(SCE_AU3_UDF);
-							sc.SetState(SCE_AU3_DEFAULT);
-						}
-						else if (strcmp(s, "_") == 0) {
-							sc.ChangeState(SCE_AU3_OPERATOR);
-							sc.SetState(SCE_AU3_DEFAULT);
-						}
-						else if (!IsAWordChar(sc.ch)) {
-							sc.ChangeState(SCE_AU3_DEFAULT);
-							sc.SetState(SCE_AU3_DEFAULT);
-						}
-					}
-				}	
-                if (sc.atLineEnd) {
-					sc.SetState(SCE_AU3_DEFAULT);}
-                break;
-            }
-			case SCE_AU3_NUMBER:
-            {
-				// Numeric indicator error=9 normal=0 normal+dec=1 hex=2 E-not=3
-				//
-				// test for Hex notation
-				if (strcmp(s, "0") == 0 && (sc.ch == 'x' || sc.ch == 'X') && ni == 0)
-				{
-					ni = 2;
-					break;
-				}
-				// test for E notation
-				if (IsADigit(sc.chPrev) && (sc.ch == 'e' || sc.ch == 'E') && ni <= 1)
-				{
-					ni = 3;
-					break;
-				}
-				//  Allow Hex characters inside hex numeric strings
-				if ((ni == 2) &&
-					(sc.ch == 'a' || sc.ch == 'b' || sc.ch == 'c' || sc.ch == 'd' || sc.ch == 'e' || sc.ch == 'f' ||
-					 sc.ch == 'A' || sc.ch == 'B' || sc.ch == 'C' || sc.ch == 'D' || sc.ch == 'E' || sc.ch == 'F' ))
-				{
-					break;
-				}
-				// test for 1 dec point only
-				if (sc.ch == '.')
-				{
-					if (ni==0)
-					{
-						ni=1;
-					}
-					else
-					{
-						ni=9;
-					}
-					break;
-				}
-				// end of numeric string ?
-				if (!(IsADigit(sc.ch)))
-				{
-					if (ni==9)
-					{
-						sc.ChangeState(SCE_AU3_DEFAULT);
-					}
-					sc.SetState(SCE_AU3_DEFAULT);
-				}
-				break;
-			}
-			case SCE_AU3_VARIABLE:
-			{
-				// Check if its a COMObject
-				if (sc.ch == '.' && !IsADigit(sc.chNext)) {
-					sc.SetState(SCE_AU3_OPERATOR);
-				}
-				else if (!IsAWordChar(sc.ch)) {
-					sc.SetState(SCE_AU3_DEFAULT);
-				}
-				break;
-            }
-			case SCE_AU3_COMOBJ:
-			{
-				if (!(IsAWordChar(sc.ch))) {
-					sc.SetState(SCE_AU3_DEFAULT);
-				}
-				break;
-            }
-            case SCE_AU3_STRING:
-            {
-				// check for " to end a double qouted string or
-				// check for ' to end a single qouted string 
-	            if ((si == 1 && sc.ch == '\"') || (si == 2 && sc.ch == '\'') || (si == 3 && sc.ch == '>'))
-				{
-					sc.ForwardSetState(SCE_AU3_DEFAULT);
-					si=0;
-				}
-                if (sc.atLineEnd)
-				{
-					si=0;
-					// at line end and not found a continuation char then reset to default
-					int lineCurrent = styler.GetLine(sc.currentPos);
-					if (!IsContinuationLine(lineCurrent,styler)) 
-					{
-						sc.SetState(SCE_AU3_DEFAULT);
-					}
-				}
-				// find Sendkeys in a STRING
-				if (sc.ch == '{' || sc.ch == '+' || sc.ch == '!' || sc.ch == '^' || sc.ch == '#' ) {
-					sc.SetState(SCE_AU3_SENT);}
-				break;
-            }
-            
-            case SCE_AU3_SENT:
-            {
-				// Send key string ended 
-				if (sc.chPrev == '}' && sc.ch != '}') 
-				{
-					// set color to SENDKEY when valid sendkey .. else set back to regular string
-					char sk[100];
-					// split {111 222} and return {111} and check if 222 is valid.
-					// if return code = 1 then invalid 222 so must be string
-					if (GetSendKey(s,sk))   
-					{
-						sc.ChangeState(SCE_AU3_STRING);
-					}
-					// if single char between {?} then its ok as sendkey for a single character
-					else if (strlen(sk) == 3)  
-					{
-						sc.ChangeState(SCE_AU3_SENT);
-					}
-					// if sendkey {111} is in table then ok as sendkey
-					else if (keywords4.InList(sk)) 
-					{
-						sc.ChangeState(SCE_AU3_SENT);
-					}
-					else
-					{
-						sc.ChangeState(SCE_AU3_STRING);
-					}
-					sc.SetState(SCE_AU3_STRING);
-				}
-				else
-				{
-					// check if the start is a valid SendKey start
-					int		nPos	= 0;
-					int		nState	= 1;
-					char	cTemp;
-					while (!(nState == 2) && ((cTemp = s[nPos]) != '\0')) 
-					{
-						if (cTemp == '{' && nState == 1) 
-						{
-							nState = 2;
-						}
-						if (nState == 1 && !(cTemp == '+' || cTemp == '!' || cTemp == '^' || cTemp == '#' ))
-						{
-							nState = 0;
-						}
-						nPos++;
-					}
-					//Verify characters infront of { ... if not assume  regular string
-					if (nState == 1 && (!(sc.ch == '{' || sc.ch == '+' || sc.ch == '!' || sc.ch == '^' || sc.ch == '#' ))) {
-						sc.ChangeState(SCE_AU3_STRING);
-						sc.SetState(SCE_AU3_STRING);
-					}
-					// If invalid character found then assume its a regular string	
-					if (nState == 0) {
-						sc.ChangeState(SCE_AU3_STRING);
-						sc.SetState(SCE_AU3_STRING);
-					}
-				}
-				// check if next portion is again a sendkey
-				if (sc.atLineEnd) 
-				{
-					sc.ChangeState(SCE_AU3_STRING);
-					sc.SetState(SCE_AU3_DEFAULT);
-					si = 0;  // reset string indicator
-				}
-				//* check in next characters following a sentkey are again a sent key
-				// Need this test incase of 2 sentkeys like {F1}{ENTER} but not detect {{}
-				if (sc.state == SCE_AU3_STRING && (sc.ch == '{' || sc.ch == '+' || sc.ch == '!' || sc.ch == '^' || sc.ch == '#' )) {
-					sc.SetState(SCE_AU3_SENT);}
-				// check to see if the string ended...
-				// Sendkey string isn't complete but the string ended....
-				if ((si == 1 && sc.ch == '\"') || (si == 2 && sc.ch == '\''))
-				{
-					sc.ChangeState(SCE_AU3_STRING);
-					sc.ForwardSetState(SCE_AU3_DEFAULT);
-				}
-				break;
-            }
-        }  //switch (sc.state)
-
-        // Determine if a new state should be entered:
-
-		if (sc.state == SCE_AU3_DEFAULT)
-        {
-            if (sc.ch == ';') {sc.SetState(SCE_AU3_COMMENT);}
-            else if (sc.ch == '#') {sc.SetState(SCE_AU3_KEYWORD);}
-            else if (sc.ch == '$') {sc.SetState(SCE_AU3_VARIABLE);}
-            else if (sc.ch == '.' && !IsADigit(sc.chNext)) {sc.SetState(SCE_AU3_OPERATOR);}
-            else if (sc.ch == '@') {sc.SetState(SCE_AU3_KEYWORD);}
-            //else if (sc.ch == '_') {sc.SetState(SCE_AU3_KEYWORD);}
-            else if (sc.ch == '<' && si==3) {sc.SetState(SCE_AU3_STRING);}  // string after #include 
-            else if (sc.ch == '\"') {
-				sc.SetState(SCE_AU3_STRING);
-				si = 1;	}
-            else if (sc.ch == '\'') {
-				sc.SetState(SCE_AU3_STRING);
-				si = 2;	}
-            else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) 
-			{
-				sc.SetState(SCE_AU3_NUMBER);
-				ni = 0;
-			}
-            else if (IsAWordStart(sc.ch)) {sc.SetState(SCE_AU3_KEYWORD);}
-            else if (IsAOperator(static_cast<char>(sc.ch))) {sc.SetState(SCE_AU3_OPERATOR);}
-			else if (sc.atLineEnd) {sc.SetState(SCE_AU3_DEFAULT);}
-        }
-    }      //for (; sc.More(); sc.Forward())
-
-	//*************************************
-	// Colourize the last word correctly 
-	//*************************************
-	if (sc.state == SCE_AU3_KEYWORD)
-		{
-		if (strcmp(s_save, "#cs")== 0 || strcmp(s_save, "#comments-start")== 0 )
-		{
-			sc.ChangeState(SCE_AU3_COMMENTBLOCK);
-			sc.SetState(SCE_AU3_COMMENTBLOCK);
-		}
-		else if (keywords.InList(s_save)) {
-			sc.ChangeState(SCE_AU3_KEYWORD);
-			sc.SetState(SCE_AU3_KEYWORD);
-		}
-		else if (keywords2.InList(s_save)) {
-			sc.ChangeState(SCE_AU3_FUNCTION);
-			sc.SetState(SCE_AU3_FUNCTION);
-		}
-		else if (keywords3.InList(s_save)) {
-			sc.ChangeState(SCE_AU3_MACRO);
-			sc.SetState(SCE_AU3_MACRO);
-		}
-		else if (keywords5.InList(s_save)) {
-			sc.ChangeState(SCE_AU3_PREPROCESSOR);
-			sc.SetState(SCE_AU3_PREPROCESSOR);
-		}
-		else if (keywords6.InList(s_save)) {
-			sc.ChangeState(SCE_AU3_SPECIAL);
-			sc.SetState(SCE_AU3_SPECIAL);
-		}
-		else if (keywords7.InList(s_save) && sc.atLineEnd) {
-			sc.ChangeState(SCE_AU3_EXPAND);
-			sc.SetState(SCE_AU3_EXPAND);
-		}
-		else if (keywords8.InList(s_save)) {
-			sc.ChangeState(SCE_AU3_UDF);
-			sc.SetState(SCE_AU3_UDF);
-		}
-		else {
-			sc.ChangeState(SCE_AU3_DEFAULT);
-			sc.SetState(SCE_AU3_DEFAULT);
-		}
-	}
-	if (sc.state == SCE_AU3_SENT)
-    {
-		// Send key string ended 
-		if (sc.chPrev == '}' && sc.ch != '}') 
-		{
-			// set color to SENDKEY when valid sendkey .. else set back to regular string
-			char sk[100];
-			// split {111 222} and return {111} and check if 222 is valid.
-			// if return code = 1 then invalid 222 so must be string
-			if (GetSendKey(s_save,sk))   
-			{
-				sc.ChangeState(SCE_AU3_STRING);
-			}
-			// if single char between {?} then its ok as sendkey for a single character
-			else if (strlen(sk) == 3)  
-			{
-				sc.ChangeState(SCE_AU3_SENT);
-			}
-			// if sendkey {111} is in table then ok as sendkey
-			else if (keywords4.InList(sk)) 
-			{
-				sc.ChangeState(SCE_AU3_SENT);
-			}
-			else
-			{
-				sc.ChangeState(SCE_AU3_STRING);
-			}
-			sc.SetState(SCE_AU3_STRING);
-		}
-		// check if next portion is again a sendkey
-		if (sc.atLineEnd) 
-		{
-			sc.ChangeState(SCE_AU3_STRING);
-			sc.SetState(SCE_AU3_DEFAULT);
-		}
-    }
-	//*************************************
-	sc.Complete();
-}
-
-//
-static bool IsStreamCommentStyle(int style) {
-	return style == SCE_AU3_COMMENT || style == SCE_AU3_COMMENTBLOCK;
-}
-
-//
-// Routine to find first none space on the current line and return its Style
-// needed for comment lines not starting on pos 1 
-static int GetStyleFirstWord(unsigned int szLine, Accessor &styler)
-{
-	int nsPos = styler.LineStart(szLine);
-	int nePos = styler.LineStart(szLine+1) - 1;
-	while (isspacechar(styler.SafeGetCharAt(nsPos)) && nsPos < nePos)
-	{
-		nsPos++; // skip to next char
-
-	} // End While
-	return styler.StyleAt(nsPos);
-
-} // GetStyleFirstWord()
-
-
-//
-static void FoldAU3Doc(unsigned int startPos, int length, int, WordList *[], Accessor &styler)
-{
-	int endPos = startPos + length;
-	// get settings from the config files for folding comments and preprocessor lines
-	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
-	bool foldInComment = styler.GetPropertyInt("fold.comment") == 2;
-	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-	bool foldpreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0;
-	// Backtrack to previous line in case need to fix its fold status
-	int lineCurrent = styler.GetLine(startPos);
-	if (startPos > 0) {
-		if (lineCurrent > 0) {
-			lineCurrent--;
-			startPos = styler.LineStart(lineCurrent);
-		}
-	}
-	// vars for style of previous/current/next lines 
-	int style = GetStyleFirstWord(lineCurrent,styler);
-	int stylePrev = 0;
-	// find the first previous line without continuation character at the end
-	while ((lineCurrent > 0 && IsContinuationLine(lineCurrent,styler)) ||
-	       (lineCurrent > 1 && IsContinuationLine(lineCurrent-1,styler))) {
-		lineCurrent--;
-		startPos = styler.LineStart(lineCurrent);
-	}
-	if (lineCurrent > 0) {
-		stylePrev = GetStyleFirstWord(lineCurrent-1,styler);
-	}
-	// vars for getting first word to check for keywords
-	bool FirstWordStart = false;
-	bool FirstWordEnd = false;
-	char szKeyword[10]="";
-	int	 szKeywordlen = 0;
-	char szThen[5]="";
-	int	 szThenlen = 0;
-	bool ThenFoundLast = false;
-	// var for indentlevel
-	int levelCurrent = SC_FOLDLEVELBASE;
-	if (lineCurrent > 0)
-		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
-	int levelNext = levelCurrent;
-	//  
-	int	visibleChars = 0;
-	char chNext = styler.SafeGetCharAt(startPos);
-	char chPrev = ' ';
-	//
-	for (int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		if (IsAWordChar(ch)) {
-			visibleChars++;
-		}
-		// get the syle for the current character neede to check in comment
-		int stylech = styler.StyleAt(i);
-		// get first word for the line for indent check max 9 characters
-		if (FirstWordStart && (!(FirstWordEnd))) {
-			if (!IsAWordChar(ch)) {
-				FirstWordEnd = true;
-				szKeyword[szKeywordlen] = '\0';
-			}
-			else {
-				if (szKeywordlen < 10) {
-				szKeyword[szKeywordlen++] = static_cast<char>(tolower(ch));
-				}
-			}
-		}
-		// start the capture of the first word 
-		if (!(FirstWordStart)) {
-			if (IsAWordChar(ch) || IsAWordStart(ch) || ch == ';') {
-				FirstWordStart = true;
-				szKeyword[szKeywordlen++] = static_cast<char>(tolower(ch));
-			}
-		}
-		// only process this logic when not in comment section
-		if (!(stylech == SCE_AU3_COMMENT)) {
-			if (ThenFoundLast) {
-				if (IsAWordChar(ch)) {
-					ThenFoundLast = false;
-				}		
-			}
-			// find out if the word "then" is the last on a "if" line
-			if (FirstWordEnd && strcmp(szKeyword,"if") == 0) {
-				if (szThenlen == 4) {
-					szThen[0] = szThen[1];
-					szThen[1] = szThen[2];
-					szThen[2] = szThen[3];
-					szThen[3] = static_cast<char>(tolower(ch));
-					if (strcmp(szThen,"then") == 0 ) {
-						ThenFoundLast = true;
-					}
-				}
-				else {
-					szThen[szThenlen++] = static_cast<char>(tolower(ch));
-					if (szThenlen == 5) {
-						szThen[4] = '\0';
-					}
-				}
-			}
-		}
-		// End of Line found so process the information 
-		if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == endPos)) {
-			// **************************
-			// Folding logic for Keywords
-			// **************************
-			// if a keyword is found on the current line and the line doesn't end with _ (continuation)
-			//    and we are not inside a commentblock.
-			if (szKeywordlen > 0 && (!(chPrev == '_')) && 
-				((!(IsStreamCommentStyle(style)) || foldInComment)) ) {
-				szKeyword[szKeywordlen] = '\0';
-				// only fold "if" last keyword is "then"  (else its a one line if)
-				if (strcmp(szKeyword,"if") == 0  && ThenFoundLast) {
-						levelNext++;
-				}
-				// create new fold for these words 
-				if (strcmp(szKeyword,"do") == 0   || strcmp(szKeyword,"for") == 0 ||
-					strcmp(szKeyword,"func") == 0 || strcmp(szKeyword,"while") == 0||
-					strcmp(szKeyword,"with") == 0 || strcmp(szKeyword,"#region") == 0 ) {
-						levelNext++;
-				}
-				// create double Fold for select&switch because Case will subtract one of the current level
-				if (strcmp(szKeyword,"select") == 0 || strcmp(szKeyword,"switch") == 0) {
-						levelNext++;
-						levelNext++;
-				}
-				// end the fold for these words before the current line
-				if (strcmp(szKeyword,"endfunc") == 0 || strcmp(szKeyword,"endif") == 0 ||
-					strcmp(szKeyword,"next") == 0    || strcmp(szKeyword,"until") == 0 || 
-					strcmp(szKeyword,"endwith") == 0 ||strcmp(szKeyword,"wend") == 0){
-						levelNext--;
-						levelCurrent--;
-				}
-				// end the fold for these words before the current line and Start new fold 
-				if (strcmp(szKeyword,"case") == 0      || strcmp(szKeyword,"else") == 0 ||
-					strcmp(szKeyword,"elseif") == 0 ) {
-						levelCurrent--;
-				}
-				// end the double fold for this word before the current line
-				if (strcmp(szKeyword,"endselect") == 0 || strcmp(szKeyword,"endswitch") == 0 ) {
-						levelNext--;
-						levelNext--;
-						levelCurrent--;
-						levelCurrent--;
-				}
-				// end the fold for these words on the current line
-				if (strcmp(szKeyword,"#endregion") == 0 ) {
-						levelNext--;
-				}
-			}
-			// Preprocessor and Comment folding
-			int styleNext = GetStyleFirstWord(lineCurrent + 1,styler);
-			// *************************************
-			// Folding logic for preprocessor blocks
-			// *************************************
-			// process preprosessor line
-			if (foldpreprocessor && style == SCE_AU3_PREPROCESSOR) {
-				if (!(stylePrev == SCE_AU3_PREPROCESSOR) && (styleNext == SCE_AU3_PREPROCESSOR)) {
-				    levelNext++;
-				}
-				// fold till the last line for normal comment lines
-				else if (stylePrev == SCE_AU3_PREPROCESSOR && !(styleNext == SCE_AU3_PREPROCESSOR)) {
-					levelNext--;
-				}
-			}
-			// *********************************
-			// Folding logic for Comment blocks
-			// *********************************
-			if (foldComment && IsStreamCommentStyle(style)) {
-				// Start of a comment block
-				if (!(stylePrev==style) && IsStreamCommentStyle(styleNext) && styleNext==style) {
-				    levelNext++;
-				} 
-				// fold till the last line for normal comment lines
-				else if (IsStreamCommentStyle(stylePrev) 
-						&& !(styleNext == SCE_AU3_COMMENT)
-						&& stylePrev == SCE_AU3_COMMENT 
-						&& style == SCE_AU3_COMMENT) {
-					levelNext--;
-				}
-				// fold till the one but last line for Blockcomment lines
-				else if (IsStreamCommentStyle(stylePrev) 
-						&& !(styleNext == SCE_AU3_COMMENTBLOCK)
-						&& style == SCE_AU3_COMMENTBLOCK) {
-					levelNext--;
-					levelCurrent--;
-				}
-			}
-			int levelUse = levelCurrent;
-			int lev = levelUse | levelNext << 16;
-			if (visibleChars == 0 && foldCompact)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			if (levelUse < levelNext) {
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			}
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			// reset values for the next line
-			lineCurrent++;
-			stylePrev = style;
-			style = styleNext;
-			levelCurrent = levelNext;
-			visibleChars = 0;
-			// if the last character is an Underscore then don't reset since the line continues on the next line.
-			if (!(chPrev == '_')) {
-				szKeywordlen = 0;
-				szThenlen = 0;
-				FirstWordStart = false;
-				FirstWordEnd = false;
-				ThenFoundLast = false;
-			}
-		}
-		// save the last processed character
-		if (!isspacechar(ch)) {
-			chPrev = ch;
-			visibleChars++;
-		}
-	}
-}
-
-
-//
-
-static const char * const AU3WordLists[] = {
-    "#autoit keywords",
-    "#autoit functions",
-    "#autoit macros",
-    "#autoit Sent keys",
-    "#autoit Pre-processors",
-    "#autoit Special",
-    "#autoit Expand",
-    "#autoit UDF",
-    0
-};
-LexerModule lmAU3(SCLEX_AU3, ColouriseAU3Doc, "au3", FoldAU3Doc , AU3WordLists);
diff --git a/src/stc/scintilla/src/LexAVE.cxx b/src/stc/scintilla/src/LexAVE.cxx
deleted file mode 100644
index e30ee7dc9e..0000000000
--- a/src/stc/scintilla/src/LexAVE.cxx
+++ /dev/null
@@ -1,225 +0,0 @@
-// SciTE - Scintilla based Text Editor
-/** @file LexAVE.cxx
- ** Lexer for Avenue.
- **
-  ** Written by Alexey Yutkin <yutkin@geol.msu.ru>.
- **/
-// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-
-
-static inline bool IsAWordChar(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_');
-}
-static inline bool IsEnumChar(const int ch) {
-	return (ch < 0x80) && (isalnum(ch)|| ch == '_');
-}
-static inline bool IsANumberChar(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '.' );
-}
-
-inline bool IsAWordStart(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '_');
-}
-
-inline bool isAveOperator(char ch) {
-	if (isalnum(ch))
-		return false;
-	// '.' left out as it is used to make up numbers
-	if (ch == '*' || ch == '/' || ch == '-' || ch == '+' ||
-		ch == '(' || ch == ')' || ch == '=' ||
-		ch == '{' || ch == '}' ||
-		ch == '[' || ch == ']' || ch == ';' ||
-		ch == '<' || ch == '>' || ch == ',' ||
-		ch == '.'  )
-		return true;
-	return false;
-}
-
-static void ColouriseAveDoc(
-	unsigned int startPos,
-	int length,
-	int initStyle,
-	WordList *keywordlists[],
-	Accessor &styler) {
-
-	WordList &keywords = *keywordlists[0];
-	WordList &keywords2 = *keywordlists[1];
-	WordList &keywords3 = *keywordlists[2];
-	WordList &keywords4 = *keywordlists[3];
-	WordList &keywords5 = *keywordlists[4];
-	WordList &keywords6 = *keywordlists[5];
-
-	// Do not leak onto next line
-	if (initStyle == SCE_AVE_STRINGEOL) {
-		initStyle = SCE_AVE_DEFAULT;
-	}
-
-	StyleContext sc(startPos, length, initStyle, styler);
-
-	for (; sc.More(); sc.Forward()) {
-		if (sc.atLineEnd) {
-			// Update the line state, so it can be seen by next line
-			int currentLine = styler.GetLine(sc.currentPos);
-			styler.SetLineState(currentLine, 0);
-		}
-		if (sc.atLineStart && (sc.state == SCE_AVE_STRING)) {
-			// Prevent SCE_AVE_STRINGEOL from leaking back to previous line
-			sc.SetState(SCE_AVE_STRING);
-		}
-
-
-		// Determine if the current state should terminate.
-		if (sc.state == SCE_AVE_OPERATOR) {
-			sc.SetState(SCE_AVE_DEFAULT);
-		} else if (sc.state == SCE_AVE_NUMBER) {
-			if (!IsANumberChar(sc.ch)) {
-				sc.SetState(SCE_AVE_DEFAULT);
-			}
-		} else if (sc.state == SCE_AVE_ENUM) {
-			if (!IsEnumChar(sc.ch)) {
-				sc.SetState(SCE_AVE_DEFAULT);
-			}
-		} else if (sc.state == SCE_AVE_IDENTIFIER) {
-			if (!IsAWordChar(sc.ch) || (sc.ch == '.')) {
-				char s[100];
-				//sc.GetCurrent(s, sizeof(s));
-				sc.GetCurrentLowered(s, sizeof(s));
-				if (keywords.InList(s)) {
-					sc.ChangeState(SCE_AVE_WORD);
-				} else if (keywords2.InList(s)) {
-					sc.ChangeState(SCE_AVE_WORD2);
-				} else if (keywords3.InList(s)) {
-					sc.ChangeState(SCE_AVE_WORD3);
-				} else if (keywords4.InList(s)) {
-					sc.ChangeState(SCE_AVE_WORD4);
-				} else if (keywords5.InList(s)) {
-					sc.ChangeState(SCE_AVE_WORD5);
-				} else if (keywords6.InList(s)) {
-					sc.ChangeState(SCE_AVE_WORD6);
-				}
-				sc.SetState(SCE_AVE_DEFAULT);
-			}
-		} else if (sc.state == SCE_AVE_COMMENT) {
-			if (sc.atLineEnd) {
-				sc.SetState(SCE_AVE_DEFAULT);
-			}
-		} else if (sc.state == SCE_AVE_STRING) {
-			 if (sc.ch == '\"') {
-				sc.ForwardSetState(SCE_AVE_DEFAULT);
-			} else if (sc.atLineEnd) {
-				sc.ChangeState(SCE_AVE_STRINGEOL);
-				sc.ForwardSetState(SCE_AVE_DEFAULT);
-			}
-		}
-
-		// Determine if a new state should be entered.
-		if (sc.state == SCE_AVE_DEFAULT) {
-			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
-				sc.SetState(SCE_AVE_NUMBER);
-			} else if (IsAWordStart(sc.ch)) {
-				sc.SetState(SCE_AVE_IDENTIFIER);
-			} else if (sc.Match('\"')) {
-				sc.SetState(SCE_AVE_STRING);
-			} else if (sc.Match('\'')) {
-				sc.SetState(SCE_AVE_COMMENT);
-				sc.Forward();
-			} else if (isAveOperator(static_cast<char>(sc.ch))) {
-				sc.SetState(SCE_AVE_OPERATOR);
-			} else if (sc.Match('#')) {
-				sc.SetState(SCE_AVE_ENUM);
-				sc.Forward();
-			}
-		}
-	}
-	sc.Complete();
-}
-
-static void FoldAveDoc(unsigned int startPos, int length, int /* initStyle */, WordList *[],
-                       Accessor &styler) {
-	unsigned int lengthDoc = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
-	int levelCurrent = levelPrev;
-	char chNext = static_cast<char>(tolower(styler[startPos]));
-	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-	int styleNext = styler.StyleAt(startPos);
-	char s[10];
-
-	for (unsigned int i = startPos; i < lengthDoc; i++) {
-		char ch = static_cast<char>(tolower(chNext));
-		chNext = static_cast<char>(tolower(styler.SafeGetCharAt(i + 1)));
-		int style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-		if (style == SCE_AVE_WORD) {
-			if (ch == 't' || ch == 'f' || ch == 'w' || ch == 'e') {
-				for (unsigned int j = 0; j < 6; j++) {
-					if (!iswordchar(styler[i + j])) {
-						break;
-					}
-					s[j] = static_cast<char>(tolower(styler[i + j]));
-					s[j + 1] = '\0';
-				}
-
-				if ((strcmp(s, "then") == 0) || (strcmp(s, "for") == 0) || (strcmp(s, "while") == 0)) {
-					levelCurrent++;
-				}
-				if ((strcmp(s, "end") == 0) || (strcmp(s, "elseif") == 0)) {
-					// Normally "elseif" and "then" will be on the same line and will cancel
-					// each other out.  // As implemented, this does not support fold.at.else.
-					levelCurrent--;
-				}
-			}
-		} else if (style == SCE_AVE_OPERATOR) {
-			if (ch == '{' || ch == '(') {
-				levelCurrent++;
-			} else if (ch == '}' || ch == ')') {
-				levelCurrent--;
-			}
-		}
-
-		if (atEOL) {
-			int lev = levelPrev;
-			if (visibleChars == 0 && foldCompact) {
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			}
-			if ((levelCurrent > levelPrev) && (visibleChars > 0)) {
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			}
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			levelPrev = levelCurrent;
-			visibleChars = 0;
-		}
-		if (!isspacechar(ch)) {
-			visibleChars++;
-		}
-	}
-	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-
-	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
-}
-
-LexerModule lmAVE(SCLEX_AVE, ColouriseAveDoc, "ave", FoldAveDoc);
-
diff --git a/src/stc/scintilla/src/LexAda.cxx b/src/stc/scintilla/src/LexAda.cxx
deleted file mode 100644
index 0227ce1108..0000000000
--- a/src/stc/scintilla/src/LexAda.cxx
+++ /dev/null
@@ -1,520 +0,0 @@
-// Scintilla source code edit control
-/** @file LexAda.cxx
- ** Lexer for Ada 95
- **/
-// Copyright 2002 by Sergey Koshcheyev <sergey.k@seznam.cz>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "Platform.h"
-
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "PropSet.h"
-#include "KeyWords.h"
-#include "SciLexer.h"
-#include "SString.h"
-
-/*
- * Interface
- */
-
-static void ColouriseDocument(
-    unsigned int startPos,
-    int length,
-    int initStyle,
-    WordList *keywordlists[],
-    Accessor &styler);
-
-static const char * const adaWordListDesc[] = {
-	"Keywords",
-	0
-};
-
-LexerModule lmAda(SCLEX_ADA, ColouriseDocument, "ada", NULL, adaWordListDesc);
-
-/*
- * Implementation
- */
-
-// Functions that have apostropheStartsAttribute as a parameter set it according to whether
-// an apostrophe encountered after processing the current token will start an attribute or
-// a character literal.
-static void ColouriseCharacter(StyleContext& sc, bool& apostropheStartsAttribute);
-static void ColouriseComment(StyleContext& sc, bool& apostropheStartsAttribute);
-static void ColouriseContext(StyleContext& sc, char chEnd, int stateEOL);
-static void ColouriseDelimiter(StyleContext& sc, bool& apostropheStartsAttribute);
-static void ColouriseLabel(StyleContext& sc, WordList& keywords, bool& apostropheStartsAttribute);
-static void ColouriseNumber(StyleContext& sc, bool& apostropheStartsAttribute);
-static void ColouriseString(StyleContext& sc, bool& apostropheStartsAttribute);
-static void ColouriseWhiteSpace(StyleContext& sc, bool& apostropheStartsAttribute);
-static void ColouriseWord(StyleContext& sc, WordList& keywords, bool& apostropheStartsAttribute);
-
-static inline bool IsDelimiterCharacter(int ch);
-static inline bool IsNumberStartCharacter(int ch);
-static inline bool IsNumberCharacter(int ch);
-static inline bool IsSeparatorOrDelimiterCharacter(int ch);
-static bool IsValidIdentifier(const SString& identifier);
-static bool IsValidNumber(const SString& number);
-static inline bool IsWordStartCharacter(int ch);
-static inline bool IsWordCharacter(int ch);
-
-static void ColouriseCharacter(StyleContext& sc, bool& apostropheStartsAttribute) {
-	apostropheStartsAttribute = true;
-
-	sc.SetState(SCE_ADA_CHARACTER);
-
-	// Skip the apostrophe and one more character (so that '' is shown as non-terminated and '''
-	// is handled correctly)
-	sc.Forward();
-	sc.Forward();
-
-	ColouriseContext(sc, '\'', SCE_ADA_CHARACTEREOL);
-}
-
-static void ColouriseContext(StyleContext& sc, char chEnd, int stateEOL) {
-	while (!sc.atLineEnd && !sc.Match(chEnd)) {
-		sc.Forward();
-	}
-
-	if (!sc.atLineEnd) {
-		sc.ForwardSetState(SCE_ADA_DEFAULT);
-	} else {
-		sc.ChangeState(stateEOL);
-	}
-}
-
-static void ColouriseComment(StyleContext& sc, bool& /*apostropheStartsAttribute*/) {
-	// Apostrophe meaning is not changed, but the parameter is present for uniformity
-
-	sc.SetState(SCE_ADA_COMMENTLINE);
-
-	while (!sc.atLineEnd) {
-		sc.Forward();
-	}
-}
-
-static void ColouriseDelimiter(StyleContext& sc, bool& apostropheStartsAttribute) {
-	apostropheStartsAttribute = sc.Match (')');
-	sc.SetState(SCE_ADA_DELIMITER);
-	sc.ForwardSetState(SCE_ADA_DEFAULT);
-}
-
-static void ColouriseLabel(StyleContext& sc, WordList& keywords, bool& apostropheStartsAttribute) {
-	apostropheStartsAttribute = false;
-
-	sc.SetState(SCE_ADA_LABEL);
-
-	// Skip "<<"
-	sc.Forward();
-	sc.Forward();
-
-	SString identifier;
-
-	while (!sc.atLineEnd && !IsSeparatorOrDelimiterCharacter(sc.ch)) {
-		identifier += static_cast<char>(tolower(sc.ch));
-		sc.Forward();
-	}
-
-	// Skip ">>"
-	if (sc.Match('>', '>')) {
-		sc.Forward();
-		sc.Forward();
-	} else {
-		sc.ChangeState(SCE_ADA_ILLEGAL);
-	}
-
-	// If the name is an invalid identifier or a keyword, then make it invalid label
-	if (!IsValidIdentifier(identifier) || keywords.InList(identifier.c_str())) {
-		sc.ChangeState(SCE_ADA_ILLEGAL);
-	}
-
-	sc.SetState(SCE_ADA_DEFAULT);
-
-}
-
-static void ColouriseNumber(StyleContext& sc, bool& apostropheStartsAttribute) {
-	apostropheStartsAttribute = true;
-
-	SString number;
-	sc.SetState(SCE_ADA_NUMBER);
-
-	// Get all characters up to a delimiter or a separator, including points, but excluding
-	// double points (ranges).
-	while (!IsSeparatorOrDelimiterCharacter(sc.ch) || (sc.ch == '.' && sc.chNext != '.')) {
-		number += static_cast<char>(sc.ch);
-		sc.Forward();
-	}
-
-	// Special case: exponent with sign
-	if ((sc.chPrev == 'e' || sc.chPrev == 'E') &&
-	        (sc.ch == '+' || sc.ch == '-')) {
-		number += static_cast<char>(sc.ch);
-		sc.Forward ();
-
-		while (!IsSeparatorOrDelimiterCharacter(sc.ch)) {
-			number += static_cast<char>(sc.ch);
-			sc.Forward();
-		}
-	}
-
-	if (!IsValidNumber(number)) {
-		sc.ChangeState(SCE_ADA_ILLEGAL);
-	}
-
-	sc.SetState(SCE_ADA_DEFAULT);
-}
-
-static void ColouriseString(StyleContext& sc, bool& apostropheStartsAttribute) {
-	apostropheStartsAttribute = true;
-
-	sc.SetState(SCE_ADA_STRING);
-	sc.Forward();
-
-	ColouriseContext(sc, '"', SCE_ADA_STRINGEOL);
-}
-
-static void ColouriseWhiteSpace(StyleContext& sc, bool& /*apostropheStartsAttribute*/) {
-	// Apostrophe meaning is not changed, but the parameter is present for uniformity
-	sc.SetState(SCE_ADA_DEFAULT);
-	sc.ForwardSetState(SCE_ADA_DEFAULT);
-}
-
-static void ColouriseWord(StyleContext& sc, WordList& keywords, bool& apostropheStartsAttribute) {
-	apostropheStartsAttribute = true;
-	sc.SetState(SCE_ADA_IDENTIFIER);
-
-	SString word;
-
-	while (!sc.atLineEnd && !IsSeparatorOrDelimiterCharacter(sc.ch)) {
-		word += static_cast<char>(tolower(sc.ch));
-		sc.Forward();
-	}
-
-	if (!IsValidIdentifier(word)) {
-		sc.ChangeState(SCE_ADA_ILLEGAL);
-
-	} else if (keywords.InList(word.c_str())) {
-		sc.ChangeState(SCE_ADA_WORD);
-
-		if (word != "all") {
-			apostropheStartsAttribute = false;
-		}
-	}
-
-	sc.SetState(SCE_ADA_DEFAULT);
-}
-
-//
-// ColouriseDocument
-//
-
-static void ColouriseDocument(
-    unsigned int startPos,
-    int length,
-    int initStyle,
-    WordList *keywordlists[],
-    Accessor &styler) {
-	WordList &keywords = *keywordlists[0];
-
-	StyleContext sc(startPos, length, initStyle, styler);
-
-	int lineCurrent = styler.GetLine(startPos);
-	bool apostropheStartsAttribute = (styler.GetLineState(lineCurrent) & 1) != 0;
-
-	while (sc.More()) {
-		if (sc.atLineEnd) {
-			// Go to the next line
-			sc.Forward();
-			lineCurrent++;
-
-			// Remember the line state for future incremental lexing
-			styler.SetLineState(lineCurrent, apostropheStartsAttribute);
-
-			// Don't continue any styles on the next line
-			sc.SetState(SCE_ADA_DEFAULT);
-		}
-
-		// Comments
-		if (sc.Match('-', '-')) {
-			ColouriseComment(sc, apostropheStartsAttribute);
-
-		// Strings
-		} else if (sc.Match('"')) {
-			ColouriseString(sc, apostropheStartsAttribute);
-
-		// Characters
-		} else if (sc.Match('\'') && !apostropheStartsAttribute) {
-			ColouriseCharacter(sc, apostropheStartsAttribute);
-
-		// Labels
-		} else if (sc.Match('<', '<')) {
-			ColouriseLabel(sc, keywords, apostropheStartsAttribute);
-
-		// Whitespace
-		} else if (IsASpace(sc.ch)) {
-			ColouriseWhiteSpace(sc, apostropheStartsAttribute);
-
-		// Delimiters
-		} else if (IsDelimiterCharacter(sc.ch)) {
-			ColouriseDelimiter(sc, apostropheStartsAttribute);
-
-		// Numbers
-		} else if (IsADigit(sc.ch) || sc.ch == '#') {
-			ColouriseNumber(sc, apostropheStartsAttribute);
-
-		// Keywords or identifiers
-		} else {
-			ColouriseWord(sc, keywords, apostropheStartsAttribute);
-		}
-	}
-
-	sc.Complete();
-}
-
-static inline bool IsDelimiterCharacter(int ch) {
-	switch (ch) {
-	case '&':
-	case '\'':
-	case '(':
-	case ')':
-	case '*':
-	case '+':
-	case ',':
-	case '-':
-	case '.':
-	case '/':
-	case ':':
-	case ';':
-	case '<':
-	case '=':
-	case '>':
-	case '|':
-		return true;
-	default:
-		return false;
-	}
-}
-
-static inline bool IsNumberCharacter(int ch) {
-	return IsNumberStartCharacter(ch) ||
-	       ch == '_' ||
-	       ch == '.' ||
-	       ch == '#' ||
-	       (ch >= 'a' && ch <= 'f') ||
-	       (ch >= 'A' && ch <= 'F');
-}
-
-static inline bool IsNumberStartCharacter(int ch) {
-	return IsADigit(ch);
-}
-
-static inline bool IsSeparatorOrDelimiterCharacter(int ch) {
-	return IsASpace(ch) || IsDelimiterCharacter(ch);
-}
-
-static bool IsValidIdentifier(const SString& identifier) {
-	// First character can't be '_', so initialize the flag to true
-	bool lastWasUnderscore = true;
-
-	size_t length = identifier.length();
-
-	// Zero-length identifiers are not valid (these can occur inside labels)
-	if (length == 0) {
-		return false;
-	}
-
-	// Check for valid character at the start
-	if (!IsWordStartCharacter(identifier[0])) {
-		return false;
-	}
-
-	// Check for only valid characters and no double underscores
-	for (size_t i = 0; i < length; i++) {
-		if (!IsWordCharacter(identifier[i]) ||
-		        (identifier[i] == '_' && lastWasUnderscore)) {
-			return false;
-		}
-		lastWasUnderscore = identifier[i] == '_';
-	}
-
-	// Check for underscore at the end
-	if (lastWasUnderscore == true) {
-		return false;
-	}
-
-	// All checks passed
-	return true;
-}
-
-static bool IsValidNumber(const SString& number) {
-	int hashPos = number.search("#");
-	bool seenDot = false;
-
-	size_t i = 0;
-	size_t length = number.length();
-
-	if (length == 0)
-		return false; // Just in case
-
-	// Decimal number
-	if (hashPos == -1) {
-		bool canBeSpecial = false;
-
-		for (; i < length; i++) {
-			if (number[i] == '_') {
-				if (!canBeSpecial) {
-					return false;
-				}
-				canBeSpecial = false;
-			} else if (number[i] == '.') {
-				if (!canBeSpecial || seenDot) {
-					return false;
-				}
-				canBeSpecial = false;
-				seenDot = true;
-			} else if (IsADigit(number[i])) {
-				canBeSpecial = true;
-			} else {
-				break;
-			}
-		}
-
-		if (!canBeSpecial)
-			return false;
-	} else {
-		// Based number
-		bool canBeSpecial = false;
-		int base = 0;
-
-		// Parse base
-		for (; i < length; i++) {
-			int ch = number[i];
-			if (ch == '_') {
-				if (!canBeSpecial)
-					return false;
-				canBeSpecial = false;
-			} else if (IsADigit(ch)) {
-				base = base * 10 + (ch - '0');
-				if (base > 16)
-					return false;
-				canBeSpecial = true;
-			} else if (ch == '#' && canBeSpecial) {
-				break;
-			} else {
-				return false;
-			}
-		}
-
-		if (base < 2)
-			return false;
-		if (i == length)
-			return false;
-
-		i++; // Skip over '#'
-
-		// Parse number
-		canBeSpecial = false;
-
-		for (; i < length; i++) {
-			int ch = tolower(number[i]);
-
-			if (ch == '_') {
-				if (!canBeSpecial) {
-					return false;
-				}
-				canBeSpecial = false;
-
-			} else if (ch == '.') {
-				if (!canBeSpecial || seenDot) {
-					return false;
-				}
-				canBeSpecial = false;
-				seenDot = true;
-
-			} else if (IsADigit(ch)) {
-				if (ch - '0' >= base) {
-					return false;
-				}
-				canBeSpecial = true;
-
-			} else if (ch >= 'a' && ch <= 'f') {
-				if (ch - 'a' + 10 >= base) {
-					return false;
-				}
-				canBeSpecial = true;
-
-			} else if (ch == '#' && canBeSpecial) {
-				break;
-
-			} else {
-				return false;
-			}
-		}
-
-		if (i == length) {
-			return false;
-		}
-
-		i++;
-	}
-
-	// Exponent (optional)
-	if (i < length) {
-		if (number[i] != 'e' && number[i] != 'E')
-			return false;
-
-		i++; // Move past 'E'
-
-		if (i == length) {
-			return false;
-		}
-
-		if (number[i] == '+')
-			i++;
-		else if (number[i] == '-') {
-			if (seenDot) {
-				i++;
-			} else {
-				return false; // Integer literals should not have negative exponents
-			}
-		}
-
-		if (i == length) {
-			return false;
-		}
-
-		bool canBeSpecial = false;
-
-		for (; i < length; i++) {
-			if (number[i] == '_') {
-				if (!canBeSpecial) {
-					return false;
-				}
-				canBeSpecial = false;
-			} else if (IsADigit(number[i])) {
-				canBeSpecial = true;
-			} else {
-				return false;
-			}
-		}
-
-		if (!canBeSpecial)
-			return false;
-	}
-
-	// if i == length, number was parsed successfully.
-	return i == length;
-}
-
-static inline bool IsWordCharacter(int ch) {
-	return IsWordStartCharacter(ch) || IsADigit(ch);
-}
-
-static inline bool IsWordStartCharacter(int ch) {
-	return (isascii(ch) && isalpha(ch)) || ch == '_';
-}
diff --git a/src/stc/scintilla/src/LexAsm.cxx b/src/stc/scintilla/src/LexAsm.cxx
deleted file mode 100644
index 93e0b37180..0000000000
--- a/src/stc/scintilla/src/LexAsm.cxx
+++ /dev/null
@@ -1,177 +0,0 @@
-// Scintilla source code edit control
-/** @file LexAsm.cxx
- ** Lexer for Assembler, just for the MASM syntax
- ** Written by The Black Horus
- ** Enhancements and NASM stuff by Kein-Hong Man, 2003-10
- ** SCE_ASM_COMMENTBLOCK and SCE_ASM_CHARACTER are for future GNU as colouring
- **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-
-static inline bool IsAWordChar(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '.' ||
-		ch == '_' || ch == '?');
-}
-
-static inline bool IsAWordStart(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '.' ||
-		ch == '%' || ch == '@' || ch == '$' || ch == '?');
-}
-
-static inline bool IsAsmOperator(char ch) {
-	if (isalnum(ch))
-		return false;
-	// '.' left out as it is used to make up numbers
-	if (ch == '*' || ch == '/' || ch == '-' || ch == '+' ||
-		ch == '(' || ch == ')' || ch == '=' || ch == '^' ||
-		ch == '[' || ch == ']' || ch == '<' || ch == '&' ||
-		ch == '>' || ch == ',' || ch == '|' || ch == '~' ||
-		ch == '%' || ch == ':')
-		return true;
-	return false;
-}
-
-static void ColouriseAsmDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-                            Accessor &styler) {
-
-	WordList &cpuInstruction = *keywordlists[0];
-	WordList &mathInstruction = *keywordlists[1];
-	WordList &registers = *keywordlists[2];
-	WordList &directive = *keywordlists[3];
-	WordList &directiveOperand = *keywordlists[4];
-	WordList &extInstruction = *keywordlists[5];
-
-	// Do not leak onto next line
-	if (initStyle == SCE_ASM_STRINGEOL)
-		initStyle = SCE_ASM_DEFAULT;
-
-	StyleContext sc(startPos, length, initStyle, styler);
-
-	for (; sc.More(); sc.Forward())
-	{
-
-		// Prevent SCE_ASM_STRINGEOL from leaking back to previous line
-		if (sc.atLineStart && (sc.state == SCE_ASM_STRING)) {
-			sc.SetState(SCE_ASM_STRING);
-		} else if (sc.atLineStart && (sc.state == SCE_ASM_CHARACTER)) {
-			sc.SetState(SCE_ASM_CHARACTER);
-		}
-
-		// Handle line continuation generically.
-		if (sc.ch == '\\') {
-			if (sc.chNext == '\n' || sc.chNext == '\r') {
-				sc.Forward();
-				if (sc.ch == '\r' && sc.chNext == '\n') {
-					sc.Forward();
-				}
-				continue;
-			}
-		}
-
-		// Determine if the current state should terminate.
-		if (sc.state == SCE_ASM_OPERATOR) {
-			if (!IsAsmOperator(static_cast<char>(sc.ch))) {
-			    sc.SetState(SCE_ASM_DEFAULT);
-			}
-		}else if (sc.state == SCE_ASM_NUMBER) {
-			if (!IsAWordChar(sc.ch)) {
-				sc.SetState(SCE_ASM_DEFAULT);
-			}
-		} else if (sc.state == SCE_ASM_IDENTIFIER) {
-			if (!IsAWordChar(sc.ch) ) {
-				char s[100];
-				sc.GetCurrentLowered(s, sizeof(s));
-
-				if (cpuInstruction.InList(s)) {
-					sc.ChangeState(SCE_ASM_CPUINSTRUCTION);
-				} else if (mathInstruction.InList(s)) {
-					sc.ChangeState(SCE_ASM_MATHINSTRUCTION);
-				} else if (registers.InList(s)) {
-					sc.ChangeState(SCE_ASM_REGISTER);
-				}  else if (directive.InList(s)) {
-					sc.ChangeState(SCE_ASM_DIRECTIVE);
-				} else if (directiveOperand.InList(s)) {
-					sc.ChangeState(SCE_ASM_DIRECTIVEOPERAND);
-				} else if (extInstruction.InList(s)) {
-					sc.ChangeState(SCE_ASM_EXTINSTRUCTION);
-				}
-				sc.SetState(SCE_ASM_DEFAULT);
-			}
-		}
-		else if (sc.state == SCE_ASM_COMMENT ) {
-			if (sc.atLineEnd) {
-				sc.SetState(SCE_ASM_DEFAULT);
-			}
-		} else if (sc.state == SCE_ASM_STRING) {
-			if (sc.ch == '\\') {
-				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
-					sc.Forward();
-				}
-			} else if (sc.ch == '\"') {
-				sc.ForwardSetState(SCE_ASM_DEFAULT);
-			} else if (sc.atLineEnd) {
-				sc.ChangeState(SCE_ASM_STRINGEOL);
-				sc.ForwardSetState(SCE_ASM_DEFAULT);
-			}
-		} else if (sc.state == SCE_ASM_CHARACTER) {
-			if (sc.ch == '\\') {
-				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
-					sc.Forward();
-				}
-			} else if (sc.ch == '\'') {
-				sc.ForwardSetState(SCE_ASM_DEFAULT);
-			} else if (sc.atLineEnd) {
-				sc.ChangeState(SCE_ASM_STRINGEOL);
-				sc.ForwardSetState(SCE_ASM_DEFAULT);
-			}
-		}
-
-		// Determine if a new state should be entered.
-		if (sc.state == SCE_ASM_DEFAULT) {
-			if (sc.ch == ';'){
-				sc.SetState(SCE_ASM_COMMENT);
-			} else if (isdigit(sc.ch) || (sc.ch == '.' && isdigit(sc.chNext))) {
-				sc.SetState(SCE_ASM_NUMBER);
-			} else if (IsAWordStart(sc.ch)) {
-				sc.SetState(SCE_ASM_IDENTIFIER);
-			} else if (sc.ch == '\"') {
-				sc.SetState(SCE_ASM_STRING);
-			} else if (sc.ch == '\'') {
-				sc.SetState(SCE_ASM_CHARACTER);
-			} else if (IsAsmOperator(static_cast<char>(sc.ch))) {
-				sc.SetState(SCE_ASM_OPERATOR);
-			}
-		}
-
-	}
-	sc.Complete();
-}
-
-static const char * const asmWordListDesc[] = {
-	"CPU instructions",
-	"FPU instructions",
-	"Registers",
-	"Directives",
-	"Directive operands",
-	"Extended instructions",
-	0
-};
-
-LexerModule lmAsm(SCLEX_ASM, ColouriseAsmDoc, "asm", 0, asmWordListDesc);
-
diff --git a/src/stc/scintilla/src/LexAsn1.cxx b/src/stc/scintilla/src/LexAsn1.cxx
deleted file mode 100644
index 1600e6329d..0000000000
--- a/src/stc/scintilla/src/LexAsn1.cxx
+++ /dev/null
@@ -1,181 +0,0 @@
-// Scintilla source code edit control
-/** @file LexAsn1.cxx
- ** Lexer for ASN.1
- **/
-// Copyright 2004 by Herr Pfarrer rpfarrer <at> yahoo <dot> de
-// Last Updated: 20/07/2004
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-// Some char test functions
-static bool isAsn1Number(int ch)
-{
-	return (ch >= '0' && ch <= '9');
-}
-
-static bool isAsn1Letter(int ch)
-{
-	return (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z');
-}
-
-static bool isAsn1Char(int ch)
-{
-	return (ch == '-' ) || isAsn1Number(ch) || isAsn1Letter (ch);
-}
-
-//
-//	Function determining the color of a given code portion
-//	Based on a "state"
-//
-static void ColouriseAsn1Doc(unsigned int startPos, int length, int initStyle, WordList *keywordLists[], Accessor &styler)
-{
-	// The keywords
-	WordList &Keywords = *keywordLists[0];
-	WordList &Attributes = *keywordLists[1];
-	WordList &Descriptors = *keywordLists[2];
-	WordList &Types = *keywordLists[3];
-
-	// Parse the whole buffer character by character using StyleContext
-	StyleContext sc(startPos, length, initStyle, styler);
-	for (; sc.More(); sc.Forward())
-	{
-		// The state engine
-		switch (sc.state)
-		{
-		case SCE_ASN1_DEFAULT:		// Plain characters
-asn1_default:
-			if (sc.ch == '-' && sc.chNext == '-')
-				// A comment begins here
-				sc.SetState(SCE_ASN1_COMMENT);
-			else if (sc.ch == '"')
-				// A string begins here
-				sc.SetState(SCE_ASN1_STRING);
-			else if (isAsn1Number (sc.ch))
-				// A number starts here (identifier should start with a letter in ASN.1)
-				sc.SetState(SCE_ASN1_SCALAR);
-			else if (isAsn1Char (sc.ch))
-				// An identifier starts here (identifier always start with a letter)
-				sc.SetState(SCE_ASN1_IDENTIFIER);
-			else if (sc.ch == ':')
-				// A ::= operator starts here
-				sc.SetState(SCE_ASN1_OPERATOR);
-			break;
-		case SCE_ASN1_COMMENT:		// A comment
-			if (sc.ch == '\r' || sc.ch == '\n')
-				// A comment ends here
-				sc.SetState(SCE_ASN1_DEFAULT);
-			break;
-		case SCE_ASN1_IDENTIFIER:	// An identifier (keyword, attribute, descriptor or type)
-			if (!isAsn1Char (sc.ch))
-			{
-				// The end of identifier is here: we can look for it in lists by now and change its state
-				char s[100];
-				sc.GetCurrent(s, sizeof(s));
-				if (Keywords.InList(s))
-					// It's a keyword, change its state
-					sc.ChangeState(SCE_ASN1_KEYWORD);
-				else if (Attributes.InList(s))
-					// It's an attribute, change its state
-					sc.ChangeState(SCE_ASN1_ATTRIBUTE);
-				else if (Descriptors.InList(s))
-					// It's a descriptor, change its state
-					sc.ChangeState(SCE_ASN1_DESCRIPTOR);
-				else if (Types.InList(s))
-					// It's a type, change its state
-					sc.ChangeState(SCE_ASN1_TYPE);
-
-				// Set to default now
-				sc.SetState(SCE_ASN1_DEFAULT);
-			}
-			break;
-		case SCE_ASN1_STRING:		// A string delimited by ""
-			if (sc.ch == '"')
-			{
-				// A string ends here
-				sc.ForwardSetState(SCE_ASN1_DEFAULT);
-
-				// To correctly manage a char sticking to the string quote
-				goto asn1_default;
-			}
-			break;
-		case SCE_ASN1_SCALAR:		// A plain number
-			if (!isAsn1Number (sc.ch))
-				// A number ends here
-				sc.SetState(SCE_ASN1_DEFAULT);
-			break;
-		case SCE_ASN1_OPERATOR:		// The affectation operator ::= and wath follows (eg: ::= { org 6 } OID or ::= 12 trap)
-			if (sc.ch == '{')
-			{
-				// An OID definition starts here: enter the sub loop
-				for (; sc.More(); sc.Forward())
-				{
-					if (isAsn1Number (sc.ch) && (!isAsn1Char (sc.chPrev) || isAsn1Number (sc.chPrev)))
-						// The OID number is highlighted
-						sc.SetState(SCE_ASN1_OID);
-					else if (isAsn1Char (sc.ch))
-						// The OID parent identifier is plain
-						sc.SetState(SCE_ASN1_IDENTIFIER);
-					else
-						sc.SetState(SCE_ASN1_DEFAULT);
-
-					if (sc.ch == '}')
-						// Here ends the OID and the operator sub loop: go back to main loop
-						break;
-				}
-			}
-			else if (isAsn1Number (sc.ch))
-			{
-				// A trap number definition starts here: enter the sub loop
-				for (; sc.More(); sc.Forward())
-				{
-					if (isAsn1Number (sc.ch))
-						// The trap number is highlighted
-						sc.SetState(SCE_ASN1_OID);
-					else
-					{
-						// The number ends here: go back to main loop
-						sc.SetState(SCE_ASN1_DEFAULT);
-						break;
-					}
-				}
-			}
-			else if (sc.ch != ':' && sc.ch != '=' && sc.ch != ' ')
-				// The operator doesn't imply an OID definition nor a trap, back to main loop
-				goto asn1_default; // To be sure to handle actually the state change
-			break;
-		}
-	}
-	sc.Complete();
-}
-
-static void FoldAsn1Doc(unsigned int, int, int, WordList *[], Accessor &styler)
-{
-	// No folding enabled, no reason to continue...
-	if( styler.GetPropertyInt("fold") == 0 )
-		return;
-
-	// No folding implemented: doesn't make sense for ASN.1
-}
-
-static const char * const asn1WordLists[] = {
-	"Keywords",
-	"Attributes",
-	"Descriptors",
-	"Types",
-	0, };
-
-
-LexerModule lmAns1(SCLEX_ASN1, ColouriseAsn1Doc, "asn1", FoldAsn1Doc, asn1WordLists);
diff --git a/src/stc/scintilla/src/LexBaan.cxx b/src/stc/scintilla/src/LexBaan.cxx
deleted file mode 100644
index 3a36eb8f27..0000000000
--- a/src/stc/scintilla/src/LexBaan.cxx
+++ /dev/null
@@ -1,189 +0,0 @@
-// Scintilla source code edit control
-/** @file LexBaan.cxx
- ** Lexer for Baan.
- ** Based heavily on LexCPP.cxx
- **/
-// Copyright 2001- by Vamsi Potluru <vamsi@who.net> & Praveen Ambekar <ambekarpraveen@yahoo.com>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static inline bool IsAWordChar(const int  ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' || ch == '$' || ch == ':');
-}
-
-static inline bool IsAWordStart(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '_');
-}
-
-static void ColouriseBaanDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-                            Accessor &styler) {
-
-	WordList &keywords = *keywordlists[0];
-	WordList &keywords2 = *keywordlists[1];
-	bool stylingWithinPreprocessor = styler.GetPropertyInt("styling.within.preprocessor") != 0;
-
-	if (initStyle == SCE_BAAN_STRINGEOL)	// Does not leak onto next line
-		initStyle = SCE_BAAN_DEFAULT;
-
-	int visibleChars = 0;
-
-	StyleContext sc(startPos, length, initStyle, styler);
-
-	for (; sc.More(); sc.Forward()) {
-
-		if (sc.state == SCE_BAAN_OPERATOR) {
-			sc.SetState(SCE_BAAN_DEFAULT);
-		} else if (sc.state == SCE_BAAN_NUMBER) {
-			if (!IsAWordChar(sc.ch)) {
-				sc.SetState(SCE_BAAN_DEFAULT);
-			}
-		} else if (sc.state == SCE_BAAN_IDENTIFIER) {
-			if (!IsAWordChar(sc.ch)) {
-				char s[100];
-				sc.GetCurrentLowered(s, sizeof(s));
-				if (keywords.InList(s)) {
-					sc.ChangeState(SCE_BAAN_WORD);
-				} else if (keywords2.InList(s)) {
-					sc.ChangeState(SCE_BAAN_WORD2);
-				}
-				sc.SetState(SCE_BAAN_DEFAULT);
-			}
-		} else if (sc.state == SCE_BAAN_PREPROCESSOR) {
-			if (stylingWithinPreprocessor) {
-				if (IsASpace(sc.ch)) {
-					sc.SetState(SCE_BAAN_DEFAULT);
-				}
-			} else {
-				if (sc.atLineEnd && (sc.chNext != '^')) {
-					sc.SetState(SCE_BAAN_DEFAULT);
-				}
-			}
-		} else if (sc.state == SCE_BAAN_COMMENT) {
-			if (sc.atLineEnd) {
-				sc.SetState(SCE_BAAN_DEFAULT);
-			}
-		} else if (sc.state == SCE_BAAN_COMMENTDOC) {
-			if (sc.MatchIgnoreCase("enddllusage")) {
-				for (unsigned int i = 0; i < 10; i++){
-					sc.Forward();
-				}
-				sc.ForwardSetState(SCE_BAAN_DEFAULT);
-			}
-		} else if (sc.state == SCE_BAAN_STRING) {
-			if (sc.ch == '\"') {
-				sc.ForwardSetState(SCE_BAAN_DEFAULT);
-			} else if ((sc.atLineEnd) && (sc.chNext != '^')) {
-				sc.ChangeState(SCE_BAAN_STRINGEOL);
-				sc.ForwardSetState(SCE_C_DEFAULT);
-				visibleChars = 0;
-			}
-		}
-
-		if (sc.state == SCE_BAAN_DEFAULT) {
-			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
-				sc.SetState(SCE_BAAN_NUMBER);
-			} else if (sc.MatchIgnoreCase("dllusage")){
-					sc.SetState(SCE_BAAN_COMMENTDOC);
-					do {
-						sc.Forward();
-					} while ((!sc.atLineEnd) && sc.More());
-			} else if (IsAWordStart(sc.ch)) {
-					sc.SetState(SCE_BAAN_IDENTIFIER);
-			} else if (sc.Match('|')){
-					sc.SetState(SCE_BAAN_COMMENT);
-			} else if (sc.ch == '\"') {
-				sc.SetState(SCE_BAAN_STRING);
-			} else if (sc.ch == '#' && visibleChars == 0) {
-				// Preprocessor commands are alone on their line
-				sc.SetState(SCE_BAAN_PREPROCESSOR);
-				// Skip whitespace between # and preprocessor word
-				do {
-					sc.Forward();
-				} while (IsASpace(sc.ch) && sc.More());
-			} else if (isoperator(static_cast<char>(sc.ch))) {
-				sc.SetState(SCE_BAAN_OPERATOR);
-			}
-		}
-		if (sc.atLineEnd) {
-			// Reset states to begining of colourise so no surprises
-			// if different sets of lines lexed.
-			visibleChars = 0;
-		}
-		if (!IsASpace(sc.ch)) {
-			visibleChars++;
-		}
-	}
-	sc.Complete();
-}
-
-static void FoldBaanDoc(unsigned int startPos, int length, int initStyle, WordList *[],
-                            Accessor &styler) {
-	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
-	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-	unsigned int endPos = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
-	int levelCurrent = levelPrev;
-	char chNext = styler[startPos];
-	int styleNext = styler.StyleAt(startPos);
-	int style = initStyle;
-	for (unsigned int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		int stylePrev = style;
-		style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-		if (foldComment &&
-			(style == SCE_BAAN_COMMENT || style == SCE_BAAN_COMMENTDOC)) {
-			if (style != stylePrev) {
-				levelCurrent++;
-			} else if ((style != styleNext) && !atEOL) {
-				// Comments don't end at end of line and the next character may be unstyled.
-				levelCurrent--;
-			}
-		}
-		if (style == SCE_BAAN_OPERATOR) {
-			if (ch == '{') {
-				levelCurrent++;
-			} else if (ch == '}') {
-				levelCurrent--;
-			}
-		}
-		if (atEOL) {
-			int lev = levelPrev;
-			if (visibleChars == 0 && foldCompact)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			if ((levelCurrent > levelPrev) && (visibleChars > 0))
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			levelPrev = levelCurrent;
-			visibleChars = 0;
-		}
-		if (!isspacechar(ch))
-			visibleChars++;
-	}
-	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
-}
-
-LexerModule lmBaan(SCLEX_BAAN, ColouriseBaanDoc, "baan", FoldBaanDoc);
diff --git a/src/stc/scintilla/src/LexBash.cxx b/src/stc/scintilla/src/LexBash.cxx
deleted file mode 100644
index e9c31d6b38..0000000000
--- a/src/stc/scintilla/src/LexBash.cxx
+++ /dev/null
@@ -1,663 +0,0 @@
-// Scintilla source code edit control
-/** @file LexBash.cxx
- ** Lexer for Bash.
- **/
-// Copyright 2004-2005 by Neil Hodgson <neilh@scintilla.org>
-// Adapted from LexPerl by Kein-Hong Man <mkh@pl.jaring.my> 2004
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-#define BASH_BASE_ERROR		65
-#define BASH_BASE_DECIMAL	66
-#define BASH_BASE_HEX		67
-#define BASH_BASE_OCTAL		68
-#define BASH_BASE_OCTAL_ERROR	69
-
-#define HERE_DELIM_MAX 256
-
-static inline int translateBashDigit(char ch) {
-	if (ch >= '0' && ch <= '9') {
-		return ch - '0';
-	} else if (ch >= 'a' && ch <= 'z') {
-		return ch - 'a' + 10;
-	} else if (ch >= 'A' && ch <= 'Z') {
-		return ch - 'A' + 36;
-	} else if (ch == '@') {
-		return 62;
-	} else if (ch == '_') {
-		return 63;
-	}
-	return BASH_BASE_ERROR;
-}
-
-static inline bool isEOLChar(char ch) {
-	return (ch == '\r') || (ch == '\n');
-}
-
-static bool isSingleCharOp(char ch) {
-	char strCharSet[2];
-	strCharSet[0] = ch;
-	strCharSet[1] = '\0';
-	return (NULL != strstr("rwxoRWXOezsfdlpSbctugkTBMACahGLNn", strCharSet));
-}
-
-static inline bool isBashOperator(char ch) {
-	if (ch == '^' || ch == '&' || ch == '\\' || ch == '%' ||
-	        ch == '(' || ch == ')' || ch == '-' || ch == '+' ||
-	        ch == '=' || ch == '|' || ch == '{' || ch == '}' ||
-	        ch == '[' || ch == ']' || ch == ':' || ch == ';' ||
-	        ch == '>' || ch == ',' || ch == '/' || ch == '<' ||
-	        ch == '?' || ch == '!' || ch == '.' || ch == '~' ||
-		ch == '@')
-		return true;
-	return false;
-}
-
-static int classifyWordBash(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler) {
-	char s[100];
-	for (unsigned int i = 0; i < end - start + 1 && i < 30; i++) {
-		s[i] = styler[start + i];
-		s[i + 1] = '\0';
-	}
-	char chAttr = SCE_SH_IDENTIFIER;
-	if (keywords.InList(s))
-		chAttr = SCE_SH_WORD;
-	styler.ColourTo(end, chAttr);
-	return chAttr;
-}
-
-static inline int getBashNumberBase(unsigned int start, unsigned int end, Accessor &styler) {
-	int base = 0;
-	for (unsigned int i = 0; i < end - start + 1 && i < 10; i++) {
-		base = base * 10 + (styler[start + i] - '0');
-	}
-	if (base > 64 || (end - start) > 1) {
-		return BASH_BASE_ERROR;
-	}
-	return base;
-}
-
-static inline bool isEndVar(char ch) {
-	return !isalnum(ch) && ch != '$' && ch != '_';
-}
-
-static inline bool isNonQuote(char ch) {
-	return isalnum(ch) || ch == '_';
-}
-
-static bool isMatch(Accessor &styler, int lengthDoc, int pos, const char *val) {
-	if ((pos + static_cast<int>(strlen(val))) >= lengthDoc) {
-		return false;
-	}
-	while (*val) {
-		if (*val != styler[pos++]) {
-			return false;
-		}
-		val++;
-	}
-	return true;
-}
-
-static char opposite(char ch) {
-	if (ch == '(')
-		return ')';
-	if (ch == '[')
-		return ']';
-	if (ch == '{')
-		return '}';
-	if (ch == '<')
-		return '>';
-	return ch;
-}
-
-static void ColouriseBashDoc(unsigned int startPos, int length, int initStyle,
-                             WordList *keywordlists[], Accessor &styler) {
-
-	// Lexer for bash often has to backtrack to start of current style to determine
-	// which characters are being used as quotes, how deeply nested is the
-	// start position and what the termination string is for here documents
-
-	WordList &keywords = *keywordlists[0];
-
-	class HereDocCls {
-	public:
-		int State;		// 0: '<<' encountered
-		// 1: collect the delimiter
-		// 2: here doc text (lines after the delimiter)
-		char Quote;		// the char after '<<'
-		bool Quoted;		// true if Quote in ('\'','"','`')
-		bool Indent;		// indented delimiter (for <<-)
-		int DelimiterLength;	// strlen(Delimiter)
-		char *Delimiter;	// the Delimiter, 256: sizeof PL_tokenbuf
-		HereDocCls() {
-			State = 0;
-            Quote = 0;
-            Quoted = false;
-            Indent = 0;
-			DelimiterLength = 0;
-			Delimiter = new char[HERE_DELIM_MAX];
-			Delimiter[0] = '\0';
-		}
-		~HereDocCls() {
-			delete []Delimiter;
-		}
-	};
-	HereDocCls HereDoc;
-
-	class QuoteCls {
-		public:
-		int  Rep;
-		int  Count;
-		char Up;
-		char Down;
-		QuoteCls() {
-			this->New(1);
-		}
-		void New(int r) {
-			Rep   = r;
-			Count = 0;
-			Up    = '\0';
-			Down  = '\0';
-		}
-		void Open(char u) {
-			Count++;
-			Up    = u;
-			Down  = opposite(Up);
-		}
-	};
-	QuoteCls Quote;
-
-	int state = initStyle;
-	int numBase = 0;
-	unsigned int lengthDoc = startPos + length;
-
-	// If in a long distance lexical state, seek to the beginning to find quote characters
-	// Bash strings can be multi-line with embedded newlines, so backtrack.
-	// Bash numbers have additional state during lexing, so backtrack too.
-	if (state == SCE_SH_HERE_Q) {
-		while ((startPos > 1) && (styler.StyleAt(startPos) != SCE_SH_HERE_DELIM)) {
-			startPos--;
-		}
-		startPos = styler.LineStart(styler.GetLine(startPos));
-		state = styler.StyleAt(startPos - 1);
-	}
-	if (state == SCE_SH_STRING
-	 || state == SCE_SH_BACKTICKS
-	 || state == SCE_SH_CHARACTER
-	 || state == SCE_SH_NUMBER
-	 || state == SCE_SH_IDENTIFIER
-	 || state == SCE_SH_COMMENTLINE
-	) {
-		while ((startPos > 1) && (styler.StyleAt(startPos - 1) == state)) {
-			startPos--;
-		}
-		state = SCE_SH_DEFAULT;
-	}
-
-	styler.StartAt(startPos);
-	char chPrev = styler.SafeGetCharAt(startPos - 1);
-	if (startPos == 0)
-		chPrev = '\n';
-	char chNext = styler[startPos];
-	styler.StartSegment(startPos);
-
-	for (unsigned int i = startPos; i < lengthDoc; i++) {
-		char ch = chNext;
-		// if the current character is not consumed due to the completion of an
-		// earlier style, lexing can be restarted via a simple goto
-	restartLexer:
-		chNext = styler.SafeGetCharAt(i + 1);
-		char chNext2 = styler.SafeGetCharAt(i + 2);
-
-		if (styler.IsLeadByte(ch)) {
-			chNext = styler.SafeGetCharAt(i + 2);
-			chPrev = ' ';
-			i += 1;
-			continue;
-		}
-
-		if ((chPrev == '\r' && ch == '\n')) {	// skip on DOS/Windows
-			styler.ColourTo(i, state);
-			chPrev = ch;
-			continue;
-		}
-
-		if (HereDoc.State == 1 && isEOLChar(ch)) {
-			// Begin of here-doc (the line after the here-doc delimiter):
-			// Lexically, the here-doc starts from the next line after the >>, but the
-			// first line of here-doc seem to follow the style of the last EOL sequence
-			HereDoc.State = 2;
-			if (HereDoc.Quoted) {
-				if (state == SCE_SH_HERE_DELIM) {
-					// Missing quote at end of string! We are stricter than bash.
-					// Colour here-doc anyway while marking this bit as an error.
-					state = SCE_SH_ERROR;
-				}
-				styler.ColourTo(i - 1, state);
-				// HereDoc.Quote always == '\''
-				state = SCE_SH_HERE_Q;
-			} else {
-				styler.ColourTo(i - 1, state);
-				// always switch
-				state = SCE_SH_HERE_Q;
-			}
-		}
-
-		if (state == SCE_SH_DEFAULT) {
-			if (ch == '\\') {	// escaped character
-				if (i < lengthDoc - 1)
-					i++;
-				ch = chNext;
-				chNext = chNext2;
-				styler.ColourTo(i, SCE_SH_IDENTIFIER);
-			} else if (isdigit(ch)) {
-				state = SCE_SH_NUMBER;
-				numBase = BASH_BASE_DECIMAL;
-				if (ch == '0') {	// hex,octal
-					if (chNext == 'x' || chNext == 'X') {
-						numBase = BASH_BASE_HEX;
-						i++;
-						ch = chNext;
-						chNext = chNext2;
-					} else if (isdigit(chNext)) {
-						numBase = BASH_BASE_OCTAL;
-					}
-				}
-			} else if (iswordstart(ch)) {
-				state = SCE_SH_WORD;
-				if (!iswordchar(chNext) && chNext != '+' && chNext != '-') {
-					// We need that if length of word == 1!
-					// This test is copied from the SCE_SH_WORD handler.
-					classifyWordBash(styler.GetStartSegment(), i, keywords, styler);
-					state = SCE_SH_DEFAULT;
-				}
-			} else if (ch == '#') {
-				state = SCE_SH_COMMENTLINE;
-			} else if (ch == '\"') {
-				state = SCE_SH_STRING;
-				Quote.New(1);
-				Quote.Open(ch);
-			} else if (ch == '\'') {
-				state = SCE_SH_CHARACTER;
-				Quote.New(1);
-				Quote.Open(ch);
-			} else if (ch == '`') {
-				state = SCE_SH_BACKTICKS;
-				Quote.New(1);
-				Quote.Open(ch);
-			} else if (ch == '$') {
-				if (chNext == '{') {
-					state = SCE_SH_PARAM;
-					goto startQuote;
-				} else if (chNext == '\'') {
-					state = SCE_SH_CHARACTER;
-					goto startQuote;
-				} else if (chNext == '"') {
-					state = SCE_SH_STRING;
-					goto startQuote;
-				} else if (chNext == '(' && chNext2 == '(') {
-					styler.ColourTo(i, SCE_SH_OPERATOR);
-					state = SCE_SH_DEFAULT;
-					goto skipChar;
-				} else if (chNext == '(' || chNext == '`') {
-					state = SCE_SH_BACKTICKS;
-				startQuote:
-					Quote.New(1);
-					Quote.Open(chNext);
-					goto skipChar;
-				} else {
-					state = SCE_SH_SCALAR;
-				skipChar:
-					i++;
-					ch = chNext;
-					chNext = chNext2;
-				}
-			} else if (ch == '*') {
-				if (chNext == '*') {	// exponentiation
-					i++;
-					ch = chNext;
-					chNext = chNext2;
-				}
-				styler.ColourTo(i, SCE_SH_OPERATOR);
-			} else if (ch == '<' && chNext == '<') {
-				state = SCE_SH_HERE_DELIM;
-				HereDoc.State = 0;
-				HereDoc.Indent = false;
-			} else if (ch == '-'	// file test operators
-			           && isSingleCharOp(chNext)
-			           && !isalnum((chNext2 = styler.SafeGetCharAt(i+2)))) {
-				styler.ColourTo(i + 1, SCE_SH_WORD);
-				state = SCE_SH_DEFAULT;
-				i++;
-				ch = chNext;
-				chNext = chNext2;
-			} else if (isBashOperator(ch)) {
-				styler.ColourTo(i, SCE_SH_OPERATOR);
-			} else {
-				// keep colouring defaults to make restart easier
-				styler.ColourTo(i, SCE_SH_DEFAULT);
-			}
-		} else if (state == SCE_SH_NUMBER) {
-			int digit = translateBashDigit(ch);
-			if (numBase == BASH_BASE_DECIMAL) {
-				if (ch == '#') {
-					numBase = getBashNumberBase(styler.GetStartSegment(), i - 1, styler);
-					if (numBase == BASH_BASE_ERROR)	// take the rest as comment
-						goto numAtEnd;
-				} else if (!isdigit(ch))
-					goto numAtEnd;
-			} else if (numBase == BASH_BASE_HEX) {
-				if ((digit < 16) || (digit >= 36 && digit <= 41)) {
-					// hex digit 0-9a-fA-F
-				} else
-					goto numAtEnd;
-			} else if (numBase == BASH_BASE_OCTAL ||
-				   numBase == BASH_BASE_OCTAL_ERROR) {
-				if (digit > 7) {
-					if (digit <= 9) {
-						numBase = BASH_BASE_OCTAL_ERROR;
-					} else
-						goto numAtEnd;
-				}
-			} else if (numBase == BASH_BASE_ERROR) {
-				if (digit > 9)
-					goto numAtEnd;
-			} else {	// DD#DDDD number style handling
-				if (digit != BASH_BASE_ERROR) {
-					if (numBase <= 36) {
-						// case-insensitive if base<=36
-						if (digit >= 36) digit -= 26;
-					}
-					if (digit >= numBase) {
-						if (digit <= 9) {
-							numBase = BASH_BASE_ERROR;
-						} else
-							goto numAtEnd;
-					}
-				} else {
-			numAtEnd:
-					if (numBase == BASH_BASE_ERROR ||
-					    numBase == BASH_BASE_OCTAL_ERROR)
-						state = SCE_SH_ERROR;
-					styler.ColourTo(i - 1, state);
-					state = SCE_SH_DEFAULT;
-					goto restartLexer;
-				}
-			}
-		} else if (state == SCE_SH_WORD) {
-			if (!iswordchar(chNext) && chNext != '+' && chNext != '-') {
-				// "." never used in Bash variable names
-				// but used in file names
-				classifyWordBash(styler.GetStartSegment(), i, keywords, styler);
-				state = SCE_SH_DEFAULT;
-				ch = ' ';
-			}
-		} else if (state == SCE_SH_IDENTIFIER) {
-			if (!iswordchar(chNext) && chNext != '+' && chNext != '-') {
-				styler.ColourTo(i, SCE_SH_IDENTIFIER);
-				state = SCE_SH_DEFAULT;
-				ch = ' ';
-			}
-		} else {
-			if (state == SCE_SH_COMMENTLINE) {
-				if (ch == '\\' && isEOLChar(chNext)) {
-					// comment continuation
-					if (chNext == '\r' && chNext2 == '\n') {
-						i += 2;
-						ch = styler.SafeGetCharAt(i);
-						chNext = styler.SafeGetCharAt(i + 1);
-					} else {
-						i++;
-						ch = chNext;
-						chNext = chNext2;
-					}
-				} else if (isEOLChar(ch)) {
-					styler.ColourTo(i - 1, state);
-					state = SCE_SH_DEFAULT;
-					goto restartLexer;
-				} else if (isEOLChar(chNext)) {
-					styler.ColourTo(i, state);
-					state = SCE_SH_DEFAULT;
-				}
-			} else if (state == SCE_SH_HERE_DELIM) {
-				//
-				// From Bash info:
-				// ---------------
-				// Specifier format is: <<[-]WORD
-				// Optional '-' is for removal of leading tabs from here-doc.
-				// Whitespace acceptable after <<[-] operator
-				//
-				if (HereDoc.State == 0) { // '<<' encountered
-					HereDoc.State = 1;
-					HereDoc.Quote = chNext;
-					HereDoc.Quoted = false;
-					HereDoc.DelimiterLength = 0;
-					HereDoc.Delimiter[HereDoc.DelimiterLength] = '\0';
-					if (chNext == '\'' || chNext == '\"') {	// a quoted here-doc delimiter (' or ")
-						i++;
-						ch = chNext;
-						chNext = chNext2;
-						HereDoc.Quoted = true;
-					} else if (!HereDoc.Indent && chNext == '-') {	// <<- indent case
-						HereDoc.Indent = true;
-						HereDoc.State = 0;
-					} else if (isalpha(chNext) || chNext == '_' || chNext == '\\'
-						|| chNext == '-' || chNext == '+' || chNext == '!') {
-						// an unquoted here-doc delimiter, no special handling
-                        // TODO check what exactly bash considers part of the delim
-					} else if (chNext == '<') {	// HERE string <<<
-						i++;
-						ch = chNext;
-						chNext = chNext2;
-						styler.ColourTo(i, SCE_SH_HERE_DELIM);
-						state = SCE_SH_DEFAULT;
-						HereDoc.State = 0;
-					} else if (isspacechar(chNext)) {
-						// eat whitespace
-						HereDoc.State = 0;
-					} else if (isdigit(chNext) || chNext == '=' || chNext == '$') {
-						// left shift << or <<= operator cases
-						styler.ColourTo(i, SCE_SH_OPERATOR);
-						state = SCE_SH_DEFAULT;
-						HereDoc.State = 0;
-					} else {
-						// symbols terminates; deprecated zero-length delimiter
-					}
-				} else if (HereDoc.State == 1) { // collect the delimiter
-					if (HereDoc.Quoted) { // a quoted here-doc delimiter
-						if (ch == HereDoc.Quote) { // closing quote => end of delimiter
-							styler.ColourTo(i, state);
-							state = SCE_SH_DEFAULT;
-						} else {
-							if (ch == '\\' && chNext == HereDoc.Quote) { // escaped quote
-								i++;
-								ch = chNext;
-								chNext = chNext2;
-							}
-							HereDoc.Delimiter[HereDoc.DelimiterLength++] = ch;
-							HereDoc.Delimiter[HereDoc.DelimiterLength] = '\0';
-						}
-					} else { // an unquoted here-doc delimiter
-						if (isalnum(ch) || ch == '_' || ch == '-' || ch == '+' || ch == '!') {
-							HereDoc.Delimiter[HereDoc.DelimiterLength++] = ch;
-							HereDoc.Delimiter[HereDoc.DelimiterLength] = '\0';
-						} else if (ch == '\\') {
-							// skip escape prefix
-						} else {
-							styler.ColourTo(i - 1, state);
-							state = SCE_SH_DEFAULT;
-							goto restartLexer;
-						}
-					}
-					if (HereDoc.DelimiterLength >= HERE_DELIM_MAX - 1) {
-						styler.ColourTo(i - 1, state);
-						state = SCE_SH_ERROR;
-						goto restartLexer;
-					}
-				}
-			} else if (HereDoc.State == 2) {
-				// state == SCE_SH_HERE_Q
-				if (isMatch(styler, lengthDoc, i, HereDoc.Delimiter)) {
-					if (!HereDoc.Indent && isEOLChar(chPrev)) {
-					endHereDoc:
-						// standard HERE delimiter
-						i += HereDoc.DelimiterLength;
-						chPrev = styler.SafeGetCharAt(i - 1);
-						ch = styler.SafeGetCharAt(i);
-						if (isEOLChar(ch)) {
-							styler.ColourTo(i - 1, state);
-							state = SCE_SH_DEFAULT;
-							HereDoc.State = 0;
-							goto restartLexer;
-						}
-						chNext = styler.SafeGetCharAt(i + 1);
-					} else if (HereDoc.Indent) {
-						// indented HERE delimiter
-						unsigned int bk = (i > 0)? i - 1: 0;
-						while (i > 0) {
-							ch = styler.SafeGetCharAt(bk--);
-							if (isEOLChar(ch)) {
-								goto endHereDoc;
-							} else if (!isspacechar(ch)) {
-								break;	// got leading non-whitespace
-							}
-						}
-					}
-				}
-			} else if (state == SCE_SH_SCALAR) {	// variable names
-				if (isEndVar(ch)) {
-					if ((state == SCE_SH_SCALAR)
-					    && i == (styler.GetStartSegment() + 1)) {
-						// Special variable: $(, $_ etc.
-						styler.ColourTo(i, state);
-						state = SCE_SH_DEFAULT;
-					} else {
-						styler.ColourTo(i - 1, state);
-						state = SCE_SH_DEFAULT;
-						goto restartLexer;
-					}
-				}
-			} else if (state == SCE_SH_STRING
-				|| state == SCE_SH_CHARACTER
-				|| state == SCE_SH_BACKTICKS
-				|| state == SCE_SH_PARAM
-				) {
-				if (!Quote.Down && !isspacechar(ch)) {
-					Quote.Open(ch);
-				} else if (ch == '\\' && Quote.Up != '\\') {
-					i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				} else if (ch == Quote.Down) {
-					Quote.Count--;
-					if (Quote.Count == 0) {
-						Quote.Rep--;
-						if (Quote.Rep <= 0) {
-							styler.ColourTo(i, state);
-							state = SCE_SH_DEFAULT;
-							ch = ' ';
-						}
-						if (Quote.Up == Quote.Down) {
-							Quote.Count++;
-						}
-					}
-				} else if (ch == Quote.Up) {
-					Quote.Count++;
-				}
-			}
-		}
-		if (state == SCE_SH_ERROR) {
-			break;
-		}
-		chPrev = ch;
-	}
-	styler.ColourTo(lengthDoc - 1, state);
-}
-
-static bool IsCommentLine(int line, Accessor &styler) {
-	int pos = styler.LineStart(line);
-	int eol_pos = styler.LineStart(line + 1) - 1;
-	for (int i = pos; i < eol_pos; i++) {
-		char ch = styler[i];
-		if (ch == '#')
-			return true;
-		else if (ch != ' ' && ch != '\t')
-			return false;
-	}
-	return false;
-}
-
-static void FoldBashDoc(unsigned int startPos, int length, int, WordList *[],
-                            Accessor &styler) {
-	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
-	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-	unsigned int endPos = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
-	int levelCurrent = levelPrev;
-	char chNext = styler[startPos];
-	int styleNext = styler.StyleAt(startPos);
-	for (unsigned int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		int style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-        // Comment folding
-		if (foldComment && atEOL && IsCommentLine(lineCurrent, styler))
-        {
-            if (!IsCommentLine(lineCurrent - 1, styler)
-                && IsCommentLine(lineCurrent + 1, styler))
-                levelCurrent++;
-            else if (IsCommentLine(lineCurrent - 1, styler)
-                     && !IsCommentLine(lineCurrent+1, styler))
-                levelCurrent--;
-        }
-		if (style == SCE_SH_OPERATOR) {
-			if (ch == '{') {
-				levelCurrent++;
-			} else if (ch == '}') {
-				levelCurrent--;
-			}
-		}
-		if (atEOL) {
-			int lev = levelPrev;
-			if (visibleChars == 0 && foldCompact)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			if ((levelCurrent > levelPrev) && (visibleChars > 0))
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			levelPrev = levelCurrent;
-			visibleChars = 0;
-		}
-		if (!isspacechar(ch))
-			visibleChars++;
-	}
-	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
-}
-
-static const char * const bashWordListDesc[] = {
-	"Keywords",
-	0
-};
-
-LexerModule lmBash(SCLEX_BASH, ColouriseBashDoc, "bash", FoldBashDoc, bashWordListDesc);
diff --git a/src/stc/scintilla/src/LexBasic.cxx b/src/stc/scintilla/src/LexBasic.cxx
deleted file mode 100644
index 79ba2b8911..0000000000
--- a/src/stc/scintilla/src/LexBasic.cxx
+++ /dev/null
@@ -1,369 +0,0 @@
-// Scintilla source code edit control
-/** @file LexBasic.cxx
- ** Lexer for BlitzBasic and PureBasic.
- **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-// This tries to be a unified Lexer/Folder for all the BlitzBasic/BlitzMax/PurBasic basics
-// and derivatives. Once they diverge enough, might want to split it into multiple
-// lexers for more code clearity.
-//
-// Mail me (elias <at> users <dot> sf <dot> net) for any bugs.
-
-// Folding only works for simple things like functions or types.
-
-// You may want to have a look at my ctags lexer as well, if you additionally to coloring
-// and folding need to extract things like label tags in your editor.
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-/* Bits:
- * 1  - whitespace
- * 2  - operator
- * 4  - identifier
- * 8  - decimal digit
- * 16 - hex digit
- * 32 - bin digit
- */
-static int character_classification[128] =
-{
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0,  0,  1,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    1,  2,  0,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  10, 2,
-    60, 60, 28, 28, 28, 28, 28, 28, 28, 28, 2,  2,  2,  2,  2,  2,
-    2,  20, 20, 20, 20, 20, 20, 4,  4,  4,  4,  4,  4,  4,  4,  4,
-    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  2,  2,  2,  2,  4,
-    2,  20, 20, 20, 20, 20, 20, 4,  4,  4,  4,  4,  4,  4,  4,  4,
-    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  2,  2,  2,  2,  0
-};
-
-static bool IsSpace(int c) {
-	return c < 128 && (character_classification[c] & 1);
-}
-
-static bool IsOperator(int c) {
-	return c < 128 && (character_classification[c] & 2);
-}
-
-static bool IsIdentifier(int c) {
-	return c < 128 && (character_classification[c] & 4);
-}
-
-static bool IsDigit(int c) {
-	return c < 128 && (character_classification[c] & 8);
-}
-
-static bool IsHexDigit(int c) {
-	return c < 128 && (character_classification[c] & 16);
-}
-
-static bool IsBinDigit(int c) {
-	return c < 128 && (character_classification[c] & 32);
-}
-
-static int LowerCase(int c)
-{
-	if (c >= 'A' && c <= 'Z')
-		return 'a' + c - 'A';
-	return c;
-}
-
-static void ColouriseBasicDoc(unsigned int startPos, int length, int initStyle,
-                           WordList *keywordlists[], Accessor &styler, char comment_char) {
-	bool wasfirst = true, isfirst = true; // true if first token in a line
-	styler.StartAt(startPos);
-
-	StyleContext sc(startPos, length, initStyle, styler);
-
-	// Can't use sc.More() here else we miss the last character
-	for (; ; sc.Forward()) {
-		if (sc.state == SCE_B_IDENTIFIER) {
-			if (!IsIdentifier(sc.ch)) {
-				// Labels
-				if (wasfirst && sc.Match(':')) {
-					sc.ChangeState(SCE_B_LABEL);
-					sc.ForwardSetState(SCE_B_DEFAULT);
-				} else {
-					char s[100];
-					int kstates[4] = {
-						SCE_B_KEYWORD,
-						SCE_B_KEYWORD2,
-						SCE_B_KEYWORD3,
-						SCE_B_KEYWORD4,
-					};
-					sc.GetCurrentLowered(s, sizeof(s));
-					for (int i = 0; i < 4; i++) {
-						if (keywordlists[i]->InList(s)) {
-							sc.ChangeState(kstates[i]);
-						}
-					}
-					// Types, must set them as operator else they will be
-					// matched as number/constant
-					if (sc.Match('.') || sc.Match('$') || sc.Match('%') ||
-						sc.Match('#')) {
-						sc.SetState(SCE_B_OPERATOR);
-					} else {
-						sc.SetState(SCE_B_DEFAULT);
-					}
-				}
-			}
-		} else if (sc.state == SCE_B_OPERATOR) {
-			if (!IsOperator(sc.ch) || sc.Match('#'))
-				sc.SetState(SCE_B_DEFAULT);
-		} else if (sc.state == SCE_B_LABEL) {
-			if (!IsIdentifier(sc.ch))
-				sc.SetState(SCE_B_DEFAULT);
-		} else if (sc.state == SCE_B_CONSTANT) {
-			if (!IsIdentifier(sc.ch))
-				sc.SetState(SCE_B_DEFAULT);
-		} else if (sc.state == SCE_B_NUMBER) {
-			if (!IsDigit(sc.ch))
-				sc.SetState(SCE_B_DEFAULT);
-		} else if (sc.state == SCE_B_HEXNUMBER) {
-			if (!IsHexDigit(sc.ch))
-				sc.SetState(SCE_B_DEFAULT);
-		} else if (sc.state == SCE_B_BINNUMBER) {
-			if (!IsBinDigit(sc.ch))
-				sc.SetState(SCE_B_DEFAULT);
-		} else if (sc.state == SCE_B_STRING) {
-			if (sc.ch == '"') {
-				sc.ForwardSetState(SCE_B_DEFAULT);
-			}
-			if (sc.atLineEnd) {
-				sc.ChangeState(SCE_B_ERROR);
-				sc.SetState(SCE_B_DEFAULT);
-			}
-		} else if (sc.state == SCE_B_COMMENT || sc.state == SCE_B_PREPROCESSOR) {
-			if (sc.atLineEnd) {
-				sc.SetState(SCE_B_DEFAULT);
-			}
-		}
-
-		if (sc.atLineStart)
-			isfirst = true;
-
-		if (sc.state == SCE_B_DEFAULT || sc.state == SCE_B_ERROR) {
-			if (isfirst && sc.Match('.')) {
-				sc.SetState(SCE_B_LABEL);
-			} else if (isfirst && sc.Match('#')) {
-				wasfirst = isfirst;
-				sc.SetState(SCE_B_IDENTIFIER);
-			} else if (sc.Match(comment_char)) {
-				// Hack to make deprecated QBASIC '$Include show
-				// up in freebasic with SCE_B_PREPROCESSOR.
-				if (comment_char == '\'' && sc.Match(comment_char, '$'))
-					sc.SetState(SCE_B_PREPROCESSOR);
-				else
-					sc.SetState(SCE_B_COMMENT);
-			} else if (sc.Match('"')) {
-				sc.SetState(SCE_B_STRING);
-			} else if (IsDigit(sc.ch)) {
-				sc.SetState(SCE_B_NUMBER);
-			} else if (sc.Match('$')) {
-				sc.SetState(SCE_B_HEXNUMBER);
-			} else if (sc.Match('%')) {
-				sc.SetState(SCE_B_BINNUMBER);
-			} else if (sc.Match('#')) {
-				sc.SetState(SCE_B_CONSTANT);
-			} else if (IsOperator(sc.ch)) {
-				sc.SetState(SCE_B_OPERATOR);
-			} else if (IsIdentifier(sc.ch)) {
-				wasfirst = isfirst;
-				sc.SetState(SCE_B_IDENTIFIER);
-			} else if (!IsSpace(sc.ch)) {
-				sc.SetState(SCE_B_ERROR);
-			}
-		}
-
-		if (!IsSpace(sc.ch))
-			isfirst = false;
-
-		if (!sc.More())
-			break;
-	}
-	sc.Complete();
-}
-
-static int CheckBlitzFoldPoint(char const *token, int &level) {
-	if (!strcmp(token, "function") ||
-		!strcmp(token, "type")) {
-		level |= SC_FOLDLEVELHEADERFLAG;
-		return 1;
-	}
-	if (!strcmp(token, "end function") ||
-		!strcmp(token, "end type")) {
-		return -1;
-	}
-	return 0;
-}
-
-static int CheckPureFoldPoint(char const *token, int &level) {
-	if (!strcmp(token, "procedure") ||
-		!strcmp(token, "enumeration") ||
-		!strcmp(token, "interface") ||
-		!strcmp(token, "structure")) {
-		level |= SC_FOLDLEVELHEADERFLAG;
-		return 1;
-	}
-	if (!strcmp(token, "endprocedure") ||
-		!strcmp(token, "endenumeration") ||
-		!strcmp(token, "endinterface") ||
-		!strcmp(token, "endstructure")) {
-		return -1;
-	}
-	return 0;
-}
-
-static int CheckFreeFoldPoint(char const *token, int &level) {
-	if (!strcmp(token, "function") ||
-		!strcmp(token, "sub") ||
-		!strcmp(token, "type")) {
-		level |= SC_FOLDLEVELHEADERFLAG;
-		return 1;
-	}
-	if (!strcmp(token, "end function") ||
-		!strcmp(token, "end sub") ||
-		!strcmp(token, "end type")) {
-		return -1;
-	}
-	return 0;
-}
-
-static void FoldBasicDoc(unsigned int startPos, int length,
-	Accessor &styler, int (*CheckFoldPoint)(char const *, int &)) {
-	int line = styler.GetLine(startPos);
-	int level = styler.LevelAt(line);
-	int go = 0, done = 0;
-	int endPos = startPos + length;
-	char word[256];
-	int wordlen = 0;
-	int i;
-        bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-	// Scan for tokens at the start of the line (they may include
-	// whitespace, for tokens like "End Function"
-	for (i = startPos; i < endPos; i++) {
-		int c = styler.SafeGetCharAt(i);
-		if (!done && !go) {
-			if (wordlen) { // are we scanning a token already?
-				word[wordlen] = static_cast<char>(LowerCase(c));
-				if (!IsIdentifier(c)) { // done with token
-					word[wordlen] = '\0';
-					go = CheckFoldPoint(word, level);
-					if (!go) {
-						// Treat any whitespace as single blank, for
-						// things like "End   Function".
-						if (IsSpace(c) && IsIdentifier(word[wordlen - 1])) {
-							word[wordlen] = ' ';
-							if (wordlen < 255)
-								wordlen++;
-						}
-						else // done with this line
-							done = 1;
-					}
-				} else if (wordlen < 255) {
-					wordlen++;
-				}
-			} else { // start scanning at first non-whitespace character
-				if (!IsSpace(c)) {
-					if (IsIdentifier(c)) {
-						word[0] = static_cast<char>(LowerCase(c));
-						wordlen = 1;
-					} else // done with this line
-						done = 1;
-				}
-			}
-		}
-		if (c == '\n') { // line end
-			if (!done && wordlen == 0 && foldCompact) // line was only space
-				level |= SC_FOLDLEVELWHITEFLAG;
-			if (level != styler.LevelAt(line))
-				styler.SetLevel(line, level);
-			level += go;
-			line++;
-			// reset state
-			wordlen = 0;
-			level &= ~SC_FOLDLEVELHEADERFLAG;
-			level &= ~SC_FOLDLEVELWHITEFLAG;
-			go = 0;
-			done = 0;
-		}
-	}
-}
-
-static void ColouriseBlitzBasicDoc(unsigned int startPos, int length, int initStyle,
-                           WordList *keywordlists[], Accessor &styler) {
-	ColouriseBasicDoc(startPos, length, initStyle, keywordlists, styler, ';');
-}
-
-static void ColourisePureBasicDoc(unsigned int startPos, int length, int initStyle,
-                           WordList *keywordlists[], Accessor &styler) {
-	ColouriseBasicDoc(startPos, length, initStyle, keywordlists, styler, ';');
-}
-
-static void ColouriseFreeBasicDoc(unsigned int startPos, int length, int initStyle,
-                           WordList *keywordlists[], Accessor &styler) {
-	ColouriseBasicDoc(startPos, length, initStyle, keywordlists, styler, '\'');
-}
-
-static void FoldBlitzBasicDoc(unsigned int startPos, int length, int,
-	WordList *[], Accessor &styler) {
-	FoldBasicDoc(startPos, length, styler, CheckBlitzFoldPoint);
-}
-
-static void FoldPureBasicDoc(unsigned int startPos, int length, int,
-	WordList *[], Accessor &styler) {
-	FoldBasicDoc(startPos, length, styler, CheckPureFoldPoint);
-}
-
-static void FoldFreeBasicDoc(unsigned int startPos, int length, int,
-	WordList *[], Accessor &styler) {
-	FoldBasicDoc(startPos, length, styler, CheckFreeFoldPoint);
-}
-
-static const char * const blitzbasicWordListDesc[] = {
-	"BlitzBasic Keywords",
-	"user1",
-	"user2",
-	"user3",
-	0
-};
-
-static const char * const purebasicWordListDesc[] = {
-	"PureBasic Keywords",
-	"PureBasic PreProcessor Keywords",
-	"user defined 1",
-	"user defined 2",
-	0
-};
-
-static const char * const freebasicWordListDesc[] = {
-	"FreeBasic Keywords",
-	"FreeBasic PreProcessor Keywords",
-	"user defined 1",
-	"user defined 2",
-	0
-};
-
-LexerModule lmBlitzBasic(SCLEX_BLITZBASIC, ColouriseBlitzBasicDoc, "blitzbasic",
-	FoldBlitzBasicDoc, blitzbasicWordListDesc);
-
-LexerModule lmPureBasic(SCLEX_PUREBASIC, ColourisePureBasicDoc, "purebasic",
-	FoldPureBasicDoc, purebasicWordListDesc);
-
-LexerModule lmFreeBasic(SCLEX_FREEBASIC, ColouriseFreeBasicDoc, "freebasic",
-	FoldFreeBasicDoc, freebasicWordListDesc);
-
diff --git a/src/stc/scintilla/src/LexBullant.cxx b/src/stc/scintilla/src/LexBullant.cxx
deleted file mode 100644
index 902f89c1e4..0000000000
--- a/src/stc/scintilla/src/LexBullant.cxx
+++ /dev/null
@@ -1,225 +0,0 @@
-// SciTE - Scintilla based Text Editor
-// LexBullant.cxx - lexer for Bullant
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-
-static int classifyWordBullant(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler) {
-	char s[100];
-	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';
-	}
-	int lev= 0;
-	char chAttr = SCE_C_IDENTIFIER;
-	if (isdigit(s[0]) || (s[0] == '.')){
-		chAttr = SCE_C_NUMBER;
-	}
-	else {
-		if (keywords.InList(s)) {
-			chAttr = SCE_C_WORD;
-			if (strcmp(s, "end") == 0)
-				lev = -1;
-			else if (strcmp(s, "method") == 0 ||
-				strcmp(s, "case") == 0 ||
-				strcmp(s, "class") == 0 ||
-				strcmp(s, "debug") == 0 ||
-				strcmp(s, "test") == 0 ||
-				strcmp(s, "if") == 0 ||
-				strcmp(s, "lock") == 0 ||
-				strcmp(s, "transaction") == 0 ||
-				strcmp(s, "trap") == 0 ||
-				strcmp(s, "until") == 0 ||
-				strcmp(s, "while") == 0)
-				lev = 1;
-		}
-	}
-	styler.ColourTo(end, chAttr);
-	return lev;
-}
-
-static void ColouriseBullantDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-	Accessor &styler) {
-	WordList &keywords = *keywordlists[0];
-
-	styler.StartAt(startPos);
-
-	bool fold = styler.GetPropertyInt("fold") != 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
-	int levelCurrent = levelPrev;
-
-	int state = initStyle;
-	if (state == SCE_C_STRINGEOL)	// Does not leak onto next line
-		state = SCE_C_DEFAULT;
-	char chPrev = ' ';
-	char chNext = styler[startPos];
-	unsigned int lengthDoc = startPos + length;
-	int visibleChars = 0;
-	styler.StartSegment(startPos);
-	int endFoundThisLine = 0;
-	for (unsigned int i = startPos; i < lengthDoc; i++) {
-		char ch = chNext;
-		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
-			endFoundThisLine = 0;
-			if (state == SCE_C_STRINGEOL) {
-				styler.ColourTo(i, state);
-				state = SCE_C_DEFAULT;
-			}
-			if (fold) {
-				int lev = levelPrev;
-				if (visibleChars == 0)
-					lev |= SC_FOLDLEVELWHITEFLAG;
-				if ((levelCurrent > levelPrev) && (visibleChars > 0))
-					lev |= SC_FOLDLEVELHEADERFLAG;
-				styler.SetLevel(lineCurrent, lev);
-				lineCurrent++;
-				levelPrev = levelCurrent;
-			}
-			visibleChars = 0;
-
-/*			int indentBlock = GetLineIndentation(lineCurrent);
-			if (blockChange==1){
-				lineCurrent++;
-				int pos=SetLineIndentation(lineCurrent, indentBlock + indentSize);
-			} else if (blockChange==-1) {
-				indentBlock -= indentSize;
-				if (indentBlock < 0)
-					indentBlock = 0;
-				SetLineIndentation(lineCurrent, indentBlock);
-				lineCurrent++;
-			}
-			blockChange=0;
-*/		}
-		if (!isspace(ch))
-			visibleChars++;
-
-		if (styler.IsLeadByte(ch)) {
-			chNext = styler.SafeGetCharAt(i + 2);
-			chPrev = ' ';
-			i += 1;
-			continue;
-		}
-
-		if (state == SCE_C_DEFAULT) {
-			if (iswordstart(ch)) {
-				styler.ColourTo(i-1, state);
-					state = SCE_C_IDENTIFIER;
-			} else if (ch == '@' && chNext == 'o') {
-				if ((styler.SafeGetCharAt(i+2) =='f') && (styler.SafeGetCharAt(i+3) == 'f')) {
-					styler.ColourTo(i-1, state);
-					state = SCE_C_COMMENT;
-				}
-			} else if (ch == '#') {
-				styler.ColourTo(i-1, state);
-				state = SCE_C_COMMENTLINE;
-			} else if (ch == '\"') {
-				styler.ColourTo(i-1, state);
-				state = SCE_C_STRING;
-			} else if (ch == '\'') {
-				styler.ColourTo(i-1, state);
-				state = SCE_C_CHARACTER;
-			} else if (isoperator(ch)) {
-				styler.ColourTo(i-1, state);
-				styler.ColourTo(i, SCE_C_OPERATOR);
-			}
-		} else if (state == SCE_C_IDENTIFIER) {
-			if (!iswordchar(ch)) {
-				int levelChange = classifyWordBullant(styler.GetStartSegment(), i - 1, keywords, styler);
-				state = SCE_C_DEFAULT;
-				chNext = styler.SafeGetCharAt(i + 1);
-				if (ch == '#') {
-					state = SCE_C_COMMENTLINE;
-				} else if (ch == '\"') {
-					state = SCE_C_STRING;
-				} else if (ch == '\'') {
-					state = SCE_C_CHARACTER;
-				} else if (isoperator(ch)) {
-					styler.ColourTo(i, SCE_C_OPERATOR);
-				}
-				if (endFoundThisLine == 0)
-					levelCurrent+=levelChange;
-				if (levelChange == -1)
-					endFoundThisLine=1;
-			}
-		} else if (state == SCE_C_COMMENT) {
-			if (ch == '@' && chNext == 'o') {
-				if (styler.SafeGetCharAt(i+2) == 'n') {
-					styler.ColourTo(i+2, state);
-					state = SCE_C_DEFAULT;
-					i+=2;
-				}
-			}
-		} else if (state == SCE_C_COMMENTLINE) {
-			if (ch == '\r' || ch == '\n') {
-				endFoundThisLine = 0;
-				styler.ColourTo(i-1, state);
-				state = SCE_C_DEFAULT;
-			}
-		} else if (state == SCE_C_STRING) {
-			if (ch == '\\') {
-				if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
-					i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-			} else if (ch == '\"') {
-				styler.ColourTo(i, state);
-				state = SCE_C_DEFAULT;
-			} else if (chNext == '\r' || chNext == '\n') {
-				endFoundThisLine = 0;
-				styler.ColourTo(i-1, SCE_C_STRINGEOL);
-				state = SCE_C_STRINGEOL;
-			}
-		} else if (state == SCE_C_CHARACTER) {
-			if ((ch == '\r' || ch == '\n') && (chPrev != '\\')) {
-				endFoundThisLine = 0;
-				styler.ColourTo(i-1, SCE_C_STRINGEOL);
-				state = SCE_C_STRINGEOL;
-			} else if (ch == '\\') {
-				if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
-					i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-			} else if (ch == '\'') {
-				styler.ColourTo(i, state);
-				state = SCE_C_DEFAULT;
-			}
-		}
-		chPrev = ch;
-	}
-	styler.ColourTo(lengthDoc - 1, state);
-
-	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-	if (fold) {
-		int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-		//styler.SetLevel(lineCurrent, levelCurrent | flagsNext);
-		styler.SetLevel(lineCurrent, levelPrev | flagsNext);
-
-	}
-}
-
-static const char * const bullantWordListDesc[] = {
-	"Keywords",
-	0
-};
-
-LexerModule lmBullant(SCLEX_BULLANT, ColouriseBullantDoc, "bullant", 0, bullantWordListDesc);
diff --git a/src/stc/scintilla/src/LexCLW.cxx b/src/stc/scintilla/src/LexCLW.cxx
deleted file mode 100644
index e28e4b13b4..0000000000
--- a/src/stc/scintilla/src/LexCLW.cxx
+++ /dev/null
@@ -1,675 +0,0 @@
-// Scintilla source code edit control
-/** @file LexClw.cxx
- ** Lexer for Clarion.
- ** 2004/12/17 Updated Lexer
- **/
-// Copyright 2003-2004 by Ron Schofield <ron@schofieldcomputer.com>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <ctype.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-// Is an end of line character
-inline bool IsEOL(const int ch) {
-
-	return(ch == '\n');
-}
-
-// Convert character to uppercase
-static char CharacterUpper(char chChar) {
-
-	if (chChar < 'a' || chChar > 'z') {
-		return(chChar);
-	}
-	else {
-		return(static_cast<char>(chChar - 'a' + 'A'));
-	}
-}
-
-// Convert string to uppercase
-static void StringUpper(char *szString) {
-
-	while (*szString) {
-		*szString = CharacterUpper(*szString);
-		szString++;
-	}
-}
-
-// Is a label start character
-inline bool IsALabelStart(const int iChar) {
-
-	return(isalpha(iChar) || iChar == '_');
-}
-
-// Is a label character
-inline bool IsALabelCharacter(const int iChar) {
-
-	return(isalnum(iChar) || iChar == '_' || iChar == ':'); 
-}
-
-// Is the character is a ! and the the next character is not a ! 
-inline bool IsACommentStart(const int iChar) {
-
-	return(iChar == '!');
-}
-
-// Is the character a Clarion hex character (ABCDEF)
-inline bool IsAHexCharacter(const int iChar, bool bCaseSensitive) {
-
-	// Case insensitive.
-	if (!bCaseSensitive) {
-		if (strchr("ABCDEFabcdef", iChar) != NULL) {
-			return(true);
-		}
-	}
-	// Case sensitive
-	else {
-		if (strchr("ABCDEF", iChar) != NULL) {
-			return(true);
-		}
-	}
-	return(false);
-}
-
-// Is the character a Clarion base character (B=Binary, O=Octal, H=Hex)
-inline bool IsANumericBaseCharacter(const int iChar, bool bCaseSensitive) {
-
-	// Case insensitive.
-	if (!bCaseSensitive) {
-		// If character is a numeric base character
-		if (strchr("BOHboh", iChar) != NULL) {
-			return(true);
-		}
-	}
-	// Case sensitive
-	else {
-		// If character is a numeric base character
-		if (strchr("BOH", iChar) != NULL) {
-			return(true);
-		}
-	}
-	return(false);
-}
-
-// Set the correct numeric constant state
-inline bool SetNumericConstantState(StyleContext &scDoc) {
-
-	int iPoints = 0;			// Point counter
-	char cNumericString[512];	// Numeric string buffer
-
-	// Buffer the current numberic string
-	scDoc.GetCurrent(cNumericString, sizeof(cNumericString));
-	// Loop through the string until end of string (NULL termination)
-	for (int iIndex = 0; cNumericString[iIndex] != '\0'; iIndex++) {
-		// Depending on the character
-		switch (cNumericString[iIndex]) {
-			// Is a . (point)
-			case '.' :
-				// Increment point counter
-				iPoints++;
-				break;
-			default :
-				break;
-		}	
-	}
-	// If points found (can be more than one for improper formatted number
-	if (iPoints > 0) {
-		return(true);
-	}
-	// Else no points found
-	else {
-		return(false);
-	}
-}
-
-// Get the next word in uppercase from the current position (keyword lookahead)
-inline bool GetNextWordUpper(Accessor &styler, unsigned int uiStartPos, int iLength, char *cWord) {
-
-	unsigned int iIndex = 0;		// Buffer Index
-
-	// Loop through the remaining string from the current position
-	for (int iOffset = uiStartPos; iOffset < iLength; iOffset++) {
-		// Get the character from the buffer using the offset
-		char cCharacter = styler[iOffset];
-		if (IsEOL(cCharacter)) {
-			break;
-		}
-		// If the character is alphabet character
-		if (isalpha(cCharacter)) {
-			// Add UPPERCASE character to the word buffer
-			cWord[iIndex++] = CharacterUpper(cCharacter);
-		}
-	}
-	// Add null termination
-	cWord[iIndex] = '\0';
-	// If no word was found
-	if (iIndex == 0) {
-		// Return failure
-		return(false);
-	}
-	// Else word was found
-	else {
-		// Return success
-		return(true);
-	}
-}
-
-// Clarion Language Colouring Procedure
-static void ColouriseClarionDoc(unsigned int uiStartPos, int iLength, int iInitStyle, WordList *wlKeywords[], Accessor &accStyler, bool bCaseSensitive) {
-
-	int iParenthesesLevel = 0;		// Parenthese Level
-	int iColumn1Label = false;		// Label starts in Column 1
-
-	WordList &wlClarionKeywords = *wlKeywords[0];			// Clarion Keywords
-	WordList &wlCompilerDirectives = *wlKeywords[1];		// Compiler Directives
-	WordList &wlRuntimeExpressions = *wlKeywords[2];		// Runtime Expressions
-	WordList &wlBuiltInProcsFuncs = *wlKeywords[3];			// Builtin Procedures and Functions
-	WordList &wlStructsDataTypes = *wlKeywords[4];			// Structures and Data Types
-	WordList &wlAttributes = *wlKeywords[5];				// Procedure Attributes
-	WordList &wlStandardEquates = *wlKeywords[6];			// Standard Equates
-	WordList &wlLabelReservedWords = *wlKeywords[7];		// Clarion Reserved Keywords (Labels)
-	WordList &wlProcLabelReservedWords = *wlKeywords[8];	// Clarion Reserved Keywords (Procedure Labels)
-
-	const char wlProcReservedKeywordList[] = 
-	"PROCEDURE FUNCTION";
-	WordList wlProcReservedKeywords;
-	wlProcReservedKeywords.Set(wlProcReservedKeywordList);
-
-	const char wlCompilerKeywordList[] = 
-	"COMPILE OMIT";
-	WordList wlCompilerKeywords;
-	wlCompilerKeywords.Set(wlCompilerKeywordList);
-
-	const char wlLegacyStatementsList[] =
-	"BOF EOF FUNCTION POINTER SHARE";
-	WordList wlLegacyStatements;
-	wlLegacyStatements.Set(wlLegacyStatementsList);
-
-	StyleContext scDoc(uiStartPos, iLength, iInitStyle, accStyler);
-
-	// lex source code
-    for (; scDoc.More(); scDoc.Forward())
-	{
-		//
-		// Determine if the current state should terminate.
-		//
-
-		// Label State Handling
-		if (scDoc.state == SCE_CLW_LABEL) {
-			// If the character is not a valid label
-			if (!IsALabelCharacter(scDoc.ch)) {
-				// If the character is a . (dot syntax)
-				if (scDoc.ch == '.') {
-					// Turn off column 1 label flag as label now cannot be reserved work
-					iColumn1Label = false;
-					// Uncolour the . (dot) to default state, move forward one character,
-					// and change back to the label state.
-					scDoc.SetState(SCE_CLW_DEFAULT);
-					scDoc.Forward();
-					scDoc.SetState(SCE_CLW_LABEL);
-				}
-				// Else check label
-				else {
-					char cLabel[512];		// Label buffer
-					// Buffer the current label string
-					scDoc.GetCurrent(cLabel,sizeof(cLabel));
-					// If case insensitive, convert string to UPPERCASE to match passed keywords.
-					if (!bCaseSensitive) {
-						StringUpper(cLabel);
-					}
-					// Else if UPPERCASE label string is in the Clarion compiler keyword list
-					if (wlCompilerKeywords.InList(cLabel) && iColumn1Label){
-						// change the label to error state
-						scDoc.ChangeState(SCE_CLW_COMPILER_DIRECTIVE);
-					}
-					// Else if UPPERCASE label string is in the Clarion reserved keyword list
-					else if (wlLabelReservedWords.InList(cLabel) && iColumn1Label){
-						// change the label to error state
-						scDoc.ChangeState(SCE_CLW_ERROR);
-					}
-					// Else if UPPERCASE label string is 
-					else if (wlProcLabelReservedWords.InList(cLabel) && iColumn1Label) {
-						char cWord[512];	// Word buffer
-						// Get the next word from the current position
-						if (GetNextWordUpper(accStyler,scDoc.currentPos,uiStartPos+iLength,cWord)) {
-							// If the next word is a procedure reserved word
-							if (wlProcReservedKeywords.InList(cWord)) {
-								// Change the label to error state
-								scDoc.ChangeState(SCE_CLW_ERROR);
-							}
-						}
-					}
-					// Else if label string is in the compiler directive keyword list
-					else if (wlCompilerDirectives.InList(cLabel)) {
-						// change the state to compiler directive state
-						scDoc.ChangeState(SCE_CLW_COMPILER_DIRECTIVE);
-					}
-					// Terminate the label state and set to default state
-					scDoc.SetState(SCE_CLW_DEFAULT);
-				}
-			}
-		}
-		// Keyword State Handling
-		else if (scDoc.state == SCE_CLW_KEYWORD) {
-			// If character is : (colon)
-			if (scDoc.ch == ':') {
-				char cEquate[512];		// Equate buffer
-				// Move forward to include : (colon) in buffer
-				scDoc.Forward();
-				// Buffer the equate string
-				scDoc.GetCurrent(cEquate,sizeof(cEquate));
-				// If case insensitive, convert string to UPPERCASE to match passed keywords.
-				if (!bCaseSensitive) {
-					StringUpper(cEquate);
-				}
-				// If statement string is in the equate list
-				if (wlStandardEquates.InList(cEquate)) {
-					// Change to equate state
-					scDoc.ChangeState(SCE_CLW_STANDARD_EQUATE);
-				}
-			}
-			// If the character is not a valid label character
-			else if (!IsALabelCharacter(scDoc.ch)) {
-				char cStatement[512];		// Statement buffer
-				// Buffer the statement string
-				scDoc.GetCurrent(cStatement,sizeof(cStatement));
-				// If case insensitive, convert string to UPPERCASE to match passed keywords.
-				if (!bCaseSensitive) {
-					StringUpper(cStatement);
-				}
-				// If statement string is in the Clarion keyword list
-				if (wlClarionKeywords.InList(cStatement)) {
-					// Change the statement string to the Clarion keyword state
-					scDoc.ChangeState(SCE_CLW_KEYWORD);
-				}
-				// Else if statement string is in the compiler directive keyword list
-				else if (wlCompilerDirectives.InList(cStatement)) {
-					// Change the statement string to the compiler directive state
-					scDoc.ChangeState(SCE_CLW_COMPILER_DIRECTIVE);
-				}
-				// Else if statement string is in the runtime expressions keyword list
-				else if (wlRuntimeExpressions.InList(cStatement)) {
-					// Change the statement string to the runtime expressions state
-					scDoc.ChangeState(SCE_CLW_RUNTIME_EXPRESSIONS);
-				}
-				// Else if statement string is in the builtin procedures and functions keyword list
-				else if (wlBuiltInProcsFuncs.InList(cStatement)) {
-					// Change the statement string to the builtin procedures and functions state
-					scDoc.ChangeState(SCE_CLW_BUILTIN_PROCEDURES_FUNCTION);
-				}
-				// Else if statement string is in the tructures and data types keyword list
-				else if (wlStructsDataTypes.InList(cStatement)) {
-					// Change the statement string to the structures and data types state
-					scDoc.ChangeState(SCE_CLW_STRUCTURE_DATA_TYPE);
-				}
-				// Else if statement string is in the procedure attribute keyword list
-				else if (wlAttributes.InList(cStatement)) {
-					// Change the statement string to the procedure attribute state
-					scDoc.ChangeState(SCE_CLW_ATTRIBUTE);
-				}
-				// Else if statement string is in the standard equate keyword list
-				else if (wlStandardEquates.InList(cStatement)) {
-					// Change the statement string to the standard equate state
-					scDoc.ChangeState(SCE_CLW_STANDARD_EQUATE);
-				}
-				// Else if statement string is in the deprecated or legacy keyword list
-				else if (wlLegacyStatements.InList(cStatement)) {
-					// Change the statement string to the standard equate state
-					scDoc.ChangeState(SCE_CLW_DEPRECATED);
-				}
-				// Else the statement string doesn't match any work list
-				else {
-					// Change the statement string to the default state
-					scDoc.ChangeState(SCE_CLW_DEFAULT);
-				}
-				// Terminate the keyword state and set to default state
-				scDoc.SetState(SCE_CLW_DEFAULT);
-			}
-		}
-		// String State Handling
-		else if (scDoc.state == SCE_CLW_STRING) {
-			// If the character is an ' (single quote)
-			if (scDoc.ch == '\'') {
-				// Set the state to default and move forward colouring
-				// the ' (single quote) as default state
-				// terminating the string state
-				scDoc.SetState(SCE_CLW_DEFAULT);
-				scDoc.Forward();
-			}
-			// If the next character is an ' (single quote)
-			if (scDoc.chNext == '\'') {
-				// Move forward one character and set to default state
-				// colouring the next ' (single quote) as default state
-				// terminating the string state
-				scDoc.ForwardSetState(SCE_CLW_DEFAULT);
-				scDoc.Forward();
-			}
-		}
-		// Picture String State Handling
-		else if (scDoc.state == SCE_CLW_PICTURE_STRING) {
-			// If the character is an ( (open parenthese)
-			if (scDoc.ch == '(') {
-				// Increment the parenthese level
-				iParenthesesLevel++;
-			}
-			// Else if the character is a ) (close parenthese) 
-			else if (scDoc.ch == ')') {
-				// If the parenthese level is set to zero
-				// parentheses matched
-				if (!iParenthesesLevel) {
-					scDoc.SetState(SCE_CLW_DEFAULT);
-				} 
-				// Else parenthese level is greater than zero
-				// still looking for matching parentheses
-				else {
-					// Decrement the parenthese level
-					iParenthesesLevel--;
-				}
-			}
-		}
-		// Standard Equate State Handling
-		else if (scDoc.state == SCE_CLW_STANDARD_EQUATE) {
-			if (!isalnum(scDoc.ch)) {
-				scDoc.SetState(SCE_CLW_DEFAULT);
-			}
-		}
-		// Integer Constant State Handling
-		else if (scDoc.state == SCE_CLW_INTEGER_CONSTANT) {
-			// If the character is not a digit (0-9)
-			// or character is not a hexidecimal character (A-F)
-			// or character is not a . (point)
-			// or character is not a numberic base character (B,O,H)
-			if (!(isdigit(scDoc.ch)
-			|| IsAHexCharacter(scDoc.ch, bCaseSensitive)
-			|| scDoc.ch == '.'
-			|| IsANumericBaseCharacter(scDoc.ch, bCaseSensitive))) {
-				// If the number was a real 
-				if (SetNumericConstantState(scDoc)) {
-					// Colour the matched string to the real constant state
-					scDoc.ChangeState(SCE_CLW_REAL_CONSTANT);
-				}
-				// Else the number was an integer
-				else {
-					// Colour the matched string to an integer constant state
-					scDoc.ChangeState(SCE_CLW_INTEGER_CONSTANT);
-				}
-				// Terminate the integer constant state and set to default state
-				scDoc.SetState(SCE_CLW_DEFAULT);
-			}
-		}
-
-		//
-		// Determine if a new state should be entered.
-		//
-
-		// Beginning of Line Handling
-		if (scDoc.atLineStart) {
-			// Reset the column 1 label flag
-			iColumn1Label = false;
-			// If column 1 character is a label start character
-			if (IsALabelStart(scDoc.ch)) {
-				// Label character is found in column 1
-				// so set column 1 label flag and clear last column 1 label
-				iColumn1Label = true;
-				// Set the state to label
-				scDoc.SetState(SCE_CLW_LABEL);
-			}
-			// else if character is a space or tab
-			else if (IsASpace(scDoc.ch)){
-				// Set to default state
-				scDoc.SetState(SCE_CLW_DEFAULT);
-			}
-			// else if comment start (!) or is an * (asterisk)
-			else if (IsACommentStart(scDoc.ch) || scDoc.ch == '*' ) {
-				// then set the state to comment.
-				scDoc.SetState(SCE_CLW_COMMENT);
-			}
-			// else the character is a ? (question mark)
-			else if (scDoc.ch == '?') {
-				// Change to the compiler directive state, move forward,
-				// colouring the ? (question mark), change back to default state.
-				scDoc.ChangeState(SCE_CLW_COMPILER_DIRECTIVE);
-				scDoc.Forward();
-				scDoc.SetState(SCE_CLW_DEFAULT);
-			}
-			// else an invalid character in column 1
-			else {
-				// Set to error state
-				scDoc.SetState(SCE_CLW_ERROR);
-			}
-		}
-		// End of Line Handling
-		else if (scDoc.atLineEnd) {
-			// Reset to the default state at the end of each line.
-			scDoc.SetState(SCE_CLW_DEFAULT);
-		}
-		// Default Handling
-		else {
-			// If in default state 
-			if (scDoc.state == SCE_CLW_DEFAULT) {
-				// If is a letter could be a possible statement
-				if (isalpha(scDoc.ch)) {
-					// Set the state to Clarion Keyword and verify later
-					scDoc.SetState(SCE_CLW_KEYWORD);
-				}
-				// else is a number
-				else if (isdigit(scDoc.ch)) {
-					// Set the state to Integer Constant and verify later
-					scDoc.SetState(SCE_CLW_INTEGER_CONSTANT);
-				}
-				// else if the start of a comment or a | (line continuation)
-				else if (IsACommentStart(scDoc.ch) || scDoc.ch == '|') {
-					// then set the state to comment.
-					scDoc.SetState(SCE_CLW_COMMENT);
-				}		
-				// else if the character is a ' (single quote)
-				else if (scDoc.ch == '\'') {
-					// If the character is also a ' (single quote) 
-					// Embedded Apostrophe
-					if (scDoc.chNext == '\'') {
-						// Move forward colouring it as default state
-						scDoc.ForwardSetState(SCE_CLW_DEFAULT);
-					}
-					else {
-						// move to the next character and then set the state to comment.
-						scDoc.ForwardSetState(SCE_CLW_STRING);
-					}
-				}		
-				// else the character is an @ (ampersand)
-				else if (scDoc.ch == '@') {
-					// Case insensitive.
-					if (!bCaseSensitive) {
-						// If character is a valid picture token character
-						if (strchr("DEKNPSTdeknpst", scDoc.chNext) != NULL) {
-							// Set to the picture string state
-							scDoc.SetState(SCE_CLW_PICTURE_STRING);
-						}
-					}
-					// Case sensitive
-					else {
-						// If character is a valid picture token character
-						if (strchr("DEKNPST", scDoc.chNext) != NULL) {
-							// Set the picture string state
-							scDoc.SetState(SCE_CLW_PICTURE_STRING);
-						}
-					}
-				}		
-			}
-		}
-	}
-	// lexing complete
-	scDoc.Complete();
-}
-
-// Clarion Language Case Sensitive Colouring Procedure
-static void ColouriseClarionDocSensitive(unsigned int uiStartPos, int iLength, int iInitStyle, WordList *wlKeywords[], Accessor &accStyler) {
-
-	ColouriseClarionDoc(uiStartPos, iLength, iInitStyle, wlKeywords, accStyler, true);
-}
-
-// Clarion Language Case Insensitive Colouring Procedure
-static void ColouriseClarionDocInsensitive(unsigned int uiStartPos, int iLength, int iInitStyle, WordList *wlKeywords[], Accessor &accStyler) {
-
-	ColouriseClarionDoc(uiStartPos, iLength, iInitStyle, wlKeywords, accStyler, false);
-}
-
-// Fill Buffer
-
-static void FillBuffer(unsigned int uiStart, unsigned int uiEnd, Accessor &accStyler, char *szBuffer, unsigned int uiLength) {
-
-	unsigned int uiPos = 0;
-
-	while ((uiPos < uiEnd - uiStart + 1) && (uiPos < uiLength-1)) {
-		szBuffer[uiPos] = static_cast<char>(toupper(accStyler[uiStart + uiPos]));
-		uiPos++;
-	}
-	szBuffer[uiPos] = '\0';
-}
-
-// Classify Clarion Fold Point
-
-static int ClassifyClarionFoldPoint(int iLevel, const char* szString) {
-
-	if (!(isdigit(szString[0]) || (szString[0] == '.'))) {
-		if (strcmp(szString, "PROCEDURE") == 0) {
-	//		iLevel = SC_FOLDLEVELBASE + 1;
-		}
-		else if (strcmp(szString, "MAP") == 0 ||
-			strcmp(szString,"ACCEPT") == 0 ||
-			strcmp(szString,"BEGIN") == 0 ||
-			strcmp(szString,"CASE") == 0 ||
-			strcmp(szString,"EXECUTE") == 0 ||
-			strcmp(szString,"IF") == 0 ||
-			strcmp(szString,"ITEMIZE") == 0 ||
-			strcmp(szString,"INTERFACE") == 0 ||
-			strcmp(szString,"JOIN") == 0 ||
-			strcmp(szString,"LOOP") == 0 ||
-			strcmp(szString,"MODULE") == 0 ||
-			strcmp(szString,"RECORD") == 0) {
-			iLevel++;
-		}
-		else if (strcmp(szString, "APPLICATION") == 0 ||
-			strcmp(szString, "CLASS") == 0 ||
-			strcmp(szString, "DETAIL") == 0 ||
-			strcmp(szString, "FILE") == 0 ||
-			strcmp(szString, "FOOTER") == 0 ||
-			strcmp(szString, "FORM") == 0 ||
-			strcmp(szString, "GROUP") == 0 ||
-			strcmp(szString, "HEADER") == 0 ||
-			strcmp(szString, "INTERFACE") == 0 ||
-			strcmp(szString, "MENU") == 0 ||
-			strcmp(szString, "MENUBAR") == 0 ||
-			strcmp(szString, "OLE") == 0 ||
-			strcmp(szString, "OPTION") == 0 ||
-			strcmp(szString, "QUEUE") == 0 ||
-			strcmp(szString, "REPORT") == 0 ||
-			strcmp(szString, "SHEET") == 0 ||
-			strcmp(szString, "TAB") == 0 ||
-			strcmp(szString, "TOOLBAR") == 0 ||
-			strcmp(szString, "VIEW") == 0 ||
-			strcmp(szString, "WINDOW") == 0) {
-			iLevel++;
-		}
-		else if (strcmp(szString, "END") == 0 ||
-			strcmp(szString, "UNTIL") == 0 ||
-			strcmp(szString, "WHILE") == 0) {
-			iLevel--;
-		}
-	}
-	return(iLevel);
-}
-
-// Clarion Language Folding Procedure
-static void FoldClarionDoc(unsigned int uiStartPos, int iLength, int iInitStyle, WordList *[], Accessor &accStyler) {
-
-	unsigned int uiEndPos = uiStartPos + iLength;
-	int iLineCurrent = accStyler.GetLine(uiStartPos);
-	int iLevelPrev = accStyler.LevelAt(iLineCurrent) & SC_FOLDLEVELNUMBERMASK;
-	int iLevelCurrent = iLevelPrev;
-	char chNext = accStyler[uiStartPos];
-	int iStyle = iInitStyle;
-	int iStyleNext = accStyler.StyleAt(uiStartPos);
-	int iVisibleChars = 0;
-	int iLastStart = 0;
-
-	for (unsigned int uiPos = uiStartPos; uiPos < uiEndPos; uiPos++) {
-
-		char chChar = chNext;
-		chNext = accStyler.SafeGetCharAt(uiPos + 1);
-		int iStylePrev = iStyle;
-		iStyle = iStyleNext;
-		iStyleNext = accStyler.StyleAt(uiPos + 1);
-		bool bEOL = (chChar == '\r' && chNext != '\n') || (chChar == '\n');
-	
-		if (iStylePrev == SCE_CLW_DEFAULT) {
-			if (iStyle == SCE_CLW_KEYWORD || iStyle == SCE_CLW_STRUCTURE_DATA_TYPE) {
-				// Store last word start point.
-				iLastStart = uiPos;
-			}
-		}
-
-		if (iStylePrev == SCE_CLW_KEYWORD || iStylePrev == SCE_CLW_STRUCTURE_DATA_TYPE) {
-			if(iswordchar(chChar) && !iswordchar(chNext)) {
-				char chBuffer[100];
-				FillBuffer(iLastStart, uiPos, accStyler, chBuffer, sizeof(chBuffer));
-				iLevelCurrent = ClassifyClarionFoldPoint(iLevelCurrent,chBuffer);
-			//	if ((iLevelCurrent == SC_FOLDLEVELBASE + 1) && iLineCurrent > 1) {
-			//		accStyler.SetLevel(iLineCurrent-1,SC_FOLDLEVELBASE);
-			//		iLevelPrev = SC_FOLDLEVELBASE;
-			//	}
-			}
-		}
-
-		if (bEOL) {
-			int iLevel = iLevelPrev;
-			if ((iLevelCurrent > iLevelPrev) && (iVisibleChars > 0))
-				iLevel |= SC_FOLDLEVELHEADERFLAG;
-			if (iLevel != accStyler.LevelAt(iLineCurrent)) {
-				accStyler.SetLevel(iLineCurrent,iLevel);
-			}
-			iLineCurrent++;
-			iLevelPrev = iLevelCurrent;
-			iVisibleChars = 0;
-		}
-		
-		if (!isspacechar(chChar))
-			iVisibleChars++;
-	}
-
-	// Fill in the real level of the next line, keeping the current flags
-	// as they will be filled in later.
-	int iFlagsNext = accStyler.LevelAt(iLineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-	accStyler.SetLevel(iLineCurrent, iLevelPrev | iFlagsNext);
-}
-
-// Word List Descriptions
-static const char * const rgWordListDescriptions[] = {
-	"Clarion Keywords",
-	"Compiler Directives",
-	"Built-in Procedures and Functions",
-	"Runtime Expressions",
-	"Structure and Data Types",
-	"Attributes",
-	"Standard Equates",
-	"Reserved Words (Labels)",
-	"Reserved Words (Procedure Labels)",
-	0,
-};
-
-// Case Sensitive Clarion Language Lexer
-LexerModule lmClw(SCLEX_CLW, ColouriseClarionDocSensitive, "clarion", FoldClarionDoc, rgWordListDescriptions);
-
-// Case Insensitive Clarion Language Lexer
-LexerModule lmClwNoCase(SCLEX_CLWNOCASE, ColouriseClarionDocInsensitive, "clarionnocase", FoldClarionDoc, rgWordListDescriptions);
diff --git a/src/stc/scintilla/src/LexCPP.cxx b/src/stc/scintilla/src/LexCPP.cxx
deleted file mode 100644
index bf089d6cff..0000000000
--- a/src/stc/scintilla/src/LexCPP.cxx
+++ /dev/null
@@ -1,461 +0,0 @@
-// Scintilla source code edit control
-/** @file LexCPP.cxx
- ** Lexer for C++, C, Java, and JavaScript.
- **/
-// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-#define KEYWORD_BOXHEADER 1
-#define KEYWORD_FOLDCONTRACTED 2
-
-static bool IsOKBeforeRE(int ch) {
-	return (ch == '(') || (ch == '=') || (ch == ',');
-}
-
-static inline bool IsAWordChar(int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_');
-}
-
-static inline bool IsAWordStart(int ch) {
-	return (ch < 0x80) && (isalpha(ch) || ch == '_');
-}
-
-static inline bool IsADoxygenChar(int ch) {
-	return (ch < 0x80 && islower(ch)) || ch == '$' || ch == '@' ||
-		ch == '\\' || ch == '&' || ch == '<' ||
-		ch == '>' || ch == '#' || ch == '{' ||
-		ch == '}' || ch == '[' || ch == ']';
-}
-
-static bool IsSpaceEquiv(int state) {
-	return (state <= SCE_C_COMMENTDOC) ||
-		// including SCE_C_DEFAULT, SCE_C_COMMENT, SCE_C_COMMENTLINE
-		(state == SCE_C_COMMENTLINEDOC) || (state == SCE_C_COMMENTDOCKEYWORD) ||
-		(state == SCE_C_COMMENTDOCKEYWORDERROR);
-}
-
-static void ColouriseCppDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-                            Accessor &styler, bool caseSensitive) {
-
-	WordList &keywords = *keywordlists[0];
-	WordList &keywords2 = *keywordlists[1];
-	WordList &keywords3 = *keywordlists[2];
-	WordList &keywords4 = *keywordlists[3];
-
-	bool stylingWithinPreprocessor = styler.GetPropertyInt("styling.within.preprocessor") != 0;
-
-	int chPrevNonWhite = ' ';
-	int visibleChars = 0;
-	bool lastWordWasUUID = false;
-	int styleBeforeDCKeyword = SCE_C_DEFAULT;
-	bool continuationLine = false;
-
-	if (initStyle == SCE_C_PREPROCESSOR) {
-		// Set continuationLine if last character of previous line is '\'
-		int lineCurrent = styler.GetLine(startPos);
-		if (lineCurrent > 0) {
-			int chBack = styler.SafeGetCharAt(startPos-1, 0);
-			int chBack2 = styler.SafeGetCharAt(startPos-2, 0);
-			int lineEndChar = '!';
-			if (chBack2 == '\r' && chBack == '\n') {
-				lineEndChar = styler.SafeGetCharAt(startPos-3, 0);
-			} else if (chBack == '\n' || chBack == '\r') {
-				lineEndChar = chBack2;
-			}
-			continuationLine = lineEndChar == '\\';
-		}
-	}
-
-	// look back to set chPrevNonWhite properly for better regex colouring
-	if (startPos > 0) {
-		int back = startPos;
-		while (--back && IsSpaceEquiv(styler.StyleAt(back)))
-			;
-		if (styler.StyleAt(back) == SCE_C_OPERATOR) {
-			chPrevNonWhite = styler.SafeGetCharAt(back);
-		}
-	}
-
-	StyleContext sc(startPos, length, initStyle, styler);
-
-	for (; sc.More(); sc.Forward()) {
-
-		if (sc.atLineStart) {
-			if (sc.state == SCE_C_STRING) {
-				// Prevent SCE_C_STRINGEOL from leaking back to previous line which 
-				// ends with a line continuation by locking in the state upto this position.
-				sc.SetState(SCE_C_STRING);
-			}
-			// Reset states to begining of colourise so no surprises
-			// if different sets of lines lexed.
-			visibleChars = 0;
-			lastWordWasUUID = false;
-		}
-
-		// Handle line continuation generically.
-		if (sc.ch == '\\') {
-			if (sc.chNext == '\n' || sc.chNext == '\r') {
-				sc.Forward();
-				if (sc.ch == '\r' && sc.chNext == '\n') {
-					sc.Forward();
-				}
-				continuationLine = true;
-				continue;
-			}
-		}
-
-		// Determine if the current state should terminate.
-		switch (sc.state) {
-			case SCE_C_OPERATOR:
-				sc.SetState(SCE_C_DEFAULT);
-				break;
-			case SCE_C_NUMBER:
-				// We accept almost anything because of hex. and number suffixes
-				if (!IsAWordChar(sc.ch)) {
-					sc.SetState(SCE_C_DEFAULT);
-				}
-				break;
-			case SCE_C_IDENTIFIER:
-				if (!IsAWordChar(sc.ch) || (sc.ch == '.')) {
-					char s[1000];
-					if (caseSensitive) {
-						sc.GetCurrent(s, sizeof(s));
-					} else {
-						sc.GetCurrentLowered(s, sizeof(s));
-					}
-					if (keywords.InList(s)) {
-						lastWordWasUUID = strcmp(s, "uuid") == 0;
-						sc.ChangeState(SCE_C_WORD);
-					} else if (keywords2.InList(s)) {
-						sc.ChangeState(SCE_C_WORD2);
-					} else if (keywords4.InList(s)) {
-						sc.ChangeState(SCE_C_GLOBALCLASS);
-					}
-					sc.SetState(SCE_C_DEFAULT);
-				}
-				break;
-			case SCE_C_PREPROCESSOR:
-				if (sc.atLineStart && !continuationLine) {
-					sc.SetState(SCE_C_DEFAULT);
-				} else if (stylingWithinPreprocessor) {
-					if (IsASpace(sc.ch)) {
-						sc.SetState(SCE_C_DEFAULT);
-					}
-				} else {
-					if (sc.Match('/', '*') || sc.Match('/', '/')) {
-						sc.SetState(SCE_C_DEFAULT);
-					}
-				}
-				break;
-			case SCE_C_COMMENT:
-				if (sc.Match('*', '/')) {
-					sc.Forward();
-					sc.ForwardSetState(SCE_C_DEFAULT);
-				}
-				break;
-			case SCE_C_COMMENTDOC:
-				if (sc.Match('*', '/')) {
-					sc.Forward();
-					sc.ForwardSetState(SCE_C_DEFAULT);
-				} else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support
-					// Verify that we have the conditions to mark a comment-doc-keyword
-					if ((IsASpace(sc.chPrev) || sc.chPrev == '*') && (!IsASpace(sc.chNext))) {
-						styleBeforeDCKeyword = SCE_C_COMMENTDOC;
-						sc.SetState(SCE_C_COMMENTDOCKEYWORD);
-					}
-				}
-				break;
-			case SCE_C_COMMENTLINE:
-				if (sc.atLineStart) {
-					sc.SetState(SCE_C_DEFAULT);
-				}
-				break;
-			case SCE_C_COMMENTLINEDOC:
-				if (sc.atLineStart) {
-					sc.SetState(SCE_C_DEFAULT);
-				} else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support
-					// Verify that we have the conditions to mark a comment-doc-keyword
-					if ((IsASpace(sc.chPrev) || sc.chPrev == '/' || sc.chPrev == '!') && (!IsASpace(sc.chNext))) {
-						styleBeforeDCKeyword = SCE_C_COMMENTLINEDOC;
-						sc.SetState(SCE_C_COMMENTDOCKEYWORD);
-					}
-				}
-				break;
-			case SCE_C_COMMENTDOCKEYWORD:
-				if ((styleBeforeDCKeyword == SCE_C_COMMENTDOC) && sc.Match('*', '/')) {
-					sc.ChangeState(SCE_C_COMMENTDOCKEYWORDERROR);
-					sc.Forward();
-					sc.ForwardSetState(SCE_C_DEFAULT);
-				} else if (!IsADoxygenChar(sc.ch)) {
-					char s[100];
-					if (caseSensitive) {
-						sc.GetCurrent(s, sizeof(s));
-					} else {
-						sc.GetCurrentLowered(s, sizeof(s));
-					}
-					if (!isspace(sc.ch) || !keywords3.InList(s + 1)) {
-						sc.ChangeState(SCE_C_COMMENTDOCKEYWORDERROR);
-					}
-					sc.SetState(styleBeforeDCKeyword);
-				}
-				break;
-			case SCE_C_STRING:
-				if (sc.atLineEnd) {
-					sc.ChangeState(SCE_C_STRINGEOL);
-				} else if (sc.ch == '\\') {
-					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
-						sc.Forward();
-					}
-				} else if (sc.ch == '\"') {
-					sc.ForwardSetState(SCE_C_DEFAULT);
-				}
-				break;
-			case SCE_C_CHARACTER:
-				if (sc.atLineEnd) {
-					sc.ChangeState(SCE_C_STRINGEOL);
-				} else if (sc.ch == '\\') {
-					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
-						sc.Forward();
-					}
-				} else if (sc.ch == '\'') {
-					sc.ForwardSetState(SCE_C_DEFAULT);
-				}
-				break;
-			case SCE_C_REGEX:
-				if (sc.atLineStart) {
-					sc.SetState(SCE_C_DEFAULT);
-				} else if (sc.ch == '/') {
-					sc.Forward();
-					while ((sc.ch < 0x80) && islower(sc.ch))
-						sc.Forward();    // gobble regex flags
-					sc.SetState(SCE_C_DEFAULT);
-				} else if (sc.ch == '\\') {
-					// Gobble up the quoted character
-					if (sc.chNext == '\\' || sc.chNext == '/') {
-						sc.Forward();
-					}
-				}
-				break;
-			case SCE_C_STRINGEOL:
-				if (sc.atLineStart) {
-					sc.SetState(SCE_C_DEFAULT);
-				}
-				break;
-			case SCE_C_VERBATIM:
-				if (sc.ch == '\"') {
-					if (sc.chNext == '\"') {
-						sc.Forward();
-					} else {
-						sc.ForwardSetState(SCE_C_DEFAULT);
-					}
-				}
-				break;
-			case SCE_C_UUID:
-				if (sc.ch == '\r' || sc.ch == '\n' || sc.ch == ')') {
-					sc.SetState(SCE_C_DEFAULT);
-				}
-		}
-
-		// Determine if a new state should be entered.
-		if (sc.state == SCE_C_DEFAULT) {
-			if (sc.Match('@', '\"')) {
-				sc.SetState(SCE_C_VERBATIM);
-				sc.Forward();
-			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
-				if (lastWordWasUUID) {
-					sc.SetState(SCE_C_UUID);
-					lastWordWasUUID = false;
-				} else {
-					sc.SetState(SCE_C_NUMBER);
-				}
-			} else if (IsAWordStart(sc.ch) || (sc.ch == '@')) {
-				if (lastWordWasUUID) {
-					sc.SetState(SCE_C_UUID);
-					lastWordWasUUID = false;
-				} else {
-					sc.SetState(SCE_C_IDENTIFIER);
-				}
-			} else if (sc.Match('/', '*')) {
-				if (sc.Match("/**") || sc.Match("/*!")) {	// Support of Qt/Doxygen doc. style
-					sc.SetState(SCE_C_COMMENTDOC);
-				} else {
-					sc.SetState(SCE_C_COMMENT);
-				}
-				sc.Forward();	// Eat the * so it isn't used for the end of the comment
-			} else if (sc.Match('/', '/')) {
-				if ((sc.Match("///") && !sc.Match("////")) || sc.Match("//!"))
-					// Support of Qt/Doxygen doc. style
-					sc.SetState(SCE_C_COMMENTLINEDOC);
-				else
-					sc.SetState(SCE_C_COMMENTLINE);
-			} else if (sc.ch == '/' && IsOKBeforeRE(chPrevNonWhite)) {
-				sc.SetState(SCE_C_REGEX);	// JavaScript's RegEx
-			} else if (sc.ch == '\"') {
-				sc.SetState(SCE_C_STRING);
-			} else if (sc.ch == '\'') {
-				sc.SetState(SCE_C_CHARACTER);
-			} else if (sc.ch == '#' && visibleChars == 0) {
-				// Preprocessor commands are alone on their line
-				sc.SetState(SCE_C_PREPROCESSOR);
-				// Skip whitespace between # and preprocessor word
-				do {
-					sc.Forward();
-				} while ((sc.ch == ' ' || sc.ch == '\t') && sc.More());
-				if (sc.atLineEnd) {
-					sc.SetState(SCE_C_DEFAULT);
-				}
-			} else if (isoperator(static_cast<char>(sc.ch))) {
-				sc.SetState(SCE_C_OPERATOR);
-			}
-		}
-
-		if (!IsASpace(sc.ch) && !IsSpaceEquiv(sc.state)) {
-			chPrevNonWhite = sc.ch;
-			visibleChars++;
-		}
-		continuationLine = false;
-	}
-	sc.Complete();
-}
-
-static bool IsStreamCommentStyle(int style) {
-	return style == SCE_C_COMMENT ||
-		style == SCE_C_COMMENTDOC ||
-		style == SCE_C_COMMENTDOCKEYWORD ||
-		style == SCE_C_COMMENTDOCKEYWORDERROR;
-}
-
-// Store both the current line's fold level and the next lines in the
-// level store to make it easy to pick up with each increment
-// and to make it possible to fiddle the current level for "} else {".
-static void FoldNoBoxCppDoc(unsigned int startPos, int length, int initStyle,
-                            Accessor &styler) {
-	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
-	bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0;
-	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-	bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0;
-	unsigned int endPos = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelCurrent = SC_FOLDLEVELBASE;
-	if (lineCurrent > 0)
-		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
-	int levelMinCurrent = levelCurrent;
-	int levelNext = levelCurrent;
-	char chNext = styler[startPos];
-	int styleNext = styler.StyleAt(startPos);
-	int style = initStyle;
-	for (unsigned int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		int stylePrev = style;
-		style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-		if (foldComment && IsStreamCommentStyle(style)) {
-			if (!IsStreamCommentStyle(stylePrev)) {
-				levelNext++;
-			} else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
-				// Comments don't end at end of line and the next character may be unstyled.
-				levelNext--;
-			}
-		}
-		if (foldComment && (style == SCE_C_COMMENTLINE)) {
-			if ((ch == '/') && (chNext == '/')) {
-				char chNext2 = styler.SafeGetCharAt(i + 2);
-				if (chNext2 == '{') {
-					levelNext++;
-				} else if (chNext2 == '}') {
-					levelNext--;
-				}
-			}
-		}
-		if (foldPreprocessor && (style == SCE_C_PREPROCESSOR)) {
-			if (ch == '#') {
-				unsigned int j = i + 1;
-				while ((j < endPos) && IsASpaceOrTab(styler.SafeGetCharAt(j))) {
-					j++;
-				}
-				if (styler.Match(j, "region") || styler.Match(j, "if")) {
-					levelNext++;
-				} else if (styler.Match(j, "end")) {
-					levelNext--;
-				}
-			}
-		}
-		if (style == SCE_C_OPERATOR) {
-			if (ch == '{') {
-				// Measure the minimum before a '{' to allow
-				// folding on "} else {"
-				if (levelMinCurrent > levelNext) {
-					levelMinCurrent = levelNext;
-				}
-				levelNext++;
-			} else if (ch == '}') {
-				levelNext--;
-			}
-		}
-		if (atEOL) {
-			int levelUse = levelCurrent;
-			if (foldAtElse) {
-				levelUse = levelMinCurrent;
-			}
-			int lev = levelUse | levelNext << 16;
-			if (visibleChars == 0 && foldCompact)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			if (levelUse < levelNext)
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			levelCurrent = levelNext;
-			levelMinCurrent = levelCurrent;
-			visibleChars = 0;
-		}
-		if (!isspacechar(ch))
-			visibleChars++;
-	}
-}
-
-static void FoldCppDoc(unsigned int startPos, int length, int initStyle, WordList *[],
-                       Accessor &styler) {
-	FoldNoBoxCppDoc(startPos, length, initStyle, styler);
-}
-
-static const char * const cppWordLists[] = {
-            "Primary keywords and identifiers",
-            "Secondary keywords and identifiers",
-            "Documentation comment keywords",
-            "Unused",
-            "Global classes and typedefs",
-            0,
-        };
-
-static void ColouriseCppDocSensitive(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-                                     Accessor &styler) {
-	ColouriseCppDoc(startPos, length, initStyle, keywordlists, styler, true);
-}
-
-static void ColouriseCppDocInsensitive(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-                                       Accessor &styler) {
-	ColouriseCppDoc(startPos, length, initStyle, keywordlists, styler, false);
-}
-
-LexerModule lmCPP(SCLEX_CPP, ColouriseCppDocSensitive, "cpp", FoldCppDoc, cppWordLists);
-LexerModule lmCPPNoCase(SCLEX_CPPNOCASE, ColouriseCppDocInsensitive, "cppnocase", FoldCppDoc, cppWordLists);
diff --git a/src/stc/scintilla/src/LexCSS.cxx b/src/stc/scintilla/src/LexCSS.cxx
deleted file mode 100644
index 963a7b3ef7..0000000000
--- a/src/stc/scintilla/src/LexCSS.cxx
+++ /dev/null
@@ -1,303 +0,0 @@
-// Scintilla source code edit control
-/** @file LexCSS.cxx
- ** Lexer for Cascading Style Sheets
- ** Written by Jakub Vrána
- ** Improved by Philippe Lhoste (CSS2)
- **/
-// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-
-static inline bool IsAWordChar(const unsigned int ch) {
-	return (isalnum(ch) || ch == '-' || ch == '_' || ch >= 161); // _ is not in fact correct CSS word-character
-}
-
-inline bool IsCssOperator(const char ch) {
-	if (!isalnum(ch) &&
-		(ch == '{' || ch == '}' || ch == ':' || ch == ',' || ch == ';' ||
-		 ch == '.' || ch == '#' || ch == '!' || ch == '@' ||
-		 /* CSS2 */
-		 ch == '*' || ch == '>' || ch == '+' || ch == '=' || ch == '~' || ch == '|' ||
-		 ch == '[' || ch == ']' || ch == '(' || ch == ')')) {
-		return true;
-	}
-	return false;
-}
-
-static void ColouriseCssDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor &styler) {
-	WordList &keywords = *keywordlists[0];
-	WordList &pseudoClasses = *keywordlists[1];
-	WordList &keywords2 = *keywordlists[2];
-
-	StyleContext sc(startPos, length, initStyle, styler);
-
-	int lastState = -1; // before operator
-	int lastStateC = -1; // before comment
-	int op = ' '; // last operator
-
-	for (; sc.More(); sc.Forward()) {
-		if (sc.state == SCE_CSS_COMMENT && sc.Match('*', '/')) {
-			if (lastStateC == -1) {
-				// backtrack to get last state:
-				// comments are like whitespace, so we must return to the previous state
-				unsigned int i = startPos;
-				for (; i > 0; i--) {
-					if ((lastStateC = styler.StyleAt(i-1)) != SCE_CSS_COMMENT) {
-						if (lastStateC == SCE_CSS_OPERATOR) {
-							op = styler.SafeGetCharAt(i-1);
-							while (--i) {
-								lastState = styler.StyleAt(i-1);
-								if (lastState != SCE_CSS_OPERATOR && lastState != SCE_CSS_COMMENT)
-									break;
-							}
-							if (i == 0)
-								lastState = SCE_CSS_DEFAULT;
-						}
-						break;
-					}
-				}
-				if (i == 0)
-					lastStateC = SCE_CSS_DEFAULT;
-			}
-			sc.Forward();
-			sc.ForwardSetState(lastStateC);
-		}
-
-		if (sc.state == SCE_CSS_COMMENT)
-			continue;
-
-		if (sc.state == SCE_CSS_DOUBLESTRING || sc.state == SCE_CSS_SINGLESTRING) {
-			if (sc.ch != (sc.state == SCE_CSS_DOUBLESTRING ? '\"' : '\''))
-				continue;
-			unsigned int i = sc.currentPos;
-			while (i && styler[i-1] == '\\')
-				i--;
-			if ((sc.currentPos - i) % 2 == 1)
-				continue;
-			sc.ForwardSetState(SCE_CSS_VALUE);
-		}
-
-		if (sc.state == SCE_CSS_OPERATOR) {
-			if (op == ' ') {
-				unsigned int i = startPos;
-				op = styler.SafeGetCharAt(i-1);
-				while (--i) {
-					lastState = styler.StyleAt(i-1);
-					if (lastState != SCE_CSS_OPERATOR && lastState != SCE_CSS_COMMENT)
-						break;
-				}
-			}
-			switch (op) {
-			case '@':
-				if (lastState == SCE_CSS_DEFAULT)
-					sc.SetState(SCE_CSS_DIRECTIVE);
-				break;
-			case '*':
-				if (lastState == SCE_CSS_DEFAULT)
-					sc.SetState(SCE_CSS_TAG);
-				break;
-			case '>':
-			case '+':
-				if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_PSEUDOCLASS || lastState == SCE_CSS_CLASS
-					|| lastState == SCE_CSS_ID || lastState == SCE_CSS_UNKNOWN_PSEUDOCLASS)
-					sc.SetState(SCE_CSS_DEFAULT);
-				break;
-			case '[':
-				if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_PSEUDOCLASS || lastState == SCE_CSS_DEFAULT ||
-					lastState == SCE_CSS_CLASS || lastState == SCE_CSS_ID || lastState == SCE_CSS_UNKNOWN_PSEUDOCLASS)
-					sc.SetState(SCE_CSS_ATTRIBUTE);
-				break;
-			case ']':
-				if (lastState == SCE_CSS_ATTRIBUTE)
-					sc.SetState(SCE_CSS_TAG);
-				break;
-			case '{':
-				if (lastState == SCE_CSS_DIRECTIVE)
-					sc.SetState(SCE_CSS_DEFAULT);
-				else if (lastState == SCE_CSS_TAG)
-					sc.SetState(SCE_CSS_IDENTIFIER);
-				break;
-			case '}':
-				if (lastState == SCE_CSS_DEFAULT || lastState == SCE_CSS_VALUE || lastState == SCE_CSS_IMPORTANT ||
-					lastState == SCE_CSS_IDENTIFIER || lastState == SCE_CSS_IDENTIFIER2)
-					sc.SetState(SCE_CSS_DEFAULT);
-				break;
-			case ':':
-				if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_PSEUDOCLASS || lastState == SCE_CSS_DEFAULT ||
-					lastState == SCE_CSS_CLASS || lastState == SCE_CSS_ID || lastState == SCE_CSS_UNKNOWN_PSEUDOCLASS)
-					sc.SetState(SCE_CSS_PSEUDOCLASS);
-				else if (lastState == SCE_CSS_IDENTIFIER || lastState == SCE_CSS_IDENTIFIER2 || lastState == SCE_CSS_UNKNOWN_IDENTIFIER)
-					sc.SetState(SCE_CSS_VALUE);
-				break;
-			case '.':
-				if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_PSEUDOCLASS || lastState == SCE_CSS_DEFAULT ||
-					lastState == SCE_CSS_CLASS || lastState == SCE_CSS_ID || lastState == SCE_CSS_UNKNOWN_PSEUDOCLASS)
-					sc.SetState(SCE_CSS_CLASS);
-				break;
-			case '#':
-				if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_PSEUDOCLASS || lastState == SCE_CSS_DEFAULT ||
-					lastState == SCE_CSS_CLASS || lastState == SCE_CSS_ID || lastState == SCE_CSS_UNKNOWN_PSEUDOCLASS)
-					sc.SetState(SCE_CSS_ID);
-				break;
-			case ',':
-				if (lastState == SCE_CSS_TAG)
-					sc.SetState(SCE_CSS_DEFAULT);
-				break;
-			case ';':
-				if (lastState == SCE_CSS_DIRECTIVE)
-					sc.SetState(SCE_CSS_DEFAULT);
-				else if (lastState == SCE_CSS_VALUE || lastState == SCE_CSS_IMPORTANT)
-					sc.SetState(SCE_CSS_IDENTIFIER);
-				break;
-			case '!':
-				if (lastState == SCE_CSS_VALUE)
-					sc.SetState(SCE_CSS_IMPORTANT);
-				break;
-			}
-		}
-
-		if (IsAWordChar(sc.ch)) {
-			if (sc.state == SCE_CSS_DEFAULT)
-				sc.SetState(SCE_CSS_TAG);
-			continue;
-		}
-
-		if (IsAWordChar(sc.chPrev) && (
-			sc.state == SCE_CSS_IDENTIFIER || sc.state == SCE_CSS_IDENTIFIER2
-			|| sc.state == SCE_CSS_UNKNOWN_IDENTIFIER
-			|| sc.state == SCE_CSS_PSEUDOCLASS || sc.state == SCE_CSS_UNKNOWN_PSEUDOCLASS
-			|| sc.state == SCE_CSS_IMPORTANT
-		)) {
-			char s[100];
-			sc.GetCurrentLowered(s, sizeof(s));
-			char *s2 = s;
-			while (*s2 && !IsAWordChar(*s2))
-				s2++;
-			switch (sc.state) {
-			case SCE_CSS_IDENTIFIER:
-				if (!keywords.InList(s2)) {
-					if (keywords2.InList(s2)) {
-						sc.ChangeState(SCE_CSS_IDENTIFIER2);
-					} else {
-						sc.ChangeState(SCE_CSS_UNKNOWN_IDENTIFIER);
-					}
-				}
-				break;
-			case SCE_CSS_UNKNOWN_IDENTIFIER:
-				if (keywords.InList(s2))
-					sc.ChangeState(SCE_CSS_IDENTIFIER);
-				else if (keywords2.InList(s2))
-					sc.ChangeState(SCE_CSS_IDENTIFIER2);
-				break;
-			case SCE_CSS_PSEUDOCLASS:
-				if (!pseudoClasses.InList(s2))
-					sc.ChangeState(SCE_CSS_UNKNOWN_PSEUDOCLASS);
-				break;
-			case SCE_CSS_UNKNOWN_PSEUDOCLASS:
-				if (pseudoClasses.InList(s2))
-					sc.ChangeState(SCE_CSS_PSEUDOCLASS);
-				break;
-			case SCE_CSS_IMPORTANT:
-				if (strcmp(s2, "important") != 0)
-					sc.ChangeState(SCE_CSS_VALUE);
-				break;
-			}
-		}
-
-		if (sc.ch != '.' && sc.ch != ':' && sc.ch != '#' && (sc.state == SCE_CSS_CLASS || sc.state == SCE_CSS_PSEUDOCLASS || sc.state == SCE_CSS_UNKNOWN_PSEUDOCLASS || sc.state == SCE_CSS_ID))
-			sc.SetState(SCE_CSS_TAG);
-
-		if (sc.Match('/', '*')) {
-			lastStateC = sc.state;
-			sc.SetState(SCE_CSS_COMMENT);
-			sc.Forward();
-		} else if (sc.state == SCE_CSS_VALUE && (sc.ch == '\"' || sc.ch == '\'')) {
-			sc.SetState((sc.ch == '\"' ? SCE_CSS_DOUBLESTRING : SCE_CSS_SINGLESTRING));
-		} else if (IsCssOperator(static_cast<char>(sc.ch))
-			&& (sc.state != SCE_CSS_ATTRIBUTE || sc.ch == ']')
-			&& (sc.state != SCE_CSS_VALUE || sc.ch == ';' || sc.ch == '}' || sc.ch == '!')
-			&& (sc.state != SCE_CSS_DIRECTIVE || sc.ch == ';' || sc.ch == '{')
-		) {
-			if (sc.state != SCE_CSS_OPERATOR)
-				lastState = sc.state;
-			sc.SetState(SCE_CSS_OPERATOR);
-			op = sc.ch;
-		}
-	}
-
-	sc.Complete();
-}
-
-static void FoldCSSDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
-	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
-	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-	unsigned int endPos = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
-	int levelCurrent = levelPrev;
-	char chNext = styler[startPos];
-	bool inComment = (styler.StyleAt(startPos-1) == SCE_CSS_COMMENT);
-	for (unsigned int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		int style = styler.StyleAt(i);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-		if (foldComment) {
-			if (!inComment && (style == SCE_CSS_COMMENT))
-				levelCurrent++;
-			else if (inComment && (style != SCE_CSS_COMMENT))
-				levelCurrent--;
-			inComment = (style == SCE_CSS_COMMENT);
-		}
-		if (style == SCE_CSS_OPERATOR) {
-			if (ch == '{') {
-				levelCurrent++;
-			} else if (ch == '}') {
-				levelCurrent--;
-			}
-		}
-		if (atEOL) {
-			int lev = levelPrev;
-			if (visibleChars == 0 && foldCompact)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			if ((levelCurrent > levelPrev) && (visibleChars > 0))
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			levelPrev = levelCurrent;
-			visibleChars = 0;
-		}
-		if (!isspacechar(ch))
-			visibleChars++;
-	}
-	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
-}
-
-static const char * const cssWordListDesc[] = {
-	"CSS1 Keywords",
-	"Pseudo classes",
-	"CSS2 Keywords",
-	0
-};
-
-LexerModule lmCss(SCLEX_CSS, ColouriseCssDoc, "css", FoldCSSDoc, cssWordListDesc);
diff --git a/src/stc/scintilla/src/LexCaml.cxx b/src/stc/scintilla/src/LexCaml.cxx
deleted file mode 100644
index 5f4fad5fb8..0000000000
--- a/src/stc/scintilla/src/LexCaml.cxx
+++ /dev/null
@@ -1,399 +0,0 @@
-// Scintilla source code edit control
-/** @file LexCaml.cxx
- ** Lexer for Objective Caml.
- **/
-// Copyright 2005 by Robert Roessler <robertr@rftp.com>
-// The License.txt file describes the conditions under which this software may be distributed.
-/*	Release History
-	20050204 Initial release.
-	20050205 Quick compiler standards/"cleanliness" adjustment.
-	20050206 Added cast for IsLeadByte().
-	20050209 Changes to "external" build support.
-	20050306 Fix for 1st-char-in-doc "corner" case.
-	20050502 Fix for [harmless] one-past-the-end coloring.
-	20050515 Refined numeric token recognition logic.
-	20051125 Added 2nd "optional" keywords class.
-	20051129 Support "magic" (read-only) comments for RCaml.
-	20051204 Swtich to using StyleContext infrastructure.
-*/
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-//	Since the Microsoft __iscsym[f] funcs are not ANSI...
-inline int  iscaml(int c) {return isalnum(c) || c == '_';}
-inline int iscamlf(int c) {return isalpha(c) || c == '_';}
-inline int iscamld(int c) {return isdigit(c) || c == '_';}
-
-static const int baseT[24] = {
-	0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* A - L */
-	0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0,16	/* M - X */
-};
-
-#ifdef BUILD_AS_EXTERNAL_LEXER
-/*
-	(actually seems to work!)
-*/
-#include "WindowAccessor.h"
-#include "ExternalLexer.h"
-
-#if PLAT_WIN
-#include <windows.h>
-#endif
-
-static void ColouriseCamlDoc(
-	unsigned int startPos, int length,
-	int initStyle,
-	WordList *keywordlists[],
-	Accessor &styler);
-
-static void FoldCamlDoc(
-	unsigned int startPos, int length,
-	int initStyle,
-	WordList *keywordlists[],
-	Accessor &styler);
-
-static void InternalLexOrFold(int lexOrFold, unsigned int startPos, int length,
-	int initStyle, char *words[], WindowID window, char *props);
-
-static const char* LexerName = "caml";
-
-#ifdef TRACE
-void Platform::DebugPrintf(const char *format, ...) {
-	char buffer[2000];
-	va_list pArguments;
-	va_start(pArguments, format);
-	vsprintf(buffer,format,pArguments);
-	va_end(pArguments);
-	Platform::DebugDisplay(buffer);
-}
-#else
-void Platform::DebugPrintf(const char *, ...) {
-}
-#endif
-
-bool Platform::IsDBCSLeadByte(int codePage, char ch) {
-	return ::IsDBCSLeadByteEx(codePage, ch) != 0;
-}
-
-long Platform::SendScintilla(WindowID w, unsigned int msg, unsigned long wParam, long lParam) {
-	return ::SendMessage(reinterpret_cast<HWND>(w), msg, wParam, lParam);
-}
-
-long Platform::SendScintillaPointer(WindowID w, unsigned int msg, unsigned long wParam, void *lParam) {
-	return ::SendMessage(reinterpret_cast<HWND>(w), msg, wParam,
-		reinterpret_cast<LPARAM>(lParam));
-}
-
-void EXT_LEXER_DECL Fold(unsigned int lexer, unsigned int startPos, int length,
-	int initStyle, char *words[], WindowID window, char *props)
-{
-	// below useless evaluation(s) to supress "not used" warnings
-	lexer;
-	// build expected data structures and do the Fold
-	InternalLexOrFold(1, startPos, length, initStyle, words, window, props);
-
-}
-
-int EXT_LEXER_DECL GetLexerCount()
-{
-	return 1;	// just us [Objective] Caml lexers here!
-}
-
-void EXT_LEXER_DECL GetLexerName(unsigned int Index, char *name, int buflength)
-{
-	// below useless evaluation(s) to supress "not used" warnings
-	Index;
-	// return as much of our lexer name as will fit (what's up with Index?)
-	if (buflength > 0) {
-		buflength--;
-		int n = strlen(LexerName);
-		if (n > buflength)
-			n = buflength;
-		memcpy(name, LexerName, n), name[n] = '\0';
-	}
-}
-
-void EXT_LEXER_DECL Lex(unsigned int lexer, unsigned int startPos, int length,
-	int initStyle, char *words[], WindowID window, char *props)
-{
-	// below useless evaluation(s) to supress "not used" warnings
-	lexer;
-	// build expected data structures and do the Lex
-	InternalLexOrFold(0, startPos, length, initStyle, words, window, props);
-}
-
-static void InternalLexOrFold(int foldOrLex, unsigned int startPos, int length,
-	int initStyle, char *words[], WindowID window, char *props)
-{
-	// create and initialize a WindowAccessor (including contained PropSet)
-	PropSet ps;
-	ps.SetMultiple(props);
-	WindowAccessor wa(window, ps);
-	// create and initialize WordList(s)
-	int nWL = 0;
-	for (; words[nWL]; nWL++) ;	// count # of WordList PTRs needed
-	WordList** wl = new WordList* [nWL + 1];// alloc WordList PTRs
-	int i = 0;
-	for (; i < nWL; i++) {
-		wl[i] = new WordList();	// (works or THROWS bad_alloc EXCEPTION)
-		wl[i]->Set(words[i]);
-	}
-	wl[i] = 0;
-	// call our "internal" folder/lexer (... then do Flush!)
-	if (foldOrLex)
-		FoldCamlDoc(startPos, length, initStyle, wl, wa);
-	else
-		ColouriseCamlDoc(startPos, length, initStyle, wl, wa);
-	wa.Flush();
-	// clean up before leaving
-	for (i = nWL - 1; i >= 0; i--)
-		delete wl[i];
-	delete [] wl;
-}
-
-static
-#endif	/* BUILD_AS_EXTERNAL_LEXER */
-
-void ColouriseCamlDoc(
-	unsigned int startPos, int length,
-	int initStyle,
-	WordList *keywordlists[],
-	Accessor &styler)
-{
-	// initialize styler
-	StyleContext sc(startPos, length, initStyle, styler);
-	// set up [initial] state info (terminating states that shouldn't "bleed")
-	int nesting = 0;
-	if (sc.state < SCE_CAML_STRING)
-		sc.state = SCE_CAML_DEFAULT;
-	if (sc.state >= SCE_CAML_COMMENT)
-		nesting = (sc.state & 0x0f) - SCE_CAML_COMMENT;
-
-	int chBase = 0, chToken = 0, chLit = 0;
-	WordList& keywords  = *keywordlists[0];
-	WordList& keywords2 = *keywordlists[1];
-	WordList& keywords3 = *keywordlists[2];
-	const int useMagic = styler.GetPropertyInt("lexer.caml.magic", 0);
-
-	// foreach char in range...
-	while (sc.More()) {
-		// set up [per-char] state info
-		int state2 = -1;		// (ASSUME no state change)
-		int chColor = sc.currentPos - 1;// (ASSUME standard coloring range)
-		bool advance = true;	// (ASSUME scanner "eats" 1 char)
-
-		// step state machine
-		switch (sc.state & 0x0f) {
-		case SCE_CAML_DEFAULT:
-			chToken = sc.currentPos;	// save [possible] token start (JIC)
-			// it's wide open; what do we have?
-			if (iscamlf(sc.ch))
-				state2 = SCE_CAML_IDENTIFIER;
-			else if (sc.Match('`') && iscamlf(sc.chNext))
-				state2 = SCE_CAML_TAGNAME;
-			else if (sc.Match('#') && isdigit(sc.chNext))
-				state2 = SCE_CAML_LINENUM;
-			else if (isdigit(sc.ch)) {
-				state2 = SCE_CAML_NUMBER, chBase = 10;
-				if (sc.Match('0') && strchr("bBoOxX", sc.chNext))
-					chBase = baseT[tolower(sc.chNext) - 'a'], sc.Forward();
-			} else if (sc.Match('\''))	/* (char literal?) */
-				state2 = SCE_CAML_CHAR, chLit = 0;
-			else if (sc.Match('\"'))
-				state2 = SCE_CAML_STRING;
-			else if (sc.Match('(', '*'))
-				state2 = SCE_CAML_COMMENT,
-					sc.ch = ' ',	// (make SURE "(*)" isn't seen as a closed comment)
-					sc.Forward();
-			else if (strchr("!?~"		/* Caml "prefix-symbol" */
-					"=<>@^|&+-*/$%"		/* Caml "infix-symbol" */
-					"()[]{};,:.#", sc.ch))	/* Caml "bracket" or ;,:.# */
-				state2 = SCE_CAML_OPERATOR;
-			break;
-
-		case SCE_CAML_IDENTIFIER:
-			// [try to] interpret as [additional] identifier char
-			if (!(iscaml(sc.ch) || sc.Match('\''))) {
-				const int n = sc.currentPos - chToken;
-				if (n < 24) {
-					// length is believable as keyword, [re-]construct token
-					char t[24];
-					for (int i = -n; i < 0; i++)
-						t[n + i] = static_cast<char>(sc.GetRelative(i));
-					t[n] = '\0';
-					// special-case "_" token as KEYWORD
-					if ((n == 1 && sc.chPrev == '_') || keywords.InList(t))
-						sc.ChangeState(SCE_CAML_KEYWORD);
-					else if (keywords2.InList(t))
-						sc.ChangeState(SCE_CAML_KEYWORD2);
-					else if (keywords3.InList(t))
-						sc.ChangeState(SCE_CAML_KEYWORD3);
-				}
-				state2 = SCE_CAML_DEFAULT, advance = false;
-			}
-			break;
-
-		case SCE_CAML_TAGNAME:
-			// [try to] interpret as [additional] tagname char
-			if (!(iscaml(sc.ch) || sc.Match('\'')))
-				state2 = SCE_CAML_DEFAULT, advance = false;
-			break;
-
-		/*case SCE_CAML_KEYWORD:
-		case SCE_CAML_KEYWORD2:
-		case SCE_CAML_KEYWORD3:
-			// [try to] interpret as [additional] keyword char
-			if (!iscaml(ch))
-				state2 = SCE_CAML_DEFAULT, advance = false;
-			break;*/
-
-		case SCE_CAML_LINENUM:
-			// [try to] interpret as [additional] linenum directive char
-			if (!isdigit(sc.ch))
-				state2 = SCE_CAML_DEFAULT, advance = false;
-			break;
-
-		case SCE_CAML_OPERATOR: {
-			// [try to] interpret as [additional] operator char
-			const char* o = 0;
-			if (iscaml(sc.ch) || isspace(sc.ch)		   /* ident or whitespace */
-				|| (o = strchr(")]};,\'\"`#", sc.ch),o)/* "termination" chars */
-				|| !strchr("!$%&*+-./:<=>?@^|~", sc.ch)/* "operator" chars */) {
-				// check for INCLUSIVE termination
-				if (o && strchr(")]};,", sc.ch)) {
-					if ((sc.Match(')') && sc.chPrev == '(')
-						|| (sc.Match(']') && sc.chPrev == '['))
-						// special-case "()" and "[]" tokens as KEYWORDS
-						sc.ChangeState(SCE_CAML_KEYWORD);
-					chColor++;
-				} else
-					advance = false;
-				state2 = SCE_CAML_DEFAULT;
-			}
-			break;
-		}
-
-		case SCE_CAML_NUMBER:
-			// [try to] interpret as [additional] numeric literal char
-			// N.B. - improperly accepts "extra" digits in base 2 or 8 literals
-			if (iscamld(sc.ch) || IsADigit(sc.ch, chBase))
-				break;
-			// how about an integer suffix?
-			if ((sc.Match('l') || sc.Match('L') || sc.Match('n'))
-				&& (iscamld(sc.chPrev) || IsADigit(sc.chPrev, chBase)))
-				break;
-			// or a floating-point literal?
-			if (chBase == 10) {
-				// with a decimal point?
-				if (sc.Match('.') && iscamld(sc.chPrev))
-					break;
-				// with an exponent? (I)
-				if ((sc.Match('e') || sc.Match('E'))
-					&& (iscamld(sc.chPrev) || sc.chPrev == '.'))
-					break;
-				// with an exponent? (II)
-				if ((sc.Match('+') || sc.Match('-'))
-					&& (sc.chPrev == 'e' || sc.chPrev == 'E'))
-					break;
-			}
-			// it looks like we have run out of number
-			state2 = SCE_CAML_DEFAULT, advance = false;
-			break;
-
-		case SCE_CAML_CHAR:
-			// [try to] interpret as [additional] char literal char
-			if (sc.Match('\\')) {
-				chLit = 1;	// (definitely IS a char literal)
-				if (sc.chPrev == '\\')
-					sc.ch = ' ';	// (so termination test isn't fooled)
-			// should we be terminating - one way or another?
-			} else if ((sc.Match('\'') && sc.chPrev != '\\') || sc.atLineEnd) {
-				state2 = SCE_CAML_DEFAULT;
-				if (sc.Match('\''))
-					chColor++;
-				else
-					sc.ChangeState(SCE_CAML_IDENTIFIER);
-			// ... maybe a char literal, maybe not
-			} else if (chLit < 1 && sc.currentPos - chToken >= 2)
-				sc.ChangeState(SCE_CAML_IDENTIFIER), advance = false;
-			break;
-
-		case SCE_CAML_STRING:
-			// [try to] interpret as [additional] string literal char
-			if (sc.Match('\\') && sc.chPrev == '\\')
-				sc.ch = ' ';	// (so '\\' doesn't cause us trouble)
-			else if (sc.Match('\"') && sc.chPrev != '\\')
-				state2 = SCE_CAML_DEFAULT, chColor++;
-			break;
-
-		case SCE_CAML_COMMENT:
-		case SCE_CAML_COMMENT1:
-		case SCE_CAML_COMMENT2:
-		case SCE_CAML_COMMENT3:
-			// we're IN a comment - does this start a NESTED comment?
-			if (sc.Match('(', '*'))
-				state2 = sc.state + 1, chToken = sc.currentPos,
-					sc.ch = ' ',	// (make SURE "(*)" isn't seen as a closed comment)
-					sc.Forward(), nesting++;
-			// [try to] interpret as [additional] comment char
-			else if (sc.Match(')') && sc.chPrev == '*') {
-				if (nesting)
-					state2 = (sc.state & 0x0f) - 1, chToken = 0, nesting--;
-				else
-					state2 = SCE_CAML_DEFAULT;
-				chColor++;
-			// enable "magic" (read-only) comment AS REQUIRED
-			} else if (useMagic && sc.currentPos - chToken == 4
-				&& sc.Match('c') && sc.chPrev == 'r' && sc.GetRelative(-2) == '@')
-				sc.state |= 0x10;	// (switch to read-only comment style)
-			break;
-		}
-
-		// handle state change and char coloring as required
-		if (state2 >= 0)
-			styler.ColourTo(chColor, sc.state), sc.ChangeState(state2);
-		// move to next char UNLESS re-scanning current char
-		if (advance)
-			sc.Forward();
-	}
-
-	// do any required terminal char coloring (JIC)
-	sc.Complete();
-}
-
-#ifdef BUILD_AS_EXTERNAL_LEXER
-static
-#endif	/* BUILD_AS_EXTERNAL_LEXER */
-void FoldCamlDoc(
-	unsigned int startPos, int length,
-	int initStyle,
-	WordList *keywordlists[],
-	Accessor &styler)
-{
-	// below useless evaluation(s) to supress "not used" warnings
-	startPos || length || initStyle || keywordlists[0] || styler.Length();
-}
-
-static const char * const camlWordListDesc[] = {
-	"Keywords",		// primary Objective Caml keywords
-	"Keywords2",	// "optional" keywords (typically from Pervasives)
-	"Keywords3",	// "optional" keywords (typically typenames)
-	0
-};
-
-#ifndef BUILD_AS_EXTERNAL_LEXER
-LexerModule lmCaml(SCLEX_CAML, ColouriseCamlDoc, "caml", FoldCamlDoc, camlWordListDesc);
-#endif	/* BUILD_AS_EXTERNAL_LEXER */
diff --git a/src/stc/scintilla/src/LexConf.cxx b/src/stc/scintilla/src/LexConf.cxx
deleted file mode 100644
index c33cdb5ce6..0000000000
--- a/src/stc/scintilla/src/LexConf.cxx
+++ /dev/null
@@ -1,184 +0,0 @@
-// Scintilla source code edit control
-/** @file LexConf.cxx
- ** Lexer for Apache Configuration Files.
- **
- ** First working version contributed by Ahmad Zawawi <zeus_go64@hotmail.com> on October 28, 2000.
- ** i created this lexer because i needed something pretty when dealing
- ** when Apache Configuration files...
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static void ColouriseConfDoc(unsigned int startPos, int length, int, WordList *keywordLists[], Accessor &styler)
-{
-	int state = SCE_CONF_DEFAULT;
-	char chNext = styler[startPos];
-	int lengthDoc = startPos + length;
-	// create a buffer large enough to take the largest chunk...
-	char *buffer = new char[length];
-	int bufferCount = 0;
-
-	// this assumes that we have 2 keyword list in conf.properties
-	WordList &directives = *keywordLists[0];
-	WordList &params = *keywordLists[1];
-
-	// go through all provided text segment
-	// using the hand-written state machine shown below
-	styler.StartAt(startPos);
-	styler.StartSegment(startPos);
-	for (int i = startPos; i < lengthDoc; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-
-		if (styler.IsLeadByte(ch)) {
-			chNext = styler.SafeGetCharAt(i + 2);
-			i++;
-			continue;
-		}
-		switch(state) {
-			case SCE_CONF_DEFAULT:
-				if( ch == '\n' || ch == '\r' || ch == '\t' || ch == ' ') {
-					// whitespace is simply ignored here...
-					styler.ColourTo(i,SCE_CONF_DEFAULT);
-					break;
-				} else if( ch == '#' ) {
-					// signals the start of a comment...
-					state = SCE_CONF_COMMENT;
-					styler.ColourTo(i,SCE_CONF_COMMENT);
-				} else if( ch == '.' /*|| ch == '/'*/) {
-					// signals the start of a file...
-					state = SCE_CONF_EXTENSION;
-					styler.ColourTo(i,SCE_CONF_EXTENSION);
-				} else if( ch == '"') {
-					state = SCE_CONF_STRING;
-					styler.ColourTo(i,SCE_CONF_STRING);
-				} else if( ispunct(ch) ) {
-					// signals an operator...
-					// no state jump necessary for this
-					// simple case...
-					styler.ColourTo(i,SCE_CONF_OPERATOR);
-				} else if( isalpha(ch) ) {
-					// signals the start of an identifier
-					bufferCount = 0;
-					buffer[bufferCount++] = static_cast<char>(tolower(ch));
-					state = SCE_CONF_IDENTIFIER;
-				} else if( isdigit(ch) ) {
-					// signals the start of a number
-					bufferCount = 0;
-					buffer[bufferCount++] = ch;
-					//styler.ColourTo(i,SCE_CONF_NUMBER);
-					state = SCE_CONF_NUMBER;
-				} else {
-					// style it the default style..
-					styler.ColourTo(i,SCE_CONF_DEFAULT);
-				}
-				break;
-
-			case SCE_CONF_COMMENT:
-				// if we find a newline here,
-				// we simply go to default state
-				// else continue to work on it...
-				if( ch == '\n' || ch == '\r' ) {
-					state = SCE_CONF_DEFAULT;
-				} else {
-					styler.ColourTo(i,SCE_CONF_COMMENT);
-				}
-				break;
-
-			case SCE_CONF_EXTENSION:
-				// if we find a non-alphanumeric char,
-				// we simply go to default state
-				// else we're still dealing with an extension...
-				if( isalnum(ch) || (ch == '_') ||
-					(ch == '-') || (ch == '$') ||
-					(ch == '/') || (ch == '.') || (ch == '*') )
-				{
-					styler.ColourTo(i,SCE_CONF_EXTENSION);
-				} else {
-					state = SCE_CONF_DEFAULT;
-					chNext = styler[i--];
-				}
-				break;
-
-			case SCE_CONF_STRING:
-				// if we find the end of a string char, we simply go to default state
-				// else we're still dealing with an string...
-				if( (ch == '"' && styler.SafeGetCharAt(i-1)!='\\') || (ch == '\n') || (ch == '\r') ) {
-					state = SCE_CONF_DEFAULT;
-				}
-				styler.ColourTo(i,SCE_CONF_STRING);
-				break;
-
-			case SCE_CONF_IDENTIFIER:
-				// stay  in CONF_IDENTIFIER state until we find a non-alphanumeric
-				if( isalnum(ch) || (ch == '_') || (ch == '-') || (ch == '/') || (ch == '$') || (ch == '.') || (ch == '*')) {
-					buffer[bufferCount++] = static_cast<char>(tolower(ch));
-				} else {
-					state = SCE_CONF_DEFAULT;
-					buffer[bufferCount] = '\0';
-
-					// check if the buffer contains a keyword, and highlight it if it is a keyword...
-					if(directives.InList(buffer)) {
-						styler.ColourTo(i-1,SCE_CONF_DIRECTIVE );
-					} else if(params.InList(buffer)) {
-						styler.ColourTo(i-1,SCE_CONF_PARAMETER );
-					} else if(strchr(buffer,'/') || strchr(buffer,'.')) {
-						styler.ColourTo(i-1,SCE_CONF_EXTENSION);
-					} else {
-						styler.ColourTo(i-1,SCE_CONF_DEFAULT);
-					}
-
-					// push back the faulty character
-					chNext = styler[i--];
-
-				}
-				break;
-
-			case SCE_CONF_NUMBER:
-				// stay  in CONF_NUMBER state until we find a non-numeric
-				if( isdigit(ch) || ch == '.') {
-					buffer[bufferCount++] = ch;
-				} else {
-					state = SCE_CONF_DEFAULT;
-					buffer[bufferCount] = '\0';
-
-					// Colourize here...
-					if( strchr(buffer,'.') ) {
-						// it is an IP address...
-						styler.ColourTo(i-1,SCE_CONF_IP);
-					} else {
-						// normal number
-						styler.ColourTo(i-1,SCE_CONF_NUMBER);
-					}
-
-					// push back a character
-					chNext = styler[i--];
-				}
-				break;
-
-		}
-	}
-	delete []buffer;
-}
-
-static const char * const confWordListDesc[] = {
-	"Directives",
-	"Parameters",
-	0
-};
-
-LexerModule lmConf(SCLEX_CONF, ColouriseConfDoc, "conf", 0, confWordListDesc);
diff --git a/src/stc/scintilla/src/LexCrontab.cxx b/src/stc/scintilla/src/LexCrontab.cxx
deleted file mode 100644
index d139bb4f14..0000000000
--- a/src/stc/scintilla/src/LexCrontab.cxx
+++ /dev/null
@@ -1,218 +0,0 @@
-// Scintilla source code edit control
-/** @file LexCrontab.cxx
- ** Lexer to use with extended crontab files used by a powerful
- ** Windows scheduler/event monitor/automation manager nnCron.
- ** (http://nemtsev.eserv.ru/)
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static void ColouriseNncrontabDoc(unsigned int startPos, int length, int, WordList
-*keywordLists[], Accessor &styler)
-{
-	int state = SCE_NNCRONTAB_DEFAULT;
-	char chNext = styler[startPos];
-	int lengthDoc = startPos + length;
-	// create a buffer large enough to take the largest chunk...
-	char *buffer = new char[length];
-	int bufferCount = 0;
-	// used when highliting environment variables inside quoted string:
-	bool insideString = false;
-
-	// this assumes that we have 3 keyword list in conf.properties
-	WordList &section = *keywordLists[0];
-	WordList &keyword = *keywordLists[1];
-	WordList &modifier = *keywordLists[2];
-
-	// go through all provided text segment
-	// using the hand-written state machine shown below
-	styler.StartAt(startPos);
-	styler.StartSegment(startPos);
-	for (int i = startPos; i < lengthDoc; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-
-		if (styler.IsLeadByte(ch)) {
-			chNext = styler.SafeGetCharAt(i + 2);
-			i++;
-			continue;
-		}
-		switch(state) {
-			case SCE_NNCRONTAB_DEFAULT:
-				if( ch == '\n' || ch == '\r' || ch == '\t' || ch == ' ') {
-					// whitespace is simply ignored here...
-					styler.ColourTo(i,SCE_NNCRONTAB_DEFAULT);
-					break;
-				} else if( ch == '#' && styler.SafeGetCharAt(i+1) == '(') {
-					// signals the start of a task...
-					state = SCE_NNCRONTAB_TASK;
-					styler.ColourTo(i,SCE_NNCRONTAB_TASK);
-				}
-				  else if( ch == '\\' && (styler.SafeGetCharAt(i+1) == ' ' ||
-										 styler.SafeGetCharAt(i+1) == '\t')) {
-					// signals the start of an extended comment...
-					state = SCE_NNCRONTAB_COMMENT;
-					styler.ColourTo(i,SCE_NNCRONTAB_COMMENT);
-				} else if( ch == '#' ) {
-					// signals the start of a plain comment...
-					state = SCE_NNCRONTAB_COMMENT;
-					styler.ColourTo(i,SCE_NNCRONTAB_COMMENT);
-				} else if( ch == ')' && styler.SafeGetCharAt(i+1) == '#') {
-					// signals the end of a task...
-					state = SCE_NNCRONTAB_TASK;
-					styler.ColourTo(i,SCE_NNCRONTAB_TASK);
-				} else if( ch == '"') {
-					state = SCE_NNCRONTAB_STRING;
-					styler.ColourTo(i,SCE_NNCRONTAB_STRING);
-				} else if( ch == '%') {
-					// signals environment variables
-					state = SCE_NNCRONTAB_ENVIRONMENT;
-					styler.ColourTo(i,SCE_NNCRONTAB_ENVIRONMENT);
-				} else if( ch == '<' && styler.SafeGetCharAt(i+1) == '%') {
-					// signals environment variables
-					state = SCE_NNCRONTAB_ENVIRONMENT;
-					styler.ColourTo(i,SCE_NNCRONTAB_ENVIRONMENT);
-				} else if( ch == '*' ) {
-					// signals an asterisk
-					// no state jump necessary for this simple case...
-					styler.ColourTo(i,SCE_NNCRONTAB_ASTERISK);
-				} else if( isalpha(ch) || ch == '<' ) {
-					// signals the start of an identifier
-					bufferCount = 0;
-					buffer[bufferCount++] = ch;
-					state = SCE_NNCRONTAB_IDENTIFIER;
-				} else if( isdigit(ch) ) {
-					// signals the start of a number
-					bufferCount = 0;
-					buffer[bufferCount++] = ch;
-					state = SCE_NNCRONTAB_NUMBER;
-				} else {
-					// style it the default style..
-					styler.ColourTo(i,SCE_NNCRONTAB_DEFAULT);
-				}
-				break;
-
-			case SCE_NNCRONTAB_COMMENT:
-				// if we find a newline here,
-				// we simply go to default state
-				// else continue to work on it...
-				if( ch == '\n' || ch == '\r' ) {
-					state = SCE_NNCRONTAB_DEFAULT;
-				} else {
-					styler.ColourTo(i,SCE_NNCRONTAB_COMMENT);
-				}
-				break;
-
-			case SCE_NNCRONTAB_TASK:
-				// if we find a newline here,
-				// we simply go to default state
-				// else continue to work on it...
-				if( ch == '\n' || ch == '\r' ) {
-					state = SCE_NNCRONTAB_DEFAULT;
-				} else {
-					styler.ColourTo(i,SCE_NNCRONTAB_TASK);
-				}
-				break;
-
-			case SCE_NNCRONTAB_STRING:
-				if( ch == '%' ) {
-					state = SCE_NNCRONTAB_ENVIRONMENT;
-					insideString = true;
-					styler.ColourTo(i-1,SCE_NNCRONTAB_STRING);
-					break;
-				}
-				// if we find the end of a string char, we simply go to default state
-				// else we're still dealing with an string...
-				if( (ch == '"' && styler.SafeGetCharAt(i-1)!='\\') ||
-					(ch == '\n') || (ch == '\r') ) {
-					state = SCE_NNCRONTAB_DEFAULT;
-				}
-				styler.ColourTo(i,SCE_NNCRONTAB_STRING);
-				break;
-
-			case SCE_NNCRONTAB_ENVIRONMENT:
-				// if we find the end of a string char, we simply go to default state
-				// else we're still dealing with an string...
-				if( ch == '%' && insideString ) {
-					state = SCE_NNCRONTAB_STRING;
-					insideString = false;
-					break;
-				}
-				if( (ch == '%' && styler.SafeGetCharAt(i-1)!='\\')
-					|| (ch == '\n') || (ch == '\r') || (ch == '>') ) {
-					state = SCE_NNCRONTAB_DEFAULT;
-					styler.ColourTo(i,SCE_NNCRONTAB_ENVIRONMENT);
-					break;
-				}
-				styler.ColourTo(i+1,SCE_NNCRONTAB_ENVIRONMENT);
-				break;
-
-			case SCE_NNCRONTAB_IDENTIFIER:
-				// stay  in CONF_IDENTIFIER state until we find a non-alphanumeric
-				if( isalnum(ch) || (ch == '_') || (ch == '-') || (ch == '/') ||
-					(ch == '$') || (ch == '.') || (ch == '<') || (ch == '>') ||
-					(ch == '@') ) {
-					buffer[bufferCount++] = ch;
-				} else {
-					state = SCE_NNCRONTAB_DEFAULT;
-					buffer[bufferCount] = '\0';
-
-					// check if the buffer contains a keyword,
-					// and highlight it if it is a keyword...
-					if(section.InList(buffer)) {
-						styler.ColourTo(i,SCE_NNCRONTAB_SECTION );
-					} else if(keyword.InList(buffer)) {
-						styler.ColourTo(i-1,SCE_NNCRONTAB_KEYWORD );
-					} // else if(strchr(buffer,'/') || strchr(buffer,'.')) {
-					//	styler.ColourTo(i-1,SCE_NNCRONTAB_EXTENSION);
-					// }
-					  else if(modifier.InList(buffer)) {
-						styler.ColourTo(i-1,SCE_NNCRONTAB_MODIFIER );
-					  }	else {
-						styler.ColourTo(i-1,SCE_NNCRONTAB_DEFAULT);
-					}
-					// push back the faulty character
-					chNext = styler[i--];
-				}
-				break;
-
-			case SCE_NNCRONTAB_NUMBER:
-				// stay  in CONF_NUMBER state until we find a non-numeric
-				if( isdigit(ch) /* || ch == '.' */ ) {
-					buffer[bufferCount++] = ch;
-				} else {
-					state = SCE_NNCRONTAB_DEFAULT;
-					buffer[bufferCount] = '\0';
-					// Colourize here... (normal number)
-					styler.ColourTo(i-1,SCE_NNCRONTAB_NUMBER);
-					// push back a character
-					chNext = styler[i--];
-				}
-				break;
-		}
-	}
-	delete []buffer;
-}
-
-static const char * const cronWordListDesc[] = {
-	"Section keywords and Forth words",
-	"nnCrontab keywords",
-	"Modifiers",
-	0
-};
-
-LexerModule lmNncrontab(SCLEX_NNCRONTAB, ColouriseNncrontabDoc, "nncrontab", 0, cronWordListDesc);
diff --git a/src/stc/scintilla/src/LexCsound.cxx b/src/stc/scintilla/src/LexCsound.cxx
deleted file mode 100644
index 27f7b990a2..0000000000
--- a/src/stc/scintilla/src/LexCsound.cxx
+++ /dev/null
@@ -1,207 +0,0 @@
-// Scintilla source code edit control
-/** @file LexCsound.cxx
- ** Lexer for Csound (Orchestra & Score)
- ** Written by Georg Ritter - <ritterfuture A T gmail D O T com>
- **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-
-static inline bool IsAWordChar(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '.' ||
-		ch == '_' || ch == '?');
-}
-
-static inline bool IsAWordStart(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '.' ||
-		ch == '%' || ch == '@' || ch == '$' || ch == '?');
-}
-
-static inline bool IsCsoundOperator(char ch) {
-	if (isalnum(ch))
-		return false;
-	// '.' left out as it is used to make up numbers
-	if (ch == '*' || ch == '/' || ch == '-' || ch == '+' ||
-		ch == '(' || ch == ')' || ch == '=' || ch == '^' ||
-		ch == '[' || ch == ']' || ch == '<' || ch == '&' ||
-		ch == '>' || ch == ',' || ch == '|' || ch == '~' ||
-		ch == '%' || ch == ':')
-		return true;
-	return false;
-}
-
-static void ColouriseCsoundDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-				Accessor &styler) {
-
-	WordList &opcode = *keywordlists[0];
-	WordList &headerStmt = *keywordlists[1];
-	WordList &otherKeyword = *keywordlists[2];
-
-	// Do not leak onto next line
-	if (initStyle == SCE_CSOUND_STRINGEOL)
-		initStyle = SCE_CSOUND_DEFAULT;
-
-	StyleContext sc(startPos, length, initStyle, styler);
-
-	for (; sc.More(); sc.Forward())
-	{
-		// Handle line continuation generically.
-		if (sc.ch == '\\') {
-			if (sc.chNext == '\n' || sc.chNext == '\r') {
-				sc.Forward();
-				if (sc.ch == '\r' && sc.chNext == '\n') {
-					sc.Forward();
-				}
-				continue;
-			}
-		}
-              
-		// Determine if the current state should terminate.
-		if (sc.state == SCE_CSOUND_OPERATOR) {
-			if (!IsCsoundOperator(static_cast<char>(sc.ch))) {
-			    sc.SetState(SCE_CSOUND_DEFAULT);
-			}
-		}else if (sc.state == SCE_CSOUND_NUMBER) {
-			if (!IsAWordChar(sc.ch)) {
-				sc.SetState(SCE_CSOUND_DEFAULT);
-			}
-		} else if (sc.state == SCE_CSOUND_IDENTIFIER) {
-			if (!IsAWordChar(sc.ch) ) {
-				char s[100];
-				sc.GetCurrent(s, sizeof(s));
-
-				if (opcode.InList(s)) {
-					sc.ChangeState(SCE_CSOUND_OPCODE);
-				} else if (headerStmt.InList(s)) {
-					sc.ChangeState(SCE_CSOUND_HEADERSTMT);
-				} else if (otherKeyword.InList(s)) {
-					sc.ChangeState(SCE_CSOUND_USERKEYWORD);
-				} else if (s[0] == 'p') {
-					sc.ChangeState(SCE_CSOUND_PARAM);
-				} else if (s[0] == 'a') {
-					sc.ChangeState(SCE_CSOUND_ARATE_VAR);
-				} else if (s[0] == 'k') {
-					sc.ChangeState(SCE_CSOUND_KRATE_VAR);
-				} else if (s[0] == 'i') { // covers both i-rate variables and i-statements
-					sc.ChangeState(SCE_CSOUND_IRATE_VAR);
-				} else if (s[0] == 'g') {
-					sc.ChangeState(SCE_CSOUND_GLOBAL_VAR);
-				}
-				sc.SetState(SCE_CSOUND_DEFAULT);
-			}
-		}
-		else if (sc.state == SCE_CSOUND_COMMENT ) {
-			if (sc.atLineEnd) {
-				sc.SetState(SCE_CSOUND_DEFAULT);
-			}
-		}
-		else if ((sc.state == SCE_CSOUND_ARATE_VAR) ||
-			(sc.state == SCE_CSOUND_KRATE_VAR) ||
-		(sc.state == SCE_CSOUND_IRATE_VAR)) {
-			if (!IsAWordChar(sc.ch)) {
-				sc.SetState(SCE_CSOUND_DEFAULT);
-			}
-		}
-		
-		// Determine if a new state should be entered.
-		if (sc.state == SCE_CSOUND_DEFAULT) {
-			if (sc.ch == ';'){
-				sc.SetState(SCE_CSOUND_COMMENT);
-			} else if (isdigit(sc.ch) || (sc.ch == '.' && isdigit(sc.chNext))) {
-				sc.SetState(SCE_CSOUND_NUMBER);
-			} else if (IsAWordStart(sc.ch)) {
-				sc.SetState(SCE_CSOUND_IDENTIFIER);
-			} else if (IsCsoundOperator(static_cast<char>(sc.ch))) {
-				sc.SetState(SCE_CSOUND_OPERATOR);
-			} else if (sc.ch == 'p') {
-				sc.SetState(SCE_CSOUND_PARAM);
-			} else if (sc.ch == 'a') {
-				sc.SetState(SCE_CSOUND_ARATE_VAR);
-			} else if (sc.ch == 'k') {
-				sc.SetState(SCE_CSOUND_KRATE_VAR);
-			} else if (sc.ch == 'i') { // covers both i-rate variables and i-statements
-				sc.SetState(SCE_CSOUND_IRATE_VAR);
-			} else if (sc.ch == 'g') {
-				sc.SetState(SCE_CSOUND_GLOBAL_VAR);
-			}
-		}
-	}
-	sc.Complete();
-}
-
-static void FoldCsoundInstruments(unsigned int startPos, int length, int /* initStyle */, WordList *[], 
-		Accessor &styler) {
-	unsigned int lengthDoc = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
-	int levelCurrent = levelPrev;
-	char chNext = styler[startPos];
-	int stylePrev = 0;
-	int styleNext = styler.StyleAt(startPos);
-	for (unsigned int i = startPos; i < lengthDoc; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		int style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-		if ((stylePrev != SCE_CSOUND_OPCODE) && (style == SCE_CSOUND_OPCODE)) {
-			char s[20];
-			unsigned int j = 0;
-			while ((j < (sizeof(s) - 1)) && (iswordchar(styler[i + j]))) {
-				s[j] = styler[i + j];
-				j++;
-			}
-			s[j] = '\0';
-
-			if (strcmp(s, "instr") == 0)
-				levelCurrent++;
-			if (strcmp(s, "endin") == 0)
-				levelCurrent--;
-		}
-
-		if (atEOL) {
-			int lev = levelPrev;
-			if (visibleChars == 0)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			if ((levelCurrent > levelPrev) && (visibleChars > 0))
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			levelPrev = levelCurrent;
-			visibleChars = 0;
-		}
-		if (!isspacechar(ch))
-			visibleChars++;
-		stylePrev = style;
-	}
-	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
-}
-
-
-static const char * const csoundWordListDesc[] = {
-	"Opcodes",
-	"Header Statements",
-	"User keywords",
-	0
-};
-
-LexerModule lmCsound(SCLEX_CSOUND, ColouriseCsoundDoc, "csound", FoldCsoundInstruments, csoundWordListDesc);
diff --git a/src/stc/scintilla/src/LexEScript.cxx b/src/stc/scintilla/src/LexEScript.cxx
deleted file mode 100644
index 49411588aa..0000000000
--- a/src/stc/scintilla/src/LexEScript.cxx
+++ /dev/null
@@ -1,270 +0,0 @@
-// Scintilla source code edit control
-/** @file LexESCRIPT.cxx
- ** Lexer for ESCRIPT
- **/
-// Copyright 2003 by Patrizio Bekerle (patrizio@bekerle.com)
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-
-
-static inline bool IsAWordChar(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_');
-}
-
-static inline bool IsAWordStart(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '_');
-}
-
-
-
-static void ColouriseESCRIPTDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-                            Accessor &styler) {
-
-	WordList &keywords = *keywordlists[0];
-	WordList &keywords2 = *keywordlists[1];
-	WordList &keywords3 = *keywordlists[2];
-
-	// Do not leak onto next line
-	/*if (initStyle == SCE_ESCRIPT_STRINGEOL)
-		initStyle = SCE_ESCRIPT_DEFAULT;*/
-
-	StyleContext sc(startPos, length, initStyle, styler);
-
-	bool caseSensitive = styler.GetPropertyInt("escript.case.sensitive", 0) != 0;
-
-	for (; sc.More(); sc.Forward()) {
-
-		/*if (sc.atLineStart && (sc.state == SCE_ESCRIPT_STRING)) {
-			// Prevent SCE_ESCRIPT_STRINGEOL from leaking back to previous line
-			sc.SetState(SCE_ESCRIPT_STRING);
-		}*/
-
-		// Handle line continuation generically.
-		if (sc.ch == '\\') {
-			if (sc.chNext == '\n' || sc.chNext == '\r') {
-				sc.Forward();
-				if (sc.ch == '\r' && sc.chNext == '\n') {
-					sc.Forward();
-				}
-				continue;
-			}
-		}
-
-		// Determine if the current state should terminate.
-		if (sc.state == SCE_ESCRIPT_OPERATOR || sc.state == SCE_ESCRIPT_BRACE) {
-			sc.SetState(SCE_ESCRIPT_DEFAULT);
-		} else if (sc.state == SCE_ESCRIPT_NUMBER) {
-			if (!IsADigit(sc.ch) || sc.ch != '.') {
-				sc.SetState(SCE_ESCRIPT_DEFAULT);
-			}
-		} else if (sc.state == SCE_ESCRIPT_IDENTIFIER) {
-			if (!IsAWordChar(sc.ch) || (sc.ch == '.')) {
-				char s[100];
-				if (caseSensitive) {
-					sc.GetCurrent(s, sizeof(s));
-				} else {
-					sc.GetCurrentLowered(s, sizeof(s));
-				}
-
-//				sc.GetCurrentLowered(s, sizeof(s));
-
-                                if (keywords.InList(s)) {
-					sc.ChangeState(SCE_ESCRIPT_WORD);
-				} else if (keywords2.InList(s)) {
-					sc.ChangeState(SCE_ESCRIPT_WORD2);
-				} else if (keywords3.InList(s)) {
-					sc.ChangeState(SCE_ESCRIPT_WORD3);
-                                        // sc.state = SCE_ESCRIPT_IDENTIFIER;
-				}
-				sc.SetState(SCE_ESCRIPT_DEFAULT);
-			}
-		} else if (sc.state == SCE_ESCRIPT_COMMENT) {
-			if (sc.Match('*', '/')) {
-				sc.Forward();
-				sc.ForwardSetState(SCE_ESCRIPT_DEFAULT);
-			}
-		} else if (sc.state == SCE_ESCRIPT_COMMENTDOC) {
-			if (sc.Match('*', '/')) {
-				sc.Forward();
-				sc.ForwardSetState(SCE_ESCRIPT_DEFAULT);
-			}
-		} else if (sc.state == SCE_ESCRIPT_COMMENTLINE) {
-			if (sc.atLineEnd) {
-				sc.SetState(SCE_ESCRIPT_DEFAULT);
-			}
-		} else if (sc.state == SCE_ESCRIPT_STRING) {
-			if (sc.ch == '\\') {
-				if (sc.chNext == '\"' || sc.chNext == '\\') {
-					sc.Forward();
-				}
-			} else if (sc.ch == '\"') {
-				sc.ForwardSetState(SCE_ESCRIPT_DEFAULT);
-			}
-		}
-
-		// Determine if a new state should be entered.
-		if (sc.state == SCE_ESCRIPT_DEFAULT) {
-			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
-				sc.SetState(SCE_ESCRIPT_NUMBER);
-			} else if (IsAWordStart(sc.ch) || (sc.ch == '#')) {
-				sc.SetState(SCE_ESCRIPT_IDENTIFIER);
-			} else if (sc.Match('/', '*')) {
-				sc.SetState(SCE_ESCRIPT_COMMENT);
-				sc.Forward();	// Eat the * so it isn't used for the end of the comment
-			} else if (sc.Match('/', '/')) {
-				sc.SetState(SCE_ESCRIPT_COMMENTLINE);
-			} else if (sc.ch == '\"') {
-				sc.SetState(SCE_ESCRIPT_STRING);
-				//} else if (isoperator(static_cast<char>(sc.ch))) {
-			} else if (sc.ch == '+' || sc.ch == '-' || sc.ch == '*' || sc.ch == '/' || sc.ch == '=' || sc.ch == '<' || sc.ch == '>' || sc.ch == '&' || sc.ch == '|' || sc.ch == '!' || sc.ch == '?' || sc.ch == ':') {
-				sc.SetState(SCE_ESCRIPT_OPERATOR);
-			} else if (sc.ch == '{' || sc.ch == '}') {
-				sc.SetState(SCE_ESCRIPT_BRACE);
-			}
-		}
-
-	}
-	sc.Complete();
-}
-
-
-static int classifyFoldPointESCRIPT(const char* s, const char* prevWord) {
-	int lev = 0;
-	if (strcmp(prevWord, "end") == 0) return lev;
-	if ((strcmp(prevWord, "else") == 0 && strcmp(s, "if") == 0) || strcmp(s, "elseif") == 0)
-		return -1;
-
-        if (strcmp(s, "for") == 0 || strcmp(s, "foreach") == 0
-	    || strcmp(s, "program") == 0 || strcmp(s, "function") == 0
-	    || strcmp(s, "while") == 0 || strcmp(s, "case") == 0
-	    || strcmp(s, "if") == 0 ) {
-		lev = 1;
-	} else if ( strcmp(s, "endfor") == 0 || strcmp(s, "endforeach") == 0
-	    || strcmp(s, "endprogram") == 0 || strcmp(s, "endfunction") == 0
-	    || strcmp(s, "endwhile") == 0 || strcmp(s, "endcase") == 0
-	    || strcmp(s, "endif") == 0 ) {
-		lev = -1;
-	}
-
-	return lev;
-}
-
-
-static bool IsStreamCommentStyle(int style) {
-	return style == SCE_ESCRIPT_COMMENT ||
-	       style == SCE_ESCRIPT_COMMENTDOC ||
-	       style == SCE_ESCRIPT_COMMENTLINE;
-}
-
-static void FoldESCRIPTDoc(unsigned int startPos, int length, int initStyle, WordList *[], Accessor &styler) {
-	//~ bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
-	// Do not know how to fold the comment at the moment.
-	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-        bool foldComment = true;
-	unsigned int endPos = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
-	int levelCurrent = levelPrev;
-	char chNext = styler[startPos];
-	int styleNext = styler.StyleAt(startPos);
-	int style = initStyle;
-
-	int lastStart = 0;
-	char prevWord[32] = "";
-
-	for (unsigned int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		int stylePrev = style;
-		style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-
-            
-		if (foldComment && IsStreamCommentStyle(style)) {
-			if (!IsStreamCommentStyle(stylePrev)) {
-				levelCurrent++;
-			} else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
-				// Comments don't end at end of line and the next character may be unstyled.
-				levelCurrent--;
-			}
-		}
-
-		if (foldComment && (style == SCE_ESCRIPT_COMMENTLINE)) {
-			if ((ch == '/') && (chNext == '/')) {
-				char chNext2 = styler.SafeGetCharAt(i + 2);
-				if (chNext2 == '{') {
-					levelCurrent++;
-				} else if (chNext2 == '}') {
-					levelCurrent--;
-				}
-			}
-		}
-
-		if (stylePrev == SCE_ESCRIPT_DEFAULT && style == SCE_ESCRIPT_WORD3)
-		{
-			// Store last word start point.
-			lastStart = i;
-		}
-
-		if (style == SCE_ESCRIPT_WORD3) {
-			if(iswordchar(ch) && !iswordchar(chNext)) {
-				char s[32];
-				unsigned int j;
-				for(j = 0; ( j < 31 ) && ( j < i-lastStart+1 ); j++) {
-					s[j] = static_cast<char>(tolower(styler[lastStart + j]));
-				}
-				s[j] = '\0';
-				levelCurrent += classifyFoldPointESCRIPT(s, prevWord);
-				strcpy(prevWord, s);
-			}
-		}
-		if (atEOL) {
-			int lev = levelPrev;
-			if (visibleChars == 0 && foldCompact)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			if ((levelCurrent > levelPrev) && (visibleChars > 0))
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			levelPrev = levelCurrent;
-			visibleChars = 0;
-			strcpy(prevWord, "");
-		}
-
-		if (!isspacechar(ch))
-			visibleChars++;
-	}
-
-	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
-}
-
-
-
-static const char * const ESCRIPTWordLists[] = {
-	"Primary keywords and identifiers",
-	"Intrinsic functions",
-	"Extended and user defined functions",
-	0,
-};
-
-LexerModule lmESCRIPT(SCLEX_ESCRIPT, ColouriseESCRIPTDoc, "escript", FoldESCRIPTDoc, ESCRIPTWordLists);
diff --git a/src/stc/scintilla/src/LexEiffel.cxx b/src/stc/scintilla/src/LexEiffel.cxx
deleted file mode 100644
index 4aed7c6af1..0000000000
--- a/src/stc/scintilla/src/LexEiffel.cxx
+++ /dev/null
@@ -1,234 +0,0 @@
-// Scintilla source code edit control
-/** @file LexEiffel.cxx
- ** Lexer for Eiffel.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static inline bool isEiffelOperator(unsigned int ch) {
-	// '.' left out as it is used to make up numbers
-	return ch == '*' || ch == '/' || ch == '\\' || ch == '-' || ch == '+' ||
-	        ch == '(' || ch == ')' || ch == '=' ||
-	        ch == '{' || ch == '}' || ch == '~' ||
-	        ch == '[' || ch == ']' || ch == ';' ||
-	        ch == '<' || ch == '>' || ch == ',' ||
-	        ch == '.' || ch == '^' || ch == '%' || ch == ':' ||
-		ch == '!' || ch == '@' || ch == '?';
-}
-
-static inline bool IsAWordChar(unsigned int  ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '_');
-}
-
-static inline bool IsAWordStart(unsigned int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '_');
-}
-
-static void ColouriseEiffelDoc(unsigned int startPos,
-                            int length,
-                            int initStyle,
-                            WordList *keywordlists[],
-                            Accessor &styler) {
-
-	WordList &keywords = *keywordlists[0];
-
-	StyleContext sc(startPos, length, initStyle, styler);
-
-	for (; sc.More(); sc.Forward()) {
-
-		if (sc.state == SCE_EIFFEL_STRINGEOL) {
-			if (sc.ch != '\r' && sc.ch != '\n') {
-				sc.SetState(SCE_EIFFEL_DEFAULT);
-			}
-		} else if (sc.state == SCE_EIFFEL_OPERATOR) {
-			sc.SetState(SCE_EIFFEL_DEFAULT);
-		} else if (sc.state == SCE_EIFFEL_WORD) {
-			if (!IsAWordChar(sc.ch)) {
-				char s[100];
-				sc.GetCurrentLowered(s, sizeof(s));
-				if (!keywords.InList(s)) {
-					sc.ChangeState(SCE_EIFFEL_IDENTIFIER);
-				}
-				sc.SetState(SCE_EIFFEL_DEFAULT);
-			}
-		} else if (sc.state == SCE_EIFFEL_NUMBER) {
-			if (!IsAWordChar(sc.ch)) {
-				sc.SetState(SCE_EIFFEL_DEFAULT);
-			}
-		} else if (sc.state == SCE_EIFFEL_COMMENTLINE) {
-			if (sc.ch == '\r' || sc.ch == '\n') {
-				sc.SetState(SCE_EIFFEL_DEFAULT);
-			}
-		} else if (sc.state == SCE_EIFFEL_STRING) {
-			if (sc.ch == '%') {
-				sc.Forward();
-			} else if (sc.ch == '\"') {
-				sc.Forward();
-				sc.SetState(SCE_EIFFEL_DEFAULT);
-			}
-		} else if (sc.state == SCE_EIFFEL_CHARACTER) {
-			if (sc.ch == '\r' || sc.ch == '\n') {
-				sc.SetState(SCE_EIFFEL_STRINGEOL);
-			} else if (sc.ch == '%') {
-				sc.Forward();
-			} else if (sc.ch == '\'') {
-				sc.Forward();
-				sc.SetState(SCE_EIFFEL_DEFAULT);
-			}
-		}
-
-		if (sc.state == SCE_EIFFEL_DEFAULT) {
-			if (sc.ch == '-' && sc.chNext == '-') {
-				sc.SetState(SCE_EIFFEL_COMMENTLINE);
-			} else if (sc.ch == '\"') {
-				sc.SetState(SCE_EIFFEL_STRING);
-			} else if (sc.ch == '\'') {
-				sc.SetState(SCE_EIFFEL_CHARACTER);
-			} else if (IsADigit(sc.ch) || (sc.ch == '.')) {
-				sc.SetState(SCE_EIFFEL_NUMBER);
-			} else if (IsAWordStart(sc.ch)) {
-				sc.SetState(SCE_EIFFEL_WORD);
-			} else if (isEiffelOperator(sc.ch)) {
-				sc.SetState(SCE_EIFFEL_OPERATOR);
-			}
-		}
-	}
-	sc.Complete();
-}
-
-static bool IsEiffelComment(Accessor &styler, int pos, int len) {
-	return len>1 && styler[pos]=='-' && styler[pos+1]=='-';
-}
-
-static void FoldEiffelDocIndent(unsigned int startPos, int length, int,
-						   WordList *[], Accessor &styler) {
-	int lengthDoc = startPos + length;
-
-	// Backtrack to previous line in case need to fix its fold status
-	int lineCurrent = styler.GetLine(startPos);
-	if (startPos > 0) {
-		if (lineCurrent > 0) {
-			lineCurrent--;
-			startPos = styler.LineStart(lineCurrent);
-		}
-	}
-	int spaceFlags = 0;
-	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, IsEiffelComment);
-	char chNext = styler[startPos];
-	for (int i = startPos; i < lengthDoc; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-
-		if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == lengthDoc)) {
-			int lev = indentCurrent;
-			int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags, IsEiffelComment);
-			if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
-				// Only non whitespace lines can be headers
-				if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) {
-					lev |= SC_FOLDLEVELHEADERFLAG;
-				} else if (indentNext & SC_FOLDLEVELWHITEFLAG) {
-					// Line after is blank so check the next - maybe should continue further?
-					int spaceFlags2 = 0;
-					int indentNext2 = styler.IndentAmount(lineCurrent + 2, &spaceFlags2, IsEiffelComment);
-					if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext2 & SC_FOLDLEVELNUMBERMASK)) {
-						lev |= SC_FOLDLEVELHEADERFLAG;
-					}
-				}
-			}
-			indentCurrent = indentNext;
-			styler.SetLevel(lineCurrent, lev);
-			lineCurrent++;
-		}
-	}
-}
-
-static void FoldEiffelDocKeyWords(unsigned int startPos, int length, int /* initStyle */, WordList *[],
-                       Accessor &styler) {
-	unsigned int lengthDoc = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
-	int levelCurrent = levelPrev;
-	char chNext = styler[startPos];
-	int stylePrev = 0;
-	int styleNext = styler.StyleAt(startPos);
-	// lastDeferred should be determined by looking back to last keyword in case
-	// the "deferred" is on a line before "class"
-	bool lastDeferred = false;
-	for (unsigned int i = startPos; i < lengthDoc; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		int style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-		if ((stylePrev != SCE_EIFFEL_WORD) && (style == SCE_EIFFEL_WORD)) {
-			char s[20];
-			unsigned int j = 0;
-			while ((j < (sizeof(s) - 1)) && (iswordchar(styler[i + j]))) {
-				s[j] = styler[i + j];
-				j++;
-			}
-			s[j] = '\0';
-
-			if (
-				(strcmp(s, "check") == 0) ||
-				(strcmp(s, "debug") == 0) ||
-				(strcmp(s, "deferred") == 0) ||
-				(strcmp(s, "do") == 0) ||
-				(strcmp(s, "from") == 0) ||
-				(strcmp(s, "if") == 0) ||
-				(strcmp(s, "inspect") == 0) ||
-				(strcmp(s, "once") == 0)
-			)
-				levelCurrent++;
-			if (!lastDeferred && (strcmp(s, "class") == 0))
-				levelCurrent++;
-			if (strcmp(s, "end") == 0)
-				levelCurrent--;
-			lastDeferred = strcmp(s, "deferred") == 0;
-		}
-
-		if (atEOL) {
-			int lev = levelPrev;
-			if (visibleChars == 0)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			if ((levelCurrent > levelPrev) && (visibleChars > 0))
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			levelPrev = levelCurrent;
-			visibleChars = 0;
-		}
-		if (!isspacechar(ch))
-			visibleChars++;
-		stylePrev = style;
-	}
-	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
-}
-
-static const char * const eiffelWordListDesc[] = {
-	"Keywords",
-	0
-};
-
-LexerModule lmEiffel(SCLEX_EIFFEL, ColouriseEiffelDoc, "eiffel", FoldEiffelDocIndent, eiffelWordListDesc);
-LexerModule lmEiffelkw(SCLEX_EIFFELKW, ColouriseEiffelDoc, "eiffelkw", FoldEiffelDocKeyWords, eiffelWordListDesc);
diff --git a/src/stc/scintilla/src/LexErlang.cxx b/src/stc/scintilla/src/LexErlang.cxx
deleted file mode 100644
index 9444eb9501..0000000000
--- a/src/stc/scintilla/src/LexErlang.cxx
+++ /dev/null
@@ -1,522 +0,0 @@
-// Scintilla source code edit control
-/** @file LexErlang.cxx
- ** Lexer for Erlang.
- ** Written by Peter-Henry Mander, based on Matlab lexer by José Fonseca
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-/*
-   TODO:
-   o  _Param should be a new lexical type
-*/
-
-static int is_radix(int radix, int ch) {
-   int digit;
-   if ( 16 < radix || 2 > radix ) {
-      return 0;
-   }
-   if ( isdigit(ch) ) {
-      digit = ch - '0';
-   } else if ( isxdigit(ch) ) {
-      digit = toupper(ch) - 'A' + 10;
-   } else {
-      return 0;
-   }
-   if ( digit < radix ) {
-      return 1;
-   } else {
-      return 0;
-   }
-}
-
-typedef enum {
-   STATE_NULL,
-   ATOM_UNQUOTED,
-   ATOM_QUOTED,
-   ATOM_FUN_NAME,
-   NODE_NAME_UNQUOTED,
-   NODE_NAME_QUOTED,
-   MACRO_START,
-   MACRO_UNQUOTED,
-   MACRO_QUOTED,
-   RECORD_START,
-   RECORD_UNQUOTED,
-   RECORD_QUOTED,
-   NUMERAL_START,
-   NUMERAL_SIGNED,
-   NUMERAL_RADIX_LITERAL,
-   NUMERAL_SPECULATIVE_MANTISSA,
-   NUMERAL_FLOAT_MANTISSA,
-   NUMERAL_FLOAT_EXPONENT,
-   NUMERAL_FLOAT_SIGNED_EXPONENT,
-   PARSE_ERROR
-} atom_parse_state_t;
-
-static void ColouriseErlangDoc(unsigned int startPos, int length, int initStyle,
-                               WordList *keywordlists[], Accessor &styler) {
-
-	WordList &keywords = *keywordlists[0];
-
-	styler.StartAt(startPos);
-
-	StyleContext sc(startPos, length, initStyle, styler);
-   atom_parse_state_t parse_state = STATE_NULL;
-   int radix_digits = 0;
-   int exponent_digits = 0;
-	for (; sc.More(); sc.Forward()) {
-      if ( STATE_NULL != parse_state ) {
-         switch (parse_state) {
-         case STATE_NULL:
-				sc.SetState(SCE_ERLANG_DEFAULT);
-            break;
-         case ATOM_UNQUOTED:
-            if ( '@' == sc.ch ){
-               parse_state = NODE_NAME_UNQUOTED;
-            } else if ( !isalnum(sc.ch) && sc.ch != '_' ) {
-               char s[100];
-               sc.GetCurrent(s, sizeof(s));
-               if (keywords.InList(s)) {
-                  sc.ChangeState(SCE_ERLANG_KEYWORD);
-                  sc.SetState(SCE_ERLANG_DEFAULT);
-                  parse_state = STATE_NULL;
-               } else {
-                  if ( '/' == sc.ch ) {
-                     parse_state = ATOM_FUN_NAME;
-                  } else {
-                     sc.ChangeState(SCE_ERLANG_ATOM);
-                     sc.SetState(SCE_ERLANG_DEFAULT);
-                     parse_state = STATE_NULL;
-                  }
-               }
-            }
-            break;
-         case ATOM_QUOTED:
-            if ( '@' == sc.ch ){
-               parse_state = NODE_NAME_QUOTED;
-            } else if ( '\'' == sc.ch && '\\' != sc.chPrev ) {
-               sc.ChangeState(SCE_ERLANG_ATOM);
-               sc.ForwardSetState(SCE_ERLANG_DEFAULT);
-               parse_state = STATE_NULL;
-            }
-            break;
-         case ATOM_FUN_NAME:
-            if ( !isdigit(sc.ch) ) {
-               sc.ChangeState(SCE_ERLANG_FUNCTION_NAME);
-               sc.SetState(SCE_ERLANG_DEFAULT);
-               parse_state = STATE_NULL;
-            }
-            break;
-         case NODE_NAME_QUOTED:
-            if ( '@' == sc.ch ) {
-               sc.SetState(SCE_ERLANG_DEFAULT);
-               parse_state = STATE_NULL;
-            } else if ( '\'' == sc.ch && '\\' != sc.chPrev ) {
-               sc.ChangeState(SCE_ERLANG_NODE_NAME);
-               sc.ForwardSetState(SCE_ERLANG_DEFAULT);
-               parse_state = STATE_NULL;
-            }
-            break;
-         case NODE_NAME_UNQUOTED:
-            if ( '@' == sc.ch ) {
-               sc.SetState(SCE_ERLANG_DEFAULT);
-               parse_state = STATE_NULL;
-            } else if ( !isalnum(sc.ch) && sc.ch != '_' ) {
-               sc.ChangeState(SCE_ERLANG_NODE_NAME);
-               sc.SetState(SCE_ERLANG_DEFAULT);
-               parse_state = STATE_NULL;
-            }
-            break;
-         case RECORD_START:
-            if ( '\'' == sc.ch ) {
-               parse_state = RECORD_QUOTED;
-            } else if (isalpha(sc.ch) && islower(sc.ch)) {
-               parse_state = RECORD_UNQUOTED;
-            } else { // error
-               sc.SetState(SCE_ERLANG_DEFAULT);
-               parse_state = STATE_NULL;
-            }
-            break;
-         case RECORD_QUOTED:
-            if ( '\'' == sc.ch && '\\' != sc.chPrev ) {
-               sc.ChangeState(SCE_ERLANG_RECORD);
-               sc.ForwardSetState(SCE_ERLANG_DEFAULT);
-               parse_state = STATE_NULL;
-            }
-            break;
-         case RECORD_UNQUOTED:
-            if ( !isalpha(sc.ch) && '_' != sc.ch ) {
-               sc.ChangeState(SCE_ERLANG_RECORD);
-               sc.SetState(SCE_ERLANG_DEFAULT);
-               parse_state = STATE_NULL;
-            }
-            break;
-         case MACRO_START:
-            if ( '\'' == sc.ch ) {
-               parse_state = MACRO_QUOTED;
-            } else if (isalpha(sc.ch)) {
-               parse_state = MACRO_UNQUOTED;
-            } else { // error
-               sc.SetState(SCE_ERLANG_DEFAULT);
-               parse_state = STATE_NULL;
-            }
-            break;
-         case MACRO_UNQUOTED:
-            if ( !isalpha(sc.ch) && '_' != sc.ch ) {
-               sc.ChangeState(SCE_ERLANG_MACRO);
-               sc.SetState(SCE_ERLANG_DEFAULT);
-               parse_state = STATE_NULL;
-            }
-            break;
-         case MACRO_QUOTED:
-            if ( '\'' == sc.ch && '\\' != sc.chPrev ) {
-               sc.ChangeState(SCE_ERLANG_MACRO);
-               sc.ForwardSetState(SCE_ERLANG_DEFAULT);
-               parse_state = STATE_NULL;
-            }
-            break;
-         case NUMERAL_START:
-            if ( isdigit(sc.ch) ) {
-               radix_digits *= 10;
-               radix_digits += sc.ch - '0'; // Assuming ASCII here!
-            } else if ( '#' == sc.ch ) {
-               if ( 2 > radix_digits || 16 < radix_digits) {
-                  sc.SetState(SCE_ERLANG_DEFAULT);
-                  parse_state = STATE_NULL;
-               } else {
-                  parse_state = NUMERAL_RADIX_LITERAL;
-               }
-            } else if ( '.' == sc.ch && isdigit(sc.chNext)) {
-               radix_digits = 0;
-               parse_state = NUMERAL_FLOAT_MANTISSA;
-            } else if ( 'e' == sc.ch || 'E' == sc.ch ) {
-               exponent_digits = 0;
-               parse_state = NUMERAL_FLOAT_EXPONENT;
-            } else {
-               radix_digits = 0;
-               sc.ChangeState(SCE_ERLANG_NUMBER);
-               sc.SetState(SCE_ERLANG_DEFAULT);
-               parse_state = STATE_NULL;
-            }
-            break;
-         case NUMERAL_RADIX_LITERAL:
-            if ( !is_radix(radix_digits,sc.ch) ) {
-               radix_digits = 0;
-               if ( !isalnum(sc.ch) ) {
-                  sc.ChangeState(SCE_ERLANG_NUMBER);
-               }
-               sc.SetState(SCE_ERLANG_DEFAULT);
-               parse_state = STATE_NULL;
-            }
-            break;
-         case NUMERAL_FLOAT_MANTISSA:
-            if ( 'e' == sc.ch || 'E' == sc.ch ) {
-               exponent_digits = 0;
-               parse_state = NUMERAL_FLOAT_EXPONENT;
-            } else if ( !isdigit(sc.ch) ) {
-               sc.ChangeState(SCE_ERLANG_NUMBER);
-               sc.SetState(SCE_ERLANG_DEFAULT);
-               parse_state = STATE_NULL;
-            }
-            break;
-         case NUMERAL_FLOAT_EXPONENT:
-            if ( '-' == sc.ch || '+' == sc.ch ) {
-               parse_state = NUMERAL_FLOAT_SIGNED_EXPONENT;
-            } else if ( !isdigit(sc.ch) ) {
-               if ( 0 < exponent_digits ) {
-                  sc.ChangeState(SCE_ERLANG_NUMBER);
-               }
-               sc.SetState(SCE_ERLANG_DEFAULT);
-               parse_state = STATE_NULL;
-            } else {
-               ++exponent_digits;
-            }
-            break;
-         case NUMERAL_FLOAT_SIGNED_EXPONENT:
-            if ( !isdigit(sc.ch) ) {
-               if ( 0 < exponent_digits ) {
-                  sc.ChangeState(SCE_ERLANG_NUMBER);
-               }
-               sc.SetState(SCE_ERLANG_DEFAULT);
-               parse_state = STATE_NULL;
-            } else {
-               ++exponent_digits;
-            }
-            break;
-         case NUMERAL_SIGNED:
-            if ( !isdigit(sc.ch) ) {
-               sc.ChangeState(SCE_ERLANG_NUMBER);
-               sc.SetState(SCE_ERLANG_DEFAULT);
-               parse_state = STATE_NULL;
-            } else if ( '.' == sc.ch ) {
-               parse_state = NUMERAL_FLOAT_MANTISSA;
-            }
-            break;
-         case NUMERAL_SPECULATIVE_MANTISSA:
-            if ( !isdigit(sc.ch) ) {
-               sc.ChangeState(SCE_ERLANG_OPERATOR);
-               sc.SetState(SCE_ERLANG_DEFAULT);
-               parse_state = STATE_NULL;
-            } else {
-               parse_state = NUMERAL_FLOAT_MANTISSA;
-            }
-            break;
-         case PARSE_ERROR:
-				sc.SetState(SCE_ERLANG_DEFAULT);
-            parse_state = STATE_NULL;
-            break;
-         }
-      } else if (sc.state == SCE_ERLANG_OPERATOR) {
-			if (sc.chPrev == '.') {
-				if (sc.ch == '*' || sc.ch == '/' || sc.ch == '\\' || sc.ch == '^') {
-					sc.ForwardSetState(SCE_ERLANG_DEFAULT);
-				} else if (sc.ch == '\'') {
-					sc.ForwardSetState(SCE_ERLANG_DEFAULT);
-				} else {
-					sc.SetState(SCE_ERLANG_DEFAULT);
-				}
-			} else {
-				sc.SetState(SCE_ERLANG_DEFAULT);
-			}
-		} else if (sc.state == SCE_ERLANG_VARIABLE) {
-			if (!isalnum(sc.ch) && sc.ch != '_') {
-            sc.SetState(SCE_ERLANG_DEFAULT);
-			}
-		} else if (sc.state == SCE_ERLANG_STRING) {
-			if (sc.ch == '\"' && sc.chPrev != '\\') {
-				sc.ForwardSetState(SCE_ERLANG_DEFAULT);
-			}
-		} else if (sc.state == SCE_ERLANG_COMMENT ) {
-			if (sc.atLineEnd) {
-				sc.SetState(SCE_ERLANG_DEFAULT);
-			}
-      } else if (sc.state == SCE_ERLANG_CHARACTER ) {
-         if ( sc.chPrev == '\\' ) {
-            sc.ForwardSetState(SCE_ERLANG_DEFAULT);
-         } else if ( sc.ch != '\\' ) {
-            sc.ForwardSetState(SCE_ERLANG_DEFAULT);
-         }
-      }
-
-		if (sc.state == SCE_ERLANG_DEFAULT) {
-			if (sc.ch == '%') {
-				sc.SetState(SCE_ERLANG_COMMENT);
-			} else if (sc.ch == '\"') {
-            sc.SetState(SCE_ERLANG_STRING);
-         } else if (sc.ch == '#') {
-            parse_state = RECORD_START;
-				sc.SetState(SCE_ERLANG_UNKNOWN);
-         } else if (sc.ch == '?') {
-            parse_state = MACRO_START;
-				sc.SetState(SCE_ERLANG_UNKNOWN);
-         } else if (sc.ch == '$') {
-				sc.SetState(SCE_ERLANG_CHARACTER);
-         } else if (sc.ch == '\'') {
-            parse_state = ATOM_QUOTED;
-				sc.SetState(SCE_ERLANG_UNKNOWN);
-			} else if ( isdigit(sc.ch) ) {
-            parse_state = NUMERAL_START;
-            radix_digits = sc.ch - '0';
-				sc.SetState(SCE_ERLANG_UNKNOWN);
-         } else if ( '.' == sc.ch ) {
-            parse_state = NUMERAL_SPECULATIVE_MANTISSA;
-				sc.SetState(SCE_ERLANG_UNKNOWN);
-			} else if (isalpha(sc.ch) && isupper(sc.ch)) {
-				sc.SetState(SCE_ERLANG_VARIABLE);
-			} else if (isalpha(sc.ch)) {
-            parse_state = ATOM_UNQUOTED;
-				sc.SetState(SCE_ERLANG_UNKNOWN);
-			} else if (isoperator(static_cast<char>(sc.ch)) || sc.ch == '\\') {
-				sc.SetState(SCE_ERLANG_OPERATOR);
-			}
-		}
-	}
-	sc.Complete();
-}
-
-static int ClassifyFoldPointErlang(
-   Accessor &styler,
-   int styleNext,
-   int keyword_start
-) {
-	int lev = 0;
-   if ( styler.Match(keyword_start,"case")
-      || (
-            styler.Match(keyword_start,"fun")
-         && SCE_ERLANG_FUNCTION_NAME != styleNext)
-      || styler.Match(keyword_start,"if")
-      || styler.Match(keyword_start,"query")
-      || styler.Match(keyword_start,"receive")
-   ) {
-      ++lev;
-   } else if ( styler.Match(keyword_start,"end") ) {
-      --lev;
-   }
-	return lev;
-}
-
-
-static void FoldErlangDoc(
-   unsigned int startPos, int length, int initStyle,
-   WordList** /*keywordlists*/, Accessor &styler
-) {
-	unsigned int endPos = startPos + length;
-	//~ int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
-	int levelCurrent = levelPrev;
-	char chNext = styler.SafeGetCharAt(startPos);
-	int styleNext = styler.StyleAt(startPos);
-	int style = initStyle;
-	int keyword_start = 0;
-
-   bool fold_keywords = true;
-   bool fold_comments = true;
-   bool fold_braces = true;
-   bool fold_function_clauses = false;
-   bool fold_clauses = false;
-
-   //int clause_level = 0;
-
-	for (unsigned int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		int stylePrev = style;
-		style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-
-      if ( (stylePrev != SCE_ERLANG_KEYWORD) && (style == SCE_ERLANG_KEYWORD) ) {
-         keyword_start = i;
-      }
-      if ( fold_keywords ) {
-         if ( (stylePrev == SCE_ERLANG_KEYWORD)
-            && (style != SCE_ERLANG_KEYWORD)
-            && (style != SCE_ERLANG_ATOM)
-         ) {
-            levelCurrent += ClassifyFoldPointErlang(styler,styleNext,keyword_start);
-         }
-      }
-
-      if ( fold_comments ) {
-         if (style == SCE_ERLANG_COMMENT) {
-            if ((ch == '%') && (chNext == '{')) {
-               levelCurrent++;
-            } else if ((ch == '%') && (chNext == '}')) {
-               levelCurrent--;
-            }
-         }
-      }
-
-      if ( fold_function_clauses ) {
-         if ( (SC_FOLDLEVELBASE == levelCurrent) /*&& (style == SCE_ERLANG_OPERATOR)*/ ) {
-            if ( (ch == '-') && (chNext == '>')) {
-               //~ fprintf(stderr,"levelCurrent=%d\n", levelCurrent);
-               //++clause_level;
-               //~ if ( 0 < clause_level )
-                  ++levelCurrent;
-            }
-         }
-         //~ if (  (stylePrev != SCE_ERLANG_RECORD)
-            //~ && (style != SCE_ERLANG_NUMBER)
-            //~ && (style != SCE_ERLANG_STRING)
-            //~ && (style != SCE_ERLANG_COMMENT)
-         //~ ) {
-            if ( (SC_FOLDLEVELBASE+1 == levelCurrent) && (ch == '.') ) {
-               //--clause_level;
-               //~ if ( 0 == clause_level )
-                  --levelCurrent;
-            }
-         //~ }
-      }
-
-      if ( fold_clauses ) {
-         if ( (0 < levelCurrent) && (style == SCE_ERLANG_OPERATOR) ) {
-            if ((ch == '-') && (chNext == '>')) {
-               levelCurrent++;
-            }
-            if ( (ch == ';') ) {
-               levelCurrent--;
-            }
-         }
-         if ( (stylePrev != SCE_ERLANG_RECORD)
-            && (style != SCE_ERLANG_NUMBER)
-            && (style != SCE_ERLANG_STRING)
-            && (style != SCE_ERLANG_COMMENT)
-         ) {
-            if ( (ch == '.') ) {
-               levelCurrent--;
-            }
-         }
-         if (  (stylePrev == SCE_ERLANG_KEYWORD)
-            && (style != SCE_ERLANG_KEYWORD)
-            && (style != SCE_ERLANG_ATOM)
-            && (
-               styler.Match(keyword_start,"end") // 'end' counted twice if fold_keywords too
-               || styler.Match(keyword_start,"after") )
-         ) {
-            levelCurrent--;
-         }
-      }
-
-      if ( fold_braces ) {
-         if (style == SCE_ERLANG_OPERATOR) {
-            if ( (ch == '{') || (ch == '(') || (ch == '[') ) {
-               levelCurrent++;
-            } else if ( (ch == '}') || (ch == ')') || (ch == ']') ) {
-               levelCurrent--;
-            }
-         }
-      }
-
-		if (atEOL) {
-			int lev = levelPrev;
-			//~ if (visibleChars == 0 && foldCompact)
-				//~ lev |= SC_FOLDLEVELWHITEFLAG;
-			//~ if ((levelCurrent > levelPrev) && (visibleChars > 0))
-			if ((levelCurrent > levelPrev)) {
-				lev |= SC_FOLDLEVELHEADERFLAG;
-         }
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			levelPrev = levelCurrent;
-			//~ visibleChars = 0;
-		}
-		//~ if (!isspacechar(ch))
-			//~ visibleChars++;
-
-	}
-	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
-}
-
-static const char * const erlangWordListDesc[] = {
-	"Keywords",
-	0
-};
-
-LexerModule lmErlang(
-   SCLEX_ERLANG,
-   ColouriseErlangDoc,
-   "erlang",
-   FoldErlangDoc,
-   erlangWordListDesc);
-
diff --git a/src/stc/scintilla/src/LexFlagship.cxx b/src/stc/scintilla/src/LexFlagship.cxx
deleted file mode 100644
index db0314eb96..0000000000
--- a/src/stc/scintilla/src/LexFlagship.cxx
+++ /dev/null
@@ -1,226 +0,0 @@
-// Scintilla source code edit control
-/** @file LexFlagShip.cxx
- ** Lexer for FlagShip 
- ** (Syntactically compatible to other XBase dialects, like dBase, Clipper, Fox etc.)
- **/
-// Copyright 2005 by Randy Butler
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static bool IsFlagShipComment(Accessor &styler, int pos, int len) {
-	return len>0 && styler[pos]=='\'';
-}
-
-static inline bool IsTypeCharacter(int ch) {
-	return ch == '%' || ch == '&' || ch == '@' || ch == '!' || ch == '#' || ch == '$';
-}
-
-// Extended to accept accented characters
-static inline bool IsAWordChar(int ch) {
-	return ch >= 0x80 ||
-	       (isalnum(ch) || ch == '.' || ch == '_');
-}
-
-static inline bool IsAWordStart(int ch) {
-	return ch >= 0x80 ||
-	       (isalnum(ch) || ch == '_');
-}
-
-static inline bool IsADateCharacter(const int ch) {
-	return (ch < 0x80) &&
-		(isalnum(ch) || ch == '|' || ch == '-' || ch == '/' || ch == ':' || ch == ' ' || ch == '\t');
-}
-
-
-static void ColouriseFlagShipDoc(unsigned int startPos, int length, int initStyle,
-                           WordList *keywordlists[], Accessor &styler) {
-
-	//bool FSScriptSyntax = true;
-	WordList &keywords = *keywordlists[0];
-	WordList &keywords2 = *keywordlists[1];
-	WordList &keywords3 = *keywordlists[2];
-	WordList &keywords4 = *keywordlists[3];
-
-	styler.StartAt(startPos);
-
-	int visibleChars = 0;
-
-	StyleContext sc(startPos, length, initStyle, styler);
-
-	for (; sc.More(); sc.Forward()) {
-
-		if (sc.state == SCE_FS_OPERATOR) {
-			sc.SetState(SCE_FS_DEFAULT);
-		} else if (sc.state == SCE_FS_IDENTIFIER) {
-			if (!IsAWordChar(sc.ch)) {
-				char s[100];
-				sc.GetCurrentLowered(s, sizeof(s));
-				if (keywords.InList(s)) {
-					sc.ChangeState(SCE_FS_KEYWORD);
-				} else if (keywords2.InList(s)) {
-					sc.ChangeState(SCE_FS_KEYWORD2);
-				} else if (keywords3.InList(s)) {
-					sc.ChangeState(SCE_FS_KEYWORD3);
-				} else if (keywords4.InList(s)) {
-					sc.ChangeState(SCE_FS_KEYWORD4);
-				}// Else, it is really an identifier...
-				sc.SetState(SCE_FS_DEFAULT);
-			}
-		} else if (sc.state == SCE_FS_NUMBER) {
-			if (!IsAWordChar(sc.ch)) {
-				sc.SetState(SCE_FS_DEFAULT);
-			}
-		} else if (sc.state == SCE_FS_STRING) {
-			// VB doubles quotes to preserve them, so just end this string
-			// state now as a following quote will start again
-			if (sc.ch == '\"') {
-				if (tolower(sc.chNext) == 'c') {
-					sc.Forward();
-				}
-				sc.ForwardSetState(SCE_FS_DEFAULT);
-			} else if (sc.atLineEnd) {
-				sc.ChangeState(SCE_FS_STRINGEOL);
-				sc.ForwardSetState(SCE_FS_DEFAULT);
-			}
-		} else if (sc.state == SCE_FS_COMMENT) {
-			if (sc.Match('*', '/')) {   // new code
-				sc.Forward();
-				sc.ForwardSetState(SCE_FS_DEFAULT);
-			//if (sc.atLineEnd) {       // old code
-			//	sc.SetState(SCE_FS_DEFAULT);
-			}
-		} else if (sc.state == SCE_FS_COMMENTLINE) {  //new code
-			if (sc.ch == '\r' || sc.ch == '\n') {
-				sc.SetState(SCE_FS_DEFAULT);
-				visibleChars = 0;
-			}
-		} else if (sc.state == SCE_FS_PREPROCESSOR) {
-			if (sc.atLineEnd) {
-				sc.SetState(SCE_FS_DEFAULT);
-			}
-		} else if (sc.state == SCE_FS_DATE) {
-			if (sc.ch == '#' || !IsADateCharacter(sc.chNext)) {
-				sc.ForwardSetState(SCE_FS_DEFAULT);
-			}
-		}
-
-		// Determine if a new state should be entered.
-		if (sc.state == SCE_FS_DEFAULT) {
-			if (sc.Match('/', '*')) {  // New code
-				sc.SetState(SCE_FS_COMMENT);
-				sc.Forward();	// Eat the * so it isn't used for the end of the comment
-			//if (sc.ch == '\'') {  // Old code
-			//	sc.SetState(SCE_FS_COMMENT); // old code
-			} else if (sc.Match('/', '/')) { // New code
-				sc.SetState(SCE_FS_COMMENTLINE);
-			} else if (sc.ch == '\"') {
-				sc.SetState(SCE_FS_STRING);
-			} else if (sc.ch == '#' && visibleChars == 0) {
-				// Preprocessor commands are alone on their line
-				sc.SetState(SCE_FS_PREPROCESSOR);
-			} else if (sc.ch == '#') {
-				int n = 1;
-				int chSeek = ' ';
-				while ((n < 100) && (chSeek == ' ' || chSeek == '\t')) {
-					chSeek = sc.GetRelative(n);
-					n++;
-				}
-				if (IsADigit(chSeek)) {
-					sc.SetState(SCE_FS_DATE);
-				} else {
-					sc.SetState(SCE_FS_OPERATOR);
-				}
-			} else if (sc.ch == '&' && tolower(sc.chNext) == 'h') {
-				sc.SetState(SCE_FS_NUMBER);
-			} else if (sc.ch == '&' && tolower(sc.chNext) == 'o') {
-				sc.SetState(SCE_FS_NUMBER);
-			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
-				sc.SetState(SCE_FS_NUMBER);
-			} else if (IsAWordStart(sc.ch) || (sc.ch == '[')) {
-				sc.SetState(SCE_FS_IDENTIFIER);
-			} else if (isoperator(static_cast<char>(sc.ch)) || (sc.ch == '\\')) {
-				sc.SetState(SCE_FS_OPERATOR);
-			}
-		}
-
-		if (sc.atLineEnd) {
-			visibleChars = 0;
-		}
-		if (!IsASpace(sc.ch)) {
-			visibleChars++;
-		}
-	}
-	sc.Complete();
-}
-
-static void FoldFlagShipDoc(unsigned int startPos, int length, int,
-						   WordList *[], Accessor &styler) {
-
-	int endPos = startPos + length;
-
-	// Backtrack to previous line in case need to fix its fold status
-	int lineCurrent = styler.GetLine(startPos);
-	if (startPos > 0) {
-		if (lineCurrent > 0) {
-			lineCurrent--;
-			startPos = styler.LineStart(lineCurrent);
-		}
-	}
-	int spaceFlags = 0;
-	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, IsFlagShipComment);
-	char chNext = styler[startPos];
-	for (int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-
-		if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == endPos)) {
-			int lev = indentCurrent;
-			int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags, IsFlagShipComment);
-			if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
-				// Only non whitespace lines can be headers
-				if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) {
-					lev |= SC_FOLDLEVELHEADERFLAG;
-				} else if (indentNext & SC_FOLDLEVELWHITEFLAG) {
-					// Line after is blank so check the next - maybe should continue further?
-					int spaceFlags2 = 0;
-					int indentNext2 = styler.IndentAmount(lineCurrent + 2, &spaceFlags2, IsFlagShipComment);
-					if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext2 & SC_FOLDLEVELNUMBERMASK)) {
-						lev |= SC_FOLDLEVELHEADERFLAG;
-					}
-				}
-			}
-			indentCurrent = indentNext;
-			styler.SetLevel(lineCurrent, lev);
-			lineCurrent++;
-		}
-	}
-}
-
-
-static const char * const FSWordListDesc[] = {
-	"Keywords",
-	"functions",
-	"user2",
-	"user3",
-	0
-};
-
-LexerModule lmFlagShip(SCLEX_FLAGSHIP, ColouriseFlagShipDoc, "flagship", FoldFlagShipDoc, FSWordListDesc);
-
-
-
diff --git a/src/stc/scintilla/src/LexForth.cxx b/src/stc/scintilla/src/LexForth.cxx
deleted file mode 100644
index 3f128156d6..0000000000
--- a/src/stc/scintilla/src/LexForth.cxx
+++ /dev/null
@@ -1,348 +0,0 @@
-// Scintilla source code edit control
-/** @file LexCrontab.cxx
- ** Lexer to use with extended crontab files used by a powerful
- ** Windows scheduler/event monitor/automation manager nnCron.
- ** (http://nemtsev.eserv.ru/)
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-bool is_whitespace(int ch){
-    return ch == '\n' || ch == '\r' || ch == '\t' || ch == ' ';
-}
-
-bool is_blank(int ch){
-    return ch == '\t' || ch == ' ';
-}
-//#define FORTH_DEBUG
-#ifdef FORTH_DEBUG
-static FILE *f_debug;
-#define log(x)  fputs(f_debug,x);
-#else
-#define log(x)
-#endif
-
-#define STATE_LOCALE
-#define BL ' '
-
-static Accessor *st;
-static int cur_pos,pos1,pos2,pos0,lengthDoc;
-char *buffer;
-
-char getChar(bool is_bl){
-    char ch=st->SafeGetCharAt(cur_pos);
-    if(is_bl) if(is_whitespace(ch)) ch=BL;
-    return ch;
-}
-
-char getCharBL(){
-    char ch=st->SafeGetCharAt(cur_pos);
-    return ch;
-}
-bool is_eol(char ch){
-    return ch=='\n' || ch=='\r';
-}
-
-int parse(char ch, bool skip_eol){
-// pos1 - start pos of word
-// pos2 - pos after of word
-// pos0 - start pos
-    char c=0;
-    int len;
-    bool is_bl=ch==BL;
-    pos0=pos1=pos2=cur_pos;
-    for(;cur_pos<lengthDoc && (c=getChar(is_bl))==ch; cur_pos++){
-        if(is_eol(c) && !skip_eol){
-            pos2=pos1;
-            return 0;
-        }
-    }
-    pos1=cur_pos;
-    pos2=pos1;
-    if(cur_pos==lengthDoc) return 0;
-    for(len=0;cur_pos<lengthDoc && (c=getChar(is_bl))!=ch; cur_pos++){
-        if(is_eol(c) && !skip_eol) break;
-        pos2++;
-        buffer[len++]=c;
-    }
-    if(c==ch) pos2--;
-    buffer[len]='\0';
-#ifdef FORTH_DEBUG
-    fprintf(f_debug,"parse: %c %s\n",ch,buffer);
-#endif
-    return len;
-}
-
-bool _is_number(char *s,int base){
-    for(;*s;s++){
-        int digit=((int)*s)-(int)'0';
-#ifdef FORTH_DEBUG
-    fprintf(f_debug,"digit: %c %d\n",*s,digit);
-#endif
-        if(digit>9 && base>10) digit-=7;
-        if(digit<0) return false;
-        if(digit>=base) return false;
-    }
-    return true;
-}
-
-bool is_number(char *s){
-    if(strncmp(s,"0x",2)==0) return _is_number(s+2,16);
-    return _is_number(s,10);
-}
-
-static void ColouriseForthDoc(unsigned int startPos, int length, int, WordList *keywordLists[], Accessor &styler)
-{
-    st=&styler;
-    cur_pos=startPos;
-    lengthDoc = startPos + length;
-    buffer = new char[length];
-
-#ifdef FORTH_DEBUG
-    f_debug=fopen("c:\\sci.log","at");
-#endif
-
-    WordList &control = *keywordLists[0];
-    WordList &keyword = *keywordLists[1];
-    WordList &defword = *keywordLists[2];
-    WordList &preword1 = *keywordLists[3];
-    WordList &preword2 = *keywordLists[4];
-    WordList &strings = *keywordLists[5];
-
-    // go through all provided text segment
-    // using the hand-written state machine shown below
-    styler.StartAt(startPos);
-    styler.StartSegment(startPos);
-    while(parse(BL,true)!=0){
-        if(pos0!=pos1){
-            styler.ColourTo(pos0,SCE_FORTH_DEFAULT);
-            styler.ColourTo(pos1-1,SCE_FORTH_DEFAULT);
-        }
-        if(strcmp("\\",buffer)==0){
-            styler.ColourTo(pos1,SCE_FORTH_COMMENT);
-            parse(1,false);
-            styler.ColourTo(pos2,SCE_FORTH_COMMENT);
-        }else if(strcmp("(",buffer)==0){
-            styler.ColourTo(pos1,SCE_FORTH_COMMENT);
-            parse(')',true);
-            if(cur_pos<lengthDoc) cur_pos++;
-            styler.ColourTo(cur_pos,SCE_FORTH_COMMENT);
-        }else if(strcmp("[",buffer)==0){
-            styler.ColourTo(pos1,SCE_FORTH_STRING);
-            parse(']',true);
-            if(cur_pos<lengthDoc) cur_pos++;
-            styler.ColourTo(cur_pos,SCE_FORTH_STRING);
-        }else if(strcmp("{",buffer)==0){
-            styler.ColourTo(pos1,SCE_FORTH_LOCALE);
-            parse('}',false);
-            if(cur_pos<lengthDoc) cur_pos++;
-            styler.ColourTo(cur_pos,SCE_FORTH_LOCALE);
-        }else if(strings.InList(buffer)) {
-            styler.ColourTo(pos1,SCE_FORTH_STRING);
-            parse('"',false);
-            if(cur_pos<lengthDoc) cur_pos++;
-            styler.ColourTo(cur_pos,SCE_FORTH_STRING);
-        }else if(control.InList(buffer)) {
-            styler.ColourTo(pos1,SCE_FORTH_CONTROL);
-            styler.ColourTo(pos2,SCE_FORTH_CONTROL);
-        }else if(keyword.InList(buffer)) {
-            styler.ColourTo(pos1,SCE_FORTH_KEYWORD);
-            styler.ColourTo(pos2,SCE_FORTH_KEYWORD);
-        }else if(defword.InList(buffer)) {
-            styler.ColourTo(pos1,SCE_FORTH_KEYWORD);
-            styler.ColourTo(pos2,SCE_FORTH_KEYWORD);
-            parse(BL,false);
-            styler.ColourTo(pos1-1,SCE_FORTH_DEFAULT);
-            styler.ColourTo(pos1,SCE_FORTH_DEFWORD);
-            styler.ColourTo(pos2,SCE_FORTH_DEFWORD);
-        }else if(preword1.InList(buffer)) {
-            styler.ColourTo(pos1,SCE_FORTH_PREWORD1);
-            parse(BL,false);
-            styler.ColourTo(pos2,SCE_FORTH_PREWORD1);
-        }else if(preword2.InList(buffer)) {
-            styler.ColourTo(pos1,SCE_FORTH_PREWORD2);
-            parse(BL,false);
-            styler.ColourTo(pos2,SCE_FORTH_PREWORD2);
-            parse(BL,false);
-            styler.ColourTo(pos1,SCE_FORTH_STRING);
-            styler.ColourTo(pos2,SCE_FORTH_STRING);
-        }else if(is_number(buffer)){
-            styler.ColourTo(pos1,SCE_FORTH_NUMBER);
-            styler.ColourTo(pos2,SCE_FORTH_NUMBER);
-        }
-    }
-#ifdef FORTH_DEBUG
-    fclose(f_debug);
-#endif
-    delete []buffer;
-    return;
-/*
-                        if(control.InList(buffer)) {
-                            styler.ColourTo(i,SCE_FORTH_CONTROL);
-                        } else if(keyword.InList(buffer)) {
-                            styler.ColourTo(i-1,SCE_FORTH_KEYWORD );
-                        } else if(defword.InList(buffer)) {
-                            styler.ColourTo(i-1,SCE_FORTH_DEFWORD );
-//                            prev_state=SCE_FORTH_DEFWORD
-                        } else if(preword1.InList(buffer)) {
-                            styler.ColourTo(i-1,SCE_FORTH_PREWORD1 );
-//                            state=SCE_FORTH_PREWORD1;
-                        } else if(preword2.InList(buffer)) {
-                            styler.ColourTo(i-1,SCE_FORTH_PREWORD2 );
-                         } else {
-                            styler.ColourTo(i-1,SCE_FORTH_DEFAULT);
-                        }
-*/
-/*
-    chPrev=' ';
-    for (int i = startPos; i < lengthDoc; i++) {
-        char ch = chNext;
-        chNext = styler.SafeGetCharAt(i + 1);
-        if(i!=startPos) chPrev=styler.SafeGetCharAt(i - 1);
-
-        if (styler.IsLeadByte(ch)) {
-            chNext = styler.SafeGetCharAt(i + 2);
-            i++;
-            continue;
-        }
-#ifdef FORTH_DEBUG
-        fprintf(f_debug,"%c %d ",ch,state);
-#endif
-        switch(state) {
-            case SCE_FORTH_DEFAULT:
-                if(is_whitespace(ch)) {
-                    // whitespace is simply ignored here...
-                    styler.ColourTo(i,SCE_FORTH_DEFAULT);
-                    break;
-                } else if( ch == '\\' && is_blank(chNext)) {
-                    // signals the start of an one line comment...
-                    state = SCE_FORTH_COMMENT;
-                    styler.ColourTo(i,SCE_FORTH_COMMENT);
-                } else if( is_whitespace(chPrev) &&  ch == '(' &&  is_whitespace(chNext)) {
-                    // signals the start of a plain comment...
-                    state = SCE_FORTH_COMMENT_ML;
-                    styler.ColourTo(i,SCE_FORTH_COMMENT_ML);
-                } else if( isdigit(ch) ) {
-                    // signals the start of a number
-                    bufferCount = 0;
-                    buffer[bufferCount++] = ch;
-                    state = SCE_FORTH_NUMBER;
-                } else if( !is_whitespace(ch)) {
-                    // signals the start of an identifier
-                    bufferCount = 0;
-                    buffer[bufferCount++] = ch;
-                    state = SCE_FORTH_IDENTIFIER;
-                } else {
-                    // style it the default style..
-                    styler.ColourTo(i,SCE_FORTH_DEFAULT);
-                }
-                break;
-
-            case SCE_FORTH_COMMENT:
-                // if we find a newline here,
-                // we simply go to default state
-                // else continue to work on it...
-                if( ch == '\n' || ch == '\r' ) {
-                    state = SCE_FORTH_DEFAULT;
-                } else {
-                    styler.ColourTo(i,SCE_FORTH_COMMENT);
-                }
-                break;
-
-            case SCE_FORTH_COMMENT_ML:
-                if( ch == ')') {
-                    state = SCE_FORTH_DEFAULT;
-                } else {
-                    styler.ColourTo(i+1,SCE_FORTH_COMMENT_ML);
-                }
-                break;
-
-            case SCE_FORTH_IDENTIFIER:
-                // stay  in CONF_IDENTIFIER state until we find a non-alphanumeric
-                if( !is_whitespace(ch) ) {
-                    buffer[bufferCount++] = ch;
-                } else {
-                    state = SCE_FORTH_DEFAULT;
-                    buffer[bufferCount] = '\0';
-#ifdef FORTH_DEBUG
-        fprintf(f_debug,"\nid %s\n",buffer);
-#endif
-
-                    // check if the buffer contains a keyword,
-                    // and highlight it if it is a keyword...
-//                    switch(prev_state)
-//                    case SCE_FORTH_DEFAULT:
-                        if(control.InList(buffer)) {
-                            styler.ColourTo(i,SCE_FORTH_CONTROL);
-                        } else if(keyword.InList(buffer)) {
-                            styler.ColourTo(i-1,SCE_FORTH_KEYWORD );
-                        } else if(defword.InList(buffer)) {
-                            styler.ColourTo(i-1,SCE_FORTH_DEFWORD );
-//                            prev_state=SCE_FORTH_DEFWORD
-                        } else if(preword1.InList(buffer)) {
-                            styler.ColourTo(i-1,SCE_FORTH_PREWORD1 );
-//                            state=SCE_FORTH_PREWORD1;
-                        } else if(preword2.InList(buffer)) {
-                            styler.ColourTo(i-1,SCE_FORTH_PREWORD2 );
-                         } else {
-                            styler.ColourTo(i-1,SCE_FORTH_DEFAULT);
-                        }
-//                        break;
-//                    case
-
-                    // push back the faulty character
-                    chNext = styler[i--];
-                }
-                break;
-
-            case SCE_FORTH_NUMBER:
-                // stay  in CONF_NUMBER state until we find a non-numeric
-                if( isdigit(ch) ) {
-                    buffer[bufferCount++] = ch;
-                } else {
-                    state = SCE_FORTH_DEFAULT;
-                    buffer[bufferCount] = '\0';
-                    // Colourize here... (normal number)
-                    styler.ColourTo(i-1,SCE_FORTH_NUMBER);
-                    // push back a character
-                    chNext = styler[i--];
-                }
-                break;
-        }
-    }
-#ifdef FORTH_DEBUG
-    fclose(f_debug);
-#endif
-    delete []buffer;
-*/
-}
-
-static void FoldForthDoc(unsigned int, int, int, WordList *[],
-                       Accessor &) {
-}
-
-static const char * const forthWordLists[] = {
-            "control keywords",
-            "keywords",
-            "definition words",
-            "prewords with one argument",
-            "prewords with two arguments",
-            "string definition keywords",
-            0,
-        };
-
-LexerModule lmForth(SCLEX_FORTH, ColouriseForthDoc, "forth",FoldForthDoc,forthWordLists);
diff --git a/src/stc/scintilla/src/LexFortran.cxx b/src/stc/scintilla/src/LexFortran.cxx
deleted file mode 100644
index 3ab1116ea6..0000000000
--- a/src/stc/scintilla/src/LexFortran.cxx
+++ /dev/null
@@ -1,452 +0,0 @@
-// Scintilla source code edit control
-/** @file LexFortran.cxx
- ** Lexer for Fortran.
- ** Writen by Chuan-jian Shen, Last changed Sep. 2003
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-/***************************************/
-#include "Platform.h"
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-/***********************************************/
-static inline bool IsAWordChar(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '%');
-}
-/**********************************************/
-static inline bool IsAWordStart(const int ch) {
-	return (ch < 0x80) && (isalnum(ch));
-}
-/***************************************/
-inline bool IsABlank(unsigned int ch) {
-    return (ch == ' ') || (ch == 0x09) || (ch == 0x0b) ;
-}
-/***************************************/
-inline bool IsALineEnd(char ch) {
-    return ((ch == '\n') || (ch == '\r')) ;
-}
-/***************************************/
-unsigned int GetContinuedPos(unsigned int pos, Accessor &styler) {
-	while (!IsALineEnd(styler.SafeGetCharAt(pos++))) continue;
-	if (styler.SafeGetCharAt(pos) == '\n') pos++;
-	while (IsABlank(styler.SafeGetCharAt(pos++))) continue;
-	char chCur = styler.SafeGetCharAt(pos);
-	if (chCur == '&') {
-		while (IsABlank(styler.SafeGetCharAt(++pos))) continue;
-		return pos;
-	} else {
-		return pos;
-	}
-}
-/***************************************/
-static void ColouriseFortranDoc(unsigned int startPos, int length, int initStyle,
-			WordList *keywordlists[], Accessor &styler, bool isFixFormat) {
-	WordList &keywords = *keywordlists[0];
-	WordList &keywords2 = *keywordlists[1];
-	WordList &keywords3 = *keywordlists[2];
-	/***************************************/
-	int posLineStart = 0, numNonBlank = 0, prevState = 0;
-	int endPos = startPos + length;
-	/***************************************/
-	// backtrack to the nearest keyword
-	while ((startPos > 1) && (styler.StyleAt(startPos) != SCE_F_WORD)) {
-		startPos--;
-	}
-	startPos = styler.LineStart(styler.GetLine(startPos));
-	initStyle = styler.StyleAt(startPos - 1);
-	StyleContext sc(startPos, endPos-startPos, initStyle, styler);
-	/***************************************/
-	for (; sc.More(); sc.Forward()) {
-		// remember the start position of the line
-		if (sc.atLineStart) {
-			posLineStart = sc.currentPos;
-			numNonBlank = 0;
-			sc.SetState(SCE_F_DEFAULT);
-		}
-		if (!IsASpaceOrTab(sc.ch)) numNonBlank ++;
-		/***********************************************/
-		// Handle the fix format generically
-		int toLineStart = sc.currentPos - posLineStart;
-		if (isFixFormat && (toLineStart < 6 || toLineStart > 72)) {
-			if (toLineStart == 0 && (tolower(sc.ch) == 'c' || sc.ch == '*') || sc.ch == '!') {
-				sc.SetState(SCE_F_COMMENT);
-				while (!sc.atLineEnd && sc.More()) sc.Forward(); // Until line end
-			} else if (toLineStart > 72) {
-				sc.SetState(SCE_F_COMMENT);
-				while (!sc.atLineEnd && sc.More()) sc.Forward(); // Until line end
-			} else if (toLineStart < 5) {
-				if (IsADigit(sc.ch))
-					sc.SetState(SCE_F_LABEL);
-				else
-					sc.SetState(SCE_F_DEFAULT);
-			} else if (toLineStart == 5) {
-				if (!IsASpace(sc.ch) && sc.ch != '0') {
-					sc.SetState(SCE_F_CONTINUATION);
-					sc.ForwardSetState(prevState);
-				} else
-					sc.SetState(SCE_F_DEFAULT);
-			}
-			continue;
-		}
-		/***************************************/
-		// Handle line continuation generically.
-		if (!isFixFormat && sc.ch == '&') {
-			char chTemp = ' ';
-			int j = 1;
-			while (IsABlank(chTemp) && j<132) {
-				chTemp = static_cast<char>(sc.GetRelative(j));
-				j++;
-			}
-			if (chTemp == '!') {
-				sc.SetState(SCE_F_CONTINUATION);
-				if (sc.chNext == '!') sc.ForwardSetState(SCE_F_COMMENT);
-			} else if (chTemp == '\r' || chTemp == '\n') {
-				int currentState = sc.state;
-				sc.SetState(SCE_F_CONTINUATION);
-				sc.ForwardSetState(SCE_F_DEFAULT);
-				while (IsASpace(sc.ch) && sc.More()) sc.Forward();
-				if (sc.ch == '&') {
-					sc.SetState(SCE_F_CONTINUATION);
-					sc.Forward();
-				}
-				sc.SetState(currentState);
-			}
-		}
-		/***************************************/
-		// Determine if the current state should terminate.
-		if (sc.state == SCE_F_OPERATOR) {
-			sc.SetState(SCE_F_DEFAULT);
-		} else if (sc.state == SCE_F_NUMBER) {
-			if (!(IsAWordChar(sc.ch) || sc.ch=='\'' || sc.ch=='\"' || sc.ch=='.')) {
-				sc.SetState(SCE_F_DEFAULT);
-			}
-		} else if (sc.state == SCE_F_IDENTIFIER) {
-			if (!IsAWordChar(sc.ch) || (sc.ch == '%')) {
-				char s[100];
-				sc.GetCurrentLowered(s, sizeof(s));
-				if (keywords.InList(s)) {
-					sc.ChangeState(SCE_F_WORD);
-				} else if (keywords2.InList(s)) {
-					sc.ChangeState(SCE_F_WORD2);
-				} else if (keywords3.InList(s)) {
-					sc.ChangeState(SCE_F_WORD3);
-				}
-				sc.SetState(SCE_F_DEFAULT);
-			}
-		} else if (sc.state == SCE_F_COMMENT || sc.state == SCE_F_PREPROCESSOR) {
-			if (sc.ch == '\r' || sc.ch == '\n') {
-				sc.SetState(SCE_F_DEFAULT);
-			}
-		} else if (sc.state == SCE_F_STRING1) {
-			prevState = sc.state;
-			if (sc.ch == '\'') {
-				if (sc.chNext == '\'') {
-					sc.Forward();
-				} else {
-					sc.ForwardSetState(SCE_F_DEFAULT);
-					prevState = SCE_F_DEFAULT;
-				}
-			} else if (sc.atLineEnd) {
-				sc.ChangeState(SCE_F_STRINGEOL);
-				sc.ForwardSetState(SCE_F_DEFAULT);
-			}
-		} else if (sc.state == SCE_F_STRING2) {
-			prevState = sc.state;
-			if (sc.atLineEnd) {
-				sc.ChangeState(SCE_F_STRINGEOL);
-				sc.ForwardSetState(SCE_F_DEFAULT);
-			} else if (sc.ch == '\"') {
-				if (sc.chNext == '\"') {
-					sc.Forward();
-				} else {
-					sc.ForwardSetState(SCE_F_DEFAULT);
-					prevState = SCE_F_DEFAULT;
-				}
-			}
-		} else if (sc.state == SCE_F_OPERATOR2) {
-			if (sc.ch == '.') {
-				sc.ForwardSetState(SCE_F_DEFAULT);
-			}
-		} else if (sc.state == SCE_F_CONTINUATION) {
-			sc.SetState(SCE_F_DEFAULT);
-		} else if (sc.state == SCE_F_LABEL) {
-			if (!IsADigit(sc.ch)) {
-				sc.SetState(SCE_F_DEFAULT);
-			} else {
-				if (isFixFormat && sc.currentPos-posLineStart > 4)
-					sc.SetState(SCE_F_DEFAULT);
-				else if (numNonBlank > 5)
-					sc.SetState(SCE_F_DEFAULT);
-			}
-		}
-		/***************************************/
-		// Determine if a new state should be entered.
-		if (sc.state == SCE_F_DEFAULT) {
-			if (sc.ch == '!') {
-				if (sc.chNext == '$') {
-					sc.SetState(SCE_F_PREPROCESSOR);
-				} else {
-					sc.SetState(SCE_F_COMMENT);
-				}
-			} else if ((!isFixFormat) && IsADigit(sc.ch) && numNonBlank == 1) {
-				sc.SetState(SCE_F_LABEL);
-			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
-				sc.SetState(SCE_F_NUMBER);
-			} else if ((tolower(sc.ch) == 'b' || tolower(sc.ch) == 'o' ||
-					    tolower(sc.ch) == 'z') && (sc.chNext == '\"' || sc.chNext == '\'')) {
-				sc.SetState(SCE_F_NUMBER);
-				sc.Forward();
-			} else if (sc.ch == '.' && isalpha(sc.chNext)) {
-				sc.SetState(SCE_F_OPERATOR2);
-			} else if (IsAWordStart(sc.ch)) {
-				sc.SetState(SCE_F_IDENTIFIER);
-			} else if (sc.ch == '\"') {
-				sc.SetState(SCE_F_STRING2);
-			} else if (sc.ch == '\'') {
-				sc.SetState(SCE_F_STRING1);
-			} else if (isoperator(static_cast<char>(sc.ch))) {
-				sc.SetState(SCE_F_OPERATOR);
-			}
-		}
-	}
-	sc.Complete();
-}
-/***************************************/
-// To determine the folding level depending on keywords
-static int classifyFoldPointFortran(const char* s, const char* prevWord, const char chNextNonBlank) {
-	int lev = 0;
-	if ((strcmp(prevWord, "else") == 0 && strcmp(s, "if") == 0) || strcmp(s, "elseif") == 0)
-		return -1;
-	if (strcmp(s, "associate") == 0 || strcmp(s, "block") == 0
-	    || strcmp(s, "blockdata") == 0 || strcmp(s, "select") == 0
-	    || strcmp(s, "do") == 0 || strcmp(s, "enum") ==0
-	    || strcmp(s, "function") == 0 || strcmp(s, "interface") == 0
-		|| strcmp(s, "module") == 0 || strcmp(s, "program") == 0
-		|| strcmp(s, "subroutine") == 0 || strcmp(s, "then") == 0
-		|| (strcmp(s, "type") == 0 && chNextNonBlank != '(') ){
-			if (strcmp(prevWord, "end") == 0)
-				lev = 0;
-			else
-				lev = 1;
-	} else if (strcmp(s, "end") == 0 && chNextNonBlank != '='
-		|| strcmp(s, "endassociate") == 0 || strcmp(s, "endblock") == 0
-		|| strcmp(s, "endblockdata") == 0 || strcmp(s, "endselect") == 0
-		|| strcmp(s, "enddo") == 0 || strcmp(s, "endenum") ==0
-		|| strcmp(s, "endif") == 0 || strcmp(s, "endforall") == 0
-		|| strcmp(s, "endfunction") == 0 || strcmp(s, "endinterface") == 0
-		|| strcmp(s, "endmodule") == 0 || strcmp(s, "endprogram") == 0
-		|| strcmp(s, "endsubroutine") == 0 || strcmp(s, "endtype") == 0
-		|| strcmp(s, "endwhere") == 0
-		|| strcmp(s, "procedure") == 0 ) { // Take care of the module procedure statement
-			lev = -1;
-	} else if (strcmp(prevWord, "end") == 0 && strcmp(s, "if") == 0){ // end if
-			lev = 0;
-	}
-	return lev;
-}
-// Folding the code
-static void FoldFortranDoc(unsigned int startPos, int length, int initStyle,
-						   Accessor &styler, bool isFixFormat) {
-	//
-	// bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
-	// Do not know how to fold the comment at the moment.
-	//
-	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-	unsigned int endPos = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
-	int levelCurrent = levelPrev;
-	char chNext = styler[startPos];
-	char chNextNonBlank;
-	int styleNext = styler.StyleAt(startPos);
-	int style = initStyle;
-	/***************************************/
-	int lastStart = 0;
-	char prevWord[32] = "";
-	char Label[6] = "";
-	// Variables for do label folding.
-	static int doLabels[100];
-	static int posLabel=-1;
-	/***************************************/
-	for (unsigned int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		chNextNonBlank = chNext;
-		unsigned int j=i+1;
-		while(IsABlank(chNextNonBlank) && j<endPos) {
-			j ++ ;
-			chNextNonBlank = styler.SafeGetCharAt(j);
-		}
-		int stylePrev = style;
-		style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-		//
-		if (stylePrev == SCE_F_DEFAULT && (style == SCE_F_WORD || style == SCE_F_LABEL)) {
-			// Store last word and label start point.
-			lastStart = i;
-		}
-		/***************************************/
-		if (style == SCE_F_WORD) {
-			if(iswordchar(ch) && !iswordchar(chNext)) {
-				char s[32];
-				unsigned int k;
-				for(k=0; (k<31 ) && (k<i-lastStart+1 ); k++) {
-					s[k] = static_cast<char>(tolower(styler[lastStart+k]));
-				}
-				s[k] = '\0';
-				// Handle the forall and where statement and structure.
-				if (strcmp(s, "forall") == 0 || strcmp(s, "where") == 0) {
-					if (strcmp(prevWord, "end") != 0) {
-						j = i + 1;
-						char chBrace = '(', chSeek = ')', ch1 = styler.SafeGetCharAt(j);
-						// Find the position of the first (
-						while (ch1 != chBrace && j<endPos) {
-							j++;
-							ch1 = styler.SafeGetCharAt(j);
-						}
-						char styBrace = styler.StyleAt(j);
-						int depth = 1;
-						char chAtPos;
-						char styAtPos;
-						while (j<endPos) {
-							j++;
-							chAtPos = styler.SafeGetCharAt(j);
-							styAtPos = styler.StyleAt(j);
-							if (styAtPos == styBrace) {
-								if (chAtPos == chBrace) depth++;
-								if (chAtPos == chSeek) depth--;
-								if (depth == 0) break;
-							}
-						}
-						while (j<endPos) {
-							j++;
-							chAtPos = styler.SafeGetCharAt(j);
-							styAtPos = styler.StyleAt(j);
-							if (styAtPos == SCE_F_COMMENT || IsABlank(chAtPos)) continue;
-							if (isFixFormat) {
-								if (!IsALineEnd(chAtPos)) {
-									break;
-								} else {
-									if (lineCurrent < styler.GetLine(styler.Length()-1)) {
-										j = styler.LineStart(lineCurrent+1);
-										if (styler.StyleAt(j+5) == SCE_F_CONTINUATION) {
-											j += 5;
-											continue;
-										} else {
-											levelCurrent++;
-											break;
-										}
-									}
-								}
-							} else {
-								if (chAtPos == '&' && styler.StyleAt(j) == SCE_F_CONTINUATION) {
-									j = GetContinuedPos(j+1, styler);
-									continue;
-								} else if (IsALineEnd(chAtPos)) {
-									levelCurrent ++;
-									break;
-								} else {
-									break;
-								}
-							}
-						}
-					}
-				} else {
-					levelCurrent += classifyFoldPointFortran(s, prevWord, chNextNonBlank);
-					// Store the do Labels into array
-					if (strcmp(s, "do") == 0 && IsADigit(chNextNonBlank)) {
-						unsigned int k = 0;
-						for (i=j; (i<j+5 && i<endPos); i++) {
-							ch = styler.SafeGetCharAt(i);
-							if (IsADigit(ch))
-								Label[k++] = ch;
-							else
-								break;
-						}
-						Label[k] = '\0';
-						posLabel ++;
-						doLabels[posLabel] = atoi(Label);
-					}
-				}
-				strcpy(prevWord, s);
-			}
-		} else if (style == SCE_F_LABEL) {
-			if(IsADigit(ch) && !IsADigit(chNext)) {
-				for(j = 0; ( j < 5 ) && ( j < i-lastStart+1 ); j++) {
-					ch = styler.SafeGetCharAt(lastStart + j);
-					if (IsADigit(ch) && styler.StyleAt(lastStart+j) == SCE_F_LABEL)
-						Label[j] = ch;
-					else
-						break;
-				}
-				Label[j] = '\0';
-				while (doLabels[posLabel] == atoi(Label) && posLabel > -1) {
-					levelCurrent--;
-					posLabel--;
-				}
-			}
-		}
-		if (atEOL) {
-			int lev = levelPrev;
-			if (visibleChars == 0 && foldCompact)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			if ((levelCurrent > levelPrev) && (visibleChars > 0))
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			levelPrev = levelCurrent;
-			visibleChars = 0;
-			strcpy(prevWord, "");
-		}
-		/***************************************/
-		if (!isspacechar(ch)) visibleChars++;
-	}
-	/***************************************/
-	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
-}
-/***************************************/
-static const char * const FortranWordLists[] = {
-	"Primary keywords and identifiers",
-	"Intrinsic functions",
-	"Extended and user defined functions",
-	0,
-};
-/***************************************/
-static void ColouriseFortranDocFreeFormat(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-                            Accessor &styler) {
-	ColouriseFortranDoc(startPos, length, initStyle, keywordlists, styler, false);
-}
-/***************************************/
-static void ColouriseFortranDocFixFormat(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-                            Accessor &styler) {
-	ColouriseFortranDoc(startPos, length, initStyle, keywordlists, styler, true);
-}
-/***************************************/
-static void FoldFortranDocFreeFormat(unsigned int startPos, int length, int initStyle,
-		WordList *[], Accessor &styler) {
-	FoldFortranDoc(startPos, length, initStyle,styler, false);
-}
-/***************************************/
-static void FoldFortranDocFixFormat(unsigned int startPos, int length, int initStyle,
-		WordList *[], Accessor &styler) {
-	FoldFortranDoc(startPos, length, initStyle,styler, true);
-}
-/***************************************/
-LexerModule lmFortran(SCLEX_FORTRAN, ColouriseFortranDocFreeFormat, "fortran", FoldFortranDocFreeFormat, FortranWordLists);
-LexerModule lmF77(SCLEX_F77, ColouriseFortranDocFixFormat, "f77", FoldFortranDocFixFormat, FortranWordLists);
diff --git a/src/stc/scintilla/src/LexGui4Cli.cxx b/src/stc/scintilla/src/LexGui4Cli.cxx
deleted file mode 100644
index f76fff6cc4..0000000000
--- a/src/stc/scintilla/src/LexGui4Cli.cxx
+++ /dev/null
@@ -1,309 +0,0 @@
-// Scintilla source code edit control
-// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
-/*
-This is the Lexer for Gui4Cli, included in SciLexer.dll
-- by d. Keletsekis, 2/10/2003
-
-To add to SciLexer.dll:
-1. Add the values below to INCLUDE\Scintilla.iface
-2. Run the include/HFacer.py script
-3. Run the src/lexGen.py script
-
-val SCE_GC_DEFAULT=0
-val SCE_GC_COMMENTLINE=1
-val SCE_GC_COMMENTBLOCK=2
-val SCE_GC_GLOBAL=3
-val SCE_GC_EVENT=4
-val SCE_GC_ATTRIBUTE=5
-val SCE_GC_CONTROL=6
-val SCE_GC_COMMAND=7
-val SCE_GC_STRING=8
-val SCE_GC_OPERATOR=9
-*/
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-#define debug Platform::DebugPrintf
-
-static inline bool IsAWordChar(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' || ch =='\\');
-}
-
-static inline bool IsAWordStart(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '.');
-}
-
-inline bool isGCOperator(int ch)
-{	if (isalnum(ch))
-		return false;
-	// '.' left out as it is used to make up numbers
-	if (ch == '*' || ch == '/' || ch == '-' || ch == '+' ||
-		 ch == '(' || ch == ')' || ch == '=' || ch == '%' ||
-		 ch == '[' || ch == ']' || ch == '<' || ch == '>' ||
-		 ch == ',' || ch == ';' || ch == ':')
-		return true;
-	return false;
-}
-
-#define isSpace(x)		((x)==' ' || (x)=='\t')
-#define isNL(x)			((x)=='\n' || (x)=='\r')
-#define isSpaceOrNL(x)  (isSpace(x) || isNL(x))
-#define BUFFSIZE 500
-#define isFoldPoint(x)  ((styler.LevelAt(x) & SC_FOLDLEVELNUMBERMASK) == 1024)
-
-static void colorFirstWord(WordList *keywordlists[], Accessor &styler,
-									StyleContext *sc, char *buff, int length, int)
-{
-	int c = 0;
-	while (sc->More() && isSpaceOrNL(sc->ch))
-	{	sc->Forward();
-	}
-	styler.ColourTo(sc->currentPos - 1, sc->state);
-
-	if (!IsAWordChar(sc->ch)) // comment, marker, etc..
-		return;
-
-	while (sc->More() && !isSpaceOrNL(sc->ch) && (c < length-1) && !isGCOperator(sc->ch))
-	{	buff[c] = static_cast<char>(sc->ch);
-		++c; sc->Forward();
-	}
-	buff[c] = '\0';
-	char *p = buff;
-	while (*p)	// capitalize..
-	{	if (islower(*p)) *p = static_cast<char>(toupper(*p));
-		++p;
-	}
-
-	WordList &kGlobal		= *keywordlists[0];	// keyword lists set by the user
-	WordList &kEvent		= *keywordlists[1];
-	WordList &kAttribute	= *keywordlists[2];
-	WordList &kControl	= *keywordlists[3];
-	WordList &kCommand	= *keywordlists[4];
-
-	int state = 0;
-	// int level = styler.LevelAt(line) & SC_FOLDLEVELNUMBERMASK;
-	// debug ("line = %d, level = %d", line, level);
-
-	if	     (kGlobal.InList(buff))		state = SCE_GC_GLOBAL;
-	else if (kAttribute.InList(buff))	state = SCE_GC_ATTRIBUTE;
-	else if (kControl.InList(buff))		state = SCE_GC_CONTROL;
-	else if (kCommand.InList(buff))		state = SCE_GC_COMMAND;
-	else if (kEvent.InList(buff))			state = SCE_GC_EVENT;
-
-	if (state)
-	{	sc->ChangeState(state);
-		styler.ColourTo(sc->currentPos - 1, sc->state);
-		sc->ChangeState(SCE_GC_DEFAULT);
-	}
-	else
-	{	sc->ChangeState(SCE_GC_DEFAULT);
-		styler.ColourTo(sc->currentPos - 1, sc->state);
-	}
-}
-
-// Main colorizing function called by Scintilla
-static void
-ColouriseGui4CliDoc(unsigned int startPos, int length, int initStyle,
-                    WordList *keywordlists[], Accessor &styler)
-{
-	styler.StartAt(startPos);
-
-	int quotestart = 0, oldstate, currentline = styler.GetLine(startPos);
-	styler.StartSegment(startPos);
-	bool noforward;
-	char buff[BUFFSIZE+1];	// buffer for command name
-
-	StyleContext sc(startPos, length, initStyle, styler);
-	buff[0] = '\0'; // cbuff = 0;
-
-	if (sc.state != SCE_GC_COMMENTBLOCK) // colorize 1st word..
-		colorFirstWord(keywordlists, styler, &sc, buff, BUFFSIZE, currentline);
-
-	while (sc.More())
-	{	noforward = 0;
-
-		switch (sc.ch)
-		{
-			case '/':
-				if (sc.state == SCE_GC_COMMENTBLOCK || sc.state == SCE_GC_STRING)
-					break;
-				if (sc.chNext == '/')	// line comment
-				{	sc.SetState (SCE_GC_COMMENTLINE);
-					sc.Forward();
-					styler.ColourTo(sc.currentPos, sc.state);
-				}
-				else if (sc.chNext == '*')	// block comment
-				{	sc.SetState(SCE_GC_COMMENTBLOCK);
-					sc.Forward();
-					styler.ColourTo(sc.currentPos, sc.state);
-				}
-				else
-					styler.ColourTo(sc.currentPos, sc.state);
-				break;
-
-			case '*':	// end of comment block, or operator..
-				if (sc.state == SCE_GC_STRING)
-					break;
-				if (sc.state == SCE_GC_COMMENTBLOCK && sc.chNext == '/')
-				{	sc.Forward();
-					styler.ColourTo(sc.currentPos, sc.state);
-					sc.ChangeState (SCE_GC_DEFAULT);
-				}
-				else
-					styler.ColourTo(sc.currentPos, sc.state);
-				break;
-
-			case '\'':	case '\"': // strings..
-				if (sc.state == SCE_GC_COMMENTBLOCK || sc.state == SCE_GC_COMMENTLINE)
-					break;
-				if (sc.state == SCE_GC_STRING)
-				{	if (sc.ch == quotestart)	// match same quote char..
-					{	styler.ColourTo(sc.currentPos, sc.state);
-						sc.ChangeState(SCE_GC_DEFAULT);
-						quotestart = 0;
-				}	}
-				else
-				{	styler.ColourTo(sc.currentPos - 1, sc.state);
-					sc.ChangeState(SCE_GC_STRING);
-					quotestart = sc.ch;
-				}
-				break;
-
-			case ';':	// end of commandline character
-				if (sc.state != SCE_GC_COMMENTBLOCK && sc.state != SCE_GC_COMMENTLINE &&
-					 sc.state != SCE_GC_STRING)
-				{
-					styler.ColourTo(sc.currentPos - 1, sc.state);
-					styler.ColourTo(sc.currentPos, SCE_GC_OPERATOR);
-					sc.ChangeState(SCE_GC_DEFAULT);
-					sc.Forward();
-					colorFirstWord(keywordlists, styler, &sc, buff, BUFFSIZE, currentline);
-					noforward = 1; // don't move forward - already positioned at next char..
-				}
-				break;
-
-			case '+': case '-': case '=':	case '!':	// operators..
-			case '<': case '>': case '&': case '|': case '$':
-				if (sc.state != SCE_GC_COMMENTBLOCK && sc.state != SCE_GC_COMMENTLINE &&
-					 sc.state != SCE_GC_STRING)
-				{
-					styler.ColourTo(sc.currentPos - 1, sc.state);
-					styler.ColourTo(sc.currentPos, SCE_GC_OPERATOR);
-					sc.ChangeState(SCE_GC_DEFAULT);
-				}
-				break;
-
-			case '\\':	// escape - same as operator, but also mark in strings..
-				if (sc.state != SCE_GC_COMMENTBLOCK && sc.state != SCE_GC_COMMENTLINE)
-				{
-					oldstate = sc.state;
-					styler.ColourTo(sc.currentPos - 1, sc.state);
-					sc.Forward(); // mark also the next char..
-					styler.ColourTo(sc.currentPos, SCE_GC_OPERATOR);
-					sc.ChangeState(oldstate);
-				}
-				break;
-
-			case '\n': case '\r':
-				++currentline;
-				if (sc.state == SCE_GC_COMMENTLINE)
-				{	styler.ColourTo(sc.currentPos, sc.state);
-					sc.ChangeState (SCE_GC_DEFAULT);
-				}
-				else if (sc.state != SCE_GC_COMMENTBLOCK)
-				{	colorFirstWord(keywordlists, styler, &sc, buff, BUFFSIZE, currentline);
-					noforward = 1; // don't move forward - already positioned at next char..
-				}
-				break;
-
-//			case ' ': case '\t':
-//			default :
-		}
-
-		if (!noforward) sc.Forward();
-
-	}
-	sc.Complete();
-}
-
-// Main folding function called by Scintilla - (based on props (.ini) files function)
-static void FoldGui4Cli(unsigned int startPos, int length, int,
-								WordList *[], Accessor &styler)
-{
-	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-
-	unsigned int endPos = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-
-	char chNext = styler[startPos];
-	int styleNext = styler.StyleAt(startPos);
-	bool headerPoint = false;
-
-	for (unsigned int i = startPos; i < endPos; i++)
-	{
-		char ch = chNext;
-		chNext = styler[i+1];
-
-		int style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-
-		if (style == SCE_GC_EVENT || style == SCE_GC_GLOBAL)
-		{	headerPoint = true; // fold at events and globals
-		}
-
-		if (atEOL)
-		{	int lev = SC_FOLDLEVELBASE+1;
-
-			if (headerPoint)
-				lev = SC_FOLDLEVELBASE;
-
-			if (visibleChars == 0 && foldCompact)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-
-			if (headerPoint)
-				lev |= SC_FOLDLEVELHEADERFLAG;
-
-			if (lev != styler.LevelAt(lineCurrent)) // set level, if not already correct
-			{	styler.SetLevel(lineCurrent, lev);
-			}
-
-			lineCurrent++;		// re-initialize our flags
-			visibleChars = 0;
-			headerPoint = false;
-		}
-
-		if (!(isspacechar(ch))) // || (style == SCE_GC_COMMENTLINE) || (style != SCE_GC_COMMENTBLOCK)))
-			visibleChars++;
-	}
-
-	int lev = headerPoint ? SC_FOLDLEVELBASE : SC_FOLDLEVELBASE+1;
-	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-	styler.SetLevel(lineCurrent, lev | flagsNext);
-}
-
-// I have no idea what these are for.. probably accessible by some message.
-static const char * const gui4cliWordListDesc[] = {
-	"Globals", "Events", "Attributes", "Control", "Commands",
-	0
-};
-
-// Declare language & pass our function pointers to Scintilla
-LexerModule lmGui4Cli(SCLEX_GUI4CLI, ColouriseGui4CliDoc, "gui4cli", FoldGui4Cli, gui4cliWordListDesc);
-
-#undef debug
-
diff --git a/src/stc/scintilla/src/LexHTML.cxx b/src/stc/scintilla/src/LexHTML.cxx
deleted file mode 100644
index dad8fce46f..0000000000
--- a/src/stc/scintilla/src/LexHTML.cxx
+++ /dev/null
@@ -1,2042 +0,0 @@
-// Scintilla source code edit control
-/** @file LexHTML.cxx
- ** Lexer for HTML.
- **/
-// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-#define SCE_HA_JS (SCE_HJA_START - SCE_HJ_START)
-#define SCE_HA_VBS (SCE_HBA_START - SCE_HB_START)
-#define SCE_HA_PYTHON (SCE_HPA_START - SCE_HP_START)
-
-enum script_type { eScriptNone = 0, eScriptJS, eScriptVBS, eScriptPython, eScriptPHP, eScriptXML, eScriptSGML, eScriptSGMLblock };
-enum script_mode { eHtml = 0, eNonHtmlScript, eNonHtmlPreProc, eNonHtmlScriptPreProc };
-
-static inline bool IsAWordChar(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_');
-}
-
-static inline bool IsAWordStart(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '_');
-}
-
-static inline int MakeLowerCase(int ch) {
-	if (ch < 'A' || ch > 'Z')
-		return ch;
-	else
-		return ch - 'A' + 'a';
-}
-
-static void GetTextSegment(Accessor &styler, unsigned int start, unsigned int end, char *s, size_t len) {
-	size_t i = 0;
-	for (; (i < end - start + 1) && (i < len-1); i++) {
-		s[i] = static_cast<char>(MakeLowerCase(styler[start + i]));
-	}
-	s[i] = '\0';
-}
-
-static script_type segIsScriptingIndicator(Accessor &styler, unsigned int start, unsigned int end, script_type prevValue) {
-	char s[100];
-	GetTextSegment(styler, start, end, s, sizeof(s));
-	//Platform::DebugPrintf("Scripting indicator [%s]\n", s);
-	if (strstr(s, "src"))	// External script
-		return eScriptNone;
-	if (strstr(s, "vbs"))
-		return eScriptVBS;
-	if (strstr(s, "pyth"))
-		return eScriptPython;
-	if (strstr(s, "javas"))
-		return eScriptJS;
-	if (strstr(s, "jscr"))
-		return eScriptJS;
-	if (strstr(s, "php"))
-		return eScriptPHP;
-	if (strstr(s, "xml"))
-		return eScriptXML;
-
-	return prevValue;
-}
-
-static int PrintScriptingIndicatorOffset(Accessor &styler, unsigned int start, unsigned int end) {
-	int iResult = 0;
-	char s[100];
-	GetTextSegment(styler, start, end, s, sizeof(s));
-	if (0 == strncmp(s, "php", 3)) {
-		iResult = 3;
-	}
-
-	return iResult;
-}
-
-static script_type ScriptOfState(int state) {
-	if ((state >= SCE_HP_START) && (state <= SCE_HP_IDENTIFIER)) {
-		return eScriptPython;
-	} else if ((state >= SCE_HB_START) && (state <= SCE_HB_STRINGEOL)) {
-		return eScriptVBS;
-	} else if ((state >= SCE_HJ_START) && (state <= SCE_HJ_REGEX)) {
-		return eScriptJS;
-	} else if ((state >= SCE_HPHP_DEFAULT) && (state <= SCE_HPHP_COMMENTLINE)) {
-		return eScriptPHP;
-	} else if ((state >= SCE_H_SGML_DEFAULT) && (state < SCE_H_SGML_BLOCK_DEFAULT)) {
-		return eScriptSGML;
-	} else if (state == SCE_H_SGML_BLOCK_DEFAULT) {
-		return eScriptSGMLblock;
-	} else {
-		return eScriptNone;
-	}
-}
-
-static int statePrintForState(int state, script_mode inScriptType) {
-	int StateToPrint;
-
-	if ((state >= SCE_HP_START) && (state <= SCE_HP_IDENTIFIER)) {
-		StateToPrint = state + ((inScriptType == eNonHtmlScript) ? 0 : SCE_HA_PYTHON);
-	} else if ((state >= SCE_HB_START) && (state <= SCE_HB_STRINGEOL)) {
-		StateToPrint = state + ((inScriptType == eNonHtmlScript) ? 0 : SCE_HA_VBS);
-	} else if ((state >= SCE_HJ_START) && (state <= SCE_HJ_REGEX)) {
-		StateToPrint = state + ((inScriptType == eNonHtmlScript) ? 0 : SCE_HA_JS);
-	} else {
-		StateToPrint = state;
-	}
-
-	return StateToPrint;
-}
-
-static int stateForPrintState(int StateToPrint) {
-	int state;
-
-	if ((StateToPrint >= SCE_HPA_START) && (StateToPrint <= SCE_HPA_IDENTIFIER)) {
-		state = StateToPrint - SCE_HA_PYTHON;
-	} else if ((StateToPrint >= SCE_HBA_START) && (StateToPrint <= SCE_HBA_STRINGEOL)) {
-		state = StateToPrint - SCE_HA_VBS;
-	} else if ((StateToPrint >= SCE_HJA_START) && (StateToPrint <= SCE_HJA_REGEX)) {
-		state = StateToPrint - SCE_HA_JS;
-	} else {
-		state = StateToPrint;
-	}
-
-	return state;
-}
-
-static inline bool IsNumber(unsigned int start, Accessor &styler) {
-	return IsADigit(styler[start]) || (styler[start] == '.') ||
-	       (styler[start] == '-') || (styler[start] == '#');
-}
-
-static inline bool isStringState(int state) {
-	bool bResult;
-
-	switch (state) {
-	case SCE_HJ_DOUBLESTRING:
-	case SCE_HJ_SINGLESTRING:
-	case SCE_HJA_DOUBLESTRING:
-	case SCE_HJA_SINGLESTRING:
-	case SCE_HB_STRING:
-	case SCE_HBA_STRING:
-	case SCE_HP_STRING:
-	case SCE_HP_CHARACTER:
-	case SCE_HP_TRIPLE:
-	case SCE_HP_TRIPLEDOUBLE:
-	case SCE_HPA_STRING:
-	case SCE_HPA_CHARACTER:
-	case SCE_HPA_TRIPLE:
-	case SCE_HPA_TRIPLEDOUBLE:
-	case SCE_HPHP_HSTRING:
-	case SCE_HPHP_SIMPLESTRING:
-	case SCE_HPHP_HSTRING_VARIABLE:
-	case SCE_HPHP_COMPLEX_VARIABLE:
-		bResult = true;
-		break;
-	default :
-		bResult = false;
-		break;
-	}
-	return bResult;
-}
-
-static inline bool stateAllowsTermination(int state) {
-	bool allowTermination = !isStringState(state);
-	if (allowTermination) {
-		switch (state) {
-		case SCE_HPHP_COMMENT:
-		case SCE_HP_COMMENTLINE:
-		case SCE_HPA_COMMENTLINE:
-			allowTermination = false;
-		}
-	}
-	return allowTermination;
-}
-
-// not really well done, since it's only comments that should lex the %> and <%
-static inline bool isCommentASPState(int state) {
-	bool bResult;
-
-	switch (state) {
-	case SCE_HJ_COMMENT:
-	case SCE_HJ_COMMENTLINE:
-	case SCE_HJ_COMMENTDOC:
-	case SCE_HB_COMMENTLINE:
-	case SCE_HP_COMMENTLINE:
-	case SCE_HPHP_COMMENT:
-	case SCE_HPHP_COMMENTLINE:
-		bResult = true;
-		break;
-	default :
-		bResult = false;
-		break;
-	}
-	return bResult;
-}
-
-static void classifyAttribHTML(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler) {
-	bool wordIsNumber = IsNumber(start, styler);
-	char chAttr = SCE_H_ATTRIBUTEUNKNOWN;
-	if (wordIsNumber) {
-		chAttr = SCE_H_NUMBER;
-	} else {
-		char s[100];
-		GetTextSegment(styler, start, end, s, sizeof(s));
-		if (keywords.InList(s))
-			chAttr = SCE_H_ATTRIBUTE;
-	}
-	if ((chAttr == SCE_H_ATTRIBUTEUNKNOWN) && !keywords)
-		// No keywords -> all are known
-		chAttr = SCE_H_ATTRIBUTE;
-	styler.ColourTo(end, chAttr);
-}
-
-static int classifyTagHTML(unsigned int start, unsigned int end,
-                           WordList &keywords, Accessor &styler, bool &tagDontFold,
-			   bool caseSensitive) {
-	char s[30 + 2];
-	// Copy after the '<'
-	unsigned int i = 0;
-	for (unsigned int cPos = start; cPos <= end && i < 30; cPos++) {
-		char ch = styler[cPos];
-		if ((ch != '<') && (ch != '/')) {
-			s[i++] = caseSensitive ? ch : static_cast<char>(MakeLowerCase(ch));
-		}
-	}
-
-	//The following is only a quick hack, to see if this whole thing would work
-	//we first need the tagname with a trailing space...
-	s[i] = ' ';
-	s[i+1] = '\0';
-
-	//...to find it in the list of no-container-tags
-	// (There are many more. We will need a keywordlist in the property file for this)
-	tagDontFold = (NULL != strstr("meta link img area br hr input ",s));
-
-	//now we can remove the trailing space
-	s[i] = '\0';
-
-	bool isScript = false;
-	char chAttr = SCE_H_TAGUNKNOWN;
-	if (s[0] == '!') {
-		chAttr = SCE_H_SGML_DEFAULT;
-	} else if (s[0] == '/') {	// Closing tag
-		if (keywords.InList(s + 1))
-			chAttr = SCE_H_TAG;
-	} else {
-		if (keywords.InList(s)) {
-			chAttr = SCE_H_TAG;
-			isScript = 0 == strcmp(s, "script");
-		}
-	}
-	if ((chAttr == SCE_H_TAGUNKNOWN) && !keywords) {
-		// No keywords -> all are known
-		chAttr = SCE_H_TAG;
-		isScript = 0 == strcmp(s, "script");
-	}
-	styler.ColourTo(end, chAttr);
-	return isScript ? SCE_H_SCRIPT : chAttr;
-}
-
-static void classifyWordHTJS(unsigned int start, unsigned int end,
-                             WordList &keywords, Accessor &styler, script_mode inScriptType) {
-	char chAttr = SCE_HJ_WORD;
-	bool wordIsNumber = IsADigit(styler[start]) || (styler[start] == '.');
-	if (wordIsNumber)
-		chAttr = SCE_HJ_NUMBER;
-	else {
-		char s[30 + 1];
-		unsigned int i = 0;
-		for (; i < end - start + 1 && i < 30; i++) {
-			s[i] = styler[start + i];
-		}
-		s[i] = '\0';
-		if (keywords.InList(s))
-			chAttr = SCE_HJ_KEYWORD;
-	}
-	styler.ColourTo(end, statePrintForState(chAttr, inScriptType));
-}
-
-static int classifyWordHTVB(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler, script_mode inScriptType) {
-	char chAttr = SCE_HB_IDENTIFIER;
-	bool wordIsNumber = IsADigit(styler[start]) || (styler[start] == '.');
-	if (wordIsNumber)
-		chAttr = SCE_HB_NUMBER;
-	else {
-		char s[100];
-		GetTextSegment(styler, start, end, s, sizeof(s));
-		if (keywords.InList(s)) {
-			chAttr = SCE_HB_WORD;
-			if (strcmp(s, "rem") == 0)
-				chAttr = SCE_HB_COMMENTLINE;
-		}
-	}
-	styler.ColourTo(end, statePrintForState(chAttr, inScriptType));
-	if (chAttr == SCE_HB_COMMENTLINE)
-		return SCE_HB_COMMENTLINE;
-	else
-		return SCE_HB_DEFAULT;
-}
-
-static void classifyWordHTPy(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler, char *prevWord, script_mode inScriptType) {
-	bool wordIsNumber = IsADigit(styler[start]);
-	char s[30 + 1];
-	unsigned int i = 0;
-	for (; i < end - start + 1 && i < 30; i++) {
-		s[i] = styler[start + i];
-	}
-	s[i] = '\0';
-	char chAttr = SCE_HP_IDENTIFIER;
-	if (0 == strcmp(prevWord, "class"))
-		chAttr = SCE_HP_CLASSNAME;
-	else if (0 == strcmp(prevWord, "def"))
-		chAttr = SCE_HP_DEFNAME;
-	else if (wordIsNumber)
-		chAttr = SCE_HP_NUMBER;
-	else if (keywords.InList(s))
-		chAttr = SCE_HP_WORD;
-	styler.ColourTo(end, statePrintForState(chAttr, inScriptType));
-	strcpy(prevWord, s);
-}
-
-// Update the word colour to default or keyword
-// Called when in a PHP word
-static void classifyWordHTPHP(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler) {
-	char chAttr = SCE_HPHP_DEFAULT;
-	bool wordIsNumber = IsADigit(styler[start]) || (styler[start] == '.' && start+1 <= end && IsADigit(styler[start+1]));
-	if (wordIsNumber)
-		chAttr = SCE_HPHP_NUMBER;
-	else {
-		char s[100];
-		GetTextSegment(styler, start, end, s, sizeof(s));
-		if (keywords.InList(s))
-			chAttr = SCE_HPHP_WORD;
-	}
-	styler.ColourTo(end, chAttr);
-}
-
-static bool isWordHSGML(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler) {
-	char s[30 + 1];
-	unsigned int i = 0;
-	for (; i < end - start + 1 && i < 30; i++) {
-		s[i] = styler[start + i];
-	}
-	s[i] = '\0';
-	return keywords.InList(s);
-}
-
-static bool isWordCdata(unsigned int start, unsigned int end, Accessor &styler) {
-	char s[30 + 1];
-	unsigned int i = 0;
-	for (; i < end - start + 1 && i < 30; i++) {
-		s[i] = styler[start + i];
-	}
-	s[i] = '\0';
-	return (0 == strcmp(s, "[CDATA["));
-}
-
-// Return the first state to reach when entering a scripting language
-static int StateForScript(script_type scriptLanguage) {
-	int Result;
-	switch (scriptLanguage) {
-	case eScriptVBS:
-		Result = SCE_HB_START;
-		break;
-	case eScriptPython:
-		Result = SCE_HP_START;
-		break;
-	case eScriptPHP:
-		Result = SCE_HPHP_DEFAULT;
-		break;
-	case eScriptXML:
-		Result = SCE_H_TAGUNKNOWN;
-		break;
-	case eScriptSGML:
-		Result = SCE_H_SGML_DEFAULT;
-		break;
-	default :
-		Result = SCE_HJ_START;
-		break;
-	}
-	return Result;
-}
-
-static inline bool ishtmlwordchar(char ch) {
-	return !isascii(ch) ||
-		(isalnum(ch) || ch == '.' || ch == '-' || ch == '_' || ch == ':' || ch == '!' || ch == '#');
-}
-
-static inline bool issgmlwordchar(char ch) {
-	return !isascii(ch) ||
-		(isalnum(ch) || ch == '.' || ch == '_' || ch == ':' || ch == '!' || ch == '#' || ch == '[');
-}
-
-static inline bool IsPhpWordStart(const unsigned char ch) {
-	return (isascii(ch) && (isalpha(ch) || (ch == '_'))) || (ch >= 0x7f);
-}
-
-static inline bool IsPhpWordChar(char ch) {
-	return IsADigit(ch) || IsPhpWordStart(ch);
-}
-
-static bool InTagState(int state) {
-	return state == SCE_H_TAG || state == SCE_H_TAGUNKNOWN ||
-	       state == SCE_H_SCRIPT ||
-	       state == SCE_H_ATTRIBUTE || state == SCE_H_ATTRIBUTEUNKNOWN ||
-	       state == SCE_H_NUMBER || state == SCE_H_OTHER ||
-	       state == SCE_H_DOUBLESTRING || state == SCE_H_SINGLESTRING;
-}
-
-static bool IsCommentState(const int state) {
-	return state == SCE_H_COMMENT || state == SCE_H_SGML_COMMENT;
-}
-
-static bool IsScriptCommentState(const int state) {
-	return state == SCE_HJ_COMMENT || state == SCE_HJ_COMMENTLINE || state == SCE_HJA_COMMENT ||
-		   state == SCE_HJA_COMMENTLINE || state == SCE_HB_COMMENTLINE || state == SCE_HBA_COMMENTLINE;
-}
-
-static bool isLineEnd(char ch) {
-	return ch == '\r' || ch == '\n';
-}
-
-static bool isOKBeforeRE(char ch) {
-	return (ch == '(') || (ch == '=') || (ch == ',');
-}
-
-static bool isPHPStringState(int state) {
-	return
-	    (state == SCE_HPHP_HSTRING) ||
-	    (state == SCE_HPHP_SIMPLESTRING) ||
-	    (state == SCE_HPHP_HSTRING_VARIABLE) ||
-	    (state == SCE_HPHP_COMPLEX_VARIABLE);
-}
-
-static int FindPhpStringDelimiter(char *phpStringDelimiter, const int phpStringDelimiterSize, int i, const int lengthDoc, Accessor &styler) {
-	int j;
-	while (i < lengthDoc && (styler[i] == ' ' || styler[i] == '\t'))
-		i++;
-	phpStringDelimiter[0] = '\n';
-	for (j = i; j < lengthDoc && styler[j] != '\n' && styler[j] != '\r'; j++) {
-		if (j - i < phpStringDelimiterSize - 2)
-			phpStringDelimiter[j-i+1] = styler[j];
-		else
-			i++;
-	}
-	phpStringDelimiter[j-i+1] = '\0';
-	return j;
-}
-
-static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-                                  Accessor &styler) {
-	WordList &keywords = *keywordlists[0];
-	WordList &keywords2 = *keywordlists[1];
-	WordList &keywords3 = *keywordlists[2];
-	WordList &keywords4 = *keywordlists[3];
-	WordList &keywords5 = *keywordlists[4];
-	WordList &keywords6 = *keywordlists[5]; // SGML (DTD) keywords
-
-	// Lexer for HTML requires more lexical states (7 bits worth) than most lexers
-	styler.StartAt(startPos, STYLE_MAX);
-	char prevWord[200];
-	prevWord[0] = '\0';
-	char phpStringDelimiter[200]; // PHP is not limited in length, we are
-	phpStringDelimiter[0] = '\0';
-	int StateToPrint = initStyle;
-	int state = stateForPrintState(StateToPrint);
-
-	// If inside a tag, it may be a script tag, so reread from the start to ensure any language tags are seen
-	if (InTagState(state)) {
-		while ((startPos > 0) && (InTagState(styler.StyleAt(startPos - 1)))) {
-			startPos--;
-			length++;
-		}
-		state = SCE_H_DEFAULT;
-	}
-	// String can be heredoc, must find a delimiter first
-	while (startPos > 0 && isPHPStringState(state) && state != SCE_HPHP_SIMPLESTRING) {
-		startPos--;
-		length++;
-		state = styler.StyleAt(startPos);
-	}
-	styler.StartAt(startPos, STYLE_MAX);
-
-	int lineCurrent = styler.GetLine(startPos);
-	int lineState;
-	if (lineCurrent > 0) {
-		lineState = styler.GetLineState(lineCurrent);
-	} else {
-		// Default client and ASP scripting language is JavaScript
-		lineState = eScriptJS << 8;
-		lineState |= styler.GetPropertyInt("asp.default.language", eScriptJS) << 4;
-	}
-	script_mode inScriptType = script_mode((lineState >> 0) & 0x03); // 2 bits of scripting mode
-	bool tagOpened = (lineState >> 2) & 0x01; // 1 bit to know if we are in an opened tag
-	bool tagClosing = (lineState >> 3) & 0x01; // 1 bit to know if we are in a closing tag
-	bool tagDontFold = false; //some HTML tags should not be folded
-	script_type aspScript = script_type((lineState >> 4) & 0x0F); // 4 bits of script name
-	script_type clientScript = script_type((lineState >> 8) & 0x0F); // 4 bits of script name
-	int beforePreProc = (lineState >> 12) & 0xFF; // 8 bits of state
-
-	script_type scriptLanguage = ScriptOfState(state);
-
-	const bool foldHTML = styler.GetPropertyInt("fold.html", 0) != 0;
-	const bool fold = foldHTML && styler.GetPropertyInt("fold", 0);
-	const bool foldHTMLPreprocessor = foldHTML && styler.GetPropertyInt("fold.html.preprocessor", 1);
-	const bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-	const bool caseSensitive = styler.GetPropertyInt("html.tags.case.sensitive", 0) != 0;
-
-	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
-	int levelCurrent = levelPrev;
-	int visibleChars = 0;
-
-	char chPrev = ' ';
-	char ch = ' ';
-	char chPrevNonWhite = ' ';
-	// look back to set chPrevNonWhite properly for better regex colouring
-	if (scriptLanguage == eScriptJS && startPos > 0) {
-		int back = startPos;
-		int style = 0;
-		while (--back) {
-			style = styler.StyleAt(back);
-			if (style < SCE_HJ_DEFAULT || style > SCE_HJ_COMMENTDOC)
-				// includes SCE_HJ_COMMENT & SCE_HJ_COMMENTLINE
-				break;
-		}
-		if (style == SCE_HJ_SYMBOLS) {
-			chPrevNonWhite = styler.SafeGetCharAt(back);
-		}
-	}
-
-	styler.StartSegment(startPos);
-	const int lengthDoc = startPos + length;
-	for (int i = startPos; i < lengthDoc; i++) {
-		const char chPrev2 = chPrev;
-		chPrev = ch;
-		if (!isspacechar(ch) && state != SCE_HJ_COMMENT &&
-			state != SCE_HJ_COMMENTLINE && state != SCE_HJ_COMMENTDOC)
-			chPrevNonWhite = ch;
-		ch = styler[i];
-		char chNext = styler.SafeGetCharAt(i + 1);
-		const char chNext2 = styler.SafeGetCharAt(i + 2);
-
-		// Handle DBCS codepages
-		if (styler.IsLeadByte(ch)) {
-			chPrev = ' ';
-			i += 1;
-			continue;
-		}
-
-		if ((!isspacechar(ch) || !foldCompact) && fold)
-			visibleChars++;
-
-		// decide what is the current state to print (depending of the script tag)
-		StateToPrint = statePrintForState(state, inScriptType);
-
-		// handle script folding
-		if (fold) {
-			switch (scriptLanguage) {
-			case eScriptJS:
-			case eScriptPHP:
-				//not currently supported				case eScriptVBS:
-
-				if ((state != SCE_HPHP_COMMENT) && (state != SCE_HPHP_COMMENTLINE) && (state != SCE_HJ_COMMENT) && (state != SCE_HJ_COMMENTLINE) && (state != SCE_HJ_COMMENTDOC) && (!isStringState(state))) {
-				//Platform::DebugPrintf("state=%d, StateToPrint=%d, initStyle=%d\n", state, StateToPrint, initStyle);
-				//if ((state == SCE_HPHP_OPERATOR) || (state == SCE_HPHP_DEFAULT) || (state == SCE_HJ_SYMBOLS) || (state == SCE_HJ_START) || (state == SCE_HJ_DEFAULT)) {
-					if ((ch == '{') || (ch == '}')) {
-						levelCurrent += (ch == '{') ? 1 : -1;
-					}
-				}
-				break;
-			case eScriptPython:
-				if (state != SCE_HP_COMMENTLINE) {
-					if ((ch == ':') && ((chNext == '\n') || (chNext == '\r' && chNext2 == '\n'))) {
-						levelCurrent++;
-					} else if ((ch == '\n') && !((chNext == '\r') && (chNext2 == '\n')) && (chNext != '\n')) {
-						// check if the number of tabs is lower than the level
-						int Findlevel = (levelCurrent & ~SC_FOLDLEVELBASE) * 8;
-						for (int j = 0; Findlevel > 0; j++) {
-							char chTmp = styler.SafeGetCharAt(i + j + 1);
-							if (chTmp == '\t') {
-								Findlevel -= 8;
-							} else if (chTmp == ' ') {
-								Findlevel--;
-							} else {
-								break;
-							}
-						}
-
-						if (Findlevel > 0) {
-							levelCurrent -= Findlevel / 8;
-							if (Findlevel % 8)
-								levelCurrent--;
-						}
-					}
-				}
-				break;
-			default:
-				break;
-			}
-		}
-
-		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
-			// New line -> record any line state onto /next/ line
-			if (fold) {
-				int lev = levelPrev;
-				if (visibleChars == 0)
-					lev |= SC_FOLDLEVELWHITEFLAG;
-				if ((levelCurrent > levelPrev) && (visibleChars > 0))
-					lev |= SC_FOLDLEVELHEADERFLAG;
-
-				styler.SetLevel(lineCurrent, lev);
-				visibleChars = 0;
-				levelPrev = levelCurrent;
-			}
-			lineCurrent++;
-			styler.SetLineState(lineCurrent,
-			                    ((inScriptType & 0x03) << 0) |
-			                    ((tagOpened & 0x01) << 2) |
-			                    ((tagClosing & 0x01) << 3) |
-			                    ((aspScript & 0x0F) << 4) |
-			                    ((clientScript & 0x0F) << 8) |
-			                    ((beforePreProc & 0xFF) << 12));
-		}
-
-		// generic end of script processing
-		else if ((inScriptType == eNonHtmlScript) && (ch == '<') && (chNext == '/')) {
-			// Check if it's the end of the script tag (or any other HTML tag)
-			switch (state) {
-				// in these cases, you can embed HTML tags (to confirm !!!!!!!!!!!!!!!!!!!!!!)
-			case SCE_H_DOUBLESTRING:
-			case SCE_H_SINGLESTRING:
-			case SCE_HJ_COMMENT:
-			case SCE_HJ_COMMENTDOC:
-			//case SCE_HJ_COMMENTLINE: // removed as this is a common thing done to hide
-			// the end of script marker from some JS interpreters.
-			case SCE_HJ_DOUBLESTRING:
-			case SCE_HJ_SINGLESTRING:
-			case SCE_HJ_REGEX:
-			case SCE_HB_STRING:
-			case SCE_HP_STRING:
-			case SCE_HP_TRIPLE:
-			case SCE_HP_TRIPLEDOUBLE:
-				break;
-			default :
-				// check if the closing tag is a script tag
-				if (state == SCE_HJ_COMMENTLINE) {
-					char tag[7]; // room for the <script> tag
-					char chr;	// current char
-					int j=0;
-					chr = styler.SafeGetCharAt(i+2);
-					while (j < 6 && !isspacechar(chr)) {
-						tag[j++] = static_cast<char>(MakeLowerCase(chr));
-						chr = styler.SafeGetCharAt(i+2+j);
-					}
-					tag[j] = '\0';
-					if (strcmp(tag, "script") != 0) break;
-				}
-				// closing tag of the script (it's a closing HTML tag anyway)
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_H_TAGUNKNOWN;
-				inScriptType = eHtml;
-				scriptLanguage = eScriptNone;
-				clientScript = eScriptJS;
-				i += 2;
-				visibleChars += 2;
-				tagClosing = true;
-				continue;
-			}
-		}
-
-		/////////////////////////////////////
-		// handle the start of PHP pre-processor = Non-HTML
-		else if ((state != SCE_H_ASPAT) &&
-		         !isPHPStringState(state) &&
-		         (state != SCE_HPHP_COMMENT) &&
-		         (ch == '<') &&
-		         (chNext == '?') &&
-				 !IsScriptCommentState(state) ) {
-			scriptLanguage = segIsScriptingIndicator(styler, i + 2, i + 10, eScriptPHP);
-			if (scriptLanguage != eScriptPHP && isStringState(state)) continue;
-			styler.ColourTo(i - 1, StateToPrint);
-			beforePreProc = state;
-			i++;
-			visibleChars++;
-			i += PrintScriptingIndicatorOffset(styler, styler.GetStartSegment() + 2, i + 10);
-			if (scriptLanguage == eScriptXML)
-				styler.ColourTo(i, SCE_H_XMLSTART);
-			else
-				styler.ColourTo(i, SCE_H_QUESTION);
-			state = StateForScript(scriptLanguage);
-			if (inScriptType == eNonHtmlScript)
-				inScriptType = eNonHtmlScriptPreProc;
-			else
-				inScriptType = eNonHtmlPreProc;
-			// Fold whole script, but not if the XML first tag (all XML-like tags in this case)
-			if (foldHTMLPreprocessor && (scriptLanguage != eScriptXML)) {
-				levelCurrent++;
-			}
-			// should be better
-			ch = styler.SafeGetCharAt(i);
-			continue;
-		}
-
-		// handle the start of ASP pre-processor = Non-HTML
-		else if (!isCommentASPState(state) && (ch == '<') && (chNext == '%') && !isPHPStringState(state)) {
-			styler.ColourTo(i - 1, StateToPrint);
-			beforePreProc = state;
-			if (inScriptType == eNonHtmlScript)
-				inScriptType = eNonHtmlScriptPreProc;
-			else
-				inScriptType = eNonHtmlPreProc;
-
-			if (chNext2 == '@') {
-				i += 2; // place as if it was the second next char treated
-				visibleChars += 2;
-				state = SCE_H_ASPAT;
-			} else if ((chNext2 == '-') && (styler.SafeGetCharAt(i + 3) == '-')) {
-				styler.ColourTo(i + 3, SCE_H_ASP);
-				state = SCE_H_XCCOMMENT;
-				scriptLanguage = eScriptVBS;
-				continue;
-			} else {
-				if (chNext2 == '=') {
-					i += 2; // place as if it was the second next char treated
-					visibleChars += 2;
-				} else {
-					i++; // place as if it was the next char treated
-					visibleChars++;
-				}
-
-				state = StateForScript(aspScript);
-			}
-			scriptLanguage = eScriptVBS;
-			styler.ColourTo(i, SCE_H_ASP);
-			// fold whole script
-			if (foldHTMLPreprocessor)
-				levelCurrent++;
-			// should be better
-			ch = styler.SafeGetCharAt(i);
-			continue;
-		}
-
-		/////////////////////////////////////
-		// handle the start of SGML language (DTD)
-		else if (((scriptLanguage == eScriptNone) || (scriptLanguage == eScriptXML)) &&
-				 (chPrev == '<') &&
-				 (ch == '!') &&
-				 (StateToPrint != SCE_H_CDATA) &&
-				 (!IsCommentState(StateToPrint)) &&
-				 (!IsScriptCommentState(StateToPrint)) ) {
-			beforePreProc = state;
-			styler.ColourTo(i - 2, StateToPrint);
-			if ((chNext == '-') && (chNext2 == '-')) {
-				state = SCE_H_COMMENT; // wait for a pending command
-				styler.ColourTo(i + 2, SCE_H_COMMENT);
-				i += 2; // follow styling after the --
-			} else if (isWordCdata(i + 1, i + 7, styler)) {
-				state = SCE_H_CDATA;
-			} else {
-				styler.ColourTo(i, SCE_H_SGML_DEFAULT); // <! is default
-				scriptLanguage = eScriptSGML;
-				state = SCE_H_SGML_COMMAND; // wait for a pending command
-			}
-			// fold whole tag (-- when closing the tag)
-			if (foldHTMLPreprocessor)
-				levelCurrent++;
-			continue;
-		}
-
-		// handle the end of a pre-processor = Non-HTML
-		else if ((
-		             ((inScriptType == eNonHtmlPreProc)
-		              || (inScriptType == eNonHtmlScriptPreProc)) && (
-		                 ((scriptLanguage != eScriptNone) && stateAllowsTermination(state) && ((ch == '%') || (ch == '?')))
-		             ) && (chNext == '>')) ||
-		         ((scriptLanguage == eScriptSGML) && (ch == '>') && (state != SCE_H_SGML_COMMENT))) {
-			if (state == SCE_H_ASPAT) {
-				aspScript = segIsScriptingIndicator(styler,
-				                                    styler.GetStartSegment(), i - 1, aspScript);
-			}
-			// Bounce out of any ASP mode
-			switch (state) {
-			case SCE_HJ_WORD:
-				classifyWordHTJS(styler.GetStartSegment(), i - 1, keywords2, styler, inScriptType);
-				break;
-			case SCE_HB_WORD:
-				classifyWordHTVB(styler.GetStartSegment(), i - 1, keywords3, styler, inScriptType);
-				break;
-			case SCE_HP_WORD:
-				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, styler, prevWord, inScriptType);
-				break;
-			case SCE_HPHP_WORD:
-				classifyWordHTPHP(styler.GetStartSegment(), i - 1, keywords5, styler);
-				break;
-			case SCE_H_XCCOMMENT:
-				styler.ColourTo(i - 1, state);
-				break;
-			default :
-				styler.ColourTo(i - 1, StateToPrint);
-				break;
-			}
-			if (scriptLanguage != eScriptSGML) {
-				i++;
-				visibleChars++;
-			}
-			if (ch == '%')
-				styler.ColourTo(i, SCE_H_ASP);
-			else if (scriptLanguage == eScriptXML)
-				styler.ColourTo(i, SCE_H_XMLEND);
-			else if (scriptLanguage == eScriptSGML)
-				styler.ColourTo(i, SCE_H_SGML_DEFAULT);
-			else
-				styler.ColourTo(i, SCE_H_QUESTION);
-			state = beforePreProc;
-			if (inScriptType == eNonHtmlScriptPreProc)
-				inScriptType = eNonHtmlScript;
-			else
-				inScriptType = eHtml;
-			// Unfold all scripting languages, except for XML tag
-			if (foldHTMLPreprocessor && (scriptLanguage != eScriptXML)) {
-				levelCurrent--;
-			}
-			scriptLanguage = eScriptNone;
-			continue;
-		}
-		/////////////////////////////////////
-
-		switch (state) {
-		case SCE_H_DEFAULT:
-			if (ch == '<') {
-				// in HTML, fold on tag open and unfold on tag close
-				tagOpened = true;
-				tagClosing = (chNext == '/');
-				styler.ColourTo(i - 1, StateToPrint);
-				if (chNext != '!')
-					state = SCE_H_TAGUNKNOWN;
-			} else if (ch == '&') {
-				styler.ColourTo(i - 1, SCE_H_DEFAULT);
-				state = SCE_H_ENTITY;
-			}
-			break;
-		case SCE_H_SGML_DEFAULT:
-		case SCE_H_SGML_BLOCK_DEFAULT:
-//			if (scriptLanguage == eScriptSGMLblock)
-//				StateToPrint = SCE_H_SGML_BLOCK_DEFAULT;
-
-			if (ch == '\"') {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_H_SGML_DOUBLESTRING;
-			} else if (ch == '\'') {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_H_SGML_SIMPLESTRING;
-			} else if ((ch == '-') && (chPrev == '-')) {
-				styler.ColourTo(i - 2, StateToPrint);
-				state = SCE_H_SGML_COMMENT;
-			} else if (isascii(ch) && isalpha(ch) && (chPrev == '%')) {
-				styler.ColourTo(i - 2, StateToPrint);
-				state = SCE_H_SGML_ENTITY;
-			} else if (ch == '#') {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_H_SGML_SPECIAL;
-			} else if (ch == '[') {
-				styler.ColourTo(i - 1, StateToPrint);
-				scriptLanguage = eScriptSGMLblock;
-				state = SCE_H_SGML_BLOCK_DEFAULT;
-			} else if (ch == ']') {
-				if (scriptLanguage == eScriptSGMLblock) {
-					styler.ColourTo(i, StateToPrint);
-					scriptLanguage = eScriptSGML;
-				} else {
-					styler.ColourTo(i - 1, StateToPrint);
-					styler.ColourTo(i, SCE_H_SGML_ERROR);
-				}
-				state = SCE_H_SGML_DEFAULT;
-			} else if (scriptLanguage == eScriptSGMLblock) {
-				if ((ch == '!') && (chPrev == '<')) {
-					styler.ColourTo(i - 2, StateToPrint);
-					styler.ColourTo(i, SCE_H_SGML_DEFAULT);
-					state = SCE_H_SGML_COMMAND;
-				} else if (ch == '>') {
-					styler.ColourTo(i - 1, StateToPrint);
-					styler.ColourTo(i, SCE_H_SGML_DEFAULT);
-				}
-			}
-			break;
-		case SCE_H_SGML_COMMAND:
-			if ((ch == '-') && (chPrev == '-')) {
-				styler.ColourTo(i - 2, StateToPrint);
-				state = SCE_H_SGML_COMMENT;
-			} else if (!issgmlwordchar(ch)) {
-				if (isWordHSGML(styler.GetStartSegment(), i - 1, keywords6, styler)) {
-					styler.ColourTo(i - 1, StateToPrint);
-					state = SCE_H_SGML_1ST_PARAM;
-				} else {
-					state = SCE_H_SGML_ERROR;
-				}
-			}
-			break;
-		case SCE_H_SGML_1ST_PARAM:
-			// wait for the beginning of the word
-			if ((ch == '-') && (chPrev == '-')) {
-				if (scriptLanguage == eScriptSGMLblock) {
-					styler.ColourTo(i - 2, SCE_H_SGML_BLOCK_DEFAULT);
-				} else {
-					styler.ColourTo(i - 2, SCE_H_SGML_DEFAULT);
-				}
-				state = SCE_H_SGML_1ST_PARAM_COMMENT;
-			} else if (issgmlwordchar(ch)) {
-				if (scriptLanguage == eScriptSGMLblock) {
-					styler.ColourTo(i - 1, SCE_H_SGML_BLOCK_DEFAULT);
-				} else {
-					styler.ColourTo(i - 1, SCE_H_SGML_DEFAULT);
-				}
-				// find the length of the word
-				int size = 1;
-				while (ishtmlwordchar(styler.SafeGetCharAt(i + size)))
-					size++;
-				styler.ColourTo(i + size - 1, StateToPrint);
-				i += size - 1;
-				visibleChars += size - 1;
-				ch = styler.SafeGetCharAt(i);
-				if (scriptLanguage == eScriptSGMLblock) {
-					state = SCE_H_SGML_BLOCK_DEFAULT;
-				} else {
-					state = SCE_H_SGML_DEFAULT;
-				}
-				continue;
-			}
-			break;
-		case SCE_H_SGML_ERROR:
-			if ((ch == '-') && (chPrev == '-')) {
-				styler.ColourTo(i - 2, StateToPrint);
-				state = SCE_H_SGML_COMMENT;
-			}
-		case SCE_H_SGML_DOUBLESTRING:
-			if (ch == '\"') {
-				styler.ColourTo(i, StateToPrint);
-				state = SCE_H_SGML_DEFAULT;
-			}
-			break;
-		case SCE_H_SGML_SIMPLESTRING:
-			if (ch == '\'') {
-				styler.ColourTo(i, StateToPrint);
-				state = SCE_H_SGML_DEFAULT;
-			}
-			break;
-		case SCE_H_SGML_COMMENT:
-			if ((ch == '-') && (chPrev == '-')) {
-				styler.ColourTo(i, StateToPrint);
-				state = SCE_H_SGML_DEFAULT;
-			}
-			break;
-		case SCE_H_CDATA:
-			if ((chPrev2 == ']') && (chPrev == ']') && (ch == '>')) {
-				styler.ColourTo(i, StateToPrint);
-				state = SCE_H_DEFAULT;
-				levelCurrent--;
-			}
-			break;
-		case SCE_H_COMMENT:
-			if ((chPrev2 == '-') && (chPrev == '-') && (ch == '>')) {
-				styler.ColourTo(i, StateToPrint);
-				state = SCE_H_DEFAULT;
-				levelCurrent--;
-			}
-			break;
-		case SCE_H_SGML_1ST_PARAM_COMMENT:
-			if ((ch == '-') && (chPrev == '-')) {
-				styler.ColourTo(i, SCE_H_SGML_COMMENT);
-				state = SCE_H_SGML_1ST_PARAM;
-			}
-			break;
-		case SCE_H_SGML_SPECIAL:
-			if (!(isascii(ch) && isupper(ch))) {
-				styler.ColourTo(i - 1, StateToPrint);
-				if (isalnum(ch)) {
-					state = SCE_H_SGML_ERROR;
-				} else {
-					state = SCE_H_SGML_DEFAULT;
-				}
-			}
-			break;
-		case SCE_H_SGML_ENTITY:
-			if (ch == ';') {
-				styler.ColourTo(i, StateToPrint);
-				state = SCE_H_SGML_DEFAULT;
-			} else if (!(isascii(ch) && isalnum(ch)) && ch != '-' && ch != '.') {
-				styler.ColourTo(i, SCE_H_SGML_ERROR);
-				state = SCE_H_SGML_DEFAULT;
-			}
-			break;
-		case SCE_H_ENTITY:
-			if (ch == ';') {
-				styler.ColourTo(i, StateToPrint);
-				state = SCE_H_DEFAULT;
-			}
-			if (ch != '#' && !(isascii(ch) && isalnum(ch))	// Should check that '#' follows '&', but it is unlikely anyway...
-				&& ch != '.' && ch != '-' && ch != '_' && ch != ':') { // valid in XML
-				styler.ColourTo(i, SCE_H_TAGUNKNOWN);
-				state = SCE_H_DEFAULT;
-			}
-			break;
-		case SCE_H_TAGUNKNOWN:
-			if (!ishtmlwordchar(ch) && !((ch == '/') && (chPrev == '<')) && ch != '[') {
-				int eClass = classifyTagHTML(styler.GetStartSegment(),
-					i - 1, keywords, styler, tagDontFold, caseSensitive);
-				if (eClass == SCE_H_SCRIPT) {
-					if (!tagClosing) {
-						inScriptType = eNonHtmlScript;
-						scriptLanguage = clientScript;
-						eClass = SCE_H_TAG;
-					} else {
-						scriptLanguage = eScriptNone;
-						eClass = SCE_H_TAG;
-					}
-				}
-				if (ch == '>') {
-					styler.ColourTo(i, eClass);
-					if (inScriptType == eNonHtmlScript) {
-						state = StateForScript(scriptLanguage);
-					} else {
-						state = SCE_H_DEFAULT;
-					}
-					tagOpened = false;
-					if (!tagDontFold){
-						if (tagClosing) {
-							levelCurrent--;
-						} else {
-							levelCurrent++;
-						}
-					}
-					tagClosing = false;
-				} else if (ch == '/' && chNext == '>') {
-					if (eClass == SCE_H_TAGUNKNOWN) {
-						styler.ColourTo(i + 1, SCE_H_TAGUNKNOWN);
-					} else {
-						styler.ColourTo(i - 1, StateToPrint);
-						styler.ColourTo(i + 1, SCE_H_TAGEND);
-					}
-					i++;
-					ch = chNext;
-					state = SCE_H_DEFAULT;
-					tagOpened = false;
-				} else {
-					if (eClass != SCE_H_TAGUNKNOWN) {
-						if (eClass == SCE_H_SGML_DEFAULT) {
-							state = SCE_H_SGML_DEFAULT;
-						} else {
-							state = SCE_H_OTHER;
-						}
-					}
-				}
-			}
-			break;
-		case SCE_H_ATTRIBUTE:
-			if (!ishtmlwordchar(ch) && ch != '/' && ch != '-') {
-				if (inScriptType == eNonHtmlScript) {
-					int scriptLanguagePrev = scriptLanguage;
-					clientScript = segIsScriptingIndicator(styler, styler.GetStartSegment(), i - 1, scriptLanguage);
-					scriptLanguage = clientScript;
-					if ((scriptLanguagePrev != scriptLanguage) && (scriptLanguage == eScriptNone))
-						inScriptType = eHtml;
-				}
-				classifyAttribHTML(styler.GetStartSegment(), i - 1, keywords, styler);
-				if (ch == '>') {
-					styler.ColourTo(i, SCE_H_TAG);
-					if (inScriptType == eNonHtmlScript) {
-						state = StateForScript(scriptLanguage);
-					} else {
-						state = SCE_H_DEFAULT;
-					}
-					tagOpened = false;
-					if (!tagDontFold){
-						if (tagClosing){
-							levelCurrent--;
-						} else {
-							levelCurrent++;
-						}
-					}
-					tagClosing = false;
-				} else if (ch == '=') {
-					styler.ColourTo(i, SCE_H_OTHER);
-					state = SCE_H_VALUE;
-				} else {
-					state = SCE_H_OTHER;
-				}
-			}
-			break;
-		case SCE_H_OTHER:
-			if (ch == '>') {
-				styler.ColourTo(i - 1, StateToPrint);
-				styler.ColourTo(i, SCE_H_TAG);
-				if (inScriptType == eNonHtmlScript) {
-					state = StateForScript(scriptLanguage);
-				} else {
-					state = SCE_H_DEFAULT;
-				}
-				tagOpened = false;
-				if (!tagDontFold){
-					if (tagClosing){
-						levelCurrent--;
-					} else {
-						levelCurrent++;
-					}
-				}
-				tagClosing = false;
-			} else if (ch == '\"') {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_H_DOUBLESTRING;
-			} else if (ch == '\'') {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_H_SINGLESTRING;
-			} else if (ch == '=') {
-				styler.ColourTo(i, StateToPrint);
-				state = SCE_H_VALUE;
-			} else if (ch == '/' && chNext == '>') {
-				styler.ColourTo(i - 1, StateToPrint);
-				styler.ColourTo(i + 1, SCE_H_TAGEND);
-				i++;
-				ch = chNext;
-				state = SCE_H_DEFAULT;
-				tagOpened = false;
-			} else if (ch == '?' && chNext == '>') {
-				styler.ColourTo(i - 1, StateToPrint);
-				styler.ColourTo(i + 1, SCE_H_XMLEND);
-				i++;
-				ch = chNext;
-				state = SCE_H_DEFAULT;
-			} else if (ishtmlwordchar(ch)) {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_H_ATTRIBUTE;
-			}
-			break;
-		case SCE_H_DOUBLESTRING:
-			if (ch == '\"') {
-				if (inScriptType == eNonHtmlScript) {
-					scriptLanguage = segIsScriptingIndicator(styler, styler.GetStartSegment(), i, scriptLanguage);
-				}
-				styler.ColourTo(i, SCE_H_DOUBLESTRING);
-				state = SCE_H_OTHER;
-			}
-			break;
-		case SCE_H_SINGLESTRING:
-			if (ch == '\'') {
-				if (inScriptType == eNonHtmlScript) {
-					scriptLanguage = segIsScriptingIndicator(styler, styler.GetStartSegment(), i, scriptLanguage);
-				}
-				styler.ColourTo(i, SCE_H_SINGLESTRING);
-				state = SCE_H_OTHER;
-			}
-			break;
-		case SCE_H_VALUE:
-			if (!ishtmlwordchar(ch)) {
-				if (ch == '\"' && chPrev == '=') {
-					// Should really test for being first character
-					state = SCE_H_DOUBLESTRING;
-				} else if (ch == '\'' && chPrev == '=') {
-					state = SCE_H_SINGLESTRING;
-				} else {
-					if (IsNumber(styler.GetStartSegment(), styler)) {
-						styler.ColourTo(i - 1, SCE_H_NUMBER);
-					} else {
-						styler.ColourTo(i - 1, StateToPrint);
-					}
-					if (ch == '>') {
-						styler.ColourTo(i, SCE_H_TAG);
-						if (inScriptType == eNonHtmlScript) {
-							state = StateForScript(scriptLanguage);
-						} else {
-							state = SCE_H_DEFAULT;
-						}
-						tagOpened = false;
-						if (!tagDontFold){
-							if (tagClosing){
-								levelCurrent--;
-							} else {
-								levelCurrent++;
-							}
-						}
-						tagClosing = false;
-					} else {
-						state = SCE_H_OTHER;
-					}
-				}
-			}
-			break;
-		case SCE_HJ_DEFAULT:
-		case SCE_HJ_START:
-		case SCE_HJ_SYMBOLS:
-			if (iswordstart(ch)) {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HJ_WORD;
-			} else if (ch == '/' && chNext == '*') {
-				styler.ColourTo(i - 1, StateToPrint);
-				if (chNext2 == '*')
-					state = SCE_HJ_COMMENTDOC;
-				else
-					state = SCE_HJ_COMMENT;
-			} else if (ch == '/' && chNext == '/') {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HJ_COMMENTLINE;
-			} else if (ch == '/' && isOKBeforeRE(chPrevNonWhite)) {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HJ_REGEX;
-			} else if (ch == '\"') {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HJ_DOUBLESTRING;
-			} else if (ch == '\'') {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HJ_SINGLESTRING;
-			} else if ((ch == '<') && (chNext == '!') && (chNext2 == '-') &&
-			           styler.SafeGetCharAt(i + 3) == '-') {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HJ_COMMENTLINE;
-			} else if ((ch == '-') && (chNext == '-') && (chNext2 == '>')) {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HJ_COMMENTLINE;
-				i += 2;
-			} else if (isoperator(ch)) {
-				styler.ColourTo(i - 1, StateToPrint);
-				styler.ColourTo(i, statePrintForState(SCE_HJ_SYMBOLS, inScriptType));
-				state = SCE_HJ_DEFAULT;
-			} else if ((ch == ' ') || (ch == '\t')) {
-				if (state == SCE_HJ_START) {
-					styler.ColourTo(i - 1, StateToPrint);
-					state = SCE_HJ_DEFAULT;
-				}
-			}
-			break;
-		case SCE_HJ_WORD:
-			if (!iswordchar(ch)) {
-				classifyWordHTJS(styler.GetStartSegment(), i - 1, keywords2, styler, inScriptType);
-				//styler.ColourTo(i - 1, eHTJSKeyword);
-				state = SCE_HJ_DEFAULT;
-				if (ch == '/' && chNext == '*') {
-					if (chNext2 == '*')
-						state = SCE_HJ_COMMENTDOC;
-					else
-						state = SCE_HJ_COMMENT;
-				} else if (ch == '/' && chNext == '/') {
-					state = SCE_HJ_COMMENTLINE;
-				} else if (ch == '\"') {
-					state = SCE_HJ_DOUBLESTRING;
-				} else if (ch == '\'') {
-					state = SCE_HJ_SINGLESTRING;
-				} else if ((ch == '-') && (chNext == '-') && (chNext2 == '>')) {
-					styler.ColourTo(i - 1, StateToPrint);
-					state = SCE_HJ_COMMENTLINE;
-					i += 2;
-				} else if (isoperator(ch)) {
-					styler.ColourTo(i, statePrintForState(SCE_HJ_SYMBOLS, inScriptType));
-					state = SCE_HJ_DEFAULT;
-				}
-			}
-			break;
-		case SCE_HJ_COMMENT:
-		case SCE_HJ_COMMENTDOC:
-			if (ch == '/' && chPrev == '*') {
-				styler.ColourTo(i, StateToPrint);
-				state = SCE_HJ_DEFAULT;
-				ch = ' ';
-			}
-			break;
-		case SCE_HJ_COMMENTLINE:
-			if (ch == '\r' || ch == '\n') {
-				styler.ColourTo(i - 1, statePrintForState(SCE_HJ_COMMENTLINE, inScriptType));
-				state = SCE_HJ_DEFAULT;
-				ch = ' ';
-			}
-			break;
-		case SCE_HJ_DOUBLESTRING:
-			if (ch == '\\') {
-				if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
-					i++;
-				}
-			} else if (ch == '\"') {
-				styler.ColourTo(i, statePrintForState(SCE_HJ_DOUBLESTRING, inScriptType));
-				state = SCE_HJ_DEFAULT;
-			} else if ((inScriptType == eNonHtmlScript) && (ch == '-') && (chNext == '-') && (chNext2 == '>')) {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HJ_COMMENTLINE;
-				i += 2;
-			} else if (isLineEnd(ch)) {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HJ_STRINGEOL;
-			}
-			break;
-		case SCE_HJ_SINGLESTRING:
-			if (ch == '\\') {
-				if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
-					i++;
-				}
-			} else if (ch == '\'') {
-				styler.ColourTo(i, statePrintForState(SCE_HJ_SINGLESTRING, inScriptType));
-				state = SCE_HJ_DEFAULT;
-			} else if ((inScriptType == eNonHtmlScript) && (ch == '-') && (chNext == '-') && (chNext2 == '>')) {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HJ_COMMENTLINE;
-				i += 2;
-			} else if (isLineEnd(ch)) {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HJ_STRINGEOL;
-			}
-			break;
-		case SCE_HJ_STRINGEOL:
-			if (!isLineEnd(ch)) {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HJ_DEFAULT;
-			} else if (!isLineEnd(chNext)) {
-				styler.ColourTo(i, StateToPrint);
-				state = SCE_HJ_DEFAULT;
-			}
-			break;
-		case SCE_HJ_REGEX:
-			if (ch == '\r' || ch == '\n' || ch == '/') {
-				if (ch == '/') {
-					while (isascii(chNext) && islower(chNext)) {   // gobble regex flags
-						i++;
-						ch = chNext;
-						chNext = styler.SafeGetCharAt(i + 1);
-					}
-				}
-				styler.ColourTo(i, StateToPrint);
-				state = SCE_HJ_DEFAULT;
-			} else if (ch == '\\') {
-				// Gobble up the quoted character
-				if (chNext == '\\' || chNext == '/') {
-					i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-			}
-			break;
-		case SCE_HB_DEFAULT:
-		case SCE_HB_START:
-			if (iswordstart(ch)) {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HB_WORD;
-			} else if (ch == '\'') {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HB_COMMENTLINE;
-			} else if (ch == '\"') {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HB_STRING;
-			} else if ((ch == '<') && (chNext == '!') && (chNext2 == '-') &&
-			           styler.SafeGetCharAt(i + 3) == '-') {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HB_COMMENTLINE;
-			} else if (isoperator(ch)) {
-				styler.ColourTo(i - 1, StateToPrint);
-				styler.ColourTo(i, statePrintForState(SCE_HB_DEFAULT, inScriptType));
-				state = SCE_HB_DEFAULT;
-			} else if ((ch == ' ') || (ch == '\t')) {
-				if (state == SCE_HB_START) {
-					styler.ColourTo(i - 1, StateToPrint);
-					state = SCE_HB_DEFAULT;
-				}
-			}
-			break;
-		case SCE_HB_WORD:
-			if (!iswordchar(ch)) {
-				state = classifyWordHTVB(styler.GetStartSegment(), i - 1, keywords3, styler, inScriptType);
-				if (state == SCE_HB_DEFAULT) {
-					if (ch == '\"') {
-						state = SCE_HB_STRING;
-					} else if (ch == '\'') {
-						state = SCE_HB_COMMENTLINE;
-					} else if (isoperator(ch)) {
-						styler.ColourTo(i, statePrintForState(SCE_HB_DEFAULT, inScriptType));
-						state = SCE_HB_DEFAULT;
-					}
-				}
-			}
-			break;
-		case SCE_HB_STRING:
-			if (ch == '\"') {
-				styler.ColourTo(i, StateToPrint);
-				state = SCE_HB_DEFAULT;
-			} else if (ch == '\r' || ch == '\n') {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HB_STRINGEOL;
-			}
-			break;
-		case SCE_HB_COMMENTLINE:
-			if (ch == '\r' || ch == '\n') {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HB_DEFAULT;
-			}
-			break;
-		case SCE_HB_STRINGEOL:
-			if (!isLineEnd(ch)) {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HB_DEFAULT;
-			} else if (!isLineEnd(chNext)) {
-				styler.ColourTo(i, StateToPrint);
-				state = SCE_HB_DEFAULT;
-			}
-			break;
-		case SCE_HP_DEFAULT:
-		case SCE_HP_START:
-			if (iswordstart(ch)) {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HP_WORD;
-			} else if ((ch == '<') && (chNext == '!') && (chNext2 == '-') &&
-			           styler.SafeGetCharAt(i + 3) == '-') {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HP_COMMENTLINE;
-			} else if (ch == '#') {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HP_COMMENTLINE;
-			} else if (ch == '\"') {
-				styler.ColourTo(i - 1, StateToPrint);
-				if (chNext == '\"' && chNext2 == '\"') {
-					i += 2;
-					state = SCE_HP_TRIPLEDOUBLE;
-					ch = ' ';
-					chPrev = ' ';
-					chNext = styler.SafeGetCharAt(i + 1);
-				} else {
-					//					state = statePrintForState(SCE_HP_STRING,inScriptType);
-					state = SCE_HP_STRING;
-				}
-			} else if (ch == '\'') {
-				styler.ColourTo(i - 1, StateToPrint);
-				if (chNext == '\'' && chNext2 == '\'') {
-					i += 2;
-					state = SCE_HP_TRIPLE;
-					ch = ' ';
-					chPrev = ' ';
-					chNext = styler.SafeGetCharAt(i + 1);
-				} else {
-					state = SCE_HP_CHARACTER;
-				}
-			} else if (isoperator(ch)) {
-				styler.ColourTo(i - 1, StateToPrint);
-				styler.ColourTo(i, statePrintForState(SCE_HP_OPERATOR, inScriptType));
-			} else if ((ch == ' ') || (ch == '\t')) {
-				if (state == SCE_HP_START) {
-					styler.ColourTo(i - 1, StateToPrint);
-					state = SCE_HP_DEFAULT;
-				}
-			}
-			break;
-		case SCE_HP_WORD:
-			if (!iswordchar(ch)) {
-				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, styler, prevWord, inScriptType);
-				state = SCE_HP_DEFAULT;
-				if (ch == '#') {
-					state = SCE_HP_COMMENTLINE;
-				} else if (ch == '\"') {
-					if (chNext == '\"' && chNext2 == '\"') {
-						i += 2;
-						state = SCE_HP_TRIPLEDOUBLE;
-						ch = ' ';
-						chPrev = ' ';
-						chNext = styler.SafeGetCharAt(i + 1);
-					} else {
-						state = SCE_HP_STRING;
-					}
-				} else if (ch == '\'') {
-					if (chNext == '\'' && chNext2 == '\'') {
-						i += 2;
-						state = SCE_HP_TRIPLE;
-						ch = ' ';
-						chPrev = ' ';
-						chNext = styler.SafeGetCharAt(i + 1);
-					} else {
-						state = SCE_HP_CHARACTER;
-					}
-				} else if (isoperator(ch)) {
-					styler.ColourTo(i, statePrintForState(SCE_HP_OPERATOR, inScriptType));
-				}
-			}
-			break;
-		case SCE_HP_COMMENTLINE:
-			if (ch == '\r' || ch == '\n') {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HP_DEFAULT;
-			}
-			break;
-		case SCE_HP_STRING:
-			if (ch == '\\') {
-				if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
-					i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-			} else if (ch == '\"') {
-				styler.ColourTo(i, StateToPrint);
-				state = SCE_HP_DEFAULT;
-			}
-			break;
-		case SCE_HP_CHARACTER:
-			if (ch == '\\') {
-				if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
-					i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-			} else if (ch == '\'') {
-				styler.ColourTo(i, StateToPrint);
-				state = SCE_HP_DEFAULT;
-			}
-			break;
-		case SCE_HP_TRIPLE:
-			if (ch == '\'' && chPrev == '\'' && chPrev2 == '\'') {
-				styler.ColourTo(i, StateToPrint);
-				state = SCE_HP_DEFAULT;
-			}
-			break;
-		case SCE_HP_TRIPLEDOUBLE:
-			if (ch == '\"' && chPrev == '\"' && chPrev2 == '\"') {
-				styler.ColourTo(i, StateToPrint);
-				state = SCE_HP_DEFAULT;
-			}
-			break;
-			///////////// start - PHP state handling
-		case SCE_HPHP_WORD:
-			if (!iswordchar(ch)) {
-				classifyWordHTPHP(styler.GetStartSegment(), i - 1, keywords5, styler);
-				if (ch == '/' && chNext == '*') {
-					i++;
-					state = SCE_HPHP_COMMENT;
-				} else if (ch == '/' && chNext == '/') {
-					i++;
-					state = SCE_HPHP_COMMENTLINE;
-				} else if (ch == '#') {
-					state = SCE_HPHP_COMMENTLINE;
-				} else if (ch == '\"') {
-					state = SCE_HPHP_HSTRING;
-					strcpy(phpStringDelimiter, "\"");
-				} else if (styler.Match(i, "<<<")) {
-					state = SCE_HPHP_HSTRING;
-					i = FindPhpStringDelimiter(phpStringDelimiter, sizeof(phpStringDelimiter), i + 3, lengthDoc, styler);
-				} else if (ch == '\'') {
-					state = SCE_HPHP_SIMPLESTRING;
-				} else if (ch == '$' && IsPhpWordStart(chNext)) {
-					state = SCE_HPHP_VARIABLE;
-				} else if (isoperator(ch)) {
-					state = SCE_HPHP_OPERATOR;
-				} else {
-					state = SCE_HPHP_DEFAULT;
-				}
-			}
-			break;
-		case SCE_HPHP_NUMBER:
-			// recognize bases 8,10 or 16 integers OR floating-point numbers
-			if (!IsADigit(ch)
-				&& strchr(".xXabcdefABCDEF", ch) == NULL
-				&& ((ch != '-' && ch != '+') || (chPrev != 'e' && chPrev != 'E'))) {
-				styler.ColourTo(i - 1, SCE_HPHP_NUMBER);
-				if (isoperator(ch))
-					state = SCE_HPHP_OPERATOR;
-				else
-					state = SCE_HPHP_DEFAULT;
-			}
-			break;
-		case SCE_HPHP_VARIABLE:
-			if (!IsPhpWordChar(ch)) {
-				styler.ColourTo(i - 1, SCE_HPHP_VARIABLE);
-				if (isoperator(ch))
-					state = SCE_HPHP_OPERATOR;
-				else
-					state = SCE_HPHP_DEFAULT;
-			}
-			break;
-		case SCE_HPHP_COMMENT:
-			if (ch == '/' && chPrev == '*') {
-				styler.ColourTo(i, StateToPrint);
-				state = SCE_HPHP_DEFAULT;
-			}
-			break;
-		case SCE_HPHP_COMMENTLINE:
-			if (ch == '\r' || ch == '\n') {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HPHP_DEFAULT;
-			}
-			break;
-		case SCE_HPHP_HSTRING:
-			if (ch == '\\' && (phpStringDelimiter[0] == '\"' || chNext == '$' || chNext == '{')) {
-				// skip the next char
-				i++;
-			} else if (((ch == '{' && chNext == '$') || (ch == '$' && chNext == '{'))
-				&& IsPhpWordStart(chNext2)) {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HPHP_COMPLEX_VARIABLE;
-			} else if (ch == '$' && IsPhpWordStart(chNext)) {
-				styler.ColourTo(i - 1, StateToPrint);
-				state = SCE_HPHP_HSTRING_VARIABLE;
-			} else if (styler.Match(i, phpStringDelimiter)) {
-				if (strlen(phpStringDelimiter) > 1)
-					i += strlen(phpStringDelimiter) - 1;
-				styler.ColourTo(i, StateToPrint);
-				state = SCE_HPHP_DEFAULT;
-			}
-			break;
-		case SCE_HPHP_SIMPLESTRING:
-			if (ch == '\\') {
-				// skip the next char
-				i++;
-			} else if (ch == '\'') {
-				styler.ColourTo(i, StateToPrint);
-				state = SCE_HPHP_DEFAULT;
-			}
-			break;
-		case SCE_HPHP_HSTRING_VARIABLE:
-			if (!IsPhpWordChar(ch)) {
-				styler.ColourTo(i - 1, StateToPrint);
-				i--; // strange but it works
-				state = SCE_HPHP_HSTRING;
-			}
-			break;
-		case SCE_HPHP_COMPLEX_VARIABLE:
-			if (ch == '}') {
-				styler.ColourTo(i, StateToPrint);
-				state = SCE_HPHP_HSTRING;
-			}
-			break;
-		case SCE_HPHP_OPERATOR:
-		case SCE_HPHP_DEFAULT:
-			styler.ColourTo(i - 1, StateToPrint);
-			if (IsADigit(ch) || (ch == '.' && IsADigit(chNext))) {
-				state = SCE_HPHP_NUMBER;
-			} else if (iswordstart(ch)) {
-				state = SCE_HPHP_WORD;
-			} else if (ch == '/' && chNext == '*') {
-				i++;
-				state = SCE_HPHP_COMMENT;
-			} else if (ch == '/' && chNext == '/') {
-				i++;
-				state = SCE_HPHP_COMMENTLINE;
-			} else if (ch == '#') {
-				state = SCE_HPHP_COMMENTLINE;
-			} else if (ch == '\"') {
-				state = SCE_HPHP_HSTRING;
-				strcpy(phpStringDelimiter, "\"");
-			} else if (styler.Match(i, "<<<")) {
-				state = SCE_HPHP_HSTRING;
-				i = FindPhpStringDelimiter(phpStringDelimiter, sizeof(phpStringDelimiter), i + 3, lengthDoc, styler);
-			} else if (ch == '\'') {
-				state = SCE_HPHP_SIMPLESTRING;
-			} else if (ch == '$' && IsPhpWordStart(chNext)) {
-				state = SCE_HPHP_VARIABLE;
-			} else if (isoperator(ch)) {
-				state = SCE_HPHP_OPERATOR;
-			} else if ((state == SCE_HPHP_OPERATOR) && (isspacechar(ch))) {
-				state = SCE_HPHP_DEFAULT;
-			}
-			break;
-			///////////// end - PHP state handling
-		}
-
-		// Some of the above terminated their lexeme but since the same character starts
-		// the same class again, only reenter if non empty segment.
-
-		bool nonEmptySegment = i >= static_cast<int>(styler.GetStartSegment());
-		if (state == SCE_HB_DEFAULT) {    // One of the above succeeded
-			if ((ch == '\"') && (nonEmptySegment)) {
-				state = SCE_HB_STRING;
-			} else if (ch == '\'') {
-				state = SCE_HB_COMMENTLINE;
-			} else if (iswordstart(ch)) {
-				state = SCE_HB_WORD;
-			} else if (isoperator(ch)) {
-				styler.ColourTo(i, SCE_HB_DEFAULT);
-			}
-		} else if (state == SCE_HBA_DEFAULT) {    // One of the above succeeded
-			if ((ch == '\"') && (nonEmptySegment)) {
-				state = SCE_HBA_STRING;
-			} else if (ch == '\'') {
-				state = SCE_HBA_COMMENTLINE;
-			} else if (iswordstart(ch)) {
-				state = SCE_HBA_WORD;
-			} else if (isoperator(ch)) {
-				styler.ColourTo(i, SCE_HBA_DEFAULT);
-			}
-		} else if (state == SCE_HJ_DEFAULT) {    // One of the above succeeded
-			if (ch == '/' && chNext == '*') {
-				if (styler.SafeGetCharAt(i + 2) == '*')
-					state = SCE_HJ_COMMENTDOC;
-				else
-					state = SCE_HJ_COMMENT;
-			} else if (ch == '/' && chNext == '/') {
-				state = SCE_HJ_COMMENTLINE;
-			} else if ((ch == '\"') && (nonEmptySegment)) {
-				state = SCE_HJ_DOUBLESTRING;
-			} else if ((ch == '\'') && (nonEmptySegment)) {
-				state = SCE_HJ_SINGLESTRING;
-			} else if (iswordstart(ch)) {
-				state = SCE_HJ_WORD;
-			} else if (isoperator(ch)) {
-				styler.ColourTo(i, statePrintForState(SCE_HJ_SYMBOLS, inScriptType));
-			}
-		}
-	}
-
-	StateToPrint = statePrintForState(state, inScriptType);
-		styler.ColourTo(lengthDoc - 1, StateToPrint);
-
-	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-	if (fold) {
-		int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-		styler.SetLevel(lineCurrent, levelPrev | flagsNext);
-	}
-}
-
-static bool isASPScript(int state) {
-	return
-		(state >= SCE_HJA_START && state <= SCE_HJA_REGEX) ||
-		(state >= SCE_HBA_START && state <= SCE_HBA_STRINGEOL) ||
-		(state >= SCE_HPA_DEFAULT && state <= SCE_HPA_IDENTIFIER);
-}
-
-static void ColouriseHBAPiece(StyleContext &sc, WordList *keywordlists[]) {
-	WordList &keywordsVBS = *keywordlists[2];
-	if (sc.state == SCE_HBA_WORD) {
-		if (!IsAWordChar(sc.ch)) {
-			char s[100];
-			sc.GetCurrentLowered(s, sizeof(s));
-			if (keywordsVBS.InList(s)) {
-				if (strcmp(s, "rem") == 0) {
-					sc.ChangeState(SCE_HBA_COMMENTLINE);
-					if (sc.atLineEnd) {
-						sc.SetState(SCE_HBA_DEFAULT);
-					}
-				} else {
-					sc.SetState(SCE_HBA_DEFAULT);
-				}
-			} else {
-				sc.ChangeState(SCE_HBA_IDENTIFIER);
-				sc.SetState(SCE_HBA_DEFAULT);
-			}
-		}
-	} else if (sc.state == SCE_HBA_NUMBER) {
-		if (!IsAWordChar(sc.ch)) {
-			sc.SetState(SCE_HBA_DEFAULT);
-		}
-	} else if (sc.state == SCE_HBA_STRING) {
-		if (sc.ch == '\"') {
-			sc.ForwardSetState(SCE_HBA_DEFAULT);
-		} else if (sc.ch == '\r' || sc.ch == '\n') {
-			sc.ChangeState(SCE_HBA_STRINGEOL);
-			sc.ForwardSetState(SCE_HBA_DEFAULT);
-		}
-	} else if (sc.state == SCE_HBA_COMMENTLINE) {
-		if (sc.ch == '\r' || sc.ch == '\n') {
-			sc.SetState(SCE_HBA_DEFAULT);
-		}
-	}
-
-	if (sc.state == SCE_HBA_DEFAULT) {
-		if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
-			sc.SetState(SCE_HBA_NUMBER);
-		} else if (IsAWordStart(sc.ch)) {
-			sc.SetState(SCE_HBA_WORD);
-		} else if (sc.ch == '\'') {
-			sc.SetState(SCE_HBA_COMMENTLINE);
-		} else if (sc.ch == '\"') {
-			sc.SetState(SCE_HBA_STRING);
-		}
-	}
-}
-
-static void ColouriseHTMLPiece(StyleContext &sc, WordList *keywordlists[]) {
-	WordList &keywordsTags = *keywordlists[0];
-	if (sc.state == SCE_H_COMMENT) {
-		if (sc.Match("-->")) {
-			sc.Forward();
-			sc.Forward();
-			sc.ForwardSetState(SCE_H_DEFAULT);
-		}
-	} else if (sc.state == SCE_H_ENTITY) {
-		if (sc.ch == ';') {
-			sc.ForwardSetState(SCE_H_DEFAULT);
-		} else if (sc.ch != '#' && (sc.ch < 0x80) && !isalnum(sc.ch)	// Should check that '#' follows '&', but it is unlikely anyway...
-			&& sc.ch != '.' && sc.ch != '-' && sc.ch != '_' && sc.ch != ':') { // valid in XML
-			sc.ChangeState(SCE_H_TAGUNKNOWN);
-			sc.SetState(SCE_H_DEFAULT);
-		}
-	} else if (sc.state == SCE_H_TAGUNKNOWN) {
-		if (!ishtmlwordchar(static_cast<char>(sc.ch)) && !((sc.ch == '/') && (sc.chPrev == '<')) && sc.ch != '[') {
-			char s[100];
-			sc.GetCurrentLowered(s, sizeof(s));
-			if (s[1] == '/') {
-				if (keywordsTags.InList(s + 2)) {
-					sc.ChangeState(SCE_H_TAG);
-				}
-			} else {
-				if (keywordsTags.InList(s + 1)) {
-					sc.ChangeState(SCE_H_TAG);
-				}
-			}
-			if (sc.ch == '>') {
-				sc.ForwardSetState(SCE_H_DEFAULT);
-			} else if (sc.Match('/', '>')) {
-				sc.SetState(SCE_H_TAGEND);
-				sc.Forward();
-				sc.ForwardSetState(SCE_H_DEFAULT);
-			} else {
-				sc.SetState(SCE_H_OTHER);
-			}
-		}
-	} else if (sc.state == SCE_H_ATTRIBUTE) {
-		if (!ishtmlwordchar(static_cast<char>(sc.ch))) {
-			char s[100];
-			sc.GetCurrentLowered(s, sizeof(s));
-			if (!keywordsTags.InList(s)) {
-				sc.ChangeState(SCE_H_ATTRIBUTEUNKNOWN);
-			}
-			sc.SetState(SCE_H_OTHER);
-		}
-	} else if (sc.state == SCE_H_OTHER) {
-		if (sc.ch == '>') {
-			sc.SetState(SCE_H_TAG);
-			sc.ForwardSetState(SCE_H_DEFAULT);
-		} else if (sc.Match('/', '>')) {
-			sc.SetState(SCE_H_TAG);
-			sc.Forward();
-			sc.ForwardSetState(SCE_H_DEFAULT);
-		} else if (sc.chPrev == '=') {
-			sc.SetState(SCE_H_VALUE);
-		}
-	} else if (sc.state == SCE_H_DOUBLESTRING) {
-		if (sc.ch == '\"') {
-			sc.ForwardSetState(SCE_H_OTHER);
-		}
-	} else if (sc.state == SCE_H_SINGLESTRING) {
-		if (sc.ch == '\'') {
-			sc.ForwardSetState(SCE_H_OTHER);
-		}
-	} else if (sc.state == SCE_H_NUMBER) {
-		if (!IsADigit(sc.ch)) {
-			sc.SetState(SCE_H_OTHER);
-		}
-	}
-
-	if (sc.state == SCE_H_DEFAULT) {
-		if (sc.ch == '<') {
-			if (sc.Match("<!--"))
-				sc.SetState(SCE_H_COMMENT);
-			else
-				sc.SetState(SCE_H_TAGUNKNOWN);
-		} else if (sc.ch == '&') {
-			sc.SetState(SCE_H_ENTITY);
-		}
-	} else if ((sc.state == SCE_H_OTHER) || (sc.state == SCE_H_VALUE)) {
-		if (sc.ch == '\"' && sc.chPrev == '=') {
-			sc.SetState(SCE_H_DOUBLESTRING);
-		} else if (sc.ch == '\'' && sc.chPrev == '=') {
-			sc.SetState(SCE_H_SINGLESTRING);
-		} else if (IsADigit(sc.ch)) {
-			sc.SetState(SCE_H_NUMBER);
-		} else if (sc.ch == '>') {
-			sc.SetState(SCE_H_TAG);
-			sc.ForwardSetState(SCE_H_DEFAULT);
-		} else if (ishtmlwordchar(static_cast<char>(sc.ch))) {
-			sc.SetState(SCE_H_ATTRIBUTE);
-		}
-	}
-}
-
-static void ColouriseASPPiece(StyleContext &sc, WordList *keywordlists[]) {
-	// Possibly exit current state to either SCE_H_DEFAULT or SCE_HBA_DEFAULT
-	if ((sc.state == SCE_H_ASPAT || isASPScript(sc.state)) && sc.Match('%', '>')) {
-		sc.SetState(SCE_H_ASP);
-		sc.Forward();
-		sc.ForwardSetState(SCE_H_DEFAULT);
-	}
-
-	// Handle some ASP script
-	if (sc.state >= SCE_HBA_START && sc.state <= SCE_HBA_STRINGEOL) {
-		ColouriseHBAPiece(sc, keywordlists);
-	} else if (sc.state >= SCE_H_DEFAULT && sc.state <= SCE_H_SGML_BLOCK_DEFAULT) {
-		ColouriseHTMLPiece(sc, keywordlists);
-	}
-
-	// Enter new sc.state
-	if ((sc.state == SCE_H_DEFAULT) || (sc.state == SCE_H_TAGUNKNOWN)) {
-		if (sc.Match('<', '%')) {
-			if (sc.state == SCE_H_TAGUNKNOWN)
-				sc.ChangeState(SCE_H_ASP);
-			else
-				sc.SetState(SCE_H_ASP);
-			sc.Forward();
-			sc.Forward();
-			if (sc.ch == '@') {
-				sc.ForwardSetState(SCE_H_ASPAT);
-			} else {
-				if (sc.ch == '=') {
-					sc.Forward();
-				}
-				sc.SetState(SCE_HBA_DEFAULT);
-			}
-		}
-	}
-}
-
-static void ColouriseASPDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-                                  Accessor &styler) {
-	// Lexer for HTML requires more lexical states (7 bits worth) than most lexers
-	StyleContext sc(startPos, length, initStyle, styler, 0x7f);
-	for (; sc.More(); sc.Forward()) {
-		ColouriseASPPiece(sc, keywordlists);
-	}
-	sc.Complete();
-}
-
-static void ColourisePHPPiece(StyleContext &sc, WordList *keywordlists[]) {
-	// Possibly exit current state to either SCE_H_DEFAULT or SCE_HBA_DEFAULT
-	if (sc.state >= SCE_HPHP_DEFAULT && sc.state <= SCE_HPHP_OPERATOR) {
-		if (!isPHPStringState(sc.state) &&
-			(sc.state != SCE_HPHP_COMMENT) &&
-			(sc.Match('?', '>'))) {
-			sc.SetState(SCE_H_QUESTION);
-			sc.Forward();
-			sc.ForwardSetState(SCE_H_DEFAULT);
-		}
-	}
-
-	if (sc.state >= SCE_H_DEFAULT && sc.state <= SCE_H_SGML_BLOCK_DEFAULT) {
-		ColouriseHTMLPiece(sc, keywordlists);
-	}
-
-	// Handle some PHP script
-	if (sc.state == SCE_HPHP_WORD) {
-		if (!IsPhpWordChar(static_cast<char>(sc.ch))) {
-			sc.SetState(SCE_HPHP_DEFAULT);
-		}
-	} else if (sc.state == SCE_HPHP_COMMENTLINE) {
-		if (sc.ch == '\r' || sc.ch == '\n') {
-			sc.SetState(SCE_HPHP_DEFAULT);
-		}
-	} else if (sc.state == SCE_HPHP_COMMENT) {
-		if (sc.Match('*', '/')) {
-			sc.Forward();
-			sc.Forward();
-			sc.SetState(SCE_HPHP_DEFAULT);
-		}
-	} else if (sc.state == SCE_HPHP_HSTRING) {
-		if (sc.ch == '\"') {
-			sc.ForwardSetState(SCE_HPHP_DEFAULT);
-		}
-	} else if (sc.state == SCE_HPHP_SIMPLESTRING) {
-		if (sc.ch == '\'') {
-			sc.ForwardSetState(SCE_HPHP_DEFAULT);
-		}
-	} else if (sc.state == SCE_HPHP_VARIABLE) {
-		if (!IsPhpWordChar(static_cast<char>(sc.ch))) {
-			sc.SetState(SCE_HPHP_DEFAULT);
-		}
-	} else if (sc.state == SCE_HPHP_OPERATOR) {
-		sc.SetState(SCE_HPHP_DEFAULT);
-	}
-
-	// Enter new sc.state
-	if ((sc.state == SCE_H_DEFAULT) || (sc.state == SCE_H_TAGUNKNOWN)) {
-		if (sc.Match("<?php")) {
-			sc.SetState(SCE_H_QUESTION);
-			sc.Forward();
-			sc.Forward();
-			sc.Forward();
-			sc.Forward();
-			sc.Forward();
-			sc.SetState(SCE_HPHP_DEFAULT);
-		}
-	}
-	if (sc.state == SCE_HPHP_DEFAULT) {
-		if (IsPhpWordStart(static_cast<char>(sc.ch))) {
-			sc.SetState(SCE_HPHP_WORD);
-		} else if (sc.ch == '#') {
-			sc.SetState(SCE_HPHP_COMMENTLINE);
-		} else if (sc.Match("<!--")) {
-			sc.SetState(SCE_HPHP_COMMENTLINE);
-		} else if (sc.Match('/', '/')) {
-			sc.SetState(SCE_HPHP_COMMENTLINE);
-		} else if (sc.Match('/', '*')) {
-			sc.SetState(SCE_HPHP_COMMENT);
-		} else if (sc.ch == '\"') {
-			sc.SetState(SCE_HPHP_HSTRING);
-		} else if (sc.ch == '\'') {
-			sc.SetState(SCE_HPHP_SIMPLESTRING);
-		} else if (sc.ch == '$' && IsPhpWordStart(static_cast<char>(sc.chNext))) {
-			sc.SetState(SCE_HPHP_VARIABLE);
-		} else if (isoperator(static_cast<char>(sc.ch))) {
-			sc.SetState(SCE_HPHP_OPERATOR);
-		}
-	}
-}
-
-static void ColourisePHPDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-                                  Accessor &styler) {
-	// Lexer for HTML requires more lexical states (7 bits worth) than most lexers
-	StyleContext sc(startPos, length, initStyle, styler, 0x7f);
-	for (; sc.More(); sc.Forward()) {
-		ColourisePHPPiece(sc, keywordlists);
-	}
-	sc.Complete();
-}
-
-static void ColourisePHPScriptDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-                                               Accessor &styler) {
-	if(startPos == 0) initStyle = SCE_HPHP_DEFAULT;
-		ColouriseHyperTextDoc(startPos,length,initStyle,keywordlists,styler);
-}
-
-static const char * const htmlWordListDesc[] = {
-	"HTML elements and attributes",
-	"JavaScript keywords",
-	"VBScript keywords",
-	"Python keywords",
-	"PHP keywords",
-	"SGML and DTD keywords",
-	0,
-};
-
-static const char * const phpscriptWordListDesc[] = {
-	"", //Unused
-	"", //Unused
-	"", //Unused
-	"", //Unused
-	"PHP keywords",
-	"", //Unused
-	0,
-};
-
-LexerModule lmHTML(SCLEX_HTML, ColouriseHyperTextDoc, "hypertext", 0, htmlWordListDesc, 7);
-LexerModule lmXML(SCLEX_XML, ColouriseHyperTextDoc, "xml", 0, htmlWordListDesc, 7);
-// SCLEX_ASP and SCLEX_PHP should not be used in new code: use SCLEX_HTML instead.
-LexerModule lmASP(SCLEX_ASP, ColouriseASPDoc, "asp", 0, htmlWordListDesc, 7);
-LexerModule lmPHP(SCLEX_PHP, ColourisePHPDoc, "php", 0, htmlWordListDesc, 7);
-LexerModule lmPHPSCRIPT(SCLEX_PHPSCRIPT, ColourisePHPScriptDoc, "phpscript", 0, phpscriptWordListDesc, 7);
diff --git a/src/stc/scintilla/src/LexHaskell.cxx b/src/stc/scintilla/src/LexHaskell.cxx
deleted file mode 100644
index 0e4be85c6b..0000000000
--- a/src/stc/scintilla/src/LexHaskell.cxx
+++ /dev/null
@@ -1,263 +0,0 @@
-/******************************************************************
- *    LexHaskell.cxx
- *
- *    A haskell lexer for the scintilla code control.
- *    Some stuff "lended" from LexPython.cxx and LexCPP.cxx.
- *    External lexer stuff inspired from the caml external lexer.
- *
- *    Written by Tobias Engvall - tumm at dtek dot chalmers dot se
- *
- *
- *    TODO:
- *    * Implement a folder :)
- *    * Nice Character-lexing (stuff inside '\''), LexPython has
- *      this.
- *
- *
- *****************************************************************/
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-#ifdef BUILD_AS_EXTERNAL_LEXER
-
-#include "ExternalLexer.h"
-#include "WindowAccessor.h"
-
-#define BUILD_EXTERNAL_LEXER 0
-
-#endif
-
-// Max level of nested comments
-#define SCE_HA_COMMENTMAX SCE_HA_COMMENTBLOCK3
-
-
-enum kwType { kwOther, kwClass, kwData, kwInstance, kwImport, kwModule, kwType};
-
-static inline bool IsNewline(const int ch) {
-   return (ch == '\n' || ch == '\r');
-}
-
-static inline bool IsWhitespace(const int ch) {
-   return (  ch == ' '
-          || ch == '\t'
-          || IsNewline(ch) );
-}
-
-static inline bool IsAWordStart(const int ch) {
-   return (ch < 0x80) && (isalnum(ch) || ch == '_');
-}
-
-static inline bool IsAWordChar(const int ch) {
-   return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' || ch == '\'');
-}
-
-static void ColorizeHaskellDoc(unsigned int startPos, int length, int initStyle,
-                               WordList *keywordlists[], Accessor &styler) {
-
-   WordList &keywords = *keywordlists[0];
-
-   int kwLast = kwOther;
-
-   StyleContext sc(startPos, length, initStyle, styler);
-
-   for (; sc.More(); sc.Forward()) {
-
-      // Check for state end
-         // Operator
-      if (sc.state == SCE_HA_OPERATOR) {
-         kwLast = kwOther;
-         sc.SetState(SCE_HA_DEFAULT);
-      }
-         // String
-      else if (sc.state == SCE_HA_STRING) {
-         if (sc.ch == '\"') {
-            sc.ForwardSetState(SCE_HA_DEFAULT);
-         }
-      }
-         // Char
-      else if (sc.state == SCE_HA_CHARACTER) {
-         if (sc.ch == '\'') {
-            sc.ForwardSetState(SCE_HA_DEFAULT);
-         }
-      }
-         // Number
-      else if (sc.state == SCE_HA_NUMBER) {
-         if (!IsADigit(sc.ch)) {
-            sc.SetState(SCE_HA_DEFAULT);
-         }
-      }
-         // Types, constructors, etc.
-      else if (sc.state == SCE_HA_CAPITAL) {
-         if (!IsAWordChar(sc.ch) || sc.ch == '.') {
-            sc.SetState(SCE_HA_DEFAULT);
-         }
-      }
-         // Identifier
-      else if (sc.state == SCE_HA_IDENTIFIER) {
-         if (!IsAWordChar(sc.ch)) {
-            char s[100];
-            sc.GetCurrent(s, sizeof(s));
-            int style = SCE_HA_IDENTIFIER;
-            if ((kwLast == kwImport) || (strcmp(s,"qualified") == 0) || (strcmp(s,"as") == 0)) {
-               style = SCE_HA_IMPORT;
-            } else if (keywords.InList(s)) {
-               style = SCE_HA_KEYWORD;
-            } else if (kwLast == kwData) {
-               style = SCE_HA_DATA;
-            } else if (kwLast == kwClass) {
-               style = SCE_HA_CLASS;
-            } else if (kwLast == kwModule) {
-               style = SCE_HA_MODULE;
-            } else if (isupper(s[0])) {
-               style = SCE_HA_CAPITAL;
-            }
-            sc.ChangeState(style);
-            sc.SetState(SCE_HA_DEFAULT);
-            if (style == SCE_HA_KEYWORD) {
-               if (0 == strcmp(s, "class"))
-                  kwLast = kwClass;
-               else if (0 == strcmp(s, "data"))
-                  kwLast = kwData;
-               else if (0 == strcmp(s, "instance"))
-                  kwLast = kwInstance;
-               else if (0 == strcmp(s, "import"))
-                  kwLast = kwImport;
-               else if (0 == strcmp(s, "module"))
-                  kwLast = kwModule;
-               else
-                  kwLast = kwOther;
-            } else if (style == SCE_HA_CLASS || style == SCE_HA_IMPORT ||
-                       style == SCE_HA_MODULE || style == SCE_HA_CAPITAL ||
-                       style == SCE_HA_DATA || style == SCE_HA_INSTANCE) {
-               kwLast = kwOther;
-            }
-         }
-      }
-         // Comments
-            // Oneliner
-      else if (sc.state == SCE_HA_COMMENTLINE) {
-         if (IsNewline(sc.ch))
-            sc.SetState(SCE_HA_DEFAULT);
-      }
-            // Nested
-      else if (sc.state >= SCE_HA_COMMENTBLOCK) {
-         if (sc.Match("{-")) {
-            if (sc.state < SCE_HA_COMMENTMAX)
-               sc.SetState(sc.state + 1);
-         }
-         else if (sc.Match("-}")) {
-            sc.Forward();
-            if (sc.state == SCE_HA_COMMENTBLOCK)
-               sc.ForwardSetState(SCE_HA_DEFAULT);
-            else
-               sc.ForwardSetState(sc.state - 1);
-         }
-      }
-      // New state?
-      if (sc.state == SCE_HA_DEFAULT) {
-         // Digit
-         if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
-            sc.SetState(SCE_HA_NUMBER);
-         }
-         // Comment line
-         else if (sc.Match("--")) {
-            sc.SetState(SCE_HA_COMMENTLINE);
-         // Comment block
-         }
-         else if (sc.Match("{-")) {
-            sc.SetState(SCE_HA_COMMENTBLOCK);
-         }
-         // String
-         else if (sc.Match('\"')) {
-            sc.SetState(SCE_HA_STRING);
-         }
-         // Character
-         else if (sc.Match('\'') && IsWhitespace(sc.GetRelative(-1)) ) {
-            sc.SetState(SCE_HA_CHARACTER);
-         }
-         // Stringstart
-         else if (sc.Match('\"')) {
-            sc.SetState(SCE_HA_STRING);
-         }
-         // Operator
-         else if (isascii(sc.ch) && isoperator(static_cast<char>(sc.ch))) {
-            sc.SetState(SCE_HA_OPERATOR);
-         }
-         // Keyword
-         else if (IsAWordStart(sc.ch)) {
-               sc.SetState(SCE_HA_IDENTIFIER);
-         }
-
-      }
-   }
-   sc.Complete();
-}
-
-// External stuff - used for dynamic-loading, not implemented in wxStyledTextCtrl yet.
-// Inspired by the caml external lexer - Credits to Robert Roessler - http://www.rftp.com
-#ifdef BUILD_EXTERNAL_LEXER
-static const char* LexerName = "haskell";
-
-void EXT_LEXER_DECL Lex(unsigned int lexer, unsigned int startPos, int length, int initStyle,
-                        char *words[], WindowID window, char *props)
-{
-   PropSet ps;
-   ps.SetMultiple(props);
-   WindowAccessor wa(window, ps);
-
-   int nWL = 0;
-   for (; words[nWL]; nWL++) ;
-   WordList** wl = new WordList* [nWL + 1];
-   int i = 0;
-   for (; i<nWL; i++)
-   {
-      wl[i] = new WordList();
-      wl[i]->Set(words[i]);
-   }
-   wl[i] = 0;
-
-   ColorizeHaskellDoc(startPos, length, initStyle, wl, wa);
-   wa.Flush();
-   for (i=nWL-1;i>=0;i--)
-      delete wl[i];
-   delete [] wl;
-}
-
-void EXT_LEXER_DECL Fold (unsigned int lexer, unsigned int startPos, int length, int initStyle,
-                        char *words[], WindowID window, char *props)
-{
-
-}
-
-int EXT_LEXER_DECL GetLexerCount()
-{
-   return 1;
-}
-
-void EXT_LEXER_DECL GetLexerName(unsigned int Index, char *name, int buflength)
-{
-   if (buflength > 0) {
-      buflength--;
-      int n = strlen(LexerName);
-      if (n > buflength)
-         n = buflength;
-      memcpy(name, LexerName, n), name[n] = '\0';
-   }
-}
-#endif
-
-LexerModule lmHaskell(SCLEX_HASKELL, ColorizeHaskellDoc, "haskell");
-
diff --git a/src/stc/scintilla/src/LexInno.cxx b/src/stc/scintilla/src/LexInno.cxx
deleted file mode 100644
index ff99da7e4e..0000000000
--- a/src/stc/scintilla/src/LexInno.cxx
+++ /dev/null
@@ -1,290 +0,0 @@
-// Scintilla source code edit control
-/** @file LexInno.cxx
- ** Lexer for Inno Setup scripts.
- **/
-// Written by Friedrich Vedder <fvedd@t-online.de>, using code from LexOthers.cxx.
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static void ColouriseInnoDoc(unsigned int startPos, int length, int, WordList *keywordLists[], Accessor &styler) {
-	int state = SCE_INNO_DEFAULT;
-	char chPrev;
-	char ch = 0;
-	char chNext = styler[startPos];
-	int lengthDoc = startPos + length;
-	char *buffer = new char[length];
-	int bufferCount = 0;
-	bool isBOL, isEOL, isWS, isBOLWS = 0;
-
-	WordList &sectionKeywords = *keywordLists[0];
-	WordList &standardKeywords = *keywordLists[1];
-	WordList &parameterKeywords = *keywordLists[2];
-	WordList &preprocessorKeywords = *keywordLists[3];
-	WordList &pascalKeywords = *keywordLists[4];
-	WordList &userKeywords = *keywordLists[5];
-
-	// Go through all provided text segment
-	// using the hand-written state machine shown below
-	styler.StartAt(startPos);
-	styler.StartSegment(startPos);
-	for (int i = startPos; i < lengthDoc; i++) {
-		chPrev = ch;
-		ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-
-		if (styler.IsLeadByte(ch)) {
-			chNext = styler.SafeGetCharAt(i + 2);
-			i++;
-			continue;
-		}
-
-		isBOL = (chPrev == 0) || (chPrev == '\n') || (chPrev == '\r' && ch != '\n');
-		isBOLWS = (isBOL) ? 1 : (isBOLWS && (chPrev == ' ' || chPrev == '\t'));
-		isEOL = (ch == '\n' || ch == '\r');
-		isWS = (ch == ' ' || ch == '\t');
-
-		switch(state) {
-			case SCE_INNO_DEFAULT:
-				if (ch == ';' && isBOLWS) {
-					// Start of a comment
-					state = SCE_INNO_COMMENT;
-				} else if (ch == '[' && isBOLWS) {
-					// Start of a section name
-					bufferCount = 0;
-					state = SCE_INNO_SECTION;
-				} else if (ch == '#' && isBOLWS) {
-					// Start of a preprocessor directive
-					state = SCE_INNO_PREPROC;
-				} else if (ch == '{' && chNext == '#') {
-					// Start of a preprocessor inline directive
-					state = SCE_INNO_PREPROC_INLINE;
-				} else if ((ch == '{' && (chNext == ' ' || chNext == '\t'))
-					   || (ch == '(' && chNext == '*')) {
-					// Start of a Pascal comment
-					state = SCE_INNO_COMMENT_PASCAL;
-				} else if (ch == '"') {
-					// Start of a double-quote string
-					state = SCE_INNO_STRING_DOUBLE;
-				} else if (ch == '\'') {
-					// Start of a single-quote string
-					state = SCE_INNO_STRING_SINGLE;
-				} else if (isascii(ch) && (isalpha(ch) || (ch == '_'))) {
-					// Start of an identifier
-					bufferCount = 0;
-					buffer[bufferCount++] = static_cast<char>(tolower(ch));
-					state = SCE_INNO_IDENTIFIER;
-				} else {
-					// Style it the default style
-					styler.ColourTo(i,SCE_INNO_DEFAULT);
-				}
-				break;
-
-			case SCE_INNO_COMMENT:
-				if (isEOL) {
-					state = SCE_INNO_DEFAULT;
-					styler.ColourTo(i,SCE_INNO_COMMENT);
-				}
-				break;
-
-			case SCE_INNO_IDENTIFIER:
-				if (isascii(ch) && (isalnum(ch) || (ch == '_'))) {
-					buffer[bufferCount++] = static_cast<char>(tolower(ch));
-				} else {
-					state = SCE_INNO_DEFAULT;
-					buffer[bufferCount] = '\0';
-
-					// Check if the buffer contains a keyword
-					if (standardKeywords.InList(buffer)) {
-						styler.ColourTo(i-1,SCE_INNO_KEYWORD);
-					} else if (parameterKeywords.InList(buffer)) {
-						styler.ColourTo(i-1,SCE_INNO_PARAMETER);
-					} else if (pascalKeywords.InList(buffer)) {
-						styler.ColourTo(i-1,SCE_INNO_KEYWORD_PASCAL);
-					} else if (userKeywords.InList(buffer)) {
-						styler.ColourTo(i-1,SCE_INNO_KEYWORD_USER);
-					} else {
-						styler.ColourTo(i-1,SCE_INNO_DEFAULT);
-					}
-
-					// Push back the faulty character
-					chNext = styler[i--];
-					ch = chPrev;
-				}
-				break;
-
-			case SCE_INNO_SECTION:
-				if (ch == ']') {
-					state = SCE_INNO_DEFAULT;
-					buffer[bufferCount] = '\0';
-
-					// Check if the buffer contains a section name
-					if (sectionKeywords.InList(buffer)) {
-						styler.ColourTo(i,SCE_INNO_SECTION);
-					} else {
-						styler.ColourTo(i,SCE_INNO_DEFAULT);
-					}
-				} else if (isascii(ch) && (isalnum(ch) || (ch == '_'))) {
-					buffer[bufferCount++] = static_cast<char>(tolower(ch));
-				} else {
-					state = SCE_INNO_DEFAULT;
-					styler.ColourTo(i,SCE_INNO_DEFAULT);
-				}
-				break;
-
-			case SCE_INNO_PREPROC:
-				if (isWS || isEOL) {
-					if (isascii(chPrev) && isalpha(chPrev)) {
-						state = SCE_INNO_DEFAULT;
-						buffer[bufferCount] = '\0';
-
-						// Check if the buffer contains a preprocessor directive
-						if (preprocessorKeywords.InList(buffer)) {
-							styler.ColourTo(i-1,SCE_INNO_PREPROC);
-						} else {
-							styler.ColourTo(i-1,SCE_INNO_DEFAULT);
-						}
-
-						// Push back the faulty character
-						chNext = styler[i--];
-						ch = chPrev;
-					}
-				} else if (isascii(ch) && isalpha(ch)) {
-					if (chPrev == '#' || chPrev == ' ' || chPrev == '\t')
-						bufferCount = 0;
-					buffer[bufferCount++] = static_cast<char>(tolower(ch));
-				}
-				break;
-
-			case SCE_INNO_STRING_DOUBLE:
-				if (ch == '"' || isEOL) {
-					state = SCE_INNO_DEFAULT;
-					styler.ColourTo(i,SCE_INNO_DEFAULT);
-				}
-				break;
-
-			case SCE_INNO_STRING_SINGLE:
-				if (ch == '\'' || isEOL) {
-					state = SCE_INNO_DEFAULT;
-					styler.ColourTo(i,SCE_INNO_DEFAULT);
-				}
-				break;
-
-			case SCE_INNO_PREPROC_INLINE:
-				if (ch == '}') {
-					state = SCE_INNO_DEFAULT;
-					styler.ColourTo(i,SCE_INNO_PREPROC_INLINE);
-				} else if (isEOL) {
-					state = SCE_INNO_DEFAULT;
-					styler.ColourTo(i,SCE_INNO_DEFAULT);
-				}
-				break;
-
-			case SCE_INNO_COMMENT_PASCAL:
-				if (ch == '}' || (ch == ')' && chPrev == '*')) {
-					state = SCE_INNO_DEFAULT;
-					styler.ColourTo(i,SCE_INNO_COMMENT_PASCAL);
-				} else if (isEOL) {
-					state = SCE_INNO_DEFAULT;
-					styler.ColourTo(i,SCE_INNO_DEFAULT);
-				}
-				break;
-
-		}
-	}
-	delete []buffer;
-}
-
-static const char * const innoWordListDesc[] = {
-	"Sections",
-	"Keywords",
-	"Parameters",
-	"Preprocessor directives",
-	"Pascal keywords",
-	"User defined keywords",
-	0
-};
-
-static void FoldInnoDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
-	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-
-	unsigned int endPos = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-
-	char chNext = styler[startPos];
-	int styleNext = styler.StyleAt(startPos);
-	bool headerPoint = false;
-	int lev;
-
-	for (unsigned int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler[i+1];
-
-		int style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-
-		if (style == SCE_INNO_SECTION)
-			headerPoint = true;
-
-		if (atEOL) {
-			lev = SC_FOLDLEVELBASE;
-
-			if (lineCurrent > 0) {
-				int levelPrevious = styler.LevelAt(lineCurrent - 1);
-
-				if (levelPrevious & SC_FOLDLEVELHEADERFLAG)
-					lev = SC_FOLDLEVELBASE + 1;
-				else
-					lev = levelPrevious & SC_FOLDLEVELNUMBERMASK;
-			}
-
-			if (headerPoint)
-				lev = SC_FOLDLEVELBASE;
-
-			if (visibleChars == 0 && foldCompact)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-
-			if (headerPoint)
-				lev |= SC_FOLDLEVELHEADERFLAG;
-
-			if (lev != styler.LevelAt(lineCurrent))
-				styler.SetLevel(lineCurrent, lev);
-
-			lineCurrent++;
-			visibleChars = 0;
-			headerPoint = false;
-		}
-		if (!isspacechar(ch))
-			visibleChars++;
-	}
-
-	if (lineCurrent > 0) {
-		int levelPrevious = styler.LevelAt(lineCurrent - 1);
-
-		if (levelPrevious & SC_FOLDLEVELHEADERFLAG)
-			lev = SC_FOLDLEVELBASE + 1;
-		else
-			lev = levelPrevious & SC_FOLDLEVELNUMBERMASK;
-	} else {
-		lev = SC_FOLDLEVELBASE;
-	}
-	int flagsNext = styler.LevelAt(lineCurrent);
-	styler.SetLevel(lineCurrent, lev | flagsNext & ~SC_FOLDLEVELNUMBERMASK);
-}
-
-LexerModule lmInno(SCLEX_INNOSETUP, ColouriseInnoDoc, "inno", FoldInnoDoc, innoWordListDesc);
diff --git a/src/stc/scintilla/src/LexKix.cxx b/src/stc/scintilla/src/LexKix.cxx
deleted file mode 100644
index e439d4d1d6..0000000000
--- a/src/stc/scintilla/src/LexKix.cxx
+++ /dev/null
@@ -1,122 +0,0 @@
-// Scintilla source code edit control
-/** @file LexKix.cxx
- ** Lexer for KIX-Scripts.
- **/
-// Copyright 2004 by Manfred Becker <manfred@becker-trdf.de>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-// Extended to accept accented characters
-static inline bool IsAWordChar(int ch) {
-	return ch >= 0x80 || isalnum(ch) || ch == '_';
-}
-
-static inline bool IsOperator(const int ch) {
-	return (ch == '+' || ch == '-' || ch == '*' || ch == '/' || ch == '&' || ch == '|' || ch == '<' || ch == '>' || ch == '=');
-}
-
-static void ColouriseKixDoc(unsigned int startPos, int length, int initStyle,
-                           WordList *keywordlists[], Accessor &styler) {
-
-	WordList &keywords = *keywordlists[0];
-	WordList &keywords2 = *keywordlists[1];
-	WordList &keywords3 = *keywordlists[2];
-//	WordList &keywords4 = *keywordlists[3];
-
-	styler.StartAt(startPos);
-
-	StyleContext sc(startPos, length, initStyle, styler);
-
-	for (; sc.More(); sc.Forward()) {
-
-		if (sc.state == SCE_KIX_COMMENT) {
-			if (sc.atLineEnd) {
-				sc.SetState(SCE_KIX_DEFAULT);
-			}
-		} else if (sc.state == SCE_KIX_STRING1) {
-			// This is a doubles quotes string
-			if (sc.ch == '\"') {
-				sc.ForwardSetState(SCE_KIX_DEFAULT);
-			}
-		} else if (sc.state == SCE_KIX_STRING2) {
-			// This is a single quote string
-			if (sc.ch == '\'') {
-				sc.ForwardSetState(SCE_KIX_DEFAULT);
-			}
-		} else if (sc.state == SCE_KIX_NUMBER) {
-			if (!IsADigit(sc.ch)) {
-				sc.SetState(SCE_KIX_DEFAULT);
-			}
-		} else if (sc.state == SCE_KIX_VAR) {
-			if (!IsAWordChar(sc.ch)) {
-				sc.SetState(SCE_KIX_DEFAULT);
-			}
-		} else if (sc.state == SCE_KIX_MACRO) {
-			if (!IsAWordChar(sc.ch) && !IsADigit(sc.ch)) {
-				char s[100];
-				sc.GetCurrentLowered(s, sizeof(s));
-
-				if (!keywords3.InList(&s[1])) {
-					sc.ChangeState(SCE_KIX_DEFAULT);
-				}
-				sc.SetState(SCE_KIX_DEFAULT);
-			}
-		} else if (sc.state == SCE_KIX_OPERATOR) {
-			if (!IsOperator(sc.ch)) {
-				sc.SetState(SCE_KIX_DEFAULT);
-			}
-		} else if (sc.state == SCE_KIX_IDENTIFIER) {
-			if (!IsAWordChar(sc.ch)) {
-				char s[100];
-				sc.GetCurrentLowered(s, sizeof(s));
-
-				if (keywords.InList(s)) {
-					sc.ChangeState(SCE_KIX_KEYWORD);
-				} else if (keywords2.InList(s)) {
-					sc.ChangeState(SCE_KIX_FUNCTIONS);
-				}
-				sc.SetState(SCE_KIX_DEFAULT);
-			}
-		}
-
-		// Determine if a new state should be entered.
-		if (sc.state == SCE_KIX_DEFAULT) {
-			if (sc.ch == ';') {
-				sc.SetState(SCE_KIX_COMMENT);
-			} else if (sc.ch == '\"') {
-				sc.SetState(SCE_KIX_STRING1);
-			} else if (sc.ch == '\'') {
-				sc.SetState(SCE_KIX_STRING2);
-			} else if (sc.ch == '$') {
-				sc.SetState(SCE_KIX_VAR);
-			} else if (sc.ch == '@') {
-				sc.SetState(SCE_KIX_MACRO);
-			} else if (IsADigit(sc.ch) || ((sc.ch == '.' || sc.ch == '&') && IsADigit(sc.chNext))) {
-				sc.SetState(SCE_KIX_NUMBER);
-			} else if (IsOperator(sc.ch)) {
-				sc.SetState(SCE_KIX_OPERATOR);
-			} else if (IsAWordChar(sc.ch)) {
-				sc.SetState(SCE_KIX_IDENTIFIER);
-			}
-		}
-	}
-	sc.Complete();
-}
-
-
-LexerModule lmKix(SCLEX_KIX, ColouriseKixDoc, "kix");
-
diff --git a/src/stc/scintilla/src/LexLisp.cxx b/src/stc/scintilla/src/LexLisp.cxx
deleted file mode 100644
index 91385f0fd4..0000000000
--- a/src/stc/scintilla/src/LexLisp.cxx
+++ /dev/null
@@ -1,275 +0,0 @@
-// Scintilla source code edit control
-/** @file LexLisp.cxx
- ** Lexer for Lisp.
- ** Written by Alexey Yutkin.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-#include "StyleContext.h"
-
-#define SCE_LISP_CHARACTER 29
-#define SCE_LISP_MACRO 30
-#define SCE_LISP_MACRO_DISPATCH 31
-
-static inline bool isLispoperator(char ch) {
-	if (isascii(ch) && isalnum(ch))
-		return false;
-	if (ch == '\'' || ch == '`' || ch == '(' || ch == ')' )
-		return true;
-	return false;
-}
-
-static inline bool isLispwordstart(char ch) {
-	return isascii(ch) && ch != ';'  && !isspacechar(ch) && !isLispoperator(ch) &&
-		ch != '\n' && ch != '\r' &&  ch != '\"';
-}
-
-
-static void classifyWordLisp(unsigned int start, unsigned int end, WordList &keywords, WordList &keywords_kw, Accessor &styler) {
-	PLATFORM_ASSERT(end >= start);
-	char s[100];
-	unsigned int i;
-	bool digit_flag = true;
-	for (i = 0; (i < end - start + 1) && (i < 99); i++) {
-		s[i] = styler[start + i];
-		s[i + 1] = '\0';
-		if (!isdigit(s[i]) && (s[i] != '.')) digit_flag = false;
-	}
-	char chAttr = SCE_LISP_IDENTIFIER;
-
-	if(digit_flag) chAttr = SCE_LISP_NUMBER;
-	else {
-		if (keywords.InList(s)) {
-			chAttr = SCE_LISP_KEYWORD;
-		} else if (keywords_kw.InList(s)) {
-			chAttr = SCE_LISP_KEYWORD_KW;
-		} else if ((s[0] == '*' && s[i-1] == '*') ||
-			   (s[0] == '+' && s[i-1] == '+')) {
-			chAttr = SCE_LISP_SPECIAL;
-		}
-	}
-	styler.ColourTo(end, chAttr);
-	return;
-}
-
-
-static void ColouriseLispDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-                            Accessor &styler) {
-
-	WordList &keywords = *keywordlists[0];
-	WordList &keywords_kw = *keywordlists[1];
-
-	styler.StartAt(startPos);
-
-	int state = initStyle, radix = -1;
-	char chNext = styler[startPos];
-	unsigned int lengthDoc = startPos + length;
-	styler.StartSegment(startPos);
-	for (unsigned int i = startPos; i < lengthDoc; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-
-		if (styler.IsLeadByte(ch)) {
-			chNext = styler.SafeGetCharAt(i + 2);
-			i += 1;
-			continue;
-		}
-
-		if (state == SCE_LISP_DEFAULT) {
-			if (ch == '#') {
-				styler.ColourTo(i - 1, state);
-				radix = -1;
-				state = SCE_LISP_MACRO_DISPATCH;
-			} else if (isLispwordstart(ch)) {
-				styler.ColourTo(i - 1, state);
-				state = SCE_LISP_IDENTIFIER;
-			}
-			else if (ch == ';') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_LISP_COMMENT;
-			}
-			else if (isLispoperator(ch) || ch=='\'') {
-				styler.ColourTo(i - 1, state);
-				styler.ColourTo(i, SCE_LISP_OPERATOR);
-				if (ch=='\'' && isLispwordstart(chNext)) {
-					state = SCE_LISP_SYMBOL;
-				}
-			}
-			else if (ch == '\"') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_LISP_STRING;
-			}
-		} else if (state == SCE_LISP_IDENTIFIER || state == SCE_LISP_SYMBOL) {
-			if (!isLispwordstart(ch)) {
-				if (state == SCE_LISP_IDENTIFIER) {
-					classifyWordLisp(styler.GetStartSegment(), i - 1, keywords, keywords_kw, styler);
-				} else {
-					styler.ColourTo(i - 1, state);
-				}
-				state = SCE_LISP_DEFAULT;
-			} /*else*/
-			if (isLispoperator(ch) || ch=='\'') {
-				styler.ColourTo(i - 1, state);
-				styler.ColourTo(i, SCE_LISP_OPERATOR);
-				if (ch=='\'' && isLispwordstart(chNext)) {
-					state = SCE_LISP_SYMBOL;
-				}
-			}
-		} else if (state == SCE_LISP_MACRO_DISPATCH) {
-			if (!isdigit(ch)) {
-				if (ch != 'r' && ch != 'R' && (i - styler.GetStartSegment()) > 1) {
-					state = SCE_LISP_DEFAULT;
-				} else {
-					switch (ch) {
-						case '|': state = SCE_LISP_MULTI_COMMENT; break;
-						case 'o':
-						case 'O': radix = 8; state = SCE_LISP_MACRO; break;
-						case 'x':
-						case 'X': radix = 16; state = SCE_LISP_MACRO; break;
-						case 'b':
-						case 'B': radix = 2; state = SCE_LISP_MACRO; break;
-						case '\\': state = SCE_LISP_CHARACTER; break;
-						case ':':
-						case '-':
-						case '+': state = SCE_LISP_MACRO; break;
-						case '\'': if (isLispwordstart(chNext)) {
-								   state = SCE_LISP_SPECIAL;
-							   } else {
-								   styler.ColourTo(i - 1, SCE_LISP_DEFAULT);
-								   styler.ColourTo(i, SCE_LISP_OPERATOR);
-								   state = SCE_LISP_DEFAULT;
-							   }
-							   break;
-						default: if (isLispoperator(ch)) {
-								 styler.ColourTo(i - 1, SCE_LISP_DEFAULT);
-								 styler.ColourTo(i, SCE_LISP_OPERATOR);
-							 }
-							 state = SCE_LISP_DEFAULT;
-							 break;
-					}
-				}
-			}
-		} else if (state == SCE_LISP_MACRO) {
-			if (isLispwordstart(ch) && (radix == -1 || IsADigit(ch, radix))) {
-				state = SCE_LISP_SPECIAL;
-			} else {
-				state = SCE_LISP_DEFAULT;
-			}
-		} else if (state == SCE_LISP_CHARACTER) {
-			if (isLispoperator(ch)) {
-				styler.ColourTo(i, SCE_LISP_SPECIAL);
-				state = SCE_LISP_DEFAULT;
-			} else if (isLispwordstart(ch)) {
-				styler.ColourTo(i, SCE_LISP_SPECIAL);
-				state = SCE_LISP_SPECIAL;
-			} else {
-				state = SCE_LISP_DEFAULT;
-			}
-		} else if (state == SCE_LISP_SPECIAL) {
-			if (!isLispwordstart(ch) || (radix != -1 && !IsADigit(ch, radix))) {
-				styler.ColourTo(i - 1, state);
-				state = SCE_LISP_DEFAULT;
-			}
-			if (isLispoperator(ch) || ch=='\'') {
-				styler.ColourTo(i - 1, state);
-				styler.ColourTo(i, SCE_LISP_OPERATOR);
-				if (ch=='\'' && isLispwordstart(chNext)) {
-					state = SCE_LISP_SYMBOL;
-				}
-			}
-		} else {
-			if (state == SCE_LISP_COMMENT) {
-				if (atEOL) {
-					styler.ColourTo(i - 1, state);
-					state = SCE_LISP_DEFAULT;
-				}
-			} else if (state == SCE_LISP_MULTI_COMMENT) {
-				if (ch == '|' && chNext == '#') {
-					i++;
-					chNext = styler.SafeGetCharAt(i + 1);
-					styler.ColourTo(i, state);
-					state = SCE_LISP_DEFAULT;
-				}
-			} else if (state == SCE_LISP_STRING) {
-				if (ch == '\\') {
-					if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
-						i++;
-						chNext = styler.SafeGetCharAt(i + 1);
-					}
-				} else if (ch == '\"') {
-					styler.ColourTo(i, state);
-					state = SCE_LISP_DEFAULT;
-				}
-			}
-		}
-
-	}
-	styler.ColourTo(lengthDoc - 1, state);
-}
-
-static void FoldLispDoc(unsigned int startPos, int length, int /* initStyle */, WordList *[],
-                            Accessor &styler) {
-	unsigned int lengthDoc = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
-	int levelCurrent = levelPrev;
-	char chNext = styler[startPos];
-	int styleNext = styler.StyleAt(startPos);
-	for (unsigned int i = startPos; i < lengthDoc; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		int style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-		if (style == SCE_LISP_OPERATOR) {
-			if (ch == '(') {
-				levelCurrent++;
-			} else if (ch == ')') {
-				levelCurrent--;
-			}
-		}
-		if (atEOL) {
-			int lev = levelPrev;
-			if (visibleChars == 0)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			if ((levelCurrent > levelPrev) && (visibleChars > 0))
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			levelPrev = levelCurrent;
-			visibleChars = 0;
-		}
-		if (!isspacechar(ch))
-			visibleChars++;
-	}
-	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
-}
-
-static const char * const lispWordListDesc[] = {
-	"Functions and special operators",
-	"Keywords",
-	0
-};
-
-LexerModule lmLISP(SCLEX_LISP, ColouriseLispDoc, "lisp", FoldLispDoc, lispWordListDesc);
diff --git a/src/stc/scintilla/src/LexLout.cxx b/src/stc/scintilla/src/LexLout.cxx
deleted file mode 100644
index 9d1a45a028..0000000000
--- a/src/stc/scintilla/src/LexLout.cxx
+++ /dev/null
@@ -1,208 +0,0 @@
-// Scintilla source code edit control
-/** @file LexLout.cxx
- ** Lexer for the Basser Lout (>= version 3) typesetting language
- **/
-// Copyright 2003 by Kein-Hong Man <mkh@pl.jaring.my>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static inline bool IsAWordChar(const int ch) {
-	return (ch < 0x80) && (isalpha(ch) || ch == '@' || ch == '_');
-}
-
-static inline bool IsAnOther(const int ch) {
-	return (ch < 0x80) && (ch == '{' || ch == '}' ||
-	ch == '!' || ch == '$' || ch == '%' || ch == '&' || ch == '\'' ||
-	ch == '(' || ch == ')' || ch == '*' || ch == '+' || ch == ',' ||
-	ch == '-' || ch == '.' || ch == '/' || ch == ':' || ch == ';' ||
-	ch == '<' || ch == '=' || ch == '>' || ch == '?' || ch == '[' ||
-	ch == ']' || ch == '^' || ch == '`' || ch == '|' || ch == '~');
-}
-
-static void ColouriseLoutDoc(unsigned int startPos, int length, int initStyle,
-			     WordList *keywordlists[], Accessor &styler) {
-
-	WordList &keywords = *keywordlists[0];
-	WordList &keywords2 = *keywordlists[1];
-	WordList &keywords3 = *keywordlists[2];
-
-	int visibleChars = 0;
-	int firstWordInLine = 0;
-	int leadingAtSign = 0;
-
-	StyleContext sc(startPos, length, initStyle, styler);
-
-	for (; sc.More(); sc.Forward()) {
-
-		if (sc.atLineStart && (sc.state == SCE_LOUT_STRING)) {
-			// Prevent SCE_LOUT_STRINGEOL from leaking back to previous line
-			sc.SetState(SCE_LOUT_STRING);
-		}
-
-		// Determine if the current state should terminate.
-		if (sc.state == SCE_LOUT_COMMENT) {
-			if (sc.atLineEnd) {
-				sc.SetState(SCE_LOUT_DEFAULT);
-				visibleChars = 0;
-			}
-		} else if (sc.state == SCE_LOUT_NUMBER) {
-			if (!IsADigit(sc.ch) && sc.ch != '.') {
-				sc.SetState(SCE_LOUT_DEFAULT);
-			}
-		} else if (sc.state == SCE_LOUT_STRING) {
-			if (sc.ch == '\\') {
-				if (sc.chNext == '\"' || sc.chNext == '\\') {
-					sc.Forward();
-				}
-			} else if (sc.ch == '\"') {
-				sc.ForwardSetState(SCE_LOUT_DEFAULT);
-			} else if (sc.atLineEnd) {
-				sc.ChangeState(SCE_LOUT_STRINGEOL);
-				sc.ForwardSetState(SCE_LOUT_DEFAULT);
-				visibleChars = 0;
-			}
-		} else if (sc.state == SCE_LOUT_IDENTIFIER) {
-			if (!IsAWordChar(sc.ch)) {
-				char s[100];
-				sc.GetCurrent(s, sizeof(s));
-
-				if (leadingAtSign) {
-					if (keywords.InList(s)) {
-						sc.ChangeState(SCE_LOUT_WORD);
-					} else {
-						sc.ChangeState(SCE_LOUT_WORD4);
-					}
-				} else if (firstWordInLine && keywords3.InList(s)) {
-					sc.ChangeState(SCE_LOUT_WORD3);
-				}
-				sc.SetState(SCE_LOUT_DEFAULT);
-			}
-		} else if (sc.state == SCE_LOUT_OPERATOR) {
-			if (!IsAnOther(sc.ch)) {
-				char s[100];
-				sc.GetCurrent(s, sizeof(s));
-
-				if (keywords2.InList(s)) {
-					sc.ChangeState(SCE_LOUT_WORD2);
-				}
-				sc.SetState(SCE_LOUT_DEFAULT);
-			}
-		}
-
-		// Determine if a new state should be entered.
-		if (sc.state == SCE_LOUT_DEFAULT) {
-			if (sc.ch == '#') {
-				sc.SetState(SCE_LOUT_COMMENT);
-			} else if (sc.ch == '\"') {
-				sc.SetState(SCE_LOUT_STRING);
-			} else if (IsADigit(sc.ch) ||
-				  (sc.ch == '.' && IsADigit(sc.chNext))) {
-				sc.SetState(SCE_LOUT_NUMBER);
-			} else if (IsAWordChar(sc.ch)) {
-				firstWordInLine = (visibleChars == 0);
-				leadingAtSign = (sc.ch == '@');
-				sc.SetState(SCE_LOUT_IDENTIFIER);
-			} else if (IsAnOther(sc.ch)) {
-				sc.SetState(SCE_LOUT_OPERATOR);
-			}
-		}
-
-		if (sc.atLineEnd) {
-			// Reset states to begining of colourise so no surprises
-			// if different sets of lines lexed.
-			visibleChars = 0;
-		}
-		if (!IsASpace(sc.ch)) {
-			visibleChars++;
-		}
-	}
-	sc.Complete();
-}
-
-static void FoldLoutDoc(unsigned int startPos, int length, int, WordList *[],
-                        Accessor &styler) {
-
-	unsigned int endPos = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
-	int levelCurrent = levelPrev;
-	char chNext = styler[startPos];
-	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-	int styleNext = styler.StyleAt(startPos);
-	char s[10];
-
-	for (unsigned int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		int style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-
-		if (style == SCE_LOUT_WORD) {
-			if (ch == '@') {
-				for (unsigned int j = 0; j < 8; j++) {
-					if (!IsAWordChar(styler[i + j])) {
-						break;
-					}
-					s[j] = styler[i + j];
-					s[j + 1] = '\0';
-				}
-				if (strcmp(s, "@Begin") == 0) {
-					levelCurrent++;
-				} else if (strcmp(s, "@End") == 0) {
-					levelCurrent--;
-				}
-			}
-		} else if (style == SCE_LOUT_OPERATOR) {
-			if (ch == '{') {
-				levelCurrent++;
-			} else if (ch == '}') {
-				levelCurrent--;
-			}
-		}
-		if (atEOL) {
-			int lev = levelPrev;
-			if (visibleChars == 0 && foldCompact) {
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			}
-			if ((levelCurrent > levelPrev) && (visibleChars > 0)) {
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			}
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			levelPrev = levelCurrent;
-			visibleChars = 0;
-		}
-		if (!isspacechar(ch))
-			visibleChars++;
-	}
-	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
-}
-
-static const char * const loutWordLists[] = {
-            "Predefined identifiers",
-            "Predefined delimiters",
-            "Predefined keywords",
-            0,
-        };
-
-LexerModule lmLout(SCLEX_LOUT, ColouriseLoutDoc, "lout", FoldLoutDoc, loutWordLists);
diff --git a/src/stc/scintilla/src/LexLua.cxx b/src/stc/scintilla/src/LexLua.cxx
deleted file mode 100644
index b3a46ad341..0000000000
--- a/src/stc/scintilla/src/LexLua.cxx
+++ /dev/null
@@ -1,357 +0,0 @@
-// Scintilla source code edit control
-/** @file LexLua.cxx
- ** Lexer for Lua language.
- **
- ** Written by Paul Winwood.
- ** Folder by Alexey Yutkin.
- ** Modified by Marcos E. Wurzius & Philippe Lhoste
- **/
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-// Extended to accept accented characters
-static inline bool IsAWordChar(int ch) {
-	return ch >= 0x80 ||
-	       (isalnum(ch) || ch == '.' || ch == '_');
-}
-
-static inline bool IsAWordStart(int ch) {
-	return ch >= 0x80 ||
-	       (isalpha(ch) || ch == '_');
-}
-
-static inline bool IsANumberChar(int ch) {
-	// Not exactly following number definition (several dots are seen as OK, etc.)
-	// but probably enough in most cases.
-	return (ch < 0x80) &&
-	        (isdigit(ch) || toupper(ch) == 'E' ||
-	        ch == '.' || ch == '-' || ch == '+' ||
-	        (ch >= 'a' && ch <= 'f') || (ch >= 'A' && ch <= 'F'));
-}
-
-static inline bool IsLuaOperator(int ch) {
-	if (ch >= 0x80 || isalnum(ch)) {
-		return false;
-	}
-	// '.' left out as it is used to make up numbers
-	if (ch == '*' || ch == '/' || ch == '-' || ch == '+' ||
-		ch == '(' || ch == ')' || ch == '=' ||
-		ch == '{' || ch == '}' || ch == '~' ||
-		ch == '[' || ch == ']' || ch == ';' ||
-		ch == '<' || ch == '>' || ch == ',' ||
-		ch == '.' || ch == '^' || ch == '%' || ch == ':' ||
-		ch == '#') {
-		return true;
-	}
-	return false;
-}
-
-// Test for [=[ ... ]=] delimiters, returns 0 if it's only a [ or ],
-// return 1 for [[ or ]], returns >=2 for [=[ or ]=] and so on.
-// The maximum number of '=' characters allowed is 254.
-static int LongDelimCheck(StyleContext &sc) {
-	int sep = 1;
-	while (sc.GetRelative(sep) == '=' && sep < 0xFF)
-		sep++;
-	if (sc.GetRelative(sep) == sc.ch)
-		return sep;
-	return 0;
-}
-
-static void ColouriseLuaDoc(
-	unsigned int startPos,
-	int length,
-	int initStyle,
-	WordList *keywordlists[],
-	Accessor &styler) {
-
-	WordList &keywords = *keywordlists[0];
-	WordList &keywords2 = *keywordlists[1];
-	WordList &keywords3 = *keywordlists[2];
-	WordList &keywords4 = *keywordlists[3];
-	WordList &keywords5 = *keywordlists[4];
-	WordList &keywords6 = *keywordlists[5];
-	WordList &keywords7 = *keywordlists[6];
-	WordList &keywords8 = *keywordlists[7];
-
-	int currentLine = styler.GetLine(startPos);
-	// Initialize long string [[ ... ]] or block comment --[[ ... ]] nesting level,
-	// if we are inside such a string. Block comment was introduced in Lua 5.0,
-	// blocks with separators [=[ ... ]=] in Lua 5.1.
-	int nestLevel = 0;
-	int sepCount = 0;
-	if (initStyle == SCE_LUA_LITERALSTRING || initStyle == SCE_LUA_COMMENT) {
-		int lineState = styler.GetLineState(currentLine - 1);
-		nestLevel = lineState >> 8;
-		sepCount = lineState & 0xFF;
-	}
-
-	// Do not leak onto next line
-	if (initStyle == SCE_LUA_STRINGEOL || initStyle == SCE_LUA_COMMENTLINE || initStyle == SCE_LUA_PREPROCESSOR) {
-		initStyle = SCE_LUA_DEFAULT;
-	}
-
-	StyleContext sc(startPos, length, initStyle, styler);
-	if (startPos == 0 && sc.ch == '#') {
-		// shbang line: # is a comment only if first char of the script
-		sc.SetState(SCE_LUA_COMMENTLINE);
-	}
-	for (; sc.More(); sc.Forward()) {
-		if (sc.atLineEnd) {
-			// Update the line state, so it can be seen by next line
-			currentLine = styler.GetLine(sc.currentPos);
-			switch (sc.state) {
-			case SCE_LUA_LITERALSTRING:
-			case SCE_LUA_COMMENT:
-				// Inside a literal string or block comment, we set the line state
-				styler.SetLineState(currentLine, (nestLevel << 8) | sepCount);
-				break;
-			default:
-				// Reset the line state
-				styler.SetLineState(currentLine, 0);
-				break;
-			}
-		}
-		if (sc.atLineStart && (sc.state == SCE_LUA_STRING)) {
-			// Prevent SCE_LUA_STRINGEOL from leaking back to previous line
-			sc.SetState(SCE_LUA_STRING);
-		}
-
-		// Handle string line continuation
-		if ((sc.state == SCE_LUA_STRING || sc.state == SCE_LUA_CHARACTER) &&
-		        sc.ch == '\\') {
-			if (sc.chNext == '\n' || sc.chNext == '\r') {
-				sc.Forward();
-				if (sc.ch == '\r' && sc.chNext == '\n') {
-					sc.Forward();
-				}
-				continue;
-			}
-		}
-
-		// Determine if the current state should terminate.
-		if (sc.state == SCE_LUA_OPERATOR) {
-			sc.SetState(SCE_LUA_DEFAULT);
-		} else if (sc.state == SCE_LUA_NUMBER) {
-			// We stop the number definition on non-numerical non-dot non-eE non-sign non-hexdigit char
-			if (!IsANumberChar(sc.ch)) {
-				sc.SetState(SCE_LUA_DEFAULT);
-			}
-		} else if (sc.state == SCE_LUA_IDENTIFIER) {
-			if (!IsAWordChar(sc.ch) || sc.Match('.', '.')) {
-				char s[100];
-				sc.GetCurrent(s, sizeof(s));
-				if (keywords.InList(s)) {
-					sc.ChangeState(SCE_LUA_WORD);
-				} else if (keywords2.InList(s)) {
-					sc.ChangeState(SCE_LUA_WORD2);
-				} else if (keywords3.InList(s)) {
-					sc.ChangeState(SCE_LUA_WORD3);
-				} else if (keywords4.InList(s)) {
-					sc.ChangeState(SCE_LUA_WORD4);
-				} else if (keywords5.InList(s)) {
-					sc.ChangeState(SCE_LUA_WORD5);
-				} else if (keywords6.InList(s)) {
-					sc.ChangeState(SCE_LUA_WORD6);
-				} else if (keywords6.InList(s)) {
-					sc.ChangeState(SCE_LUA_WORD6);
-				} else if (keywords7.InList(s)) {
-					sc.ChangeState(SCE_LUA_WORD7);
-				} else if (keywords8.InList(s)) {
-					sc.ChangeState(SCE_LUA_WORD8);
-				}
-				sc.SetState(SCE_LUA_DEFAULT);
-			}
-		} else if (sc.state == SCE_LUA_COMMENTLINE || sc.state == SCE_LUA_PREPROCESSOR) {
-			if (sc.atLineEnd) {
-				sc.ForwardSetState(SCE_LUA_DEFAULT);
-			}
-		} else if (sc.state == SCE_LUA_STRING) {
-			if (sc.ch == '\\') {
-				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
-					sc.Forward();
-				}
-			} else if (sc.ch == '\"') {
-				sc.ForwardSetState(SCE_LUA_DEFAULT);
-			} else if (sc.atLineEnd) {
-				sc.ChangeState(SCE_LUA_STRINGEOL);
-				sc.ForwardSetState(SCE_LUA_DEFAULT);
-			}
-		} else if (sc.state == SCE_LUA_CHARACTER) {
-			if (sc.ch == '\\') {
-				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
-					sc.Forward();
-				}
-			} else if (sc.ch == '\'') {
-				sc.ForwardSetState(SCE_LUA_DEFAULT);
-			} else if (sc.atLineEnd) {
-				sc.ChangeState(SCE_LUA_STRINGEOL);
-				sc.ForwardSetState(SCE_LUA_DEFAULT);
-			}
-		} else if (sc.state == SCE_LUA_LITERALSTRING || sc.state == SCE_LUA_COMMENT) {
-			if (sc.ch == '[') {
-				int sep = LongDelimCheck(sc);
-				if (sep == 1 && sepCount == 1) {    // [[-only allowed to nest
-					nestLevel++;
-					sc.Forward();
-				}
-			} else if (sc.ch == ']') {
-				int sep = LongDelimCheck(sc);
-				if (sep == 1 && sepCount == 1) {    // un-nest with ]]-only
-					nestLevel--;
-					sc.Forward();
-					if (nestLevel == 0) {
-						sc.ForwardSetState(SCE_LUA_DEFAULT);
-					}
-				} else if (sep > 1 && sep == sepCount) {   // ]=]-style delim
-					sc.Forward(sep);
-					sc.ForwardSetState(SCE_LUA_DEFAULT);
-				}
-			}
-		}
-
-		// Determine if a new state should be entered.
-		if (sc.state == SCE_LUA_DEFAULT) {
-			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
-				sc.SetState(SCE_LUA_NUMBER);
-				if (sc.ch == '0' && toupper(sc.chNext) == 'X') {
-					sc.Forward(1);
-				}
-			} else if (IsAWordStart(sc.ch)) {
-				sc.SetState(SCE_LUA_IDENTIFIER);
-			} else if (sc.ch == '\"') {
-				sc.SetState(SCE_LUA_STRING);
-			} else if (sc.ch == '\'') {
-				sc.SetState(SCE_LUA_CHARACTER);
-			} else if (sc.ch == '[') {
-				sepCount = LongDelimCheck(sc);
-				if (sepCount == 0) {
-					sc.SetState(SCE_LUA_OPERATOR);
-				} else {
-					nestLevel = 1;
-					sc.SetState(SCE_LUA_LITERALSTRING);
-					sc.Forward(sepCount);
-				}
-			} else if (sc.Match('-', '-')) {
-				sc.SetState(SCE_LUA_COMMENTLINE);
-				if (sc.Match("--[")) {
-					sc.Forward(2);
-					sepCount = LongDelimCheck(sc);
-					if (sepCount > 0) {
-						nestLevel = 1;
-						sc.ChangeState(SCE_LUA_COMMENT);
-						sc.Forward(sepCount);
-					}
-				} else {
-					sc.Forward();
-				}
-			} else if (sc.atLineStart && sc.Match('$')) {
-				sc.SetState(SCE_LUA_PREPROCESSOR);	// Obsolete since Lua 4.0, but still in old code
-			} else if (IsLuaOperator(static_cast<char>(sc.ch))) {
-				sc.SetState(SCE_LUA_OPERATOR);
-			}
-		}
-	}
-	sc.Complete();
-}
-
-static void FoldLuaDoc(unsigned int startPos, int length, int /* initStyle */, WordList *[],
-                       Accessor &styler) {
-	unsigned int lengthDoc = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
-	int levelCurrent = levelPrev;
-	char chNext = styler[startPos];
-	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-	int styleNext = styler.StyleAt(startPos);
-	char s[10];
-
-	for (unsigned int i = startPos; i < lengthDoc; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		int style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-		if (style == SCE_LUA_WORD) {
-			if (ch == 'i' || ch == 'd' || ch == 'f' || ch == 'e' || ch == 'r' || ch == 'u') {
-				for (unsigned int j = 0; j < 8; j++) {
-					if (!iswordchar(styler[i + j])) {
-						break;
-					}
-					s[j] = styler[i + j];
-					s[j + 1] = '\0';
-				}
-
-				if ((strcmp(s, "if") == 0) || (strcmp(s, "do") == 0) || (strcmp(s, "function") == 0) || (strcmp(s, "repeat") == 0)) {
-					levelCurrent++;
-				}
-				if ((strcmp(s, "end") == 0) || (strcmp(s, "elseif") == 0) || (strcmp(s, "until") == 0)) {
-					levelCurrent--;
-				}
-			}
-		} else if (style == SCE_LUA_OPERATOR) {
-			if (ch == '{' || ch == '(') {
-				levelCurrent++;
-			} else if (ch == '}' || ch == ')') {
-				levelCurrent--;
-			}
-		} else if (style == SCE_LUA_LITERALSTRING || style == SCE_LUA_COMMENT) {
-			if (ch == '[') {
-				levelCurrent++;
-			} else if (ch == ']') {
-				levelCurrent--;
-			}
-		}
-
-		if (atEOL) {
-			int lev = levelPrev;
-			if (visibleChars == 0 && foldCompact) {
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			}
-			if ((levelCurrent > levelPrev) && (visibleChars > 0)) {
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			}
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			levelPrev = levelCurrent;
-			visibleChars = 0;
-		}
-		if (!isspacechar(ch)) {
-			visibleChars++;
-		}
-	}
-	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-
-	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
-}
-
-static const char * const luaWordListDesc[] = {
-	"Keywords",
-	"Basic functions",
-	"String, (table) & math functions",
-	"(coroutines), I/O & system facilities",
-	"user1",
-	"user2",
-	"user3",
-	"user4",
-	0
-};
-
-LexerModule lmLua(SCLEX_LUA, ColouriseLuaDoc, "lua", FoldLuaDoc, luaWordListDesc);
diff --git a/src/stc/scintilla/src/LexMMIXAL.cxx b/src/stc/scintilla/src/LexMMIXAL.cxx
deleted file mode 100644
index f447899899..0000000000
--- a/src/stc/scintilla/src/LexMMIXAL.cxx
+++ /dev/null
@@ -1,183 +0,0 @@
-// Scintilla source code edit control
-/** @file LexMMIXAL.cxx
- ** Lexer for MMIX Assembler Language.
- ** Written by Christoph Hösler <christoph.hoesler@student.uni-tuebingen.de>
- ** For information about MMIX visit http://www-cs-faculty.stanford.edu/~knuth/mmix.html
- **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-
-
-static inline bool IsAWordChar(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == ':' || ch == '_');
-}
-
-inline bool isMMIXALOperator(char ch) {
-	if (isalnum(ch))
-		return false;
-	if (ch == '+' || ch == '-' || ch == '|' || ch == '^' ||
-		ch == '*' || ch == '/' || ch == '/' ||
-		ch == '%' || ch == '<' || ch == '>' || ch == '&' ||
-		ch == '~' || ch == '$' ||
-		ch == ',' || ch == '(' || ch == ')' ||
-		ch == '[' || ch == ']')
-		return true;
-	return false;
-}
-
-static void ColouriseMMIXALDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-                            Accessor &styler) {
-
-	WordList &opcodes = *keywordlists[0];
-	WordList &special_register = *keywordlists[1];
-	WordList &predef_symbols = *keywordlists[2];
-
-	StyleContext sc(startPos, length, initStyle, styler);
-
-	for (; sc.More(); sc.Forward())
-	{
-		// No EOL continuation
-		if (sc.atLineStart) {
-			if (sc.ch ==  '@' && sc.chNext == 'i') {
-				sc.SetState(SCE_MMIXAL_INCLUDE);
-			} else {
-				sc.SetState(SCE_MMIXAL_LEADWS);
-			}
-		}
-
-		// Check if first non whitespace character in line is alphanumeric
-		if (sc.state == SCE_MMIXAL_LEADWS && !isspace(sc.ch)) {	// LEADWS
-			if(!IsAWordChar(sc.ch)) {
-				sc.SetState(SCE_MMIXAL_COMMENT);
-			} else {
-				if(sc.atLineStart) {
-					sc.SetState(SCE_MMIXAL_LABEL);
-				} else {
-					sc.SetState(SCE_MMIXAL_OPCODE_PRE);
-				}
-			}
-		}
-
-		// Determine if the current state should terminate.
-		if (sc.state == SCE_MMIXAL_OPERATOR) {			// OPERATOR
-			sc.SetState(SCE_MMIXAL_OPERANDS);
-		} else if (sc.state == SCE_MMIXAL_NUMBER) {		// NUMBER
-			if (!isdigit(sc.ch)) {
-				if (IsAWordChar(sc.ch)) {
-					char s[100];
-					sc.GetCurrent(s, sizeof(s));
-					sc.ChangeState(SCE_MMIXAL_REF);
-					sc.SetState(SCE_MMIXAL_REF);
-				} else {
-					sc.SetState(SCE_MMIXAL_OPERANDS);
-				}
-			}
-		} else if (sc.state == SCE_MMIXAL_LABEL) {			// LABEL
-			if (!IsAWordChar(sc.ch) ) {
-				sc.SetState(SCE_MMIXAL_OPCODE_PRE);
-			}
-		} else if (sc.state == SCE_MMIXAL_REF) {			// REF
-			if (!IsAWordChar(sc.ch) ) {
-				char s[100];
-				sc.GetCurrent(s, sizeof(s));
-				if (*s == ':') {	// ignore base prefix for match
-					for (size_t i = 0; i != sizeof(s); ++i) {
-						*(s+i) = *(s+i+1);
-					}
-				}
-				if (special_register.InList(s)) {
-					sc.ChangeState(SCE_MMIXAL_REGISTER);
-				} else if (predef_symbols.InList(s)) {
-					sc.ChangeState(SCE_MMIXAL_SYMBOL);
-				}
-				sc.SetState(SCE_MMIXAL_OPERANDS);
-			}
-		} else if (sc.state == SCE_MMIXAL_OPCODE_PRE) {	// OPCODE_PRE
-				if (!isspace(sc.ch)) {
-					sc.SetState(SCE_MMIXAL_OPCODE);
-				}
-		} else if (sc.state == SCE_MMIXAL_OPCODE) {		// OPCODE
-			if (!IsAWordChar(sc.ch) ) {
-				char s[100];
-				sc.GetCurrent(s, sizeof(s));
-				if (opcodes.InList(s)) {
-					sc.ChangeState(SCE_MMIXAL_OPCODE_VALID);
-				} else {
-					sc.ChangeState(SCE_MMIXAL_OPCODE_UNKNOWN);
-				}
-				sc.SetState(SCE_MMIXAL_OPCODE_POST);
-			}
-		} else if (sc.state == SCE_MMIXAL_STRING) {		// STRING
-			if (sc.ch == '\"') {
-				sc.ForwardSetState(SCE_MMIXAL_OPERANDS);
-			} else if (sc.atLineEnd) {
-				sc.ForwardSetState(SCE_MMIXAL_OPERANDS);
-			}
-		} else if (sc.state == SCE_MMIXAL_CHAR) {			// CHAR
-			if (sc.ch == '\'') {
-				sc.ForwardSetState(SCE_MMIXAL_OPERANDS);
-			} else if (sc.atLineEnd) {
-				sc.ForwardSetState(SCE_MMIXAL_OPERANDS);
-			}
-		} else if (sc.state == SCE_MMIXAL_REGISTER) {		// REGISTER
-			if (!isdigit(sc.ch)) {
-				sc.SetState(SCE_MMIXAL_OPERANDS);
-			}
-		} else if (sc.state == SCE_MMIXAL_HEX) {			// HEX
-			if (!isxdigit(sc.ch)) {
-				sc.SetState(SCE_MMIXAL_OPERANDS);
-			}
-		}
-
-		// Determine if a new state should be entered.
-		if (sc.state == SCE_MMIXAL_OPCODE_POST ||		// OPCODE_POST
-			sc.state == SCE_MMIXAL_OPERANDS) {			// OPERANDS
-			if (sc.state == SCE_MMIXAL_OPERANDS && isspace(sc.ch)) {
-				if (!sc.atLineEnd) {
-					sc.SetState(SCE_MMIXAL_COMMENT);
-				}
-			} else if (isdigit(sc.ch)) {
-				sc.SetState(SCE_MMIXAL_NUMBER);
-			} else if (IsAWordChar(sc.ch) || sc.Match('@')) {
-				sc.SetState(SCE_MMIXAL_REF);
-			} else if (sc.Match('\"')) {
-				sc.SetState(SCE_MMIXAL_STRING);
-			} else if (sc.Match('\'')) {
-				sc.SetState(SCE_MMIXAL_CHAR);
-			} else if (sc.Match('$')) {
-				sc.SetState(SCE_MMIXAL_REGISTER);
-			} else if (sc.Match('#')) {
-				sc.SetState(SCE_MMIXAL_HEX);
-			} else if (isMMIXALOperator(static_cast<char>(sc.ch))) {
-				sc.SetState(SCE_MMIXAL_OPERATOR);
-			}
-		}
-	}
-	sc.Complete();
-}
-
-static const char * const MMIXALWordListDesc[] = {
-	"Operation Codes",
-	"Special Register",
-	"Predefined Symbols",
-	0
-};
-
-LexerModule lmMMIXAL(SCLEX_MMIXAL, ColouriseMMIXALDoc, "mmixal", 0, MMIXALWordListDesc);
-
diff --git a/src/stc/scintilla/src/LexMPT.cxx b/src/stc/scintilla/src/LexMPT.cxx
deleted file mode 100644
index 1058b9b496..0000000000
--- a/src/stc/scintilla/src/LexMPT.cxx
+++ /dev/null
@@ -1,182 +0,0 @@
-// Scintilla source code edit control
-/** @file LexMPT.cxx
- ** Lexer for MPT specific files. Based on LexOthers.cxx
- ** LOT = the text log file created by the MPT application while running a test program
- ** Other MPT specific files to be added later.
- **/
-// Copyright 2003 by Marius Gheorghe <mgheorghe@cabletest.com>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-#include "SString.h"
-
-static int GetLotLineState(SString &line) {
-	if (line.length()) {
-		// Most of the time the first non-blank character in line determines that line's type
-		// Now finds the first non-blank character
-		unsigned i; // Declares counter here to make it persistent after the for loop
-		for (i = 0; i < line.length(); ++i) {
-			if (!isspace(line[i]))
-				break;
-		}
-
-		// Checks if it was a blank line
-		if (i == line.length())
-			return SCE_LOT_DEFAULT;
-
-		switch (line[i]) {
-		case '*': // Fail measurement
-			return SCE_LOT_FAIL;
-
-		case '+': // Header
-		case '|': // Header
-			return SCE_LOT_HEADER;
-
-		case ':': // Set test limits
-			return SCE_LOT_SET;
-
-		case '-': // Section break
-			return SCE_LOT_BREAK;
-
-		default:  // Any other line
-			// Checks for message at the end of lot file
-			if (line.contains("PASSED")) {
-				return SCE_LOT_PASS;
-			}
-			else if (line.contains("FAILED")) {
-				return SCE_LOT_FAIL;
-			}
-			else if (line.contains("ABORTED")) {
-				return SCE_LOT_ABORT;
-			}
-			else {
-				return i ? SCE_LOT_PASS : SCE_LOT_DEFAULT;			
-			}
-		}
-	}
-	else {
-		return SCE_LOT_DEFAULT;
-	}
-}
-
-static void ColourizeLotDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
-	styler.StartAt(startPos);
-	styler.StartSegment(startPos);
-	bool atLineStart = true;// Arms the 'at line start' flag
-	char chNext = styler.SafeGetCharAt(startPos);
-	SString line("");
-	line.setsizegrowth(256);	// Lot lines are less than 256 chars long most of the time. This should avoid reallocations
-
-	// Styles LOT document
-	unsigned int i;			// Declared here because it's used after the for loop
-	for (i = startPos; i < startPos + length; ++i) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		line += ch;
-		atLineStart = false;
-
-		// LOT files are only used on the Win32 platform, thus EOL == CR+LF
-		// Searches for the end of line
-		if (ch == '\r' && chNext == '\n') {
-			line += chNext; // Gets the '\n'
-			++i; // Advances past the '\n'
-			chNext = styler.SafeGetCharAt(i + 1); // Gets character of next line
-			styler.ColourTo(i, GetLotLineState(line));
-			line = "";
-			atLineStart = true; // Arms flag for next line
-		}
-	}
-
-	// Last line may not have a line ending
-	if (!atLineStart) {
-		styler.ColourTo(i - 1, GetLotLineState(line));
-	}
-}
-
-// Folds an MPT LOT file: the blocks that can be folded are:
-// sections (headed by a set line)
-// passes (contiguous pass results within a section)
-// fails (contiguous fail results within a section)
-static void FoldLotDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
-	bool foldCompact = styler.GetPropertyInt("fold.compact", 0) != 0;
-	unsigned int endPos = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-
-	char chNext = styler.SafeGetCharAt(startPos);
-	int style = SCE_LOT_DEFAULT;
-	int styleNext = styler.StyleAt(startPos);
-	int lev = SC_FOLDLEVELBASE;
-
-	// Gets style of previous line if not at the beginning of the document
-	if (startPos > 1)
-		style = styler.StyleAt(startPos - 2);
-
-	for (unsigned int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-
-		if (ch == '\r' && chNext == '\n') {
-			// TO DO:
-			// Should really get the state of the previous line from the styler
-			int stylePrev = style;	
-			style = styleNext;
-			styleNext = styler.StyleAt(i + 2);
-		
-			switch (style) {
-/*
-			case SCE_LOT_SET:
-				lev = SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG;
-				break;
-*/
-			case SCE_LOT_FAIL:
-/*
-				if (stylePrev != SCE_LOT_FAIL) 
-					lev = SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG;
-				else
-					lev = SC_FOLDLEVELBASE + 1;
-*/
-				lev = SC_FOLDLEVELBASE;
-				break;
-
-			default:
-				if (lineCurrent == 0 || stylePrev == SCE_LOT_FAIL) 
-					lev = SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG;
-				else
-					lev = SC_FOLDLEVELBASE + 1;
-
-				if (visibleChars == 0 && foldCompact)
-					lev |= SC_FOLDLEVELWHITEFLAG;
-				break;
-			}
-
-			if (lev != styler.LevelAt(lineCurrent)) 
-				styler.SetLevel(lineCurrent, lev);
-
-			lineCurrent++;
-			visibleChars = 0;
-		}
-
-		if (!isspacechar(ch))
-			visibleChars++;
-	}
-
-	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-	styler.SetLevel(lineCurrent, lev | flagsNext);
-}
-
-static const char * const emptyWordListDesc[] = {
-	0
-};
-
-LexerModule lmLot(SCLEX_LOT, ColourizeLotDoc, "lot", FoldLotDoc, emptyWordListDesc);
diff --git a/src/stc/scintilla/src/LexMSSQL.cxx b/src/stc/scintilla/src/LexMSSQL.cxx
deleted file mode 100644
index a94666822b..0000000000
--- a/src/stc/scintilla/src/LexMSSQL.cxx
+++ /dev/null
@@ -1,359 +0,0 @@
-// Scintilla source code edit control
-/** @file LexMSSQL.cxx
- ** Lexer for MSSQL.
- **/
-// By Filip Yaghob <fyaghob@gmail.com>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-#define KW_MSSQL_STATEMENTS         0
-#define KW_MSSQL_DATA_TYPES         1
-#define KW_MSSQL_SYSTEM_TABLES      2
-#define KW_MSSQL_GLOBAL_VARIABLES   3
-#define KW_MSSQL_FUNCTIONS          4
-#define KW_MSSQL_STORED_PROCEDURES  5
-#define KW_MSSQL_OPERATORS          6
-
-static bool isMSSQLOperator(char ch) {
-	if (isascii(ch) && isalnum(ch))
-		return false;
-	// '.' left out as it is used to make up numbers
-	if (ch == '%' || ch == '^' || ch == '&' || ch == '*' ||
-        ch == '-' || ch == '+' || ch == '=' || ch == '|' ||
-        ch == '<' || ch == '>' || ch == '/' ||
-        ch == '!' || ch == '~' || ch == '(' || ch == ')' ||
-		ch == ',')
-		return true;
-	return false;
-}
-
-static char classifyWordSQL(unsigned int start,
-                            unsigned int end,
-                            WordList *keywordlists[],
-                            Accessor &styler,
-                            unsigned int actualState,
-							unsigned int prevState) {
-	char s[256];
-	bool wordIsNumber = isdigit(styler[start]) || (styler[start] == '.');
-
-	WordList &kwStatements          = *keywordlists[KW_MSSQL_STATEMENTS];
-    WordList &kwDataTypes           = *keywordlists[KW_MSSQL_DATA_TYPES];
-    WordList &kwSystemTables        = *keywordlists[KW_MSSQL_SYSTEM_TABLES];
-    WordList &kwGlobalVariables     = *keywordlists[KW_MSSQL_GLOBAL_VARIABLES];
-    WordList &kwFunctions           = *keywordlists[KW_MSSQL_FUNCTIONS];
-    WordList &kwStoredProcedures    = *keywordlists[KW_MSSQL_STORED_PROCEDURES];
-    WordList &kwOperators           = *keywordlists[KW_MSSQL_OPERATORS];
-
-	for (unsigned int i = 0; i < end - start + 1 && i < 128; i++) {
-		s[i] = static_cast<char>(tolower(styler[start + i]));
-		s[i + 1] = '\0';
-	}
-	char chAttr = SCE_MSSQL_IDENTIFIER;
-
-	if (actualState == SCE_MSSQL_GLOBAL_VARIABLE) {
-
-        if (kwGlobalVariables.InList(&s[2]))
-            chAttr = SCE_MSSQL_GLOBAL_VARIABLE;
-
-	} else if (wordIsNumber) {
-		chAttr = SCE_MSSQL_NUMBER;
-
-	} else if (prevState == SCE_MSSQL_DEFAULT_PREF_DATATYPE) {
-		// Look first in datatypes
-        if (kwDataTypes.InList(s))
-            chAttr = SCE_MSSQL_DATATYPE;
-		else if (kwOperators.InList(s))
-			chAttr = SCE_MSSQL_OPERATOR;
-		else if (kwStatements.InList(s))
-			chAttr = SCE_MSSQL_STATEMENT;
-		else if (kwSystemTables.InList(s))
-			chAttr = SCE_MSSQL_SYSTABLE;
-		else if (kwFunctions.InList(s))
-            chAttr = SCE_MSSQL_FUNCTION;
-		else if (kwStoredProcedures.InList(s))
-			chAttr = SCE_MSSQL_STORED_PROCEDURE;
-
-	} else {
-		if (kwOperators.InList(s))
-			chAttr = SCE_MSSQL_OPERATOR;
-		else if (kwStatements.InList(s))
-			chAttr = SCE_MSSQL_STATEMENT;
-		else if (kwSystemTables.InList(s))
-			chAttr = SCE_MSSQL_SYSTABLE;
-		else if (kwFunctions.InList(s))
-			chAttr = SCE_MSSQL_FUNCTION;
-		else if (kwStoredProcedures.InList(s))
-			chAttr = SCE_MSSQL_STORED_PROCEDURE;
-		else if (kwDataTypes.InList(s))
-			chAttr = SCE_MSSQL_DATATYPE;
-	}
-
-	styler.ColourTo(end, chAttr);
-
-	return chAttr;
-}
-
-static void ColouriseMSSQLDoc(unsigned int startPos, int length,
-                              int initStyle, WordList *keywordlists[], Accessor &styler) {
-
-
-	styler.StartAt(startPos);
-
-	bool fold = styler.GetPropertyInt("fold") != 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int spaceFlags = 0;
-
-	int state = initStyle;
-	int prevState = initStyle;
-	char chPrev = ' ';
-	char chNext = styler[startPos];
-	styler.StartSegment(startPos);
-	unsigned int lengthDoc = startPos + length;
-	for (unsigned int i = startPos; i < lengthDoc; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-
-		if ((ch == '\r' && chNext != '\n') || (ch == '\n')) {
-			int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags);
-			int lev = indentCurrent;
-			if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
-				// Only non whitespace lines can be headers
-				int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags);
-				if (indentCurrent < (indentNext & ~SC_FOLDLEVELWHITEFLAG)) {
-					lev |= SC_FOLDLEVELHEADERFLAG;
-				}
-			}
-			if (fold) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-		}
-
-		if (styler.IsLeadByte(ch)) {
-			chNext = styler.SafeGetCharAt(i + 2);
-			chPrev = ' ';
-			i += 1;
-			continue;
-		}
-
-		// When the last char isn't part of the state (have to deal with it too)...
-		if ( (state == SCE_MSSQL_IDENTIFIER) ||
-                    (state == SCE_MSSQL_STORED_PROCEDURE) ||
-                    (state == SCE_MSSQL_DATATYPE) ||
-                    //~ (state == SCE_MSSQL_COLUMN_NAME) ||
-                    (state == SCE_MSSQL_FUNCTION) ||
-                    //~ (state == SCE_MSSQL_GLOBAL_VARIABLE) ||
-                    (state == SCE_MSSQL_VARIABLE)) {
-			if (!iswordchar(ch)) {
-				int stateTmp;
-
-                if ((state == SCE_MSSQL_VARIABLE) || (state == SCE_MSSQL_COLUMN_NAME)) {
-                    styler.ColourTo(i - 1, state);
-					stateTmp = state;
-                } else
-                    stateTmp = classifyWordSQL(styler.GetStartSegment(), i - 1, keywordlists, styler, state, prevState);
-
-				prevState = state;
-
-				if (stateTmp == SCE_MSSQL_IDENTIFIER || stateTmp == SCE_MSSQL_VARIABLE)
-					state = SCE_MSSQL_DEFAULT_PREF_DATATYPE;
-				else
-					state = SCE_MSSQL_DEFAULT;
-			}
-		} else if (state == SCE_MSSQL_LINE_COMMENT) {
-			if (ch == '\r' || ch == '\n') {
-				styler.ColourTo(i - 1, state);
-				prevState = state;
-				state = SCE_MSSQL_DEFAULT;
-			}
-		} else if (state == SCE_MSSQL_GLOBAL_VARIABLE) {
-			if ((ch != '@') && !iswordchar(ch)) {
-				classifyWordSQL(styler.GetStartSegment(), i - 1, keywordlists, styler, state, prevState);
-				prevState = state;
-				state = SCE_MSSQL_DEFAULT;
-			}
-		}
-
-		// If is the default or one of the above succeeded
-		if (state == SCE_MSSQL_DEFAULT || state == SCE_MSSQL_DEFAULT_PREF_DATATYPE) {
-			if (iswordstart(ch)) {
-				styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
-				prevState = state;
-				state = SCE_MSSQL_IDENTIFIER;
-			} else if (ch == '/' && chNext == '*') {
-				styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
-				prevState = state;
-				state = SCE_MSSQL_COMMENT;
-			} else if (ch == '-' && chNext == '-') {
-				styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
-				prevState = state;
-				state = SCE_MSSQL_LINE_COMMENT;
-			} else if (ch == '\'') {
-				styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
-				prevState = state;
-				state = SCE_MSSQL_STRING;
-			} else if (ch == '"') {
-				styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
-				prevState = state;
-				state = SCE_MSSQL_COLUMN_NAME;
-			} else if (ch == '[') {
-				styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
-				prevState = state;
-				state = SCE_MSSQL_COLUMN_NAME_2;
-			} else if (isMSSQLOperator(ch)) {
-				styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
-				styler.ColourTo(i, SCE_MSSQL_OPERATOR);
-                //~ style = SCE_MSSQL_DEFAULT;
-				prevState = state;
-				state = SCE_MSSQL_DEFAULT;
-			} else if (ch == '@') {
-                styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
-				prevState = state;
-                if (chNext == '@') {
-                    state = SCE_MSSQL_GLOBAL_VARIABLE;
-//                    i += 2;
-                } else
-                    state = SCE_MSSQL_VARIABLE;
-            }
-
-
-		// When the last char is part of the state...
-		} else if (state == SCE_MSSQL_COMMENT) {
-				if (ch == '/' && chPrev == '*') {
-					if (((i > (styler.GetStartSegment() + 2)) || ((initStyle == SCE_MSSQL_COMMENT) &&
-					    (styler.GetStartSegment() == startPos)))) {
-						styler.ColourTo(i, state);
-						//~ state = SCE_MSSQL_COMMENT;
-					prevState = state;
-                        state = SCE_MSSQL_DEFAULT;
-					}
-				}
-			} else if (state == SCE_MSSQL_STRING) {
-				if (ch == '\'') {
-					if ( chNext == '\'' ) {
-						i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-					} else {
-						styler.ColourTo(i, state);
-					prevState = state;
-						state = SCE_MSSQL_DEFAULT;
-					//i++;
-					}
-				//ch = chNext;
-				//chNext = styler.SafeGetCharAt(i + 1);
-				}
-			} else if (state == SCE_MSSQL_COLUMN_NAME) {
-				if (ch == '"') {
-					if (chNext == '"') {
-						i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				} else {
-                    styler.ColourTo(i, state);
-					prevState = state;
-					state = SCE_MSSQL_DEFAULT_PREF_DATATYPE;
-					//i++;
-                }
-                }
-		} else if (state == SCE_MSSQL_COLUMN_NAME_2) {
-			if (ch == ']') {
-                styler.ColourTo(i, state);
-				prevState = state;
-                state = SCE_MSSQL_DEFAULT_PREF_DATATYPE;
-                //i++;
-			}
-		}
-
-		chPrev = ch;
-	}
-	styler.ColourTo(lengthDoc - 1, state);
-}
-
-static void FoldMSSQLDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
-	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
-	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-	unsigned int endPos = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
-	int levelCurrent = levelPrev;
-	char chNext = styler[startPos];
-	bool inComment = (styler.StyleAt(startPos-1) == SCE_MSSQL_COMMENT);
-    char s[10];
-	for (unsigned int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		int style = styler.StyleAt(i);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-        // Comment folding
-		if (foldComment) {
-			if (!inComment && (style == SCE_MSSQL_COMMENT))
-				levelCurrent++;
-			else if (inComment && (style != SCE_MSSQL_COMMENT))
-				levelCurrent--;
-			inComment = (style == SCE_MSSQL_COMMENT);
-		}
-        if (style == SCE_MSSQL_STATEMENT) {
-            // Folding between begin and end
-            if (ch == 'b' || ch == 'e') {
-                for (unsigned int j = 0; j < 5; j++) {
-					if (!iswordchar(styler[i + j])) {
-						break;
-					}
-					s[j] = styler[i + j];
-					s[j + 1] = '\0';
-                }
-				if (strcmp(s, "begin") == 0) {
-					levelCurrent++;
-				}
-				if (strcmp(s, "end") == 0) {
-					levelCurrent--;
-				}
-            }
-        }
-		if (atEOL) {
-			int lev = levelPrev;
-			if (visibleChars == 0 && foldCompact)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			if ((levelCurrent > levelPrev) && (visibleChars > 0))
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			levelPrev = levelCurrent;
-			visibleChars = 0;
-		}
-		if (!isspacechar(ch))
-			visibleChars++;
-	}
-	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
-}
-
-static const char * const sqlWordListDesc[] = {
-	"Statements",
-    "Data Types",
-    "System tables",
-    "Global variables",
-    "Functions",
-    "System Stored Procedures",
-    "Operators",
-	0,
-};
-
-LexerModule lmMSSQL(SCLEX_MSSQL, ColouriseMSSQLDoc, "mssql", FoldMSSQLDoc, sqlWordListDesc);
diff --git a/src/stc/scintilla/src/LexMatlab.cxx b/src/stc/scintilla/src/LexMatlab.cxx
deleted file mode 100644
index 249fa67ce2..0000000000
--- a/src/stc/scintilla/src/LexMatlab.cxx
+++ /dev/null
@@ -1,225 +0,0 @@
-// Scintilla source code edit control
-/** @file LexMatlab.cxx
- ** Lexer for Matlab.
- ** Written by José Fonseca
- **
- ** Changes by Christoph Dalitz 2003/12/04:
- **   - added support for Octave
- **   - Strings can now be included both in single or double quotes
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-
-static bool IsMatlabCommentChar(int c) {
-	return (c == '%') ;
-}
-
-static bool IsOctaveCommentChar(int c) {
-	return (c == '%' || c == '#') ;
-}
-
-static bool IsMatlabComment(Accessor &styler, int pos, int len) {
-	return len > 0 && IsMatlabCommentChar(styler[pos]) ;
-}
-
-static bool IsOctaveComment(Accessor &styler, int pos, int len) {
-	return len > 0 && IsOctaveCommentChar(styler[pos]) ;
-}
-
-static inline bool IsAWordChar(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '_');
-}
-
-static inline bool IsAWordStart(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '_');
-}
-
-static void ColouriseMatlabOctaveDoc(
-            unsigned int startPos, int length, int initStyle,
-            WordList *keywordlists[], Accessor &styler,
-            bool (*IsCommentChar)(int)) {
-
-	WordList &keywords = *keywordlists[0];
-
-	styler.StartAt(startPos);
-
-	bool transpose = false;
-
-	StyleContext sc(startPos, length, initStyle, styler);
-
-	for (; sc.More(); sc.Forward()) {
-
-		if (sc.state == SCE_MATLAB_OPERATOR) {
-			if (sc.chPrev == '.') {
-				if (sc.ch == '*' || sc.ch == '/' || sc.ch == '\\' || sc.ch == '^') {
-					sc.ForwardSetState(SCE_MATLAB_DEFAULT);
-					transpose = false;
-				} else if (sc.ch == '\'') {
-					sc.ForwardSetState(SCE_MATLAB_DEFAULT);
-					transpose = true;
-				} else {
-					sc.SetState(SCE_MATLAB_DEFAULT);
-				}
-			} else {
-				sc.SetState(SCE_MATLAB_DEFAULT);
-			}
-		} else if (sc.state == SCE_MATLAB_KEYWORD) {
-			if (!isalnum(sc.ch) && sc.ch != '_') {
-				char s[100];
-				sc.GetCurrentLowered(s, sizeof(s));
-				if (keywords.InList(s)) {
-					sc.SetState(SCE_MATLAB_DEFAULT);
-					transpose = false;
-				} else {
-					sc.ChangeState(SCE_MATLAB_IDENTIFIER);
-					sc.SetState(SCE_MATLAB_DEFAULT);
-					transpose = true;
-				}
-			}
-		} else if (sc.state == SCE_MATLAB_NUMBER) {
-			if (!isdigit(sc.ch) && sc.ch != '.'
-			        && !(sc.ch == 'e' || sc.ch == 'E')
-			        && !((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E'))) {
-				sc.SetState(SCE_MATLAB_DEFAULT);
-				transpose = true;
-			}
-		} else if (sc.state == SCE_MATLAB_STRING) {
-			if (sc.ch == '\'' && sc.chPrev != '\\') {
-				sc.ForwardSetState(SCE_MATLAB_DEFAULT);
-			}
-		} else if (sc.state == SCE_MATLAB_DOUBLEQUOTESTRING) {
-			if (sc.ch == '"' && sc.chPrev != '\\') {
-				sc.ForwardSetState(SCE_MATLAB_DEFAULT);
-			}
-		} else if (sc.state == SCE_MATLAB_COMMENT || sc.state == SCE_MATLAB_COMMAND) {
-			if (sc.atLineEnd) {
-				sc.SetState(SCE_MATLAB_DEFAULT);
-				transpose = false;
-			}
-		}
-
-		if (sc.state == SCE_MATLAB_DEFAULT) {
-			if (IsCommentChar(sc.ch)) {
-				sc.SetState(SCE_MATLAB_COMMENT);
-			} else if (sc.ch == '!') {
-				sc.SetState(SCE_MATLAB_COMMAND);
-			} else if (sc.ch == '\'') {
-				if (transpose) {
-					sc.SetState(SCE_MATLAB_OPERATOR);
-				} else {
-					sc.SetState(SCE_MATLAB_STRING);
-				}
-			} else if (sc.ch == '"') {
-              sc.SetState(SCE_MATLAB_DOUBLEQUOTESTRING);
-			} else if (isdigit(sc.ch) || (sc.ch == '.' && isdigit(sc.chNext))) {
-				sc.SetState(SCE_MATLAB_NUMBER);
-			} else if (isalpha(sc.ch)) {
-				sc.SetState(SCE_MATLAB_KEYWORD);
-			} else if (isoperator(static_cast<char>(sc.ch)) || sc.ch == '@' || sc.ch == '\\') {
-				if (sc.ch == ')' || sc.ch == ']') {
-					transpose = true;
-				} else {
-					transpose = false;
-				}
-				sc.SetState(SCE_MATLAB_OPERATOR);
-			} else {
-				transpose = false;
-			}
-		}
-	}
-	sc.Complete();
-}
-
-static void ColouriseMatlabDoc(unsigned int startPos, int length, int initStyle,
-                               WordList *keywordlists[], Accessor &styler) {
-  ColouriseMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsMatlabCommentChar);
-}
-
-static void ColouriseOctaveDoc(unsigned int startPos, int length, int initStyle,
-                               WordList *keywordlists[], Accessor &styler) {
-  ColouriseMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsOctaveCommentChar);
-}
-
-static void FoldMatlabOctaveDoc(unsigned int startPos, int length, int,
-                          WordList *[], Accessor &styler,
-                          bool (*IsComment)(Accessor&,int,int)) {
-
-	int endPos = startPos + length;
-
-	// Backtrack to previous line in case need to fix its fold status
-	int lineCurrent = styler.GetLine(startPos);
-	if (startPos > 0) {
-		if (lineCurrent > 0) {
-			lineCurrent--;
-			startPos = styler.LineStart(lineCurrent);
-		}
-	}
-	int spaceFlags = 0;
-	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, IsComment);
-	char chNext = styler[startPos];
-	for (int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-
-		if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == endPos)) {
-			int lev = indentCurrent;
-			int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags, IsComment);
-			if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
-				// Only non whitespace lines can be headers
-				if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) {
-					lev |= SC_FOLDLEVELHEADERFLAG;
-				} else if (indentNext & SC_FOLDLEVELWHITEFLAG) {
-					// Line after is blank so check the next - maybe should continue further?
-					int spaceFlags2 = 0;
-					int indentNext2 = styler.IndentAmount(lineCurrent + 2, &spaceFlags2, IsComment);
-					if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext2 & SC_FOLDLEVELNUMBERMASK)) {
-						lev |= SC_FOLDLEVELHEADERFLAG;
-					}
-				}
-			}
-			indentCurrent = indentNext;
-			styler.SetLevel(lineCurrent, lev);
-			lineCurrent++;
-		}
-	}
-}
-
-static void FoldMatlabDoc(unsigned int startPos, int length, int initStyle,
-                          WordList *keywordlists[], Accessor &styler) {
-  FoldMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsMatlabComment);
-}
-
-static void FoldOctaveDoc(unsigned int startPos, int length, int initStyle,
-                          WordList *keywordlists[], Accessor &styler) {
-  FoldMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsOctaveComment);
-}
-
-static const char * const matlabWordListDesc[] = {
-	"Keywords",
-	0
-};
-
-static const char * const octaveWordListDesc[] = {
-	"Keywords",
-	0
-};
-
-LexerModule lmMatlab(SCLEX_MATLAB, ColouriseMatlabDoc, "matlab", FoldMatlabDoc, matlabWordListDesc);
-
-LexerModule lmOctave(SCLEX_OCTAVE, ColouriseOctaveDoc, "octave", FoldOctaveDoc, octaveWordListDesc);
diff --git a/src/stc/scintilla/src/LexMetapost.cxx b/src/stc/scintilla/src/LexMetapost.cxx
deleted file mode 100644
index b7d482c0f1..0000000000
--- a/src/stc/scintilla/src/LexMetapost.cxx
+++ /dev/null
@@ -1,320 +0,0 @@
-// Scintilla source code edit control
-
-// File: LexMetapost.cxx - general context conformant metapost coloring scheme
-// Author: Hans Hagen - PRAGMA ADE - Hasselt NL - www.pragma-ade.com
-// Version: September 28, 2003
-
-// Copyright: 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-// This lexer is derived from the one written for the texwork environment (1999++) which in
-// turn is inspired on texedit (1991++) which finds its roots in wdt (1986).
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-#include "StyleContext.h"
-
-// val SCE_METAPOST_DEFAULT = 0
-// val SCE_METAPOST_SPECIAL = 1
-// val SCE_METAPOST_GROUP = 2
-// val SCE_METAPOST_SYMBOL = 3
-// val SCE_METAPOST_COMMAND = 4
-// val SCE_METAPOST_TEXT = 5
-
-// Definitions in SciTEGlobal.properties:
-//
-// Metapost Highlighting
-//
-// # Default
-// style.metapost.0=fore:#7F7F00
-// # Special
-// style.metapost.1=fore:#007F7F
-// # Group
-// style.metapost.2=fore:#880000
-// # Symbol
-// style.metapost.3=fore:#7F7F00
-// # Command
-// style.metapost.4=fore:#008800
-// # Text
-// style.metapost.5=fore:#000000
-
-// lexer.tex.comment.process=0
-
-// Auxiliary functions:
-
-static inline bool endOfLine(Accessor &styler, unsigned int i) {
-	return
-      (styler[i] == '\n') || ((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n')) ;
-}
-
-static inline bool isMETAPOSTcomment(int ch) {
-	return
-      (ch == '%') ;
-}
-
-static inline bool isMETAPOSTone(int ch) {
-	return
-      (ch == '[') || (ch == ']') || (ch == '(') || (ch == ')') ||
-      (ch == ':') || (ch == '=') || (ch == '<') || (ch == '>') ||
-      (ch == '{') || (ch == '}') || (ch == '\'') || (ch == '\"') ;
-}
-
-static inline bool isMETAPOSTtwo(int ch) {
-	return
-      (ch == ';') || (ch == '$') || (ch == '@') || (ch == '#');
-}
-
-static inline bool isMETAPOSTthree(int ch) {
-	return
-      (ch == '.') || (ch == '-') || (ch == '+') || (ch == '/') ||
-      (ch == '*') || (ch == ',') || (ch == '|') || (ch == '`') ||
-      (ch == '!') || (ch == '?') || (ch == '^') || (ch == '&') ||
-      (ch == '%') ;
-}
-
-static inline bool isMETAPOSTidentifier(int ch) {
-	return
-      ((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z')) ||
-      (ch == '_') ;
-}
-
-static inline bool isMETAPOSTnumber(int ch) {
-	return
-      (ch >= '0') && (ch <= '9') ;
-}
-
-static inline bool isMETAPOSTstring(int ch) {
-	return
-      (ch == '\"') ;
-}
-
-static inline bool isMETAPOSTcolon(int ch) {
-	return
-		(ch == ':') ;
-}
-
-static inline bool isMETAPOSTequal(int ch) {
-	return
-		(ch == '=') ;
-}
-
-static int CheckMETAPOSTInterface(
-    unsigned int startPos,
-    int length,
-    Accessor &styler,
-	int defaultInterface) {
-
-    char lineBuffer[1024] ;
-	unsigned int linePos = 0 ;
-
-	// some day we can make something lexer.metapost.mapping=(none,0)(metapost,1)(mp,1)(metafun,2)...
-
-    if (styler.SafeGetCharAt(0) == '%') {
-        for (unsigned int i = 0; i < startPos + length; i++) {
-            lineBuffer[linePos++] = styler.SafeGetCharAt(i) ;
-            if (endOfLine(styler, i) || (linePos >= sizeof(lineBuffer) - 1)) {
-                lineBuffer[linePos] = '\0';
-				if (strstr(lineBuffer, "interface=none")) {
-                    return 0 ;
-				} else if (strstr(lineBuffer, "interface=metapost") || strstr(lineBuffer, "interface=mp")) {
-                    return 1 ;
-				} else if (strstr(lineBuffer, "interface=metafun")) {
-                    return 2 ;
-				} else if (styler.SafeGetCharAt(1) == 'D' && strstr(lineBuffer, "%D \\module")) {
-					// better would be to limit the search to just one line
-					return 2 ;
-                } else {
-                    return defaultInterface ;
-                }
-            }
-		}
-    }
-
-    return defaultInterface ;
-}
-
-static void ColouriseMETAPOSTDoc(
-    unsigned int startPos,
-    int length,
-    int,
-    WordList *keywordlists[],
-    Accessor &styler) {
-
-	styler.StartAt(startPos) ;
-	styler.StartSegment(startPos) ;
-
-	bool processComment   = styler.GetPropertyInt("lexer.metapost.comment.process",   0) == 1 ;
-    int  defaultInterface = styler.GetPropertyInt("lexer.metapost.interface.default", 1) ;
-
-	int currentInterface = CheckMETAPOSTInterface(startPos,length,styler,defaultInterface) ;
-
-	// 0  no keyword highlighting
-	// 1  metapost keyword hightlighting
-	// 2+ metafun keyword hightlighting
-
-	int extraInterface = 0 ;
-
-	if (currentInterface != 0) {
-		extraInterface = currentInterface ;
-	}
-
-	WordList &keywords  = *keywordlists[0] ;
-	WordList &keywords2 = *keywordlists[extraInterface-1] ;
-
-	StyleContext sc(startPos, length, SCE_METAPOST_TEXT, styler) ;
-
-	char key[100] ;
-
-    bool inTeX     = false ;
-	bool inComment = false ;
-	bool inString  = false ;
-	bool inClause  = false ;
-
-	bool going = sc.More() ; // needed because of a fuzzy end of file state
-
-	for (; going; sc.Forward()) {
-
-		if (! sc.More()) { going = false ; } // we need to go one behind the end of text
-
-		if (inClause) {
-			sc.SetState(SCE_METAPOST_TEXT) ;
-			inClause = false ;
-		}
-
-		if (inComment) {
-			if (sc.atLineEnd) {
-				sc.SetState(SCE_METAPOST_TEXT) ;
-				inTeX = false ;
-				inComment = false ;
-				inClause = false ;
-				inString = false ; // not correct but we want to stimulate one-lines
-			}
-		} else if (inString) {
-			if (isMETAPOSTstring(sc.ch)) {
-				sc.SetState(SCE_METAPOST_SPECIAL) ;
-				sc.ForwardSetState(SCE_METAPOST_TEXT) ;
-				inString = false ;
-			} else if (sc.atLineEnd) {
-				sc.SetState(SCE_METAPOST_TEXT) ;
-				inTeX = false ;
-				inComment = false ;
-				inClause = false ;
-				inString = false ; // not correct but we want to stimulate one-lines
-			}
-		} else {
-			if ((! isMETAPOSTidentifier(sc.ch)) && (sc.LengthCurrent() > 0)) {
-				if (sc.state == SCE_METAPOST_COMMAND) {
-					sc.GetCurrent(key, sizeof(key)) ;
-					if ((strcmp(key,"btex") == 0) || (strcmp(key,"verbatimtex") == 0)) {
-    					sc.ChangeState(SCE_METAPOST_GROUP) ;
-						inTeX = true ;
-					} else if (inTeX) {
-						if (strcmp(key,"etex") == 0) {
-	    					sc.ChangeState(SCE_METAPOST_GROUP) ;
-							inTeX = false ;
-						} else {
-	    					sc.ChangeState(SCE_METAPOST_TEXT) ;
-						}
-					} else {
-						if (keywords && keywords.InList(key)) {
-    						sc.ChangeState(SCE_METAPOST_COMMAND) ;
-						} else if (keywords2 && keywords2.InList(key)) {
-							sc.ChangeState(SCE_METAPOST_EXTRA) ;
-						} else {
-							sc.ChangeState(SCE_METAPOST_TEXT) ;
-						}
-					}
-				}
-			}
-			if (isMETAPOSTcomment(sc.ch)) {
-				if (! inTeX) {
-					sc.SetState(SCE_METAPOST_SYMBOL) ;
-					sc.ForwardSetState(SCE_METAPOST_DEFAULT) ;
-					inComment = ! processComment ;
-				} else {
-					sc.SetState(SCE_METAPOST_TEXT) ;
-				}
-			} else if (isMETAPOSTstring(sc.ch)) {
-				if (! inTeX) {
-					sc.SetState(SCE_METAPOST_SPECIAL) ;
-					if (! isMETAPOSTstring(sc.chNext)) {
-						sc.ForwardSetState(SCE_METAPOST_TEXT) ;
-					}
-					inString = true ;
-				} else {
-					sc.SetState(SCE_METAPOST_TEXT) ;
-				}
-			} else if (isMETAPOSTcolon(sc.ch)) {
-				if (! inTeX) {
-					if (! isMETAPOSTequal(sc.chNext)) {
-						sc.SetState(SCE_METAPOST_COMMAND) ;
-						inClause = true ;
-					} else {
-						sc.SetState(SCE_METAPOST_SPECIAL) ;
-					}
-				} else {
-					sc.SetState(SCE_METAPOST_TEXT) ;
-				}
-			} else if (isMETAPOSTone(sc.ch)) {
-				if (! inTeX) {
-					sc.SetState(SCE_METAPOST_SPECIAL) ;
-				} else {
-					sc.SetState(SCE_METAPOST_TEXT) ;
-				}
-			} else if (isMETAPOSTtwo(sc.ch)) {
-				if (! inTeX) {
-					sc.SetState(SCE_METAPOST_GROUP) ;
-				} else {
-					sc.SetState(SCE_METAPOST_TEXT) ;
-				}
-			} else if (isMETAPOSTthree(sc.ch)) {
-				if (! inTeX) {
-					sc.SetState(SCE_METAPOST_SYMBOL) ;
-				} else {
-					sc.SetState(SCE_METAPOST_TEXT) ;
-				}
-			} else if (isMETAPOSTidentifier(sc.ch)) {
-				if (sc.state != SCE_METAPOST_COMMAND) {
-					sc.SetState(SCE_METAPOST_TEXT) ;
-					sc.ChangeState(SCE_METAPOST_COMMAND) ;
-				}
-			} else if (isMETAPOSTnumber(sc.ch)) {
-				// rather redundant since for the moment we don't handle numbers
-				sc.SetState(SCE_METAPOST_TEXT) ;
-			} else if (sc.atLineEnd) {
-				sc.SetState(SCE_METAPOST_TEXT) ;
-				inTeX = false ;
-				inComment = false ;
-				inClause = false ;
-				inString = false ;
-			} else {
-				sc.SetState(SCE_METAPOST_TEXT) ;
-			}
-		}
-
-	}
-
-	sc.Complete();
-
-}
-
-// Hooks info the system:
-
-static const char * const metapostWordListDesc[] = {
-	"MetaPost",
-	"MetaFun",
-	0
-} ;
-
-LexerModule lmMETAPOST(SCLEX_METAPOST, ColouriseMETAPOSTDoc, "metapost", 0, metapostWordListDesc);
diff --git a/src/stc/scintilla/src/LexNsis.cxx b/src/stc/scintilla/src/LexNsis.cxx
deleted file mode 100644
index 6a7274ef59..0000000000
--- a/src/stc/scintilla/src/LexNsis.cxx
+++ /dev/null
@@ -1,647 +0,0 @@
-// Scintilla source code edit control
-/** @file LexNsis.cxx
- ** Lexer for NSIS
- **/
-// Copyright 2003 - 2005 by Angelo Mandato <angelo [at] spaceblue [dot] com>
-// Last Updated: 03/13/2005
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-/*
-// located in SciLexer.h
-#define SCLEX_NSIS 43
-
-#define SCE_NSIS_DEFAULT 0
-#define SCE_NSIS_COMMENT 1
-#define SCE_NSIS_STRINGDQ 2
-#define SCE_NSIS_STRINGLQ 3
-#define SCE_NSIS_STRINGRQ 4
-#define SCE_NSIS_FUNCTION 5
-#define SCE_NSIS_VARIABLE 6
-#define SCE_NSIS_LABEL 7
-#define SCE_NSIS_USERDEFINED 8
-#define SCE_NSIS_SECTIONDEF 9
-#define SCE_NSIS_SUBSECTIONDEF 10
-#define SCE_NSIS_IFDEFINEDEF 11
-#define SCE_NSIS_MACRODEF 12
-#define SCE_NSIS_STRINGVAR 13
-#define SCE_NSIS_NUMBER 14
-// ADDED for Scintilla v1.63
-#define SCE_NSIS_SECTIONGROUP 15
-#define SCE_NSIS_PAGEEX 16
-#define SCE_NSIS_FUNCTIONDEF 17
-#define SCE_NSIS_COMMENTBOX 18
-*/
-
-static bool isNsisNumber(char ch)
-{
-  return (ch >= '0' && ch <= '9');
-}
-
-static bool isNsisChar(char ch)
-{
-  return (ch == '.' ) || (ch == '_' ) || isNsisNumber(ch) || (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z');
-}
-
-static bool isNsisLetter(char ch)
-{
-  return (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z');
-}
-
-static bool NsisNextLineHasElse(unsigned int start, unsigned int end, Accessor &styler)
-{
-  int nNextLine = -1;
-  for( unsigned int i = start; i < end; i++ )
-  {
-    char cNext = styler.SafeGetCharAt( i );
-    if( cNext == '\n' )
-    {
-      nNextLine = i+1;
-      break;
-    }
-  }
-
-  if( nNextLine == -1 ) // We never foudn the next line...
-    return false;
-
-  for( unsigned int firstChar = nNextLine; firstChar < end; firstChar++ )
-  {
-    char cNext = styler.SafeGetCharAt( firstChar );
-    if( cNext == ' ' )
-      continue;
-    if( cNext == '\t' )
-      continue;
-    if( cNext == '!' )
-    {
-      if( styler.Match(firstChar, "!else") )
-        return true;
-    }
-    break;
-  }
-
-  return false;
-}
-
-static int NsisCmp( char *s1, char *s2, bool bIgnoreCase )
-{
-  if( bIgnoreCase )
-     return CompareCaseInsensitive( s1, s2);
-
-  return strcmp( s1, s2 );
-}
-
-static int calculateFoldNsis(unsigned int start, unsigned int end, int foldlevel, Accessor &styler, bool bElse, bool foldUtilityCmd )
-{
-  int style = styler.StyleAt(end);
-
-  // If the word is too long, it is not what we are looking for
-  if( end - start > 20 )
-    return foldlevel;
-
-  if( foldUtilityCmd )
-  {
-    // Check the style at this point, if it is not valid, then return zero
-    if( style != SCE_NSIS_FUNCTIONDEF && style != SCE_NSIS_SECTIONDEF &&
-        style != SCE_NSIS_SUBSECTIONDEF && style != SCE_NSIS_IFDEFINEDEF &&
-        style != SCE_NSIS_MACRODEF && style != SCE_NSIS_SECTIONGROUP &&
-        style != SCE_NSIS_PAGEEX )
-          return foldlevel;
-  }
-  else
-  { 
-    if( style != SCE_NSIS_FUNCTIONDEF && style != SCE_NSIS_SECTIONDEF &&
-        style != SCE_NSIS_SUBSECTIONDEF && style != SCE_NSIS_SECTIONGROUP &&
-        style != SCE_NSIS_PAGEEX )
-          return foldlevel;
-  }
-
-  int newFoldlevel = foldlevel;
-  bool bIgnoreCase = false;
-  if( styler.GetPropertyInt("nsis.ignorecase") == 1 )
-    bIgnoreCase = true;
-
-  char s[20]; // The key word we are looking for has atmost 13 characters
-  for (unsigned int i = 0; i < end - start + 1 && i < 19; i++)
-	{
-		s[i] = static_cast<char>( styler[ start + i ] );
-		s[i + 1] = '\0';
-	}
-
-  if( s[0] == '!' )
-  {
-    if( NsisCmp(s, "!ifndef", bIgnoreCase) == 0 || NsisCmp(s, "!ifdef", bIgnoreCase ) == 0 || NsisCmp(s, "!macro", bIgnoreCase ) == 0 )
-      newFoldlevel++;
-    else if( NsisCmp(s, "!endif", bIgnoreCase) == 0 || NsisCmp(s, "!macroend", bIgnoreCase ) == 0 )
-      newFoldlevel--;
-    else if( bElse && NsisCmp(s, "!else", bIgnoreCase) == 0 )
-      newFoldlevel++;
-  }
-  else
-  {
-    if( NsisCmp(s, "Section", bIgnoreCase ) == 0 || NsisCmp(s, "SectionGroup", bIgnoreCase ) == 0 || NsisCmp(s, "Function", bIgnoreCase) == 0 || NsisCmp(s, "SubSection", bIgnoreCase ) == 0 || NsisCmp(s, "PageEx", bIgnoreCase ) == 0 )
-      newFoldlevel++;
-    else if( NsisCmp(s, "SectionGroupEnd", bIgnoreCase ) == 0 || NsisCmp(s, "SubSectionEnd", bIgnoreCase ) == 0 || NsisCmp(s, "FunctionEnd", bIgnoreCase) == 0 || NsisCmp(s, "SectionEnd", bIgnoreCase ) == 0 || NsisCmp(s, "PageExEnd", bIgnoreCase ) == 0 )
-      newFoldlevel--;
-  }
-  
-  return newFoldlevel;
-}
-
-static int classifyWordNsis(unsigned int start, unsigned int end, WordList *keywordLists[], Accessor &styler )
-{
-  bool bIgnoreCase = false;
-  if( styler.GetPropertyInt("nsis.ignorecase") == 1 )
-    bIgnoreCase = true;
-
-  bool bUserVars = false;
-  if( styler.GetPropertyInt("nsis.uservars") == 1 )
-    bUserVars = true;
-
-	char s[100];
-
-	WordList &Functions = *keywordLists[0];
-	WordList &Variables = *keywordLists[1];
-	WordList &Lables = *keywordLists[2];
-	WordList &UserDefined = *keywordLists[3];
-
-	for (unsigned int i = 0; i < end - start + 1 && i < 99; i++)
-	{
-    if( bIgnoreCase )
-      s[i] = static_cast<char>( tolower(styler[ start + i ] ) );
-    else
-		  s[i] = static_cast<char>( styler[ start + i ] );
-		s[i + 1] = '\0';
-	}
-
-	// Check for special words...
-	if( NsisCmp(s, "!macro", bIgnoreCase ) == 0 || NsisCmp(s, "!macroend", bIgnoreCase) == 0 ) // Covers !micro and !microend
-		return SCE_NSIS_MACRODEF;
-
-	if( NsisCmp(s, "!ifdef", bIgnoreCase ) == 0 ||  NsisCmp(s, "!ifndef", bIgnoreCase) == 0 ||  NsisCmp(s, "!endif", bIgnoreCase) == 0 )
-		return SCE_NSIS_IFDEFINEDEF;
-
-  if( NsisCmp(s, "!else", bIgnoreCase ) == 0 ) // ||  NsisCmp(s, "!ifndef", bIgnoreCase) == 0 ||  NsisCmp(s, "!endif", bIgnoreCase) == 0 )
-		return SCE_NSIS_IFDEFINEDEF;
-
-  if( NsisCmp(s, "SectionGroup", bIgnoreCase) == 0 || NsisCmp(s, "SectionGroupEnd", bIgnoreCase) == 0 ) // Covers SectionGroup and SectionGroupEnd
-    return SCE_NSIS_SECTIONGROUP;
-
-	if( NsisCmp(s, "Section", bIgnoreCase ) == 0 || NsisCmp(s, "SectionEnd", bIgnoreCase) == 0 ) // Covers Section and SectionEnd
-		return SCE_NSIS_SECTIONDEF;
-
-	if( NsisCmp(s, "SubSection", bIgnoreCase) == 0 || NsisCmp(s, "SubSectionEnd", bIgnoreCase) == 0 ) // Covers SubSection and SubSectionEnd
-		return SCE_NSIS_SUBSECTIONDEF;
-
-  if( NsisCmp(s, "PageEx", bIgnoreCase) == 0 || NsisCmp(s, "PageExEnd", bIgnoreCase) == 0 ) // Covers PageEx and PageExEnd
-    return SCE_NSIS_PAGEEX;
-
-	if( NsisCmp(s, "Function", bIgnoreCase) == 0 || NsisCmp(s, "FunctionEnd", bIgnoreCase) == 0 ) // Covers Function and FunctionEnd
-		return SCE_NSIS_FUNCTIONDEF;
-
-	if ( Functions.InList(s) )
-		return SCE_NSIS_FUNCTION;
-
-	if ( Variables.InList(s) )
-		return SCE_NSIS_VARIABLE;
-
-	if ( Lables.InList(s) )
-		return SCE_NSIS_LABEL;
-
-	if( UserDefined.InList(s) )
-		return SCE_NSIS_USERDEFINED;
-
-	if( strlen(s) > 3 )
-	{
-		if( s[1] == '{' && s[strlen(s)-1] == '}' )
-			return SCE_NSIS_VARIABLE;
-	}
-
-  // See if the variable is a user defined variable
-  if( s[0] == '$' && bUserVars )
-  {
-    bool bHasSimpleNsisChars = true;
-    for (unsigned int j = 1; j < end - start + 1 && j < 99; j++)
-	  {
-      if( !isNsisChar( s[j] ) )
-      {
-        bHasSimpleNsisChars = false;
-        break;
-      }
-	  }
-
-    if( bHasSimpleNsisChars )
-      return SCE_NSIS_VARIABLE;
-  }
-
-  // To check for numbers
-  if( isNsisNumber( s[0] ) )
-  {
-    bool bHasSimpleNsisNumber = true;
-    for (unsigned int j = 1; j < end - start + 1 && j < 99; j++)
-	  {
-      if( !isNsisNumber( s[j] ) )
-      {
-        bHasSimpleNsisNumber = false;
-        break;
-      }
-	  }
-
-    if( bHasSimpleNsisNumber )
-      return SCE_NSIS_NUMBER;
-  }
-
-	return SCE_NSIS_DEFAULT;
-}
-
-static void ColouriseNsisDoc(unsigned int startPos, int length, int, WordList *keywordLists[], Accessor &styler)
-{
-	int state = SCE_NSIS_DEFAULT;
-  if( startPos > 0 )
-    state = styler.StyleAt(startPos-1); // Use the style from the previous line, usually default, but could be commentbox
-
-	styler.StartAt( startPos );
-	styler.GetLine( startPos );
-
-	unsigned int nLengthDoc = startPos + length;
-	styler.StartSegment( startPos );
-
-	char cCurrChar;
-	bool bVarInString = false;
-  bool bClassicVarInString = false;
-
-	unsigned int i;
-	for( i = startPos; i < nLengthDoc; i++ )
-	{
-		cCurrChar = styler.SafeGetCharAt( i );
-		char cNextChar = styler.SafeGetCharAt(i+1);
-
-		switch(state)
-		{
-			case SCE_NSIS_DEFAULT:
-				if( cCurrChar == ';' || cCurrChar == '#' ) // we have a comment line
-				{
-					styler.ColourTo(i-1, state );
-					state = SCE_NSIS_COMMENT;
-					break;
-				}
-				if( cCurrChar == '"' )
-				{
-					styler.ColourTo(i-1, state );
-					state = SCE_NSIS_STRINGDQ;
-					bVarInString = false;
-          bClassicVarInString = false;
-					break;
-				}
-				if( cCurrChar == '\'' )
-				{
-					styler.ColourTo(i-1, state );
-					state = SCE_NSIS_STRINGRQ;
-					bVarInString = false;
-          bClassicVarInString = false;
-					break;
-				}
-				if( cCurrChar == '`' )
-				{
-					styler.ColourTo(i-1, state );
-					state = SCE_NSIS_STRINGLQ;
-					bVarInString = false;
-          bClassicVarInString = false;
-					break;
-				}
-
-				// NSIS KeyWord,Function, Variable, UserDefined:
-				if( cCurrChar == '$' || isNsisChar(cCurrChar) || cCurrChar == '!' )
-				{
-					styler.ColourTo(i-1,state);
-				  state = SCE_NSIS_FUNCTION;
-
-          // If it is a number, we must check and set style here first...
-          if( isNsisNumber(cCurrChar) && (cNextChar == '\t' || cNextChar == ' ' || cNextChar == '\r' || cNextChar == '\n' ) )
-              styler.ColourTo( i, SCE_NSIS_NUMBER);
-
-					break;
-				}
-
-        if( cCurrChar == '/' && cNextChar == '*' )
-        {
-          styler.ColourTo(i-1,state);
-          state = SCE_NSIS_COMMENTBOX;
-          break;
-        }
-
-				break;
-			case SCE_NSIS_COMMENT:
-				if( cNextChar == '\n' || cNextChar == '\r' )
-        {
-          // Special case:
-          if( cCurrChar == '\\' )
-          {
-            styler.ColourTo(i-2,state);
-            styler.ColourTo(i,SCE_NSIS_DEFAULT);
-          }
-          else
-          {
-				    styler.ColourTo(i,state);
-            state = SCE_NSIS_DEFAULT;
-          }
-        }
-				break;
-			case SCE_NSIS_STRINGDQ:
-      case SCE_NSIS_STRINGLQ:
-      case SCE_NSIS_STRINGRQ:
-
-        if( styler.SafeGetCharAt(i-1) == '\\' && styler.SafeGetCharAt(i-2) == '$' )
-          break; // Ignore the next character, even if it is a quote of some sort
-
-        if( cCurrChar == '"' && state == SCE_NSIS_STRINGDQ )
-				{
-					styler.ColourTo(i,state);
-				  state = SCE_NSIS_DEFAULT;
-          break;
-				}
-
-        if( cCurrChar == '`' && state == SCE_NSIS_STRINGLQ )
-        {
-					styler.ColourTo(i,state);
-				  state = SCE_NSIS_DEFAULT;
-          break;
-				}
-
-        if( cCurrChar == '\'' && state == SCE_NSIS_STRINGRQ )
-				{
-					styler.ColourTo(i,state);
-				  state = SCE_NSIS_DEFAULT;
-          break;
-				}
-
-        if( cNextChar == '\r' || cNextChar == '\n' )
-        {
-          int nCurLine = styler.GetLine(i+1);
-          int nBack = i;
-          // We need to check if the previous line has a \ in it...
-          bool bNextLine = false;
-
-          while( nBack > 0 )
-          {
-            if( styler.GetLine(nBack) != nCurLine )
-              break;
-
-            char cTemp = styler.SafeGetCharAt(nBack, 'a'); // Letter 'a' is safe here
-
-            if( cTemp == '\\' )
-            {
-              bNextLine = true;
-              break;
-            }
-            if( cTemp != '\r' && cTemp != '\n' && cTemp != '\t' && cTemp != ' ' )
-              break;
-
-            nBack--;
-          }
-
-          if( bNextLine )
-          {
-            styler.ColourTo(i+1,state);
-          }
-          if( bNextLine == false )
-          {
-            styler.ColourTo(i,state);
-				    state = SCE_NSIS_DEFAULT;
-          }
-        }
-				break;
-
-			case SCE_NSIS_FUNCTION:
-
-				// NSIS KeyWord:
-        if( cCurrChar == '$' )
-          state = SCE_NSIS_DEFAULT;
-        else if( cCurrChar == '\\' && (cNextChar == 'n' || cNextChar == 'r' || cNextChar == 't' ) )
-          state = SCE_NSIS_DEFAULT;
-				else if( (isNsisChar(cCurrChar) && !isNsisChar( cNextChar) && cNextChar != '}') || cCurrChar == '}' )
-				{
-					state = classifyWordNsis( styler.GetStartSegment(), i, keywordLists, styler );
-					styler.ColourTo( i, state);
-					state = SCE_NSIS_DEFAULT;
-				}
-				else if( !isNsisChar( cCurrChar ) && cCurrChar != '{' && cCurrChar != '}' )
-				{
-          if( classifyWordNsis( styler.GetStartSegment(), i-1, keywordLists, styler) == SCE_NSIS_NUMBER )
-             styler.ColourTo( i-1, SCE_NSIS_NUMBER );
-
-					state = SCE_NSIS_DEFAULT;
-
-					if( cCurrChar == '"' )
-					{
-						state = SCE_NSIS_STRINGDQ;
-						bVarInString = false;
-            bClassicVarInString = false;
-					}
-					else if( cCurrChar == '`' )
-					{
-						state = SCE_NSIS_STRINGLQ;
-						bVarInString = false;
-            bClassicVarInString = false;
-					}
-					else if( cCurrChar == '\'' )
-					{
-						state = SCE_NSIS_STRINGRQ;
-						bVarInString = false;
-            bClassicVarInString = false;
-					}
-					else if( cCurrChar == '#' || cCurrChar == ';' )
-          {
-						state = SCE_NSIS_COMMENT;
-          }
-				}
-				break;
-      case SCE_NSIS_COMMENTBOX:
-
-        if( styler.SafeGetCharAt(i-1) == '*' && cCurrChar == '/' )
-        {
-          styler.ColourTo(i,state);
-          state = SCE_NSIS_DEFAULT;
-        }
-        break;
-		}
-
-		if( state == SCE_NSIS_COMMENT || state == SCE_NSIS_COMMENTBOX )
-		{
-			styler.ColourTo(i,state);
-		}
-		else if( state == SCE_NSIS_STRINGDQ || state == SCE_NSIS_STRINGLQ || state == SCE_NSIS_STRINGRQ )
-		{
-      bool bIngoreNextDollarSign = false;
-      bool bUserVars = false;
-      if( styler.GetPropertyInt("nsis.uservars") == 1 )
-        bUserVars = true;
-
-      if( bVarInString && cCurrChar == '$' )
-      {
-        bVarInString = false;
-        bIngoreNextDollarSign = true;
-      }
-      else if( bVarInString && cCurrChar == '\\' && (cNextChar == 'n' || cNextChar == 'r' || cNextChar == 't' || cNextChar == '"' || cNextChar == '`' || cNextChar == '\'' ) )
-      {
-        styler.ColourTo( i+1, SCE_NSIS_STRINGVAR);
-        bVarInString = false;
-        bIngoreNextDollarSign = false;
-      }
-
-      // Covers "$INSTDIR and user vars like $MYVAR"
-      else if( bVarInString && !isNsisChar(cNextChar) )
-      {
-        int nWordState = classifyWordNsis( styler.GetStartSegment(), i, keywordLists, styler);
-				if( nWordState == SCE_NSIS_VARIABLE )
-					styler.ColourTo( i, SCE_NSIS_STRINGVAR);
-        else if( bUserVars )
-          styler.ColourTo( i, SCE_NSIS_STRINGVAR);
-        bVarInString = false;
-      }
-      // Covers "${TEST}..."
-      else if( bClassicVarInString && cNextChar == '}' )
-      {
-        styler.ColourTo( i+1, SCE_NSIS_STRINGVAR);
-				bClassicVarInString = false;
-      }
-
-      // Start of var in string
-			if( !bIngoreNextDollarSign && cCurrChar == '$' && cNextChar == '{' )
-			{
-				styler.ColourTo( i-1, state);
-				bClassicVarInString = true;
-        bVarInString = false;
-			}
-      else if( !bIngoreNextDollarSign && cCurrChar == '$' )
-      {
-        styler.ColourTo( i-1, state);
-        bVarInString = true;
-        bClassicVarInString = false;
-      }
-		}
-	}
-
-  // Colourise remaining document
-	styler.ColourTo(nLengthDoc-1,state);
-}
-
-static void FoldNsisDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler)
-{
-	// No folding enabled, no reason to continue...
-	if( styler.GetPropertyInt("fold") == 0 )
-		return;
-
-  bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) == 1;
-  bool foldUtilityCmd = styler.GetPropertyInt("nsis.foldutilcmd", 1) == 1;
-  bool blockComment = false;
-
-  int lineCurrent = styler.GetLine(startPos);
-  unsigned int safeStartPos = styler.LineStart( lineCurrent );
-
-  bool bArg1 = true;
-  int nWordStart = -1;
-
-  int levelCurrent = SC_FOLDLEVELBASE;
-	if (lineCurrent > 0)
-		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
-	int levelNext = levelCurrent;
-  int style = styler.StyleAt(safeStartPos);
-  if( style == SCE_NSIS_COMMENTBOX )
-  {
-    if( styler.SafeGetCharAt(safeStartPos) == '/' && styler.SafeGetCharAt(safeStartPos+1) == '*' )
-      levelNext++;
-    blockComment = true;
-  }
-
-  for (unsigned int i = safeStartPos; i < startPos + length; i++)
-	{
-    char chCurr = styler.SafeGetCharAt(i);
-    style = styler.StyleAt(i);
-    if( blockComment && style != SCE_NSIS_COMMENTBOX )
-    {
-      levelNext--;
-      blockComment = false;
-    }
-    else if( !blockComment && style == SCE_NSIS_COMMENTBOX )
-    {
-      levelNext++;
-      blockComment = true;
-    }
-
-    if( bArg1 && !blockComment)
-    {
-      if( nWordStart == -1 && (isNsisLetter(chCurr) || chCurr == '!') )
-      {
-        nWordStart = i;
-      }
-      else if( isNsisLetter(chCurr) == false && nWordStart > -1 )
-      {
-        int newLevel = calculateFoldNsis( nWordStart, i-1, levelNext, styler, foldAtElse, foldUtilityCmd );
-
-        if( newLevel == levelNext )
-        {
-          if( foldAtElse && foldUtilityCmd )
-          {
-            if( NsisNextLineHasElse(i, startPos + length, styler) )
-              levelNext--;
-          }
-        }
-        else
-          levelNext = newLevel;
-        bArg1 = false;
-      }
-    }
-
-    if( chCurr == '\n' )
-    {
-      if( bArg1 && foldAtElse && foldUtilityCmd && !blockComment )
-      {
-        if( NsisNextLineHasElse(i, startPos + length, styler) )
-          levelNext--;
-      }
-
-      // If we are on a new line...
-      int levelUse = levelCurrent;
-			int lev = levelUse | levelNext << 16;
-      if (levelUse < levelNext )
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			if (lev != styler.LevelAt(lineCurrent))
-				styler.SetLevel(lineCurrent, lev);
-
-			lineCurrent++;
-			levelCurrent = levelNext;
-      bArg1 = true; // New line, lets look at first argument again
-      nWordStart = -1;
-    }
-  }
-
-	int levelUse = levelCurrent;
-	int lev = levelUse | levelNext << 16;
-	if (levelUse < levelNext)
-		lev |= SC_FOLDLEVELHEADERFLAG;
-	if (lev != styler.LevelAt(lineCurrent))
-		styler.SetLevel(lineCurrent, lev);
-}
-
-static const char * const nsisWordLists[] = {
-	"Functions",
-	"Variables",
-	"Lables",
-	"UserDefined",
-	0, };
-
-
-LexerModule lmNsis(SCLEX_NSIS, ColouriseNsisDoc, "nsis", FoldNsisDoc, nsisWordLists);
-
diff --git a/src/stc/scintilla/src/LexOpal.cxx b/src/stc/scintilla/src/LexOpal.cxx
deleted file mode 100644
index d1d188998f..0000000000
--- a/src/stc/scintilla/src/LexOpal.cxx
+++ /dev/null
@@ -1,518 +0,0 @@
-// Scintilla source code edit control
-/** @file LexOpal.cxx
- ** Lexer for OPAL (functional language similar to Haskell)
- ** Written by Sebastian Pipping <webmaster@hartwork.org>
- **/
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-#include "StyleContext.h"
-
-inline static void getRange( unsigned int start, unsigned int end, Accessor & styler, char * s, unsigned int len )
-{
-	unsigned int i = 0;
-	while( ( i < end - start + 1 ) && ( i < len - 1 ) )
-	{
-		s[i] = static_cast<char>( styler[ start + i ] );
-		i++;
-	}
-	s[ i ] = '\0';
-}
-
-inline bool HandleString( unsigned int & cur, unsigned int one_too_much, Accessor & styler )
-{
-	char ch;
-
-	// Wait for string to close
-	bool even_backslash_count = true; // Without gaps in between
-	cur++; // Skip initial quote
-	for( ; ; )
-	{
-		if( cur >= one_too_much )
-		{
-			styler.ColourTo( cur - 1, SCE_OPAL_STRING );
-			return false; // STOP
-		}
-
-		ch = styler.SafeGetCharAt( cur );
-		if( ( ch == '\015' ) || ( ch == '\012' ) ) // Deny multi-line strings
-		{
-			styler.ColourTo( cur - 1, SCE_OPAL_STRING );
-			styler.StartSegment( cur );
-			return true;
-		}
-		else
-		{
-			if( even_backslash_count )
-			{
-				if( ch == '"' )
-				{
-					styler.ColourTo( cur, SCE_OPAL_STRING );
-					cur++;
-					if( cur >= one_too_much )
-					{
-						return false; // STOP
-					}
-					else
-					{
-						styler.StartSegment( cur );
-						return true;
-					}
-				}
-				else if( ch == '\\' )
-				{
-					even_backslash_count = false;
-				}
-			}
-			else
-			{
-				even_backslash_count = true;
-			}
-		}
-
-		cur++;
-	}
-}
-
-inline bool HandleCommentBlock( unsigned int & cur, unsigned int one_too_much, Accessor & styler, bool could_fail )
-{
-	char ch;
-	
-	if( could_fail )
-	{
-		cur++;
-		if( cur >= one_too_much )
-		{
-			styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
-			return false; // STOP
-		}
-		
-		ch = styler.SafeGetCharAt( cur );
-		if( ch != '*' )
-		{
-			styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
-			styler.StartSegment( cur );
-			return true;
-		}
-	}
-	
-	// Wait for comment close
-	cur++;
-	bool star_found = false;
-	for( ; ; )
-	{
-		if( cur >= one_too_much )
-		{
-			styler.ColourTo( cur - 1, SCE_OPAL_COMMENT_BLOCK );
-			return false; // STOP
-		}
-		
-		ch = styler.SafeGetCharAt( cur );
-		if( star_found )
-		{
-			if( ch == '/' )
-			{
-				styler.ColourTo( cur, SCE_OPAL_COMMENT_BLOCK );
-				cur++;
-				if( cur >= one_too_much )
-				{
-					return false; // STOP
-				}
-				else
-				{
-					styler.StartSegment( cur );
-					return true;
-				}
-			}
-			else if( ch != '*' )
-			{
-				star_found = false;
-			}
-		}
-		else if( ch == '*' )
-		{
-			star_found = true;
-		}
-		cur++;
-	}
-}
-
-inline bool HandleCommentLine( unsigned int & cur, unsigned int one_too_much, Accessor & styler, bool could_fail )
-{
-	char ch;
-	
-	if( could_fail )
-	{
-		cur++;
-		if( cur >= one_too_much )
-		{
-			styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
-			return false; // STOP
-		}
-		
-		ch = styler.SafeGetCharAt( cur );
-		if( ch != '-' )
-		{
-			styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
-			styler.StartSegment( cur );
-			return true;
-		}
-
-		cur++;
-		if( cur >= one_too_much )
-		{
-			styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
-			return false; // STOP
-		}
-		
-		ch = styler.SafeGetCharAt( cur );
-		if( ( ch != ' ' ) && ( ch != '\t' ) )
-		{
-			styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
-			styler.StartSegment( cur );
-			return true;
-		}
-	}
-
-	// Wait for end of line
-	bool fifteen_found = false;
-
-	for( ; ; )
-	{
-		cur++;
-
-		if( cur >= one_too_much )
-		{
-			styler.ColourTo( cur - 1, SCE_OPAL_COMMENT_LINE );
-			return false; // STOP
-		}
-
-		ch = styler.SafeGetCharAt( cur );
-		if( fifteen_found )
-		{
-/*
-			if( ch == '\012' )
-			{
-				// One newline on Windows (015, 012)
-			}
-			else
-			{
-				// One newline on MAC (015) and another char
-			}
-*/
-			cur--;
-			styler.ColourTo( cur - 1, SCE_OPAL_COMMENT_LINE );
-			styler.StartSegment( cur );
-			return true;
-		}
-		else
-		{
-			if( ch == '\015' )
-			{
-				fifteen_found = true;	
-			}
-			else if( ch == '\012' )
-			{
-				// One newline on Linux (012)
-				styler.ColourTo( cur - 1, SCE_OPAL_COMMENT_LINE );
-				styler.StartSegment( cur );
-				return true;
-			}
-		}
-	}
-}
-
-inline bool HandlePar( unsigned int & cur, Accessor & styler )
-{
-	styler.ColourTo( cur, SCE_OPAL_PAR );
-
-	cur++;
-
-	styler.StartSegment( cur );
-	return true;
-}
-
-inline bool HandleSpace( unsigned int & cur, unsigned int one_too_much, Accessor & styler )
-{
-	char ch;
-
-	cur++;
-	for( ; ; )
-	{
-		if( cur >= one_too_much )
-		{
-			styler.ColourTo( cur - 1, SCE_OPAL_SPACE );
-			return false;
-		}
-		
-		ch = styler.SafeGetCharAt( cur );
-		switch( ch )
-		{
-		case ' ':
-		case '\t':
-		case '\015':
-		case '\012':
-			cur++;
-			break;
-		
-		default:
-			styler.ColourTo( cur - 1, SCE_OPAL_SPACE );
-			styler.StartSegment( cur );
-			return true;
-		}
-	}
-}
-
-inline bool HandleInteger( unsigned int & cur, unsigned int one_too_much, Accessor & styler )
-{
-	char ch;
-
-	for( ; ; )
-	{
-		cur++;
-		if( cur >= one_too_much )
-		{
-			styler.ColourTo( cur - 1, SCE_OPAL_INTEGER );
-			return false; // STOP
-		}
-
-		ch = styler.SafeGetCharAt( cur );
-		if( !isdigit( ch ) )
-		{
-			styler.ColourTo( cur - 1, SCE_OPAL_INTEGER );
-			styler.StartSegment( cur );
-			return true;
-		}
-	}
-}
-
-inline bool HandleWord( unsigned int & cur, unsigned int one_too_much, Accessor & styler, WordList * keywordlists[] )
-{
-	char ch;
-	const unsigned int beg = cur;
-
-	cur++;
-	for( ; ; )
-	{
-		ch = styler.SafeGetCharAt( cur );
-		if( ( ch != '_' ) && ( ch != '-' ) &&
-			!islower( ch ) && !isupper( ch ) && !isdigit( ch ) ) break;
-
-		cur++;
-		if( cur >= one_too_much ) 
-		{
-			break;
-		}
-	}
-
-	const int ide_len = cur - beg + 1;
-	char * ide = new char[ ide_len ];
-	getRange( beg, cur, styler, ide, ide_len );
-	
-	WordList & keywords    = *keywordlists[ 0 ];
-	WordList & classwords  = *keywordlists[ 1 ];
-
-	if( keywords.InList( ide ) ) // Keyword
-	{
-		delete [] ide;
-
-		styler.ColourTo( cur - 1, SCE_OPAL_KEYWORD );
-		if( cur >= one_too_much )
-		{
-			return false; // STOP
-		}
-		else
-		{
-			styler.StartSegment( cur );	
-			return true;			
-		}
-	}
-	else if( classwords.InList( ide ) ) // Sort
-	{
-		delete [] ide;
-
-		styler.ColourTo( cur - 1, SCE_OPAL_SORT );
-		if( cur >= one_too_much )
-		{
-			return false; // STOP
-		}
-		else
-		{
-			styler.StartSegment( cur );	
-			return true;			
-		}
-	}
-	else if( !strcmp( ide, "true" ) || !strcmp( ide, "false" ) ) // Bool const
-	{
-		delete [] ide;
-
-		styler.ColourTo( cur - 1, SCE_OPAL_BOOL_CONST );
-		if( cur >= one_too_much )
-		{
-			return false; // STOP
-		}
-		else
-		{
-			styler.StartSegment( cur );	
-			return true;			
-		}
-	}
-	else // Unknown keyword
-	{
-		delete [] ide;
-
-		styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
-		if( cur >= one_too_much )
-		{
-			return false; // STOP
-		}
-		else
-		{
-			styler.StartSegment( cur );
-			return true;			
-		}
-	}
-
-}
-
-inline bool HandleSkip( unsigned int & cur, unsigned int one_too_much, Accessor & styler )
-{
-	cur++;
-	styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
-	if( cur >= one_too_much )
-	{
-		return false; // STOP
-	}
-	else
-	{
-		styler.StartSegment( cur );	
-		return true;
-	}
-}
-
-static void ColouriseOpalDoc( unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor & styler )
-{
-	styler.StartAt( startPos );
-	styler.StartSegment( startPos );
-
-	unsigned int & cur = startPos;
-	const unsigned int one_too_much = startPos + length;
-
-	int state = initStyle;
-
-	for( ; ; )
-	{
-		switch( state )
-		{
-		case SCE_OPAL_KEYWORD:
-		case SCE_OPAL_SORT:
-			if( !HandleWord( cur, one_too_much, styler, keywordlists ) ) return;
-			state = SCE_OPAL_DEFAULT;
-			break;
-
-		case SCE_OPAL_INTEGER:
-			if( !HandleInteger( cur, one_too_much, styler ) ) return;
-			state = SCE_OPAL_DEFAULT;
-			break;
-
-		case SCE_OPAL_COMMENT_BLOCK:
-			if( !HandleCommentBlock( cur, one_too_much, styler, false ) ) return;
-			state = SCE_OPAL_DEFAULT;
-			break;
-
-		case SCE_OPAL_COMMENT_LINE:
-			if( !HandleCommentLine( cur, one_too_much, styler, false ) ) return;
-			state = SCE_OPAL_DEFAULT;
-			break;
-
-		case SCE_OPAL_STRING:
-			if( !HandleString( cur, one_too_much, styler ) ) return;
-			state = SCE_OPAL_DEFAULT;
-			break;
-			
-		default: // SCE_OPAL_DEFAULT:
-			{
-				char ch = styler.SafeGetCharAt( cur );
-				
-				switch( ch )
-				{
-				// String
-				case '"':
-					if( !HandleString( cur, one_too_much, styler ) ) return;
-					break;
-
-				// Comment block
-				case '/':
-					if( !HandleCommentBlock( cur, one_too_much, styler, true ) ) return;
-					break;
-
-				// Comment line
-				case '-':
-					if( !HandleCommentLine( cur, one_too_much, styler, true ) ) return;
-					break;
-
-				// Par
-				case '(':
-				case ')':
-				case '[':
-				case ']':
-				case '{':
-				case '}':
-					if( !HandlePar( cur, styler ) ) return;
-					break;
-
-				// Whitespace
-				case ' ':
-				case '\t':
-				case '\015':
-				case '\012':
-					if( !HandleSpace( cur, one_too_much, styler ) ) return;
-					break;
-				
-				default:
-					{
-						// Integer
-						if( isdigit( ch ) )
-						{
-							if( !HandleInteger( cur, one_too_much, styler ) ) return;
-						}
-
-						// Keyword
-						else if( islower( ch ) || isupper( ch ) )
-						{
-							if( !HandleWord( cur, one_too_much, styler, keywordlists ) ) return;
-							
-						}
-
-						// Skip
-						else
-						{
-							if( !HandleSkip( cur, one_too_much, styler ) ) return;
-						}
-					}
-				}
-
-				break;
-			}
-		}
-	}
-}
-
-static const char * const opalWordListDesc[] = {
-	"Keywords",
-	"Sorts",
-	0
-};
-
-LexerModule lmOpal(SCLEX_OPAL, ColouriseOpalDoc, "opal", NULL, opalWordListDesc);
diff --git a/src/stc/scintilla/src/LexOthers.cxx b/src/stc/scintilla/src/LexOthers.cxx
deleted file mode 100644
index 5f6e7e4041..0000000000
--- a/src/stc/scintilla/src/LexOthers.cxx
+++ /dev/null
@@ -1,1140 +0,0 @@
-// Scintilla source code edit control
-/** @file LexOthers.cxx
- ** Lexers for batch files, diff results, properties files, make files and error lists.
- ** Also lexer for LaTeX documents.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static bool Is0To9(char ch) {
-	return (ch >= '0') && (ch <= '9');
-}
-
-static bool Is1To9(char ch) {
-	return (ch >= '1') && (ch <= '9');
-}
-
-static inline bool AtEOL(Accessor &styler, unsigned int i) {
-	return (styler[i] == '\n') ||
-	       ((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n'));
-}
-
-// Tests for BATCH Operators
-static bool IsBOperator(char ch) {
-	return (ch == '=') || (ch == '+') || (ch == '>') || (ch == '<') ||
-		(ch == '|') || (ch == '?') || (ch == '*');
-}
-
-// Tests for BATCH Separators
-static bool IsBSeparator(char ch) {
-	return (ch == '\\') || (ch == '.') || (ch == ';') ||
-		(ch == '\"') || (ch == '\'') || (ch == '/') || (ch == ')');
-}
-
-static void ColouriseBatchLine(
-    char *lineBuffer,
-    unsigned int lengthLine,
-    unsigned int startLine,
-    unsigned int endPos,
-    WordList *keywordlists[],
-    Accessor &styler) {
-
-	unsigned int offset = 0;	// Line Buffer Offset
-	unsigned int enVarEnd;		// Environment Variable End point
-	unsigned int cmdLoc;		// External Command / Program Location
-	char wordBuffer[81];		// Word Buffer - large to catch long paths
-	unsigned int wbl;		// Word Buffer Length
-	unsigned int wbo;		// Word Buffer Offset - also Special Keyword Buffer Length
-	WordList &keywords = *keywordlists[0];      // Internal Commands
-	WordList &keywords2 = *keywordlists[1];     // External Commands (optional)
-
-	// CHOICE, ECHO, GOTO, PROMPT and SET have Default Text that may contain Regular Keywords
-	//   Toggling Regular Keyword Checking off improves readability
-	// Other Regular Keywords and External Commands / Programs might also benefit from toggling
-	//   Need a more robust algorithm to properly toggle Regular Keyword Checking
-	bool continueProcessing = true;	// Used to toggle Regular Keyword Checking
-	// Special Keywords are those that allow certain characters without whitespace after the command
-	// Examples are: cd. cd\ md. rd. dir| dir> echo: echo. path=
-	// Special Keyword Buffer used to determine if the first n characters is a Keyword
-	char sKeywordBuffer[10];	// Special Keyword Buffer
-	bool sKeywordFound;		// Exit Special Keyword for-loop if found
-
-	// Skip initial spaces
-	while ((offset < lengthLine) && (isspacechar(lineBuffer[offset]))) {
-		offset++;
-	}
-	// Colorize Default Text
-	styler.ColourTo(startLine + offset - 1, SCE_BAT_DEFAULT);
-	// Set External Command / Program Location
-	cmdLoc = offset;
-
-	// Check for Fake Label (Comment) or Real Label - return if found
-	if (lineBuffer[offset] == ':') {
-		if (lineBuffer[offset + 1] == ':') {
-			// Colorize Fake Label (Comment) - :: is similar to REM, see http://content.techweb.com/winmag/columns/explorer/2000/21.htm
-			styler.ColourTo(endPos, SCE_BAT_COMMENT);
-		} else {
-			// Colorize Real Label
-			styler.ColourTo(endPos, SCE_BAT_LABEL);
-		}
-		return;
-	// Check for Drive Change (Drive Change is internal command) - return if found
-	} else if ((isalpha(lineBuffer[offset])) &&
-		(lineBuffer[offset + 1] == ':') &&
-		((isspacechar(lineBuffer[offset + 2])) ||
-		(((lineBuffer[offset + 2] == '\\')) &&
-		(isspacechar(lineBuffer[offset + 3]))))) {
-		// Colorize Regular Keyword
-		styler.ColourTo(endPos, SCE_BAT_WORD);
-		return;
-	}
-
-	// Check for Hide Command (@ECHO OFF/ON)
-	if (lineBuffer[offset] == '@') {
-		styler.ColourTo(startLine + offset, SCE_BAT_HIDE);
-		offset++;
-	// Check for Argument (%n) or Environment Variable (%x...%)
-	} else if (lineBuffer[offset] == '%') {
-		enVarEnd = offset + 1;
-		// Search end of word for second % (can be a long path)
-		while ((enVarEnd < lengthLine) &&
-			(!isspacechar(lineBuffer[enVarEnd])) &&
-			(lineBuffer[enVarEnd] != '%') &&
-			(!IsBOperator(lineBuffer[enVarEnd])) &&
-			(!IsBSeparator(lineBuffer[enVarEnd]))) {
-			enVarEnd++;
-		}
-		// Check for Argument (%n)
-		if ((Is0To9(lineBuffer[offset + 1])) &&
-			(lineBuffer[enVarEnd] != '%')) {
-			// Colorize Argument
-			styler.ColourTo(startLine + offset + 1, SCE_BAT_IDENTIFIER);
-			offset += 2;
-			// Check for External Command / Program
-			if (!isspacechar(lineBuffer[offset])) {
-				cmdLoc = offset;
-			}
-		// Check for Environment Variable (%x...%)
-		} else if ((lineBuffer[offset + 1] != '%') &&
-			(lineBuffer[enVarEnd] == '%')) {
-			offset = enVarEnd;
-			// Colorize Environment Variable
-			styler.ColourTo(startLine + offset, SCE_BAT_IDENTIFIER);
-			offset++;
-			// Check for External Command / Program
-			if (!isspacechar(lineBuffer[offset])) {
-				cmdLoc = offset;
-			}
-		}
-	}
-	// Skip next spaces
-	while ((offset < lengthLine) && (isspacechar(lineBuffer[offset]))) {
-		offset++;
-	}
-
-	// Read remainder of line word-at-a-time or remainder-of-word-at-a-time
-	while (offset < lengthLine) {
-		if (offset > startLine) {
-			// Colorize Default Text
-			styler.ColourTo(startLine + offset - 1, SCE_BAT_DEFAULT);
-		}
-		// Copy word from Line Buffer into Word Buffer
-		wbl = 0;
-		for (; offset < lengthLine && wbl < 80 &&
-		        !isspacechar(lineBuffer[offset]); wbl++, offset++) {
-			wordBuffer[wbl] = static_cast<char>(tolower(lineBuffer[offset]));
-		}
-		wordBuffer[wbl] = '\0';
-		wbo = 0;
-
-		// Check for Comment - return if found
-		if (CompareCaseInsensitive(wordBuffer, "rem") == 0) {
-			styler.ColourTo(endPos, SCE_BAT_COMMENT);
-			return;
-		}
-		// Check for Separator
-		if (IsBSeparator(wordBuffer[0])) {
-			// Check for External Command / Program
-			if ((cmdLoc == offset - wbl) &&
-				((wordBuffer[0] == ':') ||
-				(wordBuffer[0] == '\\') ||
-				(wordBuffer[0] == '.'))) {
-				// Reset Offset to re-process remainder of word
-				offset -= (wbl - 1);
-				// Colorize External Command / Program
-				if (!keywords2) {
-					styler.ColourTo(startLine + offset - 1, SCE_BAT_COMMAND);
-				} else if (keywords2.InList(wordBuffer)) {
-					styler.ColourTo(startLine + offset - 1, SCE_BAT_COMMAND);
-				} else {
-					styler.ColourTo(startLine + offset - 1, SCE_BAT_DEFAULT);
-				}
-				// Reset External Command / Program Location
-				cmdLoc = offset;
-			} else {
-				// Reset Offset to re-process remainder of word
-				offset -= (wbl - 1);
-				// Colorize Default Text
-				styler.ColourTo(startLine + offset - 1, SCE_BAT_DEFAULT);
-			}
-		// Check for Regular Keyword in list
-		} else if ((keywords.InList(wordBuffer)) &&
-			(continueProcessing)) {
-			// ECHO, GOTO, PROMPT and SET require no further Regular Keyword Checking
-			if ((CompareCaseInsensitive(wordBuffer, "echo") == 0) ||
-				(CompareCaseInsensitive(wordBuffer, "goto") == 0) ||
-				(CompareCaseInsensitive(wordBuffer, "prompt") == 0) ||
-				(CompareCaseInsensitive(wordBuffer, "set") == 0)) {
-				continueProcessing = false;
-			}
-			// Identify External Command / Program Location for ERRORLEVEL, and EXIST
-			if ((CompareCaseInsensitive(wordBuffer, "errorlevel") == 0) ||
-				(CompareCaseInsensitive(wordBuffer, "exist") == 0)) {
-				// Reset External Command / Program Location
-				cmdLoc = offset;
-				// Skip next spaces
-				while ((cmdLoc < lengthLine) &&
-					(isspacechar(lineBuffer[cmdLoc]))) {
-					cmdLoc++;
-				}
-				// Skip comparison
-				while ((cmdLoc < lengthLine) &&
-					(!isspacechar(lineBuffer[cmdLoc]))) {
-					cmdLoc++;
-				}
-				// Skip next spaces
-				while ((cmdLoc < lengthLine) &&
-					(isspacechar(lineBuffer[cmdLoc]))) {
-					cmdLoc++;
-				}
-			// Identify External Command / Program Location for CALL, DO, LOADHIGH and LH
-			} else if ((CompareCaseInsensitive(wordBuffer, "call") == 0) ||
-				(CompareCaseInsensitive(wordBuffer, "do") == 0) ||
-				(CompareCaseInsensitive(wordBuffer, "loadhigh") == 0) ||
-				(CompareCaseInsensitive(wordBuffer, "lh") == 0)) {
-				// Reset External Command / Program Location
-				cmdLoc = offset;
-				// Skip next spaces
-				while ((cmdLoc < lengthLine) &&
-					(isspacechar(lineBuffer[cmdLoc]))) {
-					cmdLoc++;
-				}
-			}
-			// Colorize Regular keyword
-			styler.ColourTo(startLine + offset - 1, SCE_BAT_WORD);
-			// No need to Reset Offset
-		// Check for Special Keyword in list, External Command / Program, or Default Text
-		} else if ((wordBuffer[0] != '%') &&
-			(!IsBOperator(wordBuffer[0])) &&
-			(continueProcessing)) {
-			// Check for Special Keyword
-			//     Affected Commands are in Length range 2-6
-			//     Good that ERRORLEVEL, EXIST, CALL, DO, LOADHIGH, and LH are unaffected
-			sKeywordFound = false;
-			for (unsigned int keywordLength = 2; keywordLength < wbl && keywordLength < 7 && !sKeywordFound; keywordLength++) {
-				wbo = 0;
-				// Copy Keyword Length from Word Buffer into Special Keyword Buffer
-				for (; wbo < keywordLength; wbo++) {
-					sKeywordBuffer[wbo] = static_cast<char>(wordBuffer[wbo]);
-				}
-				sKeywordBuffer[wbo] = '\0';
-				// Check for Special Keyword in list
-				if ((keywords.InList(sKeywordBuffer)) &&
-					((IsBOperator(wordBuffer[wbo])) ||
-					(IsBSeparator(wordBuffer[wbo])))) {
-					sKeywordFound = true;
-					// ECHO requires no further Regular Keyword Checking
-					if (CompareCaseInsensitive(sKeywordBuffer, "echo") == 0) {
-						continueProcessing = false;
-					}
-					// Colorize Special Keyword as Regular Keyword
-					styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_BAT_WORD);
-					// Reset Offset to re-process remainder of word
-					offset -= (wbl - wbo);
-				}
-			}
-			// Check for External Command / Program or Default Text
-			if (!sKeywordFound) {
-				wbo = 0;
-				// Check for External Command / Program
-				if (cmdLoc == offset - wbl) {
-					// Read up to %, Operator or Separator
-					while ((wbo < wbl) &&
-						(wordBuffer[wbo] != '%') &&
-						(!IsBOperator(wordBuffer[wbo])) &&
-						(!IsBSeparator(wordBuffer[wbo]))) {
-						wbo++;
-					}
-					// Reset External Command / Program Location
-					cmdLoc = offset - (wbl - wbo);
-					// Reset Offset to re-process remainder of word
-					offset -= (wbl - wbo);
-					// CHOICE requires no further Regular Keyword Checking
-					if (CompareCaseInsensitive(wordBuffer, "choice") == 0) {
-						continueProcessing = false;
-					}
-					// Check for START (and its switches) - What follows is External Command \ Program
-					if (CompareCaseInsensitive(wordBuffer, "start") == 0) {
-						// Reset External Command / Program Location
-						cmdLoc = offset;
-						// Skip next spaces
-						while ((cmdLoc < lengthLine) &&
-							(isspacechar(lineBuffer[cmdLoc]))) {
-							cmdLoc++;
-						}
-						// Reset External Command / Program Location if command switch detected
-						if (lineBuffer[cmdLoc] == '/') {
-							// Skip command switch
-							while ((cmdLoc < lengthLine) &&
-								(!isspacechar(lineBuffer[cmdLoc]))) {
-								cmdLoc++;
-							}
-							// Skip next spaces
-							while ((cmdLoc < lengthLine) &&
-								(isspacechar(lineBuffer[cmdLoc]))) {
-								cmdLoc++;
-							}
-						}
-					}
-					// Colorize External Command / Program
-					if (!keywords2) {
-						styler.ColourTo(startLine + offset - 1, SCE_BAT_COMMAND);
-					} else if (keywords2.InList(wordBuffer)) {
-						styler.ColourTo(startLine + offset - 1, SCE_BAT_COMMAND);
-					} else {
-						styler.ColourTo(startLine + offset - 1, SCE_BAT_DEFAULT);
-					}
-					// No need to Reset Offset
-				// Check for Default Text
-				} else {
-					// Read up to %, Operator or Separator
-					while ((wbo < wbl) &&
-						(wordBuffer[wbo] != '%') &&
-						(!IsBOperator(wordBuffer[wbo])) &&
-						(!IsBSeparator(wordBuffer[wbo]))) {
-						wbo++;
-					}
-					// Colorize Default Text
-					styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_BAT_DEFAULT);
-					// Reset Offset to re-process remainder of word
-					offset -= (wbl - wbo);
-				}
-			}
-		// Check for Argument  (%n), Environment Variable (%x...%) or Local Variable (%%a)
-		} else if (wordBuffer[0] == '%') {
-			// Colorize Default Text
-			styler.ColourTo(startLine + offset - 1 - wbl, SCE_BAT_DEFAULT);
-			wbo++;
-			// Search to end of word for second % (can be a long path)
-			while ((wbo < wbl) &&
-				(wordBuffer[wbo] != '%') &&
-				(!IsBOperator(wordBuffer[wbo])) &&
-				(!IsBSeparator(wordBuffer[wbo]))) {
-				wbo++;
-			}
-			// Check for Argument (%n)
-			if ((Is0To9(wordBuffer[1])) &&
-				(wordBuffer[wbo] != '%')) {
-				// Check for External Command / Program
-				if (cmdLoc == offset - wbl) {
-					cmdLoc = offset - (wbl - 2);
-				}
-				// Colorize Argument
-				styler.ColourTo(startLine + offset - 1 - (wbl - 2), SCE_BAT_IDENTIFIER);
-				// Reset Offset to re-process remainder of word
-				offset -= (wbl - 2);
-			// Check for Environment Variable (%x...%)
-			} else if ((wordBuffer[1] != '%') &&
-				(wordBuffer[wbo] == '%')) {
-				wbo++;
-				// Check for External Command / Program
-				if (cmdLoc == offset - wbl) {
-					cmdLoc = offset - (wbl - wbo);
-				}
-				// Colorize Environment Variable
-				styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_BAT_IDENTIFIER);
-				// Reset Offset to re-process remainder of word
-				offset -= (wbl - wbo);
-			// Check for Local Variable (%%a)
-			} else if (
-				(wordBuffer[1] == '%') &&
-				(wordBuffer[2] != '%') &&
-				(!IsBOperator(wordBuffer[2])) &&
-				(!IsBSeparator(wordBuffer[2]))) {
-				// Check for External Command / Program
-				if (cmdLoc == offset - wbl) {
-					cmdLoc = offset - (wbl - 3);
-				}
-				// Colorize Local Variable
-				styler.ColourTo(startLine + offset - 1 - (wbl - 3), SCE_BAT_IDENTIFIER);
-				// Reset Offset to re-process remainder of word
-				offset -= (wbl - 3);
-			}
-		// Check for Operator
-		} else if (IsBOperator(wordBuffer[0])) {
-			// Colorize Default Text
-			styler.ColourTo(startLine + offset - 1 - wbl, SCE_BAT_DEFAULT);
-			// Check for Comparison Operator
-			if ((wordBuffer[0] == '=') && (wordBuffer[1] == '=')) {
-				// Identify External Command / Program Location for IF
-				cmdLoc = offset;
-				// Skip next spaces
-				while ((cmdLoc < lengthLine) &&
-					(isspacechar(lineBuffer[cmdLoc]))) {
-					cmdLoc++;
-				}
-				// Colorize Comparison Operator
-				styler.ColourTo(startLine + offset - 1 - (wbl - 2), SCE_BAT_OPERATOR);
-				// Reset Offset to re-process remainder of word
-				offset -= (wbl - 2);
-			// Check for Pipe Operator
-			} else if (wordBuffer[0] == '|') {
-				// Reset External Command / Program Location
-				cmdLoc = offset - wbl + 1;
-				// Skip next spaces
-				while ((cmdLoc < lengthLine) &&
-					(isspacechar(lineBuffer[cmdLoc]))) {
-					cmdLoc++;
-				}
-				// Colorize Pipe Operator
-				styler.ColourTo(startLine + offset - 1 - (wbl - 1), SCE_BAT_OPERATOR);
-				// Reset Offset to re-process remainder of word
-				offset -= (wbl - 1);
-			// Check for Other Operator
-			} else {
-				// Check for > Operator
-				if (wordBuffer[0] == '>') {
-					// Turn Keyword and External Command / Program checking back on
-					continueProcessing = true;
-				}
-				// Colorize Other Operator
-				styler.ColourTo(startLine + offset - 1 - (wbl - 1), SCE_BAT_OPERATOR);
-				// Reset Offset to re-process remainder of word
-				offset -= (wbl - 1);
-			}
-		// Check for Default Text
-		} else {
-			// Read up to %, Operator or Separator
-			while ((wbo < wbl) &&
-				(wordBuffer[wbo] != '%') &&
-				(!IsBOperator(wordBuffer[wbo])) &&
-				(!IsBSeparator(wordBuffer[wbo]))) {
-				wbo++;
-			}
-			// Colorize Default Text
-			styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_BAT_DEFAULT);
-			// Reset Offset to re-process remainder of word
-			offset -= (wbl - wbo);
-		}
-		// Skip next spaces - nothing happens if Offset was Reset
-		while ((offset < lengthLine) && (isspacechar(lineBuffer[offset]))) {
-			offset++;
-		}
-	}
-	// Colorize Default Text for remainder of line - currently not lexed
-	styler.ColourTo(endPos, SCE_BAT_DEFAULT);
-}
-
-static void ColouriseBatchDoc(
-    unsigned int startPos,
-    int length,
-    int /*initStyle*/,
-    WordList *keywordlists[],
-    Accessor &styler) {
-
-	char lineBuffer[1024];
-
-	styler.StartAt(startPos);
-	styler.StartSegment(startPos);
-	unsigned int linePos = 0;
-	unsigned int startLine = startPos;
-	for (unsigned int i = startPos; i < startPos + length; i++) {
-		lineBuffer[linePos++] = styler[i];
-		if (AtEOL(styler, i) || (linePos >= sizeof(lineBuffer) - 1)) {
-			// End of line (or of line buffer) met, colourise it
-			lineBuffer[linePos] = '\0';
-			ColouriseBatchLine(lineBuffer, linePos, startLine, i, keywordlists, styler);
-			linePos = 0;
-			startLine = i + 1;
-		}
-	}
-	if (linePos > 0) {	// Last line does not have ending characters
-		ColouriseBatchLine(lineBuffer, linePos, startLine, startPos + length - 1,
-		                   keywordlists, 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 ", 5)) {
-		styler.ColourTo(endLine, SCE_DIFF_COMMAND);
-	} else if (0 == strncmp(lineBuffer, "--- ", 4)) {
-		// In a context diff, --- appears in both the header and the position markers
-		if (atoi(lineBuffer+4) && !strchr(lineBuffer, '/'))
-			styler.ColourTo(endLine, SCE_DIFF_POSITION);
-		else
-			styler.ColourTo(endLine, SCE_DIFF_HEADER);
-	} else if (0 == strncmp(lineBuffer, "+++ ", 4)) {
-		// I don't know of any diff where "+++ " is a position marker, but for
-		// consistency, do the same as with "--- " and "*** ".
-		if (atoi(lineBuffer+4) && !strchr(lineBuffer, '/'))
-			styler.ColourTo(endLine, SCE_DIFF_POSITION);
-		else
-			styler.ColourTo(endLine, SCE_DIFF_HEADER);
-	} else if (0 == strncmp(lineBuffer, "====", 4)) {  // For p4's diff
-		styler.ColourTo(endLine, SCE_DIFF_HEADER);
-	} else if (0 == strncmp(lineBuffer, "***", 3)) {
-		// In a context diff, *** appears in both the header and the position markers.
-		// Also ******** is a chunk header, but here it's treated as part of the
-		// position marker since there is no separate style for a chunk header.
-		if (lineBuffer[3] == ' ' && atoi(lineBuffer+4) && !strchr(lineBuffer, '/'))
-			styler.ColourTo(endLine, SCE_DIFF_POSITION);
-		else if (lineBuffer[3] == '*')
-			styler.ColourTo(endLine, SCE_DIFF_POSITION);
-		else
-			styler.ColourTo(endLine, SCE_DIFF_HEADER);
-	} else if (0 == strncmp(lineBuffer, "? ", 2)) {    // For difflib
-		styler.ColourTo(endLine, SCE_DIFF_HEADER);
-	} else if (lineBuffer[0] == '@') {
-		styler.ColourTo(endLine, SCE_DIFF_POSITION);
-	} else if (lineBuffer[0] >= '0' && lineBuffer[0] <= '9') {
-		styler.ColourTo(endLine, SCE_DIFF_POSITION);
-	} else if (lineBuffer[0] == '-' || lineBuffer[0] == '<') {
-		styler.ColourTo(endLine, SCE_DIFF_DELETED);
-	} else if (lineBuffer[0] == '+' || lineBuffer[0] == '>') {
-		styler.ColourTo(endLine, SCE_DIFF_ADDED);
-	} else if (lineBuffer[0] != ' ') {
-		styler.ColourTo(endLine, SCE_DIFF_COMMENT);
-	} else {
-		styler.ColourTo(endLine, SCE_DIFF_DEFAULT);
-	}
-}
-
-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 (AtEOL(styler, i) || (linePos >= sizeof(lineBuffer) - 1)) {
-			// End of line (or of line buffer) met, colourise it
-			lineBuffer[linePos] = '\0';
-			ColouriseDiffLine(lineBuffer, i, styler);
-			linePos = 0;
-		}
-	}
-	if (linePos > 0) {	// Last line does not have ending characters
-		ColouriseDiffLine(lineBuffer, startPos + length - 1, styler);
-	}
-}
-
-static void FoldDiffDoc(unsigned int startPos, int length, int, WordList*[], Accessor &styler) {
-	int curLine = styler.GetLine(startPos);
-	int prevLevel = SC_FOLDLEVELBASE;
-	if (curLine > 0)
-		prevLevel = styler.LevelAt(curLine-1);
-
-	int curLineStart = styler.LineStart(curLine);
-	do {
-		int nextLevel = prevLevel;
-		if (prevLevel & SC_FOLDLEVELHEADERFLAG)
-			nextLevel = (prevLevel & SC_FOLDLEVELNUMBERMASK) + 1;
-
-		int lineType = styler.StyleAt(curLineStart);
-		if (lineType == SCE_DIFF_COMMAND)
-			nextLevel = (SC_FOLDLEVELBASE + 1) | SC_FOLDLEVELHEADERFLAG;
-		else if (lineType == SCE_DIFF_HEADER) {
-			nextLevel = (SC_FOLDLEVELBASE + 2) | SC_FOLDLEVELHEADERFLAG;
-		} else if (lineType == SCE_DIFF_POSITION)
-			nextLevel = (SC_FOLDLEVELBASE + 3) | SC_FOLDLEVELHEADERFLAG;
-
-		if ((nextLevel & SC_FOLDLEVELHEADERFLAG) && (nextLevel == prevLevel))
-			styler.SetLevel(curLine-1, prevLevel & ~SC_FOLDLEVELHEADERFLAG);
-
-		styler.SetLevel(curLine, nextLevel);
-		prevLevel = nextLevel;
-
-		curLineStart = styler.LineStart(++curLine);
-	} while (static_cast<int>(startPos) + length > curLineStart);
-}
-
-
-static void ColourisePropsLine(
-    char *lineBuffer,
-    unsigned int lengthLine,
-    unsigned int startLine,
-    unsigned int endPos,
-    Accessor &styler) {
-
-	unsigned int i = 0;
-	while ((i < lengthLine) && isspacechar(lineBuffer[i]))	// Skip initial spaces
-		i++;
-	if (i < lengthLine) {
-		if (lineBuffer[i] == '#' || lineBuffer[i] == '!' || lineBuffer[i] == ';') {
-			styler.ColourTo(endPos, SCE_PROPS_COMMENT);
-		} else if (lineBuffer[i] == '[') {
-			styler.ColourTo(endPos, SCE_PROPS_SECTION);
-		} else if (lineBuffer[i] == '@') {
-			styler.ColourTo(startLine + i, SCE_PROPS_DEFVAL);
-			if (lineBuffer[++i] == '=')
-				styler.ColourTo(startLine + i, SCE_PROPS_ASSIGNMENT);
-			styler.ColourTo(endPos, SCE_PROPS_DEFAULT);
-		} else {
-			// Search for the '=' character
-			while ((i < lengthLine) && (lineBuffer[i] != '='))
-				i++;
-			if ((i < lengthLine) && (lineBuffer[i] == '=')) {
-				styler.ColourTo(startLine + i - 1, SCE_PROPS_KEY);
-				styler.ColourTo(startLine + i, SCE_PROPS_ASSIGNMENT);
-				styler.ColourTo(endPos, SCE_PROPS_DEFAULT);
-			} else {
-				styler.ColourTo(endPos, SCE_PROPS_DEFAULT);
-			}
-		}
-	} else {
-		styler.ColourTo(endPos, SCE_PROPS_DEFAULT);
-	}
-}
-
-static void ColourisePropsDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
-	char lineBuffer[1024];
-	styler.StartAt(startPos);
-	styler.StartSegment(startPos);
-	unsigned int linePos = 0;
-	unsigned int startLine = startPos;
-	for (unsigned int i = startPos; i < startPos + length; i++) {
-		lineBuffer[linePos++] = styler[i];
-		if (AtEOL(styler, i) || (linePos >= sizeof(lineBuffer) - 1)) {
-			// End of line (or of line buffer) met, colourise it
-			lineBuffer[linePos] = '\0';
-			ColourisePropsLine(lineBuffer, linePos, startLine, i, styler);
-			linePos = 0;
-			startLine = i + 1;
-		}
-	}
-	if (linePos > 0) {	// Last line does not have ending characters
-		ColourisePropsLine(lineBuffer, linePos, startLine, startPos + length - 1, styler);
-	}
-}
-
-// adaption by ksc, using the "} else {" trick of 1.53
-// 030721
-static void FoldPropsDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
-	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-
-	unsigned int endPos = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-
-	char chNext = styler[startPos];
-	int styleNext = styler.StyleAt(startPos);
-	bool headerPoint = false;
-	int lev;
-
-	for (unsigned int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler[i+1];
-
-		int style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-
-		if (style == SCE_PROPS_SECTION) {
-			headerPoint = true;
-		}
-
-		if (atEOL) {
-			lev = SC_FOLDLEVELBASE;
-
-			if (lineCurrent > 0) {
-				int levelPrevious = styler.LevelAt(lineCurrent - 1);
-
-				if (levelPrevious & SC_FOLDLEVELHEADERFLAG) {
-					lev = SC_FOLDLEVELBASE + 1;
-				} else {
-					lev = levelPrevious & SC_FOLDLEVELNUMBERMASK;
-				}
-			}
-
-			if (headerPoint) {
-				lev = SC_FOLDLEVELBASE;
-			}
-			if (visibleChars == 0 && foldCompact)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-
-			if (headerPoint) {
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			}
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-
-			lineCurrent++;
-			visibleChars = 0;
-			headerPoint = false;
-		}
-		if (!isspacechar(ch))
-			visibleChars++;
-	}
-
-	if (lineCurrent > 0) {
-		int levelPrevious = styler.LevelAt(lineCurrent - 1);
-		if (levelPrevious & SC_FOLDLEVELHEADERFLAG) {
-			lev = SC_FOLDLEVELBASE + 1;
-		} else {
-			lev = levelPrevious & SC_FOLDLEVELNUMBERMASK;
-		}
-	} else {
-		lev = SC_FOLDLEVELBASE;
-	}
-	int flagsNext = styler.LevelAt(lineCurrent);
-	styler.SetLevel(lineCurrent, lev | flagsNext & ~SC_FOLDLEVELNUMBERMASK);
-}
-
-static void ColouriseMakeLine(
-    char *lineBuffer,
-    unsigned int lengthLine,
-    unsigned int startLine,
-    unsigned int endPos,
-    Accessor &styler) {
-
-	unsigned int i = 0;
-	int lastNonSpace = -1;
-	unsigned int state = SCE_MAKE_DEFAULT;
-	bool bSpecial = false;
-	// Skip initial spaces
-	while ((i < lengthLine) && isspacechar(lineBuffer[i])) {
-		i++;
-	}
-	if (lineBuffer[i] == '#') {	// Comment
-		styler.ColourTo(endPos, SCE_MAKE_COMMENT);
-		return;
-	}
-	if (lineBuffer[i] == '!') {	// Special directive
-		styler.ColourTo(endPos, SCE_MAKE_PREPROCESSOR);
-		return;
-	}
-	while (i < lengthLine) {
-		if (lineBuffer[i] == '$' && lineBuffer[i + 1] == '(') {
-			styler.ColourTo(startLine + i - 1, state);
-			state = SCE_MAKE_IDENTIFIER;
-		} else if (state == SCE_MAKE_IDENTIFIER && lineBuffer[i] == ')') {
-			styler.ColourTo(startLine + i, state);
-			state = SCE_MAKE_DEFAULT;
-		}
-		if (!bSpecial) {
-			if (lineBuffer[i] == ':') {
-				// We should check that no colouring was made since the beginning of the line,
-				// to avoid colouring stuff like /OUT:file
-				if (lastNonSpace >= 0)
-					styler.ColourTo(startLine + lastNonSpace, SCE_MAKE_TARGET);
-				styler.ColourTo(startLine + i - 1, SCE_MAKE_DEFAULT);
-				styler.ColourTo(startLine + i, SCE_MAKE_OPERATOR);
-				bSpecial = true;	// Only react to the first ':' of the line
-				state = SCE_MAKE_DEFAULT;
-			} else if (lineBuffer[i] == '=') {
-				if (lastNonSpace >= 0)
-					styler.ColourTo(startLine + lastNonSpace, SCE_MAKE_IDENTIFIER);
-				styler.ColourTo(startLine + i - 1, SCE_MAKE_DEFAULT);
-				styler.ColourTo(startLine + i, SCE_MAKE_OPERATOR);
-				bSpecial = true;	// Only react to the first '=' of the line
-				state = SCE_MAKE_DEFAULT;
-			}
-		}
-		if (!isspacechar(lineBuffer[i])) {
-			lastNonSpace = i;
-		}
-		i++;
-	}
-	if (state == SCE_MAKE_IDENTIFIER) {
-		styler.ColourTo(endPos, SCE_MAKE_IDEOL);	// Error, variable reference not ended
-	} else {
-		styler.ColourTo(endPos, SCE_MAKE_DEFAULT);
-	}
-}
-
-static void ColouriseMakeDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
-	char lineBuffer[1024];
-	styler.StartAt(startPos);
-	styler.StartSegment(startPos);
-	unsigned int linePos = 0;
-	unsigned int startLine = startPos;
-	for (unsigned int i = startPos; i < startPos + length; i++) {
-		lineBuffer[linePos++] = styler[i];
-		if (AtEOL(styler, i) || (linePos >= sizeof(lineBuffer) - 1)) {
-			// End of line (or of line buffer) met, colourise it
-			lineBuffer[linePos] = '\0';
-			ColouriseMakeLine(lineBuffer, linePos, startLine, i, styler);
-			linePos = 0;
-			startLine = i + 1;
-		}
-	}
-	if (linePos > 0) {	// Last line does not have ending characters
-		ColouriseMakeLine(lineBuffer, linePos, startLine, startPos + length - 1, styler);
-	}
-}
-
-static bool strstart(const char *haystack, const char *needle) {
-	return strncmp(haystack, needle, strlen(needle)) == 0;
-}
-
-static int RecogniseErrorListLine(const char *lineBuffer, unsigned int lengthLine) {
-	if (lineBuffer[0] == '>') {
-		// Command or return status
-		return SCE_ERR_CMD;
-	} else if (lineBuffer[0] == '<') {
-		// Diff removal, but not interested. Trapped to avoid hitting CTAG cases.
-		return SCE_ERR_DEFAULT;
-	} else if (lineBuffer[0] == '!') {
-		return SCE_ERR_DIFF_CHANGED;
-	} else if (lineBuffer[0] == '+') {
-		if (strstart(lineBuffer, "+++ ")) {
-			return SCE_ERR_DIFF_MESSAGE;
-		} else {
-			return SCE_ERR_DIFF_ADDITION;
-		}
-	} else if (lineBuffer[0] == '-') {
-		if (strstart(lineBuffer, "--- ")) {
-			return SCE_ERR_DIFF_MESSAGE;
-		} else {
-			return SCE_ERR_DIFF_DELETION;
-		}
-	} else if (strstart(lineBuffer, "cf90-")) {
-		// Absoft Pro Fortran 90/95 v8.2 error and/or warning message
-		return SCE_ERR_ABSF;
-	} else if (strstart(lineBuffer, "fortcom:")) {
-		// Intel Fortran Compiler v8.0 error/warning message
-		return SCE_ERR_IFORT;
-	} else if (strstr(lineBuffer, "File \"") && strstr(lineBuffer, ", line ")) {
-		return SCE_ERR_PYTHON;
-	} else if (strstr(lineBuffer, " in ") && strstr(lineBuffer, " on line ")) {
-		return SCE_ERR_PHP;
-	} else if ((strstart(lineBuffer, "Error ") ||
-	            strstart(lineBuffer, "Warning ")) &&
-	           strstr(lineBuffer, " at (") &&
-	           strstr(lineBuffer, ") : ") &&
-	           (strstr(lineBuffer, " at (") < strstr(lineBuffer, ") : "))) {
-		// Intel Fortran Compiler error/warning message
-		return SCE_ERR_IFC;
-	} else if (strstart(lineBuffer, "Error ")) {
-		// Borland error message
-		return SCE_ERR_BORLAND;
-	} else if (strstart(lineBuffer, "Warning ")) {
-		// Borland warning message
-		return SCE_ERR_BORLAND;
-	} else if (strstr(lineBuffer, "at line " ) &&
-	           (strstr(lineBuffer, "at line " ) < (lineBuffer + lengthLine)) &&
-	           strstr(lineBuffer, "file ") &&
-	           (strstr(lineBuffer, "file ") < (lineBuffer + lengthLine))) {
-		// Lua 4 error message
-		return SCE_ERR_LUA;
-	} else if (strstr(lineBuffer, " at " ) &&
-	           (strstr(lineBuffer, " at " ) < (lineBuffer + lengthLine)) &&
-	           strstr(lineBuffer, " line ") &&
-	           (strstr(lineBuffer, " line ") < (lineBuffer + lengthLine)) &&
-	           (strstr(lineBuffer, " at " ) < (strstr(lineBuffer, " line ")))) {
-		// perl error message
-		return SCE_ERR_PERL;
-	} else if ((memcmp(lineBuffer, "   at ", 6) == 0) &&
-	           strstr(lineBuffer, ":line ")) {
-		// A .NET traceback
-		return SCE_ERR_NET;
-	} else if (strstart(lineBuffer, "Line ") &&
-	           strstr(lineBuffer, ", file ")) {
-		// Essential Lahey Fortran error message
-		return SCE_ERR_ELF;
-	} else if (strstart(lineBuffer, "line ") &&
-	           strstr(lineBuffer, " column ")) {
-		// HTML tidy style: line 42 column 1
-		return SCE_ERR_TIDY;
-	} else if (strstart(lineBuffer, "\tat ") &&
-	           strstr(lineBuffer, "(") &&
-	           strstr(lineBuffer, ".java:")) {
-		// Java stack back trace
-		return SCE_ERR_JAVA_STACK;
-	} else {
-		// Look for one of the following formats:
-		// GCC: <filename>:<line>:<message>
-		// Microsoft: <filename>(<line>) :<message>
-		// Common: <filename>(<line>): warning|error|note|remark|catastrophic|fatal
-		// Common: <filename>(<line>) warning|error|note|remark|catastrophic|fatal
-		// Microsoft: <filename>(<line>,<column>)<message>
-		// CTags: \t<message>
-		// Lua 5 traceback: \t<filename>:<line>:<message>
-		bool initialTab = (lineBuffer[0] == '\t');
-		enum { stInitial,
-			stGccStart, stGccDigit, stGcc,
-			stMsStart, stMsDigit, stMsBracket, stMsVc, stMsDigitComma, stMsDotNet,
-			stCtagsStart, stCtagsStartString, stCtagsStringDollar, stCtags,
-			stUnrecognized
-		} state = stInitial;
-		for (unsigned int i = 0; i < lengthLine; i++) {
-			char ch = lineBuffer[i];
-			char chNext = ' ';
-			if ((i + 1) < lengthLine)
-				chNext = lineBuffer[i + 1];
-			if (state == stInitial) {
-				if (ch == ':') {
-					// May be GCC, or might be Lua 5 (Lua traceback same but with tab prefix)
-					if ((chNext != '\\') && (chNext != '/')) {
-						// This check is not completely accurate as may be on
-						// GTK+ with a file name that includes ':'.
-						state = stGccStart;
-					}
-				} else if ((ch == '(') && Is1To9(chNext) && (!initialTab)) {
-					// May be Microsoft
-					// Check against '0' often removes phone numbers
-					state = stMsStart;
-				} else if ((ch == '\t') && (!initialTab)) {
-					// May be CTags
-					state = stCtagsStart;
-				}
-			} else if (state == stGccStart) {	// <filename>:
-				state = Is1To9(ch) ? stGccDigit : stUnrecognized;
-			} else if (state == stGccDigit) {	// <filename>:<line>
-				if (ch == ':') {
-					state = stGcc;	// :9.*: is GCC
-					break;
-				} else if (!Is0To9(ch)) {
-					state = stUnrecognized;
-				}
-			} else if (state == stMsStart) {	// <filename>(
-				state = Is0To9(ch) ? stMsDigit : stUnrecognized;
-			} else if (state == stMsDigit) {	// <filename>(<line>
-				if (ch == ',') {
-					state = stMsDigitComma;
-				} else if (ch == ')') {
-					state = stMsBracket;
-				} else if ((ch != ' ') && !Is0To9(ch)) {
-					state = stUnrecognized;
-				}
-			} else if (state == stMsBracket) {	// <filename>(<line>)
-				if ((ch == ' ') && (chNext == ':')) {
-					state = stMsVc;
-				} else if ((ch == ':' && chNext == ' ') || (ch == ' ')) {
-					// Possibly Delphi.. don't test against chNext as it's one of the strings below.
-					char word[512];
-					unsigned int j, chPos;
-					unsigned numstep;
-					chPos = 0;
-					if (ch == ' ')
-						numstep = 1; // ch was ' ', handle as if it's a delphi errorline, only add 1 to i.
-					else
-						numstep = 2; // otherwise add 2.
-					for (j = i + numstep; j < lengthLine && isalpha(lineBuffer[j]) && chPos < sizeof(word) - 1; j++)
-						word[chPos++] = lineBuffer[j];
-					word[chPos] = 0;
-					if (!CompareCaseInsensitive(word, "error") || !CompareCaseInsensitive(word, "warning") ||
-						!CompareCaseInsensitive(word, "fatal") || !CompareCaseInsensitive(word, "catastrophic") ||
-						!CompareCaseInsensitive(word, "note") || !CompareCaseInsensitive(word, "remark")) {
-						state = stMsVc;
-					} else
-						state = stUnrecognized;
-				} else {
-					state = stUnrecognized;
-				}
-			} else if (state == stMsDigitComma) {	// <filename>(<line>,
-				if (ch == ')') {
-					state = stMsDotNet;
-					break;
-				} else if ((ch != ' ') && !Is0To9(ch)) {
-					state = stUnrecognized;
-				}
-			} else if (state == stCtagsStart) {
-				if ((lineBuffer[i - 1] == '\t') &&
-				        ((ch == '/' && lineBuffer[i + 1] == '^') || Is0To9(ch))) {
-					state = stCtags;
-					break;
-				} else if ((ch == '/') && (lineBuffer[i + 1] == '^')) {
-					state = stCtagsStartString;
-				}
-			} else if ((state == stCtagsStartString) && ((lineBuffer[i] == '$') && (lineBuffer[i + 1] == '/'))) {
-				state = stCtagsStringDollar;
-				break;
-			}
-		}
-		if (state == stGcc) {
-			return SCE_ERR_GCC;
-		} else if ((state == stMsVc) || (state == stMsDotNet)) {
-			return SCE_ERR_MS;
-		} else if ((state == stCtagsStringDollar) || (state == stCtags)) {
-			return SCE_ERR_CTAG;
-		} else {
-			return SCE_ERR_DEFAULT;
-		}
-	}
-}
-
-static void ColouriseErrorListLine(
-    char *lineBuffer,
-    unsigned int lengthLine,
-    unsigned int endPos,
-    Accessor &styler) {
-	styler.ColourTo(endPos, RecogniseErrorListLine(lineBuffer, lengthLine));
-}
-
-static void ColouriseErrorListDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
-	char lineBuffer[10000];
-	styler.StartAt(startPos);
-	styler.StartSegment(startPos);
-	unsigned int linePos = 0;
-	for (unsigned int i = startPos; i < startPos + length; i++) {
-		lineBuffer[linePos++] = styler[i];
-		if (AtEOL(styler, i) || (linePos >= sizeof(lineBuffer) - 1)) {
-			// End of line (or of line buffer) met, colourise it
-			lineBuffer[linePos] = '\0';
-			ColouriseErrorListLine(lineBuffer, linePos, i, styler);
-			linePos = 0;
-		}
-	}
-	if (linePos > 0) {	// Last line does not have ending characters
-		ColouriseErrorListLine(lineBuffer, linePos, startPos + length - 1, styler);
-	}
-}
-
-static int isSpecial(char s) {
-	return (s == '\\') || (s == ',') || (s == ';') || (s == '\'') || (s == ' ') ||
-	       (s == '\"') || (s == '`') || (s == '^') || (s == '~');
-}
-
-static int isTag(int start, Accessor &styler) {
-	char s[6];
-	unsigned int i = 0, e = 1;
-	while (i < 5 && e) {
-		s[i] = styler[start + i];
-		i++;
-		e = styler[start + i] != '{';
-	}
-	s[i] = '\0';
-	return (strcmp(s, "begin") == 0) || (strcmp(s, "end") == 0);
-}
-
-static void ColouriseLatexDoc(unsigned int startPos, int length, int initStyle,
-                              WordList *[], Accessor &styler) {
-
-	styler.StartAt(startPos);
-
-	int state = initStyle;
-	char chNext = styler[startPos];
-	styler.StartSegment(startPos);
-	int lengthDoc = startPos + length;
-
-	for (int i = startPos; i < lengthDoc; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-
-		if (styler.IsLeadByte(ch)) {
-			chNext = styler.SafeGetCharAt(i + 2);
-			i++;
-			continue;
-		}
-		switch (state) {
-		case SCE_L_DEFAULT :
-			switch (ch) {
-			case '\\' :
-				styler.ColourTo(i - 1, state);
-				if (isSpecial(styler[i + 1])) {
-					styler.ColourTo(i + 1, SCE_L_COMMAND);
-					i++;
-					chNext = styler.SafeGetCharAt(i + 1);
-				} else {
-					if (isTag(i + 1, styler))
-						state = SCE_L_TAG;
-					else
-						state = SCE_L_COMMAND;
-				}
-				break;
-			case '$' :
-				styler.ColourTo(i - 1, state);
-				state = SCE_L_MATH;
-				if (chNext == '$') {
-					i++;
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-				break;
-			case '%' :
-				styler.ColourTo(i - 1, state);
-				state = SCE_L_COMMENT;
-				break;
-			}
-			break;
-		case SCE_L_COMMAND :
-			if (chNext == '[' || chNext == '{' || chNext == '}' ||
-			        chNext == ' ' || chNext == '\r' || chNext == '\n') {
-				styler.ColourTo(i, state);
-				state = SCE_L_DEFAULT;
-				i++;
-				chNext = styler.SafeGetCharAt(i + 1);
-			}
-			break;
-		case SCE_L_TAG :
-			if (ch == '}') {
-				styler.ColourTo(i, state);
-				state = SCE_L_DEFAULT;
-			}
-			break;
-		case SCE_L_MATH :
-			if (ch == '$') {
-				if (chNext == '$') {
-					i++;
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-				styler.ColourTo(i, state);
-				state = SCE_L_DEFAULT;
-			}
-			break;
-		case SCE_L_COMMENT :
-			if (ch == '\r' || ch == '\n') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_L_DEFAULT;
-			}
-		}
-	}
-	styler.ColourTo(lengthDoc-1, state);
-}
-
-static const char * const batchWordListDesc[] = {
-	"Internal Commands",
-	"External Commands",
-	0
-};
-
-static const char * const emptyWordListDesc[] = {
-	0
-};
-
-static void ColouriseNullDoc(unsigned int startPos, int length, int, WordList *[],
-                            Accessor &styler) {
-	// Null language means all style bytes are 0 so just mark the end - no need to fill in.
-	if (length > 0) {
-		styler.StartAt(startPos + length - 1);
-		styler.StartSegment(startPos + length - 1);
-		styler.ColourTo(startPos + length - 1, 0);
-	}
-}
-
-LexerModule lmBatch(SCLEX_BATCH, ColouriseBatchDoc, "batch", 0, batchWordListDesc);
-LexerModule lmDiff(SCLEX_DIFF, ColouriseDiffDoc, "diff", FoldDiffDoc, emptyWordListDesc);
-LexerModule lmProps(SCLEX_PROPERTIES, ColourisePropsDoc, "props", FoldPropsDoc, emptyWordListDesc);
-LexerModule lmMake(SCLEX_MAKEFILE, ColouriseMakeDoc, "makefile", 0, emptyWordListDesc);
-LexerModule lmErrorList(SCLEX_ERRORLIST, ColouriseErrorListDoc, "errorlist", 0, emptyWordListDesc);
-LexerModule lmLatex(SCLEX_LATEX, ColouriseLatexDoc, "latex", 0, emptyWordListDesc);
-LexerModule lmNull(SCLEX_NULL, ColouriseNullDoc, "null");
diff --git a/src/stc/scintilla/src/LexPB.cxx b/src/stc/scintilla/src/LexPB.cxx
deleted file mode 100644
index 7878a6bf8f..0000000000
--- a/src/stc/scintilla/src/LexPB.cxx
+++ /dev/null
@@ -1,358 +0,0 @@
-// Scintilla source code edit control
-// @file LexPB.cxx
-// Lexer for PowerBasic by Roland Walter, roland@rowalt.de (for PowerBasic see www.powerbasic.com)
-//
-// Changes:
-// 17.10.2003: Toggling of subs/functions now until next sub/function - this gives better results
-// 29.10.2003: 1. Bug: Toggling didn't work for subs/functions added in editor
-//             2. Own colors for PB constants and Inline Assembler SCE_B_CONSTANT and SCE_B_ASM
-//             3. Several smaller syntax coloring improvements and speed optimizations
-// 12.07.2004: 1. Toggling for macros added
-//             2. Further folding speed optimitations (for people dealing with very large listings)
-//
-// Necessary changes for the PB lexer in Scintilla project:
-//  - In SciLexer.h and Scintilla.iface:
-//
-//    #define SCLEX_POWERBASIC 51       //ID for PowerBasic lexer
-//    (...)
-//    #define SCE_B_DEFAULT 0           //in both VB and PB lexer
-//    #define SCE_B_COMMENT 1           //in both VB and PB lexer
-//    #define SCE_B_NUMBER 2            //in both VB and PB lexer
-//    #define SCE_B_KEYWORD 3           //in both VB and PB lexer
-//    #define SCE_B_STRING 4            //in both VB and PB lexer
-//    #define SCE_B_PREPROCESSOR 5      //VB lexer only, not in PB lexer
-//    #define SCE_B_OPERATOR 6          //in both VB and PB lexer
-//    #define SCE_B_IDENTIFIER 7        //in both VB and PB lexer
-//    #define SCE_B_DATE 8              //VB lexer only, not in PB lexer
-//    #define SCE_B_CONSTANT 13         //PB lexer only, not in VB lexer
-//    #define SCE_B_ASM 14              //PB lexer only, not in VB lexer
-
-//  - Statement added to KeyWords.cxx:      'LINK_LEXER(lmPB);'
-//  - Statement added to scintilla_vc6.mak: '$(DIR_O)\LexPB.obj: ...\src\LexPB.cxx $(LEX_HEADERS)'
-//
-// Copyright for Scintilla: 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static inline bool IsTypeCharacter(const int ch)
-{
-    return ch == '%' || ch == '&' || ch == '@' || ch == '!' || ch == '#' || ch == '$' || ch == '?';
-}
-
-static inline bool IsAWordChar(const int ch)
-{
-    return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_');
-}
-
-static inline bool IsAWordStart(const int ch)
-{
-    return (ch < 0x80) && (isalnum(ch) || ch == '_');
-}
-
-bool MatchUpperCase(Accessor &styler, int pos, const char *s)   //Same as styler.Match() but uppercase comparison (a-z,A-Z and space only)
-{
-    char ch;
-    for (int i=0; *s; i++)
-    {
-        ch=styler.SafeGetCharAt(pos+i);
-        if (ch > 0x60) ch -= '\x20';
-        if (*s != ch) return false;
-        s++;
-    }
-    return true;
-}
-
-static void ColourisePBDoc(unsigned int startPos, int length, int initStyle,WordList *keywordlists[],Accessor &styler) {
-
-    WordList &keywords = *keywordlists[0];
-
-    styler.StartAt(startPos);
-
-    StyleContext sc(startPos, length, initStyle, styler);
-
-    for (; sc.More(); sc.Forward()) {
-        switch (sc.state)
-        {
-            case SCE_B_OPERATOR:
-            {
-                sc.SetState(SCE_B_DEFAULT);
-                break;
-            }
-            case SCE_B_KEYWORD:
-            {
-                if (!IsAWordChar(sc.ch))
-                {
-                    if (!IsTypeCharacter(sc.ch))
-                    {
-                        char s[100];
-                        sc.GetCurrentLowered(s, sizeof(s));
-                        if (keywords.InList(s))
-                        {
-                            if (strcmp(s, "rem") == 0)
-                            {
-                                sc.ChangeState(SCE_B_COMMENT);
-                                if (sc.atLineEnd) {sc.SetState(SCE_B_DEFAULT);}
-                            }
-                            else if (strcmp(s, "asm") == 0)
-                            {
-                                sc.ChangeState(SCE_B_ASM);
-                                if (sc.atLineEnd) {sc.SetState(SCE_B_DEFAULT);}
-                            }
-                            else
-                            {
-                                sc.SetState(SCE_B_DEFAULT);
-                            }
-                        }
-                        else
-                        {
-                            sc.ChangeState(SCE_B_IDENTIFIER);
-                            sc.SetState(SCE_B_DEFAULT);
-                        }
-                    }
-                }
-                break;
-            }
-            case SCE_B_NUMBER:
-            {
-                if (!IsAWordChar(sc.ch)) {sc.SetState(SCE_B_DEFAULT);}
-                break;
-            }
-            case SCE_B_STRING:
-            {
-                if (sc.ch == '\"'){sc.ForwardSetState(SCE_B_DEFAULT);}
-                break;
-            }
-            case SCE_B_CONSTANT:
-            {
-                if (!IsAWordChar(sc.ch)) {sc.SetState(SCE_B_DEFAULT);}
-                break;
-            }
-            case SCE_B_COMMENT:
-            {
-                if (sc.atLineEnd) {sc.SetState(SCE_B_DEFAULT);}
-                break;
-            }
-            case SCE_B_ASM:
-            {
-                if (sc.atLineEnd) {sc.SetState(SCE_B_DEFAULT);}
-                break;
-            }
-        }  //switch (sc.state)
-
-        // Determine if a new state should be entered:
-        if (sc.state == SCE_B_DEFAULT)
-        {
-            if (sc.ch == '\'') {sc.SetState(SCE_B_COMMENT);}
-            else if (sc.ch == '\"') {sc.SetState(SCE_B_STRING);}
-            else if (sc.ch == '&' && tolower(sc.chNext) == 'h') {sc.SetState(SCE_B_NUMBER);}
-            else if (sc.ch == '&' && tolower(sc.chNext) == 'b') {sc.SetState(SCE_B_NUMBER);}
-            else if (sc.ch == '&' && tolower(sc.chNext) == 'o') {sc.SetState(SCE_B_NUMBER);}
-            else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {sc.SetState(SCE_B_NUMBER);}
-            else if (IsAWordStart(sc.ch)) {sc.SetState(SCE_B_KEYWORD);}
-            else if (sc.ch == '%') {sc.SetState(SCE_B_CONSTANT);}
-            else if (sc.ch == '$') {sc.SetState(SCE_B_CONSTANT);}
-            else if (sc.ch == '#') {sc.SetState(SCE_B_KEYWORD);}
-            else if (sc.ch == '!') {sc.SetState(SCE_B_ASM);}
-            else if (isoperator(static_cast<char>(sc.ch)) || (sc.ch == '\\')) {sc.SetState(SCE_B_OPERATOR);}
-        }
-    }      //for (; sc.More(); sc.Forward())
-    sc.Complete();
-}
-
-//The folding routine for PowerBasic toggles SUBs and FUNCTIONs only. This was exactly what I wanted,
-//nothing more. I had worked with this kind of toggling for several years when I used the great good old
-//GFA Basic which is dead now. After testing the feature of toggling FOR-NEXT loops, WHILE-WEND loops
-//and so on too I found this is more disturbing then helping (for me). So if You think in another way
-//you can (or must) write Your own toggling routine ;-)
-static void FoldPBDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler)
-{
-    // No folding enabled, no reason to continue...
-    if( styler.GetPropertyInt("fold") == 0 )
-        return;
-
-    unsigned int endPos = startPos + length;
-    int lineCurrent = styler.GetLine(startPos);
-    int levelCurrent = SC_FOLDLEVELBASE;
-    if (lineCurrent > 0)
-        levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
-    int levelNext = levelCurrent;
-    char chNext = styler[startPos];
-
-    bool fNewLine=true;
-    bool fMightBeMultiLineMacro=false;
-    bool fBeginOfCommentFound=false;
-    for (unsigned int i = startPos; i < endPos; i++)
-    {
-        char ch = chNext;
-        chNext = styler.SafeGetCharAt(i + 1);
-
-        if (fNewLine)            //Begin of a new line (The Sub/Function/Macro keywords may occur at begin of line only)
-        {
-            fNewLine=false;
-            fBeginOfCommentFound=false;
-            switch (ch)
-            {
-            case ' ':      //Most lines start with space - so check this first, the code is the same as for 'default:'
-            case '\t':     //Handle tab too
-                {
-                    int levelUse = levelCurrent;
-                    int lev = levelUse | levelNext << 16;
-                    styler.SetLevel(lineCurrent, lev);
-                    break;
-                }
-            case 'F':
-            case 'f':
-                {
-					switch (chNext)
-					{
-                    case 'U':
-                    case 'u':
-						{
-							if( MatchUpperCase(styler,i,"FUNCTION") )
-							{
-								styler.SetLevel(lineCurrent, (SC_FOLDLEVELBASE << 16) | SC_FOLDLEVELHEADERFLAG);
-								levelNext=SC_FOLDLEVELBASE+1;
-							}
-							break;
-						}
-					}
-                break;
-                }
-            case 'S':
-            case 's':
-                {
-					switch (chNext)
-					{
-                    case 'U':
-                    case 'u':
-						{
-							if( MatchUpperCase(styler,i,"SUB") )
-							{
-								styler.SetLevel(lineCurrent, (SC_FOLDLEVELBASE << 16) | SC_FOLDLEVELHEADERFLAG);
-								levelNext=SC_FOLDLEVELBASE+1;
-							}
-							break;
-						}
-                    case 'T':
-                    case 't':
-						{
-							if( MatchUpperCase(styler,i,"STATIC FUNCTION") )
-							{
-								styler.SetLevel(lineCurrent, (SC_FOLDLEVELBASE << 16) | SC_FOLDLEVELHEADERFLAG);
-								levelNext=SC_FOLDLEVELBASE+1;
-							}
-							else if( MatchUpperCase(styler,i,"STATIC SUB") )
-							{
-								styler.SetLevel(lineCurrent, (SC_FOLDLEVELBASE << 16) | SC_FOLDLEVELHEADERFLAG);
-								levelNext=SC_FOLDLEVELBASE+1;
-							}
-							break;
-						}
-					}
-                break;
-                }
-            case 'C':
-            case 'c':
-                {
-					switch (chNext)
-					{
-                    case 'A':
-                    case 'a':
-						{
-							if( MatchUpperCase(styler,i,"CALLBACK FUNCTION") )
-							{
-								styler.SetLevel(lineCurrent, (SC_FOLDLEVELBASE << 16) | SC_FOLDLEVELHEADERFLAG);
-								levelNext=SC_FOLDLEVELBASE+1;
-							}
-							break;
-						}
-					}
-                break;
-                }
-            case 'M':
-            case 'm':
-                {
-					switch (chNext)
-					{
-                    case 'A':
-                    case 'a':
-						{
-							if( MatchUpperCase(styler,i,"MACRO") )
-							{
-								fMightBeMultiLineMacro=true;  //Set folder level at end of line, we have to check for single line macro
-							}
-							break;
-						}
-					}
-                break;
-                }
-            default:
-                {
-                    int levelUse = levelCurrent;
-                    int lev = levelUse | levelNext << 16;
-                    styler.SetLevel(lineCurrent, lev);
-                    break;
-                }
-            }  //switch (ch)
-        }  //if( fNewLine )
-
-        switch (ch)
-        {
-            case '=':                              //To test single line macros
-            {
-                if (fBeginOfCommentFound==false)
-                    fMightBeMultiLineMacro=false;  //The found macro is a single line macro only;
-                break;
-            }
-            case '\'':                             //A comment starts
-            {
-                fBeginOfCommentFound=true;
-                break;
-            }
-            case '\n':
-            {
-                if (fMightBeMultiLineMacro)        //The current line is the begin of a multi line macro
-                {
-                    fMightBeMultiLineMacro=false;
-                    styler.SetLevel(lineCurrent, (SC_FOLDLEVELBASE << 16) | SC_FOLDLEVELHEADERFLAG);
-                    levelNext=SC_FOLDLEVELBASE+1;
-                }
-                lineCurrent++;
-                levelCurrent = levelNext;
-                fNewLine=true;
-                break;
-            }
-            case '\r':
-            {
-                if (chNext != '\n')
-                {
-                    lineCurrent++;
-                    levelCurrent = levelNext;
-                    fNewLine=true;
-                }
-                break;
-            }
-        }  //switch (ch)
-    }  //for (unsigned int i = startPos; i < endPos; i++)
-}
-
-static const char * const pbWordListDesc[] = {
-    "Keywords",
-    0
-};
-
-LexerModule lmPB(SCLEX_POWERBASIC, ColourisePBDoc, "powerbasic", FoldPBDoc, pbWordListDesc);
diff --git a/src/stc/scintilla/src/LexPOV.cxx b/src/stc/scintilla/src/LexPOV.cxx
deleted file mode 100644
index 5cc05ce6ab..0000000000
--- a/src/stc/scintilla/src/LexPOV.cxx
+++ /dev/null
@@ -1,312 +0,0 @@
-// Scintilla source code edit control
-/** @file LexPOV.cxx
- ** Lexer for POV-Ray SDL (Persistance of Vision Raytracer, Scene Description Language).
- ** Written by Philippe Lhoste but this is mostly a derivative of LexCPP...
- **/
-// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-// Some points that distinguish from a simple C lexer:
-// Identifiers start only by a character.
-// No line continuation character.
-// Strings are limited to 256 characters.
-// Directives are similar to preprocessor commands,
-// but we match directive keywords and colorize incorrect ones.
-// Block comments can be nested (code stolen from my code in LexLua).
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static inline bool IsAWordChar(int ch) {
-	return ch < 0x80 && (isalnum(ch) || ch == '_');
-}
-
-static inline bool IsAWordStart(int ch) {
-	return ch < 0x80 && isalpha(ch);
-}
-
-static inline bool IsANumberChar(int ch) {
-	// Not exactly following number definition (several dots are seen as OK, etc.)
-	// but probably enough in most cases.
-	return (ch < 0x80) &&
-	        (isdigit(ch) || toupper(ch) == 'E' ||
-             ch == '.' || ch == '-' || ch == '+');
-}
-
-static void ColourisePovDoc(
-	unsigned int startPos,
-	int length,
-	int initStyle,
-	WordList *keywordlists[],
-    Accessor &styler) {
-
-	WordList &keywords1 = *keywordlists[0];
-	WordList &keywords2 = *keywordlists[1];
-	WordList &keywords3 = *keywordlists[2];
-	WordList &keywords4 = *keywordlists[3];
-	WordList &keywords5 = *keywordlists[4];
-	WordList &keywords6 = *keywordlists[5];
-	WordList &keywords7 = *keywordlists[6];
-	WordList &keywords8 = *keywordlists[7];
-
-	int currentLine = styler.GetLine(startPos);
-	// Initialize the block comment /* */ nesting level, if we are inside such a comment.
-	int blockCommentLevel = 0;
-	if (initStyle == SCE_POV_COMMENT) {
-		blockCommentLevel = styler.GetLineState(currentLine - 1);
-	}
-
-	// Do not leak onto next line
-	if (initStyle == SCE_POV_STRINGEOL || initStyle == SCE_POV_COMMENTLINE) {
-		initStyle = SCE_POV_DEFAULT;
-	}
-
-	short stringLen = 0;
-
-	StyleContext sc(startPos, length, initStyle, styler);
-
-	for (; sc.More(); sc.Forward()) {
-		if (sc.atLineEnd) {
-			// Update the line state, so it can be seen by next line
-			currentLine = styler.GetLine(sc.currentPos);
-			if (sc.state == SCE_POV_COMMENT) {
-				// Inside a block comment, we set the line state
-				styler.SetLineState(currentLine, blockCommentLevel);
-			} else {
-				// Reset the line state
-				styler.SetLineState(currentLine, 0);
-			}
-		}
-
-		if (sc.atLineStart && (sc.state == SCE_POV_STRING)) {
-			// Prevent SCE_POV_STRINGEOL from leaking back to previous line
-			sc.SetState(SCE_POV_STRING);
-		}
-
-		// Determine if the current state should terminate.
-		if (sc.state == SCE_POV_OPERATOR) {
-			sc.SetState(SCE_POV_DEFAULT);
-		} else if (sc.state == SCE_POV_NUMBER) {
-			// We stop the number definition on non-numerical non-dot non-eE non-sign char
-			if (!IsANumberChar(sc.ch)) {
-				sc.SetState(SCE_POV_DEFAULT);
-			}
-		} else if (sc.state == SCE_POV_IDENTIFIER) {
-			if (!IsAWordChar(sc.ch)) {
-				char s[100];
-				sc.GetCurrent(s, sizeof(s));
-				if (keywords2.InList(s)) {
-					sc.ChangeState(SCE_POV_WORD2);
-				} else if (keywords3.InList(s)) {
-					sc.ChangeState(SCE_POV_WORD3);
-				} else if (keywords4.InList(s)) {
-					sc.ChangeState(SCE_POV_WORD4);
-				} else if (keywords5.InList(s)) {
-					sc.ChangeState(SCE_POV_WORD5);
-				} else if (keywords6.InList(s)) {
-					sc.ChangeState(SCE_POV_WORD6);
-				} else if (keywords7.InList(s)) {
-					sc.ChangeState(SCE_POV_WORD7);
-				} else if (keywords8.InList(s)) {
-					sc.ChangeState(SCE_POV_WORD8);
-				}
-				sc.SetState(SCE_POV_DEFAULT);
-			}
-		} else if (sc.state == SCE_POV_DIRECTIVE) {
-			if (!IsAWordChar(sc.ch)) {
-				char s[100];
-				char *p;
-				sc.GetCurrent(s, sizeof(s));
-				p = s;
-				// Skip # and whitespace between # and directive word
-				do {
-					p++;
-				} while ((*p == ' ' || *p == '\t') && *p != '\0');
-				if (!keywords1.InList(p)) {
-					sc.ChangeState(SCE_POV_BADDIRECTIVE);
-				}
-				sc.SetState(SCE_POV_DEFAULT);
-			}
-		} else if (sc.state == SCE_POV_COMMENT) {
-			if (sc.Match('/', '*')) {
-				blockCommentLevel++;
-				sc.Forward();
-			} else if (sc.Match('*', '/') && blockCommentLevel > 0) {
-				blockCommentLevel--;
-				sc.Forward();
-				if (blockCommentLevel == 0) {
-					sc.ForwardSetState(SCE_POV_DEFAULT);
-				}
-			}
-		} else if (sc.state == SCE_POV_COMMENTLINE) {
-			if (sc.atLineEnd) {
-				sc.ForwardSetState(SCE_POV_DEFAULT);
-			}
-		} else if (sc.state == SCE_POV_STRING) {
-			if (sc.ch == '\\') {
-				stringLen++;
-				if (strchr("abfnrtuv0'\"", sc.chNext)) {
-					// Compound characters are counted as one.
-					// Note: for Unicode chars \u, we shouldn't count the next 4 digits...
-					sc.Forward();
-				}
-			} else if (sc.ch == '\"') {
-				sc.ForwardSetState(SCE_POV_DEFAULT);
-			} else if (sc.atLineEnd) {
-				sc.ChangeState(SCE_POV_STRINGEOL);
-				sc.ForwardSetState(SCE_POV_DEFAULT);
-			} else {
-				stringLen++;
-			}
-			if (stringLen > 256) {
-				// Strings are limited to 256 chars
-				sc.SetState(SCE_POV_STRINGEOL);
-			}
-		} else if (sc.state == SCE_POV_STRINGEOL) {
-			if (sc.ch == '\\') {
-				if (sc.chNext == '\"' || sc.chNext == '\\') {
-					sc.Forward();
-				}
-			} else if (sc.ch == '\"') {
-				sc.ForwardSetState(SCE_C_DEFAULT);
-			} else if (sc.atLineEnd) {
-				sc.ForwardSetState(SCE_POV_DEFAULT);
-			}
-		}
-
-		// Determine if a new state should be entered.
-		if (sc.state == SCE_POV_DEFAULT) {
-			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
-				sc.SetState(SCE_POV_NUMBER);
-			} else if (IsAWordStart(sc.ch)) {
-				sc.SetState(SCE_POV_IDENTIFIER);
-			} else if (sc.Match('/', '*')) {
-				blockCommentLevel = 1;
-				sc.SetState(SCE_POV_COMMENT);
-				sc.Forward();	// Eat the * so it isn't used for the end of the comment
-			} else if (sc.Match('/', '/')) {
-				sc.SetState(SCE_POV_COMMENTLINE);
-			} else if (sc.ch == '\"') {
-				sc.SetState(SCE_POV_STRING);
-				stringLen = 0;
-			} else if (sc.ch == '#') {
-				sc.SetState(SCE_POV_DIRECTIVE);
-				// Skip whitespace between # and directive word
-				do {
-					sc.Forward();
-				} while ((sc.ch == ' ' || sc.ch == '\t') && sc.More());
-				if (sc.atLineEnd) {
-					sc.SetState(SCE_POV_DEFAULT);
-				}
-			} else if (isoperator(static_cast<char>(sc.ch))) {
-				sc.SetState(SCE_POV_OPERATOR);
-			}
-		}
-	}
-	sc.Complete();
-}
-
-static void FoldPovDoc(
-	unsigned int startPos,
-	int length,
-	int initStyle,
-	WordList *[],
-	Accessor &styler) {
-
-	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
-	bool foldDirective = styler.GetPropertyInt("fold.directive") != 0;
-	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-	unsigned int endPos = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
-	int levelCurrent = levelPrev;
-	char chNext = styler[startPos];
-	int styleNext = styler.StyleAt(startPos);
-	int style = initStyle;
-	for (unsigned int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		int stylePrev = style;
-		style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-		if (foldComment && (style == SCE_POV_COMMENT)) {
-			if (stylePrev != SCE_POV_COMMENT) {
-				levelCurrent++;
-			} else if ((styleNext != SCE_POV_COMMENT) && !atEOL) {
-				// Comments don't end at end of line and the next character may be unstyled.
-				levelCurrent--;
-			}
-		}
-		if (foldComment && (style == SCE_POV_COMMENTLINE)) {
-			if ((ch == '/') && (chNext == '/')) {
-				char chNext2 = styler.SafeGetCharAt(i + 2);
-				if (chNext2 == '{') {
-					levelCurrent++;
-				} else if (chNext2 == '}') {
-					levelCurrent--;
-				}
-			}
-		}
-		if (foldDirective && (style == SCE_POV_DIRECTIVE)) {
-			if (ch == '#') {
-				unsigned int j=i+1;
-				while ((j<endPos) && IsASpaceOrTab(styler.SafeGetCharAt(j))) {
-					j++;
-				}
-			}
-		}
-		if (style == SCE_POV_OPERATOR) {
-			if (ch == '{') {
-				levelCurrent++;
-			} else if (ch == '}') {
-				levelCurrent--;
-			}
-		}
-		if (atEOL) {
-			int lev = levelPrev;
-			if (visibleChars == 0 && foldCompact)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			if ((levelCurrent > levelPrev) && (visibleChars > 0))
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			levelPrev = levelCurrent;
-			visibleChars = 0;
-		}
-		if (!isspacechar(ch))
-			visibleChars++;
-	}
-	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
-}
-
-static const char * const povWordLists[] = {
-	"Language directives",
-	"Objects & CSG & Appearance",
-	"Types & Modifiers & Items",
-	"Predefined Identifiers",
-	"Predefined Functions",
-	"User defined 1",
-	"User defined 2",
-	"User defined 3",
-	0,
-};
-
-LexerModule lmPOV(SCLEX_POV, ColourisePovDoc, "pov", FoldPovDoc, povWordLists);
diff --git a/src/stc/scintilla/src/LexPS.cxx b/src/stc/scintilla/src/LexPS.cxx
deleted file mode 100644
index 3c75ae554d..0000000000
--- a/src/stc/scintilla/src/LexPS.cxx
+++ /dev/null
@@ -1,343 +0,0 @@
-// Scintilla source code edit control
-/** @file LexPS.cxx
- ** Lexer for PostScript
- **
- ** Written by Nigel Hathaway <nigel@bprj.co.uk>.
- ** The License.txt file describes the conditions under which this software may be distributed.
- **/
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static inline bool IsASelfDelimitingChar(const int ch) {
-    return (ch == '[' || ch == ']' || ch == '{' || ch == '}' ||
-            ch == '/' || ch == '<' || ch == '>' ||
-            ch == '(' || ch == ')' || ch == '%');
-}
-
-static inline bool IsAWhitespaceChar(const int ch) {
-    return (ch == ' '  || ch == '\t' || ch == '\r' ||
-            ch == '\n' || ch == '\f' || ch == '\0');
-}
-
-static bool IsABaseNDigit(const int ch, const int base) {
-    int maxdig = '9';
-    int letterext = -1;
-
-    if (base <= 10)
-        maxdig = '0' + base - 1;
-    else
-        letterext = base - 11;
-
-    return ((ch >= '0' && ch <= maxdig) ||
-            (ch >= 'A' && ch <= ('A' + letterext)) ||
-            (ch >= 'a' && ch <= ('a' + letterext)));
-}
-
-static inline bool IsABase85Char(const int ch) {
-    return ((ch >= '!' && ch <= 'u') || ch == 'z');
-}
-
-static void ColourisePSDoc(
-    unsigned int startPos,
-    int length,
-    int initStyle,
-    WordList *keywordlists[],
-    Accessor &styler) {
-
-    WordList &keywords1 = *keywordlists[0];
-    WordList &keywords2 = *keywordlists[1];
-    WordList &keywords3 = *keywordlists[2];
-    WordList &keywords4 = *keywordlists[3];
-    WordList &keywords5 = *keywordlists[4];
-
-    StyleContext sc(startPos, length, initStyle, styler);
-
-    bool tokenizing = styler.GetPropertyInt("ps.tokenize") != 0;
-    int pslevel = styler.GetPropertyInt("ps.level", 3);
-    int lineCurrent = styler.GetLine(startPos);
-    int nestTextCurrent = 0;
-    if (lineCurrent > 0 && initStyle == SCE_PS_TEXT)
-        nestTextCurrent = styler.GetLineState(lineCurrent - 1);
-    int numRadix = 0;
-    bool numHasPoint = false;
-    bool numHasExponent = false;
-    bool numHasSign = false;
-
-    // Clear out existing tokenization
-    if (tokenizing && length > 0) {
-        styler.StartAt(startPos, static_cast<char>(INDIC2_MASK));
-        styler.ColourTo(startPos + length-1, 0);
-        styler.Flush();
-        styler.StartAt(startPos);
-        styler.StartSegment(startPos);
-    }
-
-    for (; sc.More(); sc.Forward()) {
-        if (sc.atLineStart)
-            lineCurrent = styler.GetLine(sc.currentPos);
-
-        // Determine if the current state should terminate.
-        if (sc.state == SCE_PS_COMMENT || sc.state == SCE_PS_DSC_VALUE) {
-            if (sc.atLineEnd) {
-                sc.SetState(SCE_C_DEFAULT);
-            }
-        } else if (sc.state == SCE_PS_DSC_COMMENT) {
-            if (sc.ch == ':') {
-                sc.Forward();
-                if (!sc.atLineEnd)
-                    sc.SetState(SCE_PS_DSC_VALUE);
-                else
-                    sc.SetState(SCE_C_DEFAULT);
-            } else if (sc.atLineEnd) {
-                sc.SetState(SCE_C_DEFAULT);
-            } else if (IsAWhitespaceChar(sc.ch)) {
-                sc.ChangeState(SCE_PS_COMMENT);
-            }
-        } else if (sc.state == SCE_PS_NUMBER) {
-            if (IsASelfDelimitingChar(sc.ch) || IsAWhitespaceChar(sc.ch)) {
-                if ((sc.chPrev == '+' || sc.chPrev == '-' ||
-                     sc.chPrev == 'E' || sc.chPrev == 'e') && numRadix == 0)
-                    sc.ChangeState(SCE_PS_NAME);
-                sc.SetState(SCE_C_DEFAULT);
-            } else if (sc.ch == '#') {
-                if (numHasPoint || numHasExponent || numHasSign || numRadix != 0) {
-                    sc.ChangeState(SCE_PS_NAME);
-                } else {
-                    char szradix[5];
-                    sc.GetCurrent(szradix, 4);
-                    numRadix = atoi(szradix);
-                    if (numRadix < 2 || numRadix > 36)
-                        sc.ChangeState(SCE_PS_NAME);
-                }
-            } else if ((sc.ch == 'E' || sc.ch == 'e') && numRadix == 0) {
-                if (numHasExponent) {
-                    sc.ChangeState(SCE_PS_NAME);
-                } else {
-                    numHasExponent = true;
-                    if (sc.chNext == '+' || sc.chNext == '-')
-                        sc.Forward();
-                }
-            } else if (sc.ch == '.') {
-                if (numHasPoint || numHasExponent || numRadix != 0) {
-                    sc.ChangeState(SCE_PS_NAME);
-                } else {
-                    numHasPoint = true;
-                }
-            } else if (numRadix == 0) {
-                if (!IsABaseNDigit(sc.ch, 10))
-                    sc.ChangeState(SCE_PS_NAME);
-            } else {
-                if (!IsABaseNDigit(sc.ch, numRadix))
-                    sc.ChangeState(SCE_PS_NAME);
-            }
-        } else if (sc.state == SCE_PS_NAME || sc.state == SCE_PS_KEYWORD) {
-            if (IsASelfDelimitingChar(sc.ch) || IsAWhitespaceChar(sc.ch)) {
-                char s[100];
-                sc.GetCurrent(s, sizeof(s));
-                if ((pslevel >= 1 && keywords1.InList(s)) ||
-                    (pslevel >= 2 && keywords2.InList(s)) ||
-                    (pslevel >= 3 && keywords3.InList(s)) ||
-                    keywords4.InList(s) || keywords5.InList(s)) {
-                    sc.ChangeState(SCE_PS_KEYWORD);
-                }
-                sc.SetState(SCE_C_DEFAULT);
-            }
-        } else if (sc.state == SCE_PS_LITERAL || sc.state == SCE_PS_IMMEVAL) {
-            if (IsASelfDelimitingChar(sc.ch) || IsAWhitespaceChar(sc.ch))
-                sc.SetState(SCE_C_DEFAULT);
-        } else if (sc.state == SCE_PS_PAREN_ARRAY || sc.state == SCE_PS_PAREN_DICT ||
-                   sc.state == SCE_PS_PAREN_PROC) {
-            sc.SetState(SCE_C_DEFAULT);
-        } else if (sc.state == SCE_PS_TEXT) {
-            if (sc.ch == '(') {
-                nestTextCurrent++;
-            } else if (sc.ch == ')') {
-                if (--nestTextCurrent == 0)
-                   sc.ForwardSetState(SCE_PS_DEFAULT);
-            } else if (sc.ch == '\\') {
-                sc.Forward();
-            }
-        } else if (sc.state == SCE_PS_HEXSTRING) {
-            if (sc.ch == '>') {
-                sc.ForwardSetState(SCE_PS_DEFAULT);
-            } else if (!IsABaseNDigit(sc.ch, 16) && !IsAWhitespaceChar(sc.ch)) {
-                sc.SetState(SCE_PS_HEXSTRING);
-                styler.ColourTo(sc.currentPos, SCE_PS_BADSTRINGCHAR);
-            }
-        } else if (sc.state == SCE_PS_BASE85STRING) {
-            if (sc.Match('~', '>')) {
-                sc.Forward();
-                sc.ForwardSetState(SCE_PS_DEFAULT);
-            } else if (!IsABase85Char(sc.ch) && !IsAWhitespaceChar(sc.ch)) {
-                sc.SetState(SCE_PS_BASE85STRING);
-                styler.ColourTo(sc.currentPos, SCE_PS_BADSTRINGCHAR);
-            }
-        }
-
-        // Determine if a new state should be entered.
-        if (sc.state == SCE_C_DEFAULT) {
-            unsigned int tokenpos = sc.currentPos;
-
-            if (sc.ch == '[' || sc.ch == ']') {
-                sc.SetState(SCE_PS_PAREN_ARRAY);
-            } else if (sc.ch == '{' || sc.ch == '}') {
-                sc.SetState(SCE_PS_PAREN_PROC);
-            } else if (sc.ch == '/') {
-                if (sc.chNext == '/') {
-                    sc.SetState(SCE_PS_IMMEVAL);
-                    sc.Forward();
-                } else {
-                    sc.SetState(SCE_PS_LITERAL);
-                }
-            } else if (sc.ch == '<') {
-                if (sc.chNext == '<') {
-                    sc.SetState(SCE_PS_PAREN_DICT);
-                    sc.Forward();
-                } else if (sc.chNext == '~') {
-                    sc.SetState(SCE_PS_BASE85STRING);
-                    sc.Forward();
-                } else {
-                    sc.SetState(SCE_PS_HEXSTRING);
-                }
-            } else if (sc.ch == '>' && sc.chNext == '>') {
-                    sc.SetState(SCE_PS_PAREN_DICT);
-                    sc.Forward();
-            } else if (sc.ch == '>' || sc.ch == ')') {
-                sc.SetState(SCE_C_DEFAULT);
-                styler.ColourTo(sc.currentPos, SCE_PS_BADSTRINGCHAR);
-            } else if (sc.ch == '(') {
-                sc.SetState(SCE_PS_TEXT);
-                nestTextCurrent = 1;
-            } else if (sc.ch == '%') {
-                if (sc.chNext == '%' && sc.atLineStart) {
-                    sc.SetState(SCE_PS_DSC_COMMENT);
-                    sc.Forward();
-                    if (sc.chNext == '+') {
-                        sc.Forward();
-                        sc.ForwardSetState(SCE_PS_DSC_VALUE);
-                    }
-                } else {
-                    sc.SetState(SCE_PS_COMMENT);
-                }
-            } else if ((sc.ch == '+' || sc.ch == '-' || sc.ch == '.') &&
-                       IsABaseNDigit(sc.chNext, 10)) {
-                sc.SetState(SCE_PS_NUMBER);
-                numRadix = 0;
-                numHasPoint = (sc.ch == '.');
-                numHasExponent = false;
-                numHasSign = (sc.ch == '+' || sc.ch == '-');
-            } else if ((sc.ch == '+' || sc.ch == '-') && sc.chNext == '.' &&
-                       IsABaseNDigit(sc.GetRelative(2), 10)) {
-                sc.SetState(SCE_PS_NUMBER);
-                numRadix = 0;
-                numHasPoint = false;
-                numHasExponent = false;
-                numHasSign = true;
-            } else if (IsABaseNDigit(sc.ch, 10)) {
-                sc.SetState(SCE_PS_NUMBER);
-                numRadix = 0;
-                numHasPoint = false;
-                numHasExponent = false;
-                numHasSign = false;
-            } else if (!IsAWhitespaceChar(sc.ch)) {
-                sc.SetState(SCE_PS_NAME);
-            }
-
-            // Mark the start of tokens
-            if (tokenizing && sc.state != SCE_C_DEFAULT && sc.state != SCE_PS_COMMENT &&
-                sc.state != SCE_PS_DSC_COMMENT && sc.state != SCE_PS_DSC_VALUE) {
-                styler.Flush();
-                styler.StartAt(tokenpos, static_cast<char>(INDIC2_MASK));
-                styler.ColourTo(tokenpos, INDIC2_MASK);
-                styler.Flush();
-                styler.StartAt(tokenpos);
-                styler.StartSegment(tokenpos);
-            }
-        }
-
-        if (sc.atLineEnd)
-            styler.SetLineState(lineCurrent, nestTextCurrent);
-    }
-
-    sc.Complete();
-}
-
-static void FoldPSDoc(unsigned int startPos, int length, int, WordList *[],
-                       Accessor &styler) {
-    bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-    bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0;
-    unsigned int endPos = startPos + length;
-    int visibleChars = 0;
-    int lineCurrent = styler.GetLine(startPos);
-    int levelCurrent = SC_FOLDLEVELBASE;
-    if (lineCurrent > 0)
-        levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
-    int levelMinCurrent = levelCurrent;
-    int levelNext = levelCurrent;
-    char chNext = styler[startPos];
-    int styleNext = styler.StyleAt(startPos);
-    int style;
-    for (unsigned int i = startPos; i < endPos; i++) {
-        char ch = chNext;
-        chNext = styler.SafeGetCharAt(i + 1);
-        style = styleNext;
-        styleNext = styler.StyleAt(i + 1);
-        bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');  //mac??
-        if ((style & 31) == SCE_PS_PAREN_PROC) {
-            if (ch == '{') {
-                // Measure the minimum before a '{' to allow
-                // folding on "} {"
-                if (levelMinCurrent > levelNext) {
-                    levelMinCurrent = levelNext;
-                }
-                levelNext++;
-            } else if (ch == '}') {
-                levelNext--;
-            }
-        }
-        if (atEOL) {
-            int levelUse = levelCurrent;
-            if (foldAtElse) {
-                levelUse = levelMinCurrent;
-            }
-            int lev = levelUse | levelNext << 16;
-            if (visibleChars == 0 && foldCompact)
-                lev |= SC_FOLDLEVELWHITEFLAG;
-            if (levelUse < levelNext)
-                lev |= SC_FOLDLEVELHEADERFLAG;
-            if (lev != styler.LevelAt(lineCurrent)) {
-                styler.SetLevel(lineCurrent, lev);
-            }
-            lineCurrent++;
-            levelCurrent = levelNext;
-            levelMinCurrent = levelCurrent;
-            visibleChars = 0;
-        }
-        if (!isspacechar(ch))
-            visibleChars++;
-    }
-}
-
-static const char * const psWordListDesc[] = {
-    "PS Level 1 operators",
-    "PS Level 2 operators",
-    "PS Level 3 operators",
-    "RIP-specific operators",
-    "User-defined operators",
-    0
-};
-
-LexerModule lmPS(SCLEX_PS, ColourisePSDoc, "ps", FoldPSDoc, psWordListDesc);
diff --git a/src/stc/scintilla/src/LexPascal.cxx b/src/stc/scintilla/src/LexPascal.cxx
deleted file mode 100644
index 434f88d4fe..0000000000
--- a/src/stc/scintilla/src/LexPascal.cxx
+++ /dev/null
@@ -1,369 +0,0 @@
-// Scintilla source code edit control
-/** @file LexPascal.cxx
- ** Lexer for Pascal.
- ** Written by Laurent le Tynevez
- ** Updated by Simon Steele <s.steele@pnotepad.org> September 2002
- ** Updated by Mathias Rauen <scite@madshi.net> May 2003 (Delphi adjustments)
- **/
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-#include "StyleContext.h"
-
-static void getRange(unsigned int start,
-		unsigned int end,
-		Accessor &styler,
-		char *s,
-		unsigned int len) {
-	unsigned int i = 0;
-	while ((i < end - start + 1) && (i < len-1)) {
-		s[i] = static_cast<char>(tolower(styler[start + i]));
-		i++;
-	}
-	s[i] = '\0';
-}
-
-static bool IsStreamCommentStyle(int style) {
-	return style == SCE_C_COMMENT ||
-		style == SCE_C_COMMENTDOC ||
-		style == SCE_C_COMMENTDOCKEYWORD ||
-		style == SCE_C_COMMENTDOCKEYWORDERROR;
-}
-
-static void ColourTo(Accessor &styler, unsigned int end, unsigned int attr, bool bInAsm) {
-	if ((bInAsm) && (attr == SCE_C_OPERATOR || attr == SCE_C_NUMBER || attr == SCE_C_DEFAULT || attr == SCE_C_WORD || attr == SCE_C_IDENTIFIER)) {
-		styler.ColourTo(end, SCE_C_REGEX);
-	} else
-		styler.ColourTo(end, attr);
-}
-
-// returns 1 if the item starts a class definition, and -1 if the word is "end", and 2 if the word is "asm"
-static int classifyWordPascal(unsigned int start, unsigned int end, /*WordList &keywords*/WordList *keywordlists[], Accessor &styler, bool bInClass, bool bInAsm) {
-	int ret = 0;
-
-	WordList& keywords = *keywordlists[0];
-	WordList& classwords = *keywordlists[1];
-
-	char s[100];
-	getRange(start, end, styler, s, sizeof(s));
-
-	char chAttr = SCE_C_IDENTIFIER;
-	if (isdigit(s[0]) || (s[0] == '.') ||(s[0] == '$')) {
-		chAttr = SCE_C_NUMBER;
-	}
-	else {
-		if (s[0] == '#') {
-			chAttr = SCE_C_CHARACTER;
-		}
-		else {
-			if (keywords.InList(s)) {
-				chAttr = SCE_C_WORD;
-
-				if(strcmp(s, "class") == 0) {
-					ret = 1;
-				}
-				else if (strcmp(s, "asm") == 0) {
-					ret = 2;
-				}
-				else if (strcmp(s, "end") == 0) {
-					ret = -1;
-				}
-			} else if (bInClass) {
-				if (classwords.InList(s)) {
-					chAttr = SCE_C_WORD;
-				}
-			}
-		}
-	}
-	ColourTo(styler, end, chAttr, (bInAsm && ret != -1));
-	return ret;
-}
-
-static int classifyFoldPointPascal(const char* s) {
-	int lev = 0;
-	if (!(isdigit(s[0]) || (s[0] == '.'))) {
-		if (strcmp(s, "begin") == 0 ||
-			strcmp(s, "object") == 0 ||
-			strcmp(s, "case") == 0 ||
-			strcmp(s, "class") == 0 ||
-			strcmp(s, "record") == 0 ||
-			strcmp(s, "try") == 0) {
-			lev=1;
-		} else if (strcmp(s, "end") == 0) {
-			lev=-1;
-		}
-	}
-	return lev;
-}
-
-static void ColourisePascalDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-	Accessor &styler) {
-
-	styler.StartAt(startPos);
-
-	int state = initStyle;
-	if (state == SCE_C_CHARACTER)	// Does not leak onto next line
-		state = SCE_C_DEFAULT;
-	char chPrev = ' ';
-	char chNext = styler[startPos];
-	unsigned int lengthDoc = startPos + length;
-
-	bool bInClassDefinition;
-
-	int currentLine = styler.GetLine(startPos);
-	if (currentLine > 0) {
-		styler.SetLineState(currentLine, styler.GetLineState(currentLine-1));
-		bInClassDefinition = (styler.GetLineState(currentLine) == 1);
-	} else {
-		styler.SetLineState(currentLine, 0);
-		bInClassDefinition = false;
-	}
-
-	bool bInAsm = (state == SCE_C_REGEX);
-	if (bInAsm)
-		state = SCE_C_DEFAULT;
-
-	styler.StartSegment(startPos);
-	for (unsigned int i = startPos; i < lengthDoc; i++) {
-		char ch = chNext;
-
-		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_CHARACTER) {
-				ColourTo(styler, i, state, bInAsm);
-				state = SCE_C_DEFAULT;
-			}
-			currentLine++;
-			styler.SetLineState(currentLine, (bInClassDefinition ? 1 : 0));
-		}
-
-		if (styler.IsLeadByte(ch)) {
-			chNext = styler.SafeGetCharAt(i + 2);
-			chPrev = ' ';
-			i += 1;
-			continue;
-		}
-
-		if (state == SCE_C_DEFAULT) {
-			if (iswordstart(ch) || ch == '#' || ch == '$' || (ch == '@' && bInAsm)) {
-				ColourTo(styler, i-1, state, bInAsm);
-				state = SCE_C_IDENTIFIER;
-			} else if (ch == '{' && chNext != '$' && chNext != '&') {
-				ColourTo(styler, i-1, state, bInAsm);
-				state = SCE_C_COMMENT;
-			} else if (ch == '(' && chNext == '*'
-						&& styler.SafeGetCharAt(i + 2) != '$'
-						&& styler.SafeGetCharAt(i + 2) != '&') {
-				ColourTo(styler, i-1, state, bInAsm);
-				state = SCE_C_COMMENTDOC;
-			} else if (ch == '/' && chNext == '/') {
-				ColourTo(styler, i-1, state, bInAsm);
-				state = SCE_C_COMMENTLINE;
-			} else if (ch == '\'') {
-				ColourTo(styler, i-1, state, bInAsm);
-				state = SCE_C_CHARACTER;
-			} else if (ch == '{' && (chNext == '$' || chNext=='&')) {
-				ColourTo(styler, i-1, state, bInAsm);
-				state = SCE_C_PREPROCESSOR;
-			} else if (isoperator(ch)) {
-				ColourTo(styler, i-1, state, bInAsm);
-				ColourTo(styler, i, SCE_C_OPERATOR, bInAsm);
-
-			}
-		} else if (state == SCE_C_IDENTIFIER) {
-			bool bDoublePoint = ((ch == '.') && (chPrev == '.'));
-			if ((!iswordchar(ch) && ch != '$' && ch != '#' && (ch != '@' || !bInAsm)) || bDoublePoint) {
-				if (bDoublePoint) i--;
-				int lStateChange = classifyWordPascal(styler.GetStartSegment(), i - 1, keywordlists, styler, bInClassDefinition, bInAsm);
-
-				if(lStateChange == 1) {
-					styler.SetLineState(currentLine, 1);
-					bInClassDefinition = true;
-				} else if(lStateChange == 2) {
-					bInAsm = true;
-				} else if(lStateChange == -1) {
-					styler.SetLineState(currentLine, 0);
-					bInClassDefinition = false;
-					bInAsm = false;
-				}
-				if (bDoublePoint) {
-					i++;
-					ColourTo(styler, i-1, SCE_C_DEFAULT, bInAsm);
-				}
-
-				state = SCE_C_DEFAULT;
-				chNext = styler.SafeGetCharAt(i + 1);
-				if (ch == '{' && chNext != '$' && chNext != '&') {
-					state = SCE_C_COMMENT;
-				} else if (ch == '(' && chNext == '*'
-						&& styler.SafeGetCharAt(i + 2) != '$'
-						&& styler.SafeGetCharAt(i + 2) != '&') {
-					ColourTo(styler, i-1, state, bInAsm);
-					state = SCE_C_COMMENTDOC;
-				} else if (ch == '/' && chNext == '/') {
-					state = SCE_C_COMMENTLINE;
-				} else if (ch == '\'') {
-					state = SCE_C_CHARACTER;
-				} else if (isoperator(ch)) {
-					ColourTo(styler, i, SCE_C_OPERATOR, bInAsm);
-				}
-			}
-		} else {
-			if (state == SCE_C_PREPROCESSOR) {
-				if (ch=='}'){
-					ColourTo(styler, i, state, bInAsm);
-					state = SCE_C_DEFAULT;
-				} else {
-					if ((ch == '\r' || ch == '\n') && !(chPrev == '\\' || chPrev == '\r')) {
-						ColourTo(styler, i-1, state, bInAsm);
-						state = SCE_C_DEFAULT;
-					}
-				}
-			} else if (state == SCE_C_COMMENT) {
-				if (ch == '}' ) {
-					ColourTo(styler, i, state, bInAsm);
-					state = SCE_C_DEFAULT;
-				}
-			} else if (state == SCE_C_COMMENTDOC) {
-				if (ch == ')' && chPrev == '*') {
-					if (((i > styler.GetStartSegment() + 2) || (
-						(initStyle == SCE_C_COMMENTDOC) &&
-						(styler.GetStartSegment() == static_cast<unsigned int>(startPos))))) {
-							ColourTo(styler, i, state, bInAsm);
-							state = SCE_C_DEFAULT;
-					}
-				}
-			} else if (state == SCE_C_COMMENTLINE) {
-				if (ch == '\r' || ch == '\n') {
-					ColourTo(styler, i-1, state, bInAsm);
-					state = SCE_C_DEFAULT;
-				}
-			} else if (state == SCE_C_CHARACTER) {
-				if (ch == '\'') {
-					ColourTo(styler, i, state, bInAsm);
-					state = SCE_C_DEFAULT;
-				}
-			}
-		}
-		chPrev = ch;
-	}
-	ColourTo(styler, lengthDoc - 1, state, bInAsm);
-}
-
-static void FoldPascalDoc(unsigned int startPos, int length, int initStyle, WordList *[],
-                            Accessor &styler) {
-	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
-	bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0;
-	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-	unsigned int endPos = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
-	int levelCurrent = levelPrev;
-	char chNext = styler[startPos];
-	int styleNext = styler.StyleAt(startPos);
-	int style = initStyle;
-
-	int lastStart = 0;
-
-	for (unsigned int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		int stylePrev = style;
-		style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-
-		if (stylePrev == SCE_C_DEFAULT && style == SCE_C_WORD)
-		{
-			// Store last word start point.
-			lastStart = i;
-		}
-
-		if (stylePrev == SCE_C_WORD) {
-			if(iswordchar(ch) && !iswordchar(chNext)) {
-				char s[100];
-				getRange(lastStart, i, styler, s, sizeof(s));
-				levelCurrent += classifyFoldPointPascal(s);
-			}
-		}
-
-		if (foldComment && (style == SCE_C_COMMENTLINE)) {
-			if ((ch == '/') && (chNext == '/')) {
-				char chNext2 = styler.SafeGetCharAt(i + 2);
-				if (chNext2 == '{') {
-					levelCurrent++;
-				} else if (chNext2 == '}') {
-					levelCurrent--;
-				}
-			}
-		}
-
-		if (foldPreprocessor && (style == SCE_C_PREPROCESSOR)) {
-			if (ch == '{' && chNext == '$') {
-				unsigned int j=i+2; // skip {$
-				while ((j<endPos) && IsASpaceOrTab(styler.SafeGetCharAt(j))) {
-					j++;
-				}
-				if (styler.Match(j, "region") || styler.Match(j, "if")) {
-					levelCurrent++;
-				} else if (styler.Match(j, "end")) {
-					levelCurrent--;
-				}
-			}
-		}
-
-		if (foldComment && IsStreamCommentStyle(style)) {
-			if (!IsStreamCommentStyle(stylePrev)) {
-				levelCurrent++;
-			} else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
-				// Comments don't end at end of line and the next character may be unstyled.
-				levelCurrent--;
-			}
-		}
-
-		if (atEOL) {
-			int lev = levelPrev;
-			if (visibleChars == 0 && foldCompact)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			if ((levelCurrent > levelPrev) && (visibleChars > 0))
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			levelPrev = levelCurrent;
-			visibleChars = 0;
-		}
-
-		if (!isspacechar(ch))
-			visibleChars++;
-	}
-
-	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
-}
-
-static const char * const pascalWordListDesc[] = {
-	"Keywords",
-	"Classwords",
-	0
-};
-
-LexerModule lmPascal(SCLEX_PASCAL, ColourisePascalDoc, "pascal", FoldPascalDoc, pascalWordListDesc);
diff --git a/src/stc/scintilla/src/LexPerl.cxx b/src/stc/scintilla/src/LexPerl.cxx
deleted file mode 100644
index cb9152ecaf..0000000000
--- a/src/stc/scintilla/src/LexPerl.cxx
+++ /dev/null
@@ -1,1232 +0,0 @@
-// Scintilla source code edit control
-/** @file LexPerl.cxx
- ** Lexer for subset of Perl.
- **/
-// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
-// Lexical analysis fixes by Kein-Hong Man <mkh@pl.jaring.my>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-#define PERLNUM_BINARY 1    // order is significant: 1-4 cannot have a dot
-#define PERLNUM_HEX 2
-#define PERLNUM_OCTAL 3
-#define PERLNUM_FLOAT 4     // actually exponent part
-#define PERLNUM_DECIMAL 5   // 1-5 are numbers; 6-7 are strings
-#define PERLNUM_VECTOR 6
-#define PERLNUM_V_VECTOR 7
-#define PERLNUM_BAD 8
-
-#define BACK_NONE 0         // lookback state for bareword disambiguation:
-#define BACK_OPERATOR 1     // whitespace/comments are insignificant
-#define BACK_KEYWORD 2      // operators/keywords are needed for disambiguation
-
-#define HERE_DELIM_MAX 256
-
-static inline bool isEOLChar(char ch) {
-	return (ch == '\r') || (ch == '\n');
-}
-
-static bool isSingleCharOp(char ch) {
-	char strCharSet[2];
-	strCharSet[0] = ch;
-	strCharSet[1] = '\0';
-	return (NULL != strstr("rwxoRWXOezsfdlpSbctugkTBMAC", strCharSet));
-}
-
-static inline bool isPerlOperator(char ch) {
-	if (ch == '^' || ch == '&' || ch == '\\' ||
-	        ch == '(' || ch == ')' || ch == '-' || ch == '+' ||
-	        ch == '=' || ch == '|' || ch == '{' || ch == '}' ||
-	        ch == '[' || ch == ']' || ch == ':' || ch == ';' ||
-	        ch == '>' || ch == ',' ||
-	        ch == '?' || ch == '!' || ch == '.' || ch == '~')
-		return true;
-	// these chars are already tested before this call
-	// ch == '%' || ch == '*' || ch == '<' || ch == '/' ||
-	return false;
-}
-
-static bool isPerlKeyword(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler) {
-	char s[100];
-    unsigned int i, len = end - start;
-    if (len > 30) { len = 30; }
-	for (i = 0; i < len; i++, start++) s[i] = styler[start];
-    s[i] = '\0';
-	return keywords.InList(s);
-}
-
-static inline bool isEndVar(char ch) {
-	return !isalnum(ch) && ch != '#' && ch != '$' &&
-	       ch != '_' && ch != '\'';
-}
-
-
-static inline bool isNonQuote(char ch) {
-	return isalnum(ch) || ch == '_';
-}
-
-static inline char actualNumStyle(int numberStyle) {
-    if (numberStyle == PERLNUM_VECTOR || numberStyle == PERLNUM_V_VECTOR) {
-        return SCE_PL_STRING;
-    } else if (numberStyle == PERLNUM_BAD) {
-        return SCE_PL_ERROR;
-    }
-    return SCE_PL_NUMBER;
-}
-
-static bool isMatch(Accessor &styler, int lengthDoc, int pos, const char *val) {
-	if ((pos + static_cast<int>(strlen(val))) >= lengthDoc) {
-		return false;
-	}
-	while (*val) {
-		if (*val != styler[pos++]) {
-			return false;
-		}
-		val++;
-	}
-	return true;
-}
-
-static char opposite(char ch) {
-	if (ch == '(')
-		return ')';
-	if (ch == '[')
-		return ']';
-	if (ch == '{')
-		return '}';
-	if (ch == '<')
-		return '>';
-	return ch;
-}
-
-static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
-                             WordList *keywordlists[], Accessor &styler) {
-
-	// Lexer for perl often has to backtrack to start of current style to determine
-	// which characters are being used as quotes, how deeply nested is the
-	// start position and what the termination string is for here documents
-
-	WordList &keywords = *keywordlists[0];
-
-	class HereDocCls {
-	public:
-		int State;		// 0: '<<' encountered
-		// 1: collect the delimiter
-		// 2: here doc text (lines after the delimiter)
-		char Quote;		// the char after '<<'
-		bool Quoted;		// true if Quote in ('\'','"','`')
-		int DelimiterLength;	// strlen(Delimiter)
-		char *Delimiter;	// the Delimiter, 256: sizeof PL_tokenbuf
-		HereDocCls() {
-			State = 0;
-            Quote = 0;
-            Quoted = false;
-			DelimiterLength = 0;
-			Delimiter = new char[HERE_DELIM_MAX];
-			Delimiter[0] = '\0';
-		}
-		~HereDocCls() {
-			delete []Delimiter;
-		}
-	};
-	HereDocCls HereDoc;	// TODO: FIFO for stacked here-docs
-
-	class QuoteCls {
-		public:
-		int  Rep;
-		int  Count;
-		char Up;
-		char Down;
-		QuoteCls() {
-			this->New(1);
-		}
-		void New(int r) {
-			Rep   = r;
-			Count = 0;
-			Up    = '\0';
-			Down  = '\0';
-		}
-		void Open(char u) {
-			Count++;
-			Up    = u;
-			Down  = opposite(Up);
-		}
-	};
-	QuoteCls Quote;
-
-	int state = initStyle;
-	char numState = PERLNUM_DECIMAL;
-	int dotCount = 0;
-	unsigned int lengthDoc = startPos + length;
-	//int sookedpos = 0; // these have no apparent use, see POD state
-	//char sooked[100];
-	//sooked[sookedpos] = '\0';
-
-	// If in a long distance lexical state, seek to the beginning to find quote characters
-	// Perl strings can be multi-line with embedded newlines, so backtrack.
-	// Perl numbers have additional state during lexing, so backtrack too.
-	if (state == SCE_PL_HERE_Q || state == SCE_PL_HERE_QQ || state == SCE_PL_HERE_QX) {
-		while ((startPos > 1) && (styler.StyleAt(startPos) != SCE_PL_HERE_DELIM)) {
-			startPos--;
-		}
-		startPos = styler.LineStart(styler.GetLine(startPos));
-		state = styler.StyleAt(startPos - 1);
-	}
-	if ( state == SCE_PL_STRING_Q
-	|| state == SCE_PL_STRING_QQ
-	|| state == SCE_PL_STRING_QX
-	|| state == SCE_PL_STRING_QR
-	|| state == SCE_PL_STRING_QW
-	|| state == SCE_PL_REGEX
-	|| state == SCE_PL_REGSUBST
-	|| state == SCE_PL_STRING
-	|| state == SCE_PL_BACKTICKS
-	|| state == SCE_PL_CHARACTER
-	|| state == SCE_PL_NUMBER
-	|| state == SCE_PL_IDENTIFIER
-    || state == SCE_PL_ERROR
-	) {
-		while ((startPos > 1) && (styler.StyleAt(startPos - 1) == state)) {
-			startPos--;
-		}
-		state = SCE_PL_DEFAULT;
-	}
-
-    // lookback at start of lexing to set proper state for backflag
-    // after this, they are updated when elements are lexed
-    int backflag = BACK_NONE;
-    unsigned int backPos = startPos;
-    if (backPos > 0) {
-        backPos--;
-        int sty = SCE_PL_DEFAULT;
-        while ((backPos > 0) && (sty = styler.StyleAt(backPos),
-               sty == SCE_PL_DEFAULT || sty == SCE_PL_COMMENTLINE))
-            backPos--;
-        if (sty == SCE_PL_OPERATOR)
-            backflag = BACK_OPERATOR;
-        else if (sty == SCE_PL_WORD)
-            backflag = BACK_KEYWORD;
-    }
-
-	styler.StartAt(startPos);
-	char chPrev = styler.SafeGetCharAt(startPos - 1);
-	if (startPos == 0)
-		chPrev = '\n';
-	char chNext = styler[startPos];
-	styler.StartSegment(startPos);
-
-	for (unsigned int i = startPos; i < lengthDoc; i++) {
-		char ch = chNext;
-		// if the current character is not consumed due to the completion of an
-		// earlier style, lexing can be restarted via a simple goto
-	restartLexer:
-		chNext = styler.SafeGetCharAt(i + 1);
-		char chNext2 = styler.SafeGetCharAt(i + 2);
-
-		if (styler.IsLeadByte(ch)) {
-			chNext = styler.SafeGetCharAt(i + 2);
-			chPrev = ' ';
-			i += 1;
-			continue;
-		}
-		if ((chPrev == '\r' && ch == '\n')) {	// skip on DOS/Windows
-			styler.ColourTo(i, state);
-			chPrev = ch;
-			continue;
-		}
-
-		if (HereDoc.State == 1 && isEOLChar(ch)) {
-			// Begin of here-doc (the line after the here-doc delimiter):
-			// Lexically, the here-doc starts from the next line after the >>, but the
-			// first line of here-doc seem to follow the style of the last EOL sequence
-			HereDoc.State = 2;
-			if (HereDoc.Quoted) {
-				if (state == SCE_PL_HERE_DELIM) {
-					// Missing quote at end of string! We are stricter than perl.
-					// Colour here-doc anyway while marking this bit as an error.
-					state = SCE_PL_ERROR;
-				}
-				styler.ColourTo(i - 1, state);
-				switch (HereDoc.Quote) {
-				case '\'':
-					state = SCE_PL_HERE_Q ;
-					break;
-				case '"':
-					state = SCE_PL_HERE_QQ;
-					break;
-				case '`':
-					state = SCE_PL_HERE_QX;
-					break;
-				}
-			} else {
-				styler.ColourTo(i - 1, state);
-				switch (HereDoc.Quote) {
-				case '\\':
-					state = SCE_PL_HERE_Q ;
-					break;
-				default :
-					state = SCE_PL_HERE_QQ;
-				}
-			}
-		}
-
-		if (state == SCE_PL_DEFAULT) {
-			if (isdigit(ch) || (isdigit(chNext) &&
-				(ch == '.' || ch == 'v'))) {
-				state = SCE_PL_NUMBER;
-                backflag = BACK_NONE;
-				numState = PERLNUM_DECIMAL;
-				dotCount = 0;
-				if (ch == '0') {	// hex,bin,octal
-					if (chNext == 'x') {
-						numState = PERLNUM_HEX;
-					} else if (chNext == 'b') {
-                        numState = PERLNUM_BINARY;
-                    } else if (isdigit(chNext)) {
-                        numState = PERLNUM_OCTAL;
-                    }
-                    if (numState != PERLNUM_DECIMAL) {
-						i++;
-						ch = chNext;
-						chNext = chNext2;
-                    }
-				} else if (ch == 'v') {	// vector
-					numState = PERLNUM_V_VECTOR;
-				}
-			} else if (iswordstart(ch)) {
-                // if immediately prefixed by '::', always a bareword
-                state = SCE_PL_WORD;
-                if (chPrev == ':' && styler.SafeGetCharAt(i - 2) == ':') {
-                    state = SCE_PL_IDENTIFIER;
-                }
-                unsigned int kw = i + 1;
-                // first check for possible quote-like delimiter
-				if (ch == 's' && !isNonQuote(chNext)) {
-					state = SCE_PL_REGSUBST;
-					Quote.New(2);
-				} else if (ch == 'm' && !isNonQuote(chNext)) {
-					state = SCE_PL_REGEX;
-					Quote.New(1);
-				} else if (ch == 'q' && !isNonQuote(chNext)) {
-					state = SCE_PL_STRING_Q;
-					Quote.New(1);
-				} else if (ch == 'y' && !isNonQuote(chNext)) {
-					state = SCE_PL_REGSUBST;
-					Quote.New(2);
-				} else if (ch == 't' && chNext == 'r' && !isNonQuote(chNext2)) {
-					state = SCE_PL_REGSUBST;
-					Quote.New(2);
-                    kw++;
-				} else if (ch == 'q' && (chNext == 'q' || chNext == 'r' || chNext == 'w' || chNext == 'x') && !isNonQuote(chNext2)) {
-					if      (chNext == 'q') state = SCE_PL_STRING_QQ;
-					else if (chNext == 'x') state = SCE_PL_STRING_QX;
-					else if (chNext == 'r') state = SCE_PL_STRING_QR;
-					else if (chNext == 'w') state = SCE_PL_STRING_QW;
-					Quote.New(1);
-                    kw++;
-				} else if (ch == 'x' && (chNext == '=' ||	// repetition
-                           (chNext != '_' && !isalnum(chNext)) ||
-                           (isdigit(chPrev) && isdigit(chNext)))) {
-                    state = SCE_PL_OPERATOR;
-                }
-                // if potentially a keyword, scan forward and grab word, then check
-                // if it's really one; if yes, disambiguation test is performed
-                // otherwise it is always a bareword and we skip a lot of scanning
-                // note: keywords assumed to be limited to [_a-zA-Z] only
-                if (state == SCE_PL_WORD) {
-                    while (iswordstart(styler.SafeGetCharAt(kw))) kw++;
-                    if (!isPerlKeyword(styler.GetStartSegment(), kw, keywords, styler)) {
-                        state = SCE_PL_IDENTIFIER;
-                    }
-                }
-                // if already SCE_PL_IDENTIFIER, then no ambiguity, skip this
-                // for quote-like delimiters/keywords, attempt to disambiguate
-                // to select for bareword, change state -> SCE_PL_IDENTIFIER
-                if (state != SCE_PL_IDENTIFIER && i > 0) {
-                    unsigned int j = i;
-                    bool moreback = false;      // true if passed newline/comments
-                    bool brace = false;         // true if opening brace found
-                    char ch2;
-                    // first look backwards past whitespace/comments for EOLs
-                    // if BACK_NONE, neither operator nor keyword, so skip test
-                    if (backflag != BACK_NONE) {
-                        while (--j > backPos) {
-                            if (isEOLChar(styler.SafeGetCharAt(j)))
-                                moreback = true;
-                        }
-                        ch2 = styler.SafeGetCharAt(j);
-                        if (ch2 == '{' && !moreback) {
-                            // {bareword: possible variable spec
-                            brace = true;
-                        } else if ((ch2 == '&')
-                                // &bareword: subroutine call
-                                || (ch2 == '>' && styler.SafeGetCharAt(j - 1) == '-')
-                                // ->bareword: part of variable spec
-                                || (ch2 == 'b' && styler.Match(j - 2, "su"))) {
-                                // sub bareword: subroutine declaration
-                                // (implied BACK_KEYWORD, no keywords end in 'sub'!)
-                            state = SCE_PL_IDENTIFIER;
-                        }
-                        // if status still ambiguous, look forward after word past
-                        // tabs/spaces only; if ch2 isn't one of '[{(,' it can never
-                        // match anything, so skip the whole thing
-                        j = kw;
-                        if (state != SCE_PL_IDENTIFIER
-                            && (ch2 == '{' || ch2 == '(' || ch2 == '['|| ch2 == ',')
-                            && kw < lengthDoc) {
-                            while (ch2 = styler.SafeGetCharAt(j),
-                                   (ch2 == ' ' || ch2 == '\t') && j < lengthDoc) {
-                                j++;
-                            }
-                            if ((ch2 == '}' && brace)
-                             // {bareword}: variable spec
-                             || (ch2 == '=' && styler.SafeGetCharAt(j + 1) == '>')) {
-                             // [{(, bareword=>: hash literal
-                                state = SCE_PL_IDENTIFIER;
-                            }
-                        }
-                    }
-                }
-                backflag = BACK_NONE;
-                // an identifier or bareword
-                if (state == SCE_PL_IDENTIFIER) {
-                    if ((!iswordchar(chNext) && chNext != '\'')
-                        || (chNext == '.' && chNext2 == '.')) {
-                        // We need that if length of word == 1!
-                        // This test is copied from the SCE_PL_WORD handler.
-                        styler.ColourTo(i, SCE_PL_IDENTIFIER);
-                        state = SCE_PL_DEFAULT;
-                    }
-                // a keyword
-                } else if (state == SCE_PL_WORD) {
-                    i = kw - 1;
-                    if (ch == '_' && chNext == '_' &&
-                        (isMatch(styler, lengthDoc, styler.GetStartSegment(), "__DATA__")
-                      || isMatch(styler, lengthDoc, styler.GetStartSegment(), "__END__"))) {
-                        styler.ColourTo(i, SCE_PL_DATASECTION);
-                        state = SCE_PL_DATASECTION;
-                    } else {
-                        styler.ColourTo(i, SCE_PL_WORD);
-                        state = SCE_PL_DEFAULT;
-                        backflag = BACK_KEYWORD;
-                        backPos = i;
-                    }
-                    ch = styler.SafeGetCharAt(i);
-                    chNext = styler.SafeGetCharAt(i + 1);
-                // a repetition operator 'x'
-                } else if (state == SCE_PL_OPERATOR) {
-                    styler.ColourTo(i, SCE_PL_OPERATOR);
-                    state = SCE_PL_DEFAULT;
-                // quote-like delimiter, skip one char if double-char delimiter
-                } else {
-                    i = kw - 1;
-                    chNext = styler.SafeGetCharAt(i + 1);
-                }
-			} else if (ch == '#') {
-				state = SCE_PL_COMMENTLINE;
-			} else if (ch == '\"') {
-				state = SCE_PL_STRING;
-				Quote.New(1);
-				Quote.Open(ch);
-                backflag = BACK_NONE;
-			} else if (ch == '\'') {
-				if (chPrev == '&') {
-					// Archaic call
-					styler.ColourTo(i, state);
-				} else {
-					state = SCE_PL_CHARACTER;
-					Quote.New(1);
-					Quote.Open(ch);
-				}
-                backflag = BACK_NONE;
-			} else if (ch == '`') {
-				state = SCE_PL_BACKTICKS;
-				Quote.New(1);
-				Quote.Open(ch);
-                backflag = BACK_NONE;
-			} else if (ch == '$') {
-				if ((chNext == '{') || isspacechar(chNext)) {
-					styler.ColourTo(i, SCE_PL_SCALAR);
-				} else {
-					state = SCE_PL_SCALAR;
-					if (chNext == '`' && chNext2 == '`') {
-						i += 2;
-						ch = styler.SafeGetCharAt(i);
-						chNext = styler.SafeGetCharAt(i + 1);
-					} else {
-						i++;
-						ch = chNext;
-						chNext = chNext2;
-					}
-				}
-                backflag = BACK_NONE;
-			} else if (ch == '@') {
-				if (isalpha(chNext) || chNext == '#' || chNext == '$'
-					|| chNext == '_' || chNext == '+' || chNext == '-') {
-					state = SCE_PL_ARRAY;
-				} else if (chNext != '{' && chNext != '[') {
-					styler.ColourTo(i, SCE_PL_ARRAY);
-				} else {
-					styler.ColourTo(i, SCE_PL_ARRAY);
-				}
-                backflag = BACK_NONE;
-			} else if (ch == '%') {
-				if (isalpha(chNext) || chNext == '#' || chNext == '$'
-                    || chNext == '_' || chNext == '!' || chNext == '^') {
-					state = SCE_PL_HASH;
-                    i++;
-                    ch = chNext;
-                    chNext = chNext2;
-				} else if (chNext == '{') {
-					styler.ColourTo(i, SCE_PL_HASH);
-				} else {
-					styler.ColourTo(i, SCE_PL_OPERATOR);
-				}
-                backflag = BACK_NONE;
-			} else if (ch == '*') {
-                char strch[2];
-                strch[0] = chNext;
-                strch[1] = '\0';
-				if (isalpha(chNext) || chNext == '_' ||
-                    NULL != strstr("^/|,\\\";#%^:?<>)[]", strch)) {
-					state = SCE_PL_SYMBOLTABLE;
-                    i++;
-                    ch = chNext;
-                    chNext = chNext2;
-				} else if (chNext == '{') {
-					styler.ColourTo(i, SCE_PL_SYMBOLTABLE);
-				} else {
-					if (chNext == '*') {	// exponentiation
-						i++;
-						ch = chNext;
-						chNext = chNext2;
-					}
-					styler.ColourTo(i, SCE_PL_OPERATOR);
-				}
-                backflag = BACK_NONE;
-			} else if (ch == '/' || (ch == '<' && chNext == '<')) {
-				// Explicit backward peeking to set a consistent preferRE for
-				// any slash found, so no longer need to track preferRE state.
-				// Find first previous significant lexed element and interpret.
-                // Test for HERE doc start '<<' shares this code, helps to
-                // determine if it should be an operator.
-				bool preferRE = false;
-                bool isHereDoc = (ch == '<');
-                bool hereDocSpace = false;      // these are for corner case:
-                bool hereDocScalar = false;     // SCALAR [whitespace] '<<'
-				unsigned int bk = (i > 0)? i - 1: 0;
-				char bkch;
-				styler.Flush();
-                if (styler.StyleAt(bk) == SCE_PL_DEFAULT)
-                    hereDocSpace = true;
-				while ((bk > 0) && (styler.StyleAt(bk) == SCE_PL_DEFAULT ||
-					styler.StyleAt(bk) == SCE_PL_COMMENTLINE)) {
-					bk--;
-				}
-				if (bk == 0) {
-					// position 0 won't really be checked; rarely happens
-					// hard to fix due to an unsigned index i
-					preferRE = true;
-				} else {
-					int bkstyle = styler.StyleAt(bk);
-					bkch = styler.SafeGetCharAt(bk);
-					switch(bkstyle) {
-					case SCE_PL_OPERATOR:
-						preferRE = true;
-						if (bkch == ')' || bkch == ']') {
-							preferRE = false;
-						} else if (bkch == '}') {
-							// backtrack further, count balanced brace pairs
-							// if a brace pair found, see if it's a variable
-							int braceCount = 1;
-							while (--bk > 0) {
-								bkstyle = styler.StyleAt(bk);
-								if (bkstyle == SCE_PL_OPERATOR) {
-									bkch = styler.SafeGetCharAt(bk);
-									if (bkch == ';') {	// early out
-										break;
-									} else if (bkch == '}') {
-										braceCount++;
-									} else if (bkch == '{') {
-										if (--braceCount == 0)
-											break;
-									}
-								}
-							}
-							if (bk == 0) {
-								// at beginning, true
-							} else if (braceCount == 0) {
-								// balanced { found, bk>0, skip more whitespace
-								if (styler.StyleAt(--bk) == SCE_PL_DEFAULT) {
-									while (bk > 0) {
-										bkstyle = styler.StyleAt(--bk);
-										if (bkstyle != SCE_PL_DEFAULT)
-											break;
-									}
-								}
-								bkstyle = styler.StyleAt(bk);
-								if (bkstyle == SCE_PL_SCALAR
-								 || bkstyle == SCE_PL_ARRAY
-								 || bkstyle == SCE_PL_HASH
-								 || bkstyle == SCE_PL_SYMBOLTABLE
-								 || bkstyle == SCE_PL_OPERATOR) {
-									preferRE = false;
-								}
-							}
-						}
-						break;
-					case SCE_PL_IDENTIFIER:
-						preferRE = true;
-						if (bkch == '>') {	// inputsymbol
-							preferRE = false;
-							break;
-						}
-						// backtrack to find "->" or "::" before identifier
-						while (bk > 0 && styler.StyleAt(bk) == SCE_PL_IDENTIFIER) {
-							bk--;
-						}
-						while (bk > 0) {
-							bkstyle = styler.StyleAt(bk);
-							if (bkstyle == SCE_PL_DEFAULT ||
-							    bkstyle == SCE_PL_COMMENTLINE) {
-							} else if (bkstyle == SCE_PL_OPERATOR) {
-								// gcc 3.2.3 bloats if more compact form used
-								bkch = styler.SafeGetCharAt(bk);
-								if (bkch == '>') { // "->"
-									if (styler.SafeGetCharAt(bk - 1) == '-') {
-										preferRE = false;
-										break;
-									}
-								} else if (bkch == ':') { // "::"
-									if (styler.SafeGetCharAt(bk - 1) == ':') {
-										preferRE = false;
-										break;
-									}
-								}
-							} else {// bare identifier, usually a function call but Perl
-								// optimizes them as pseudo-constants, then the next
-								// '/' will be a divide; favour divide over regex
-								// if there is a whitespace after the '/'
-								if (isspacechar(chNext)) {
-									preferRE = false;
-								}
-								break;
-							}
-							bk--;
-						}
-						break;
-                    case SCE_PL_SCALAR:     // for $var<< case
-                        hereDocScalar = true;
-                        break;
-					// other styles uses the default, preferRE=false
-					case SCE_PL_WORD:
-					case SCE_PL_POD:
-					case SCE_PL_POD_VERB:
-					case SCE_PL_HERE_Q:
-					case SCE_PL_HERE_QQ:
-					case SCE_PL_HERE_QX:
-						preferRE = true;
-						break;
-					}
-				}
-                if (isHereDoc) {    // handle HERE doc
-                    // if SCALAR whitespace '<<', *always* a HERE doc
-                    if (preferRE || (hereDocSpace && hereDocScalar)) {
-                        state = SCE_PL_HERE_DELIM;
-                        HereDoc.State = 0;
-                    } else {        // << operator
-						i++;
-						ch = chNext;
-						chNext = chNext2;
-                        styler.ColourTo(i, SCE_PL_OPERATOR);
-                    }
-                } else {            // handle regexp
-                    if (preferRE) {
-                        state = SCE_PL_REGEX;
-                        Quote.New(1);
-                        Quote.Open(ch);
-                    } else {        // / operator
-                        styler.ColourTo(i, SCE_PL_OPERATOR);
-                    }
-                }
-                backflag = BACK_NONE;
-			} else if (ch == '<') {
-				// looks forward for matching > on same line
-				unsigned int fw = i + 1;
-				while (fw < lengthDoc) {
-					char fwch = styler.SafeGetCharAt(fw);
-					if (fwch == ' ') {
-						if (styler.SafeGetCharAt(fw-1) != '\\' ||
-						    styler.SafeGetCharAt(fw-2) != '\\')
-						break;
-					} else if (isEOLChar(fwch) || isspacechar(fwch)) {
-						break;
-					} else if (fwch == '>') {
-						if ((fw - i) == 2 &&	// '<=>' case
-						    styler.SafeGetCharAt(fw-1) == '=') {
-							styler.ColourTo(fw, SCE_PL_OPERATOR);
-						} else {
-							styler.ColourTo(fw, SCE_PL_IDENTIFIER);
-						}
-						i = fw;
-						ch = fwch;
-						chNext = styler.SafeGetCharAt(i+1);
-					}
-					fw++;
-				}
-				styler.ColourTo(i, SCE_PL_OPERATOR);
-                backflag = BACK_NONE;
-			} else if (ch == '='	// POD
-			           && isalpha(chNext)
-			           && (isEOLChar(chPrev))) {
-				state = SCE_PL_POD;
-                backflag = BACK_NONE;
-				//sookedpos = 0;
-				//sooked[sookedpos] = '\0';
-			} else if (ch == '-'	// file test operators
-			           && isSingleCharOp(chNext)
-			           && !isalnum((chNext2 = styler.SafeGetCharAt(i+2)))) {
-				styler.ColourTo(i + 1, SCE_PL_WORD);
-				state = SCE_PL_DEFAULT;
-				i++;
-				ch = chNext;
-				chNext = chNext2;
-                backflag = BACK_NONE;
-			} else if (isPerlOperator(ch)) {
-				if (ch == '.' && chNext == '.') { // .. and ...
-					i++;
-					if (chNext2 == '.') { i++; }
-					state = SCE_PL_DEFAULT;
-					ch = styler.SafeGetCharAt(i);
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-				styler.ColourTo(i, SCE_PL_OPERATOR);
-                backflag = BACK_OPERATOR;
-                backPos = i;
-			} else {
-				// keep colouring defaults to make restart easier
-				styler.ColourTo(i, SCE_PL_DEFAULT);
-			}
-		} else if (state == SCE_PL_NUMBER) {
-			if (ch == '.') {
-				if (chNext == '.') {
-					// double dot is always an operator
-					goto numAtEnd;
-				} else if (numState <= PERLNUM_FLOAT) {
-					// non-decimal number or float exponent, consume next dot
-					styler.ColourTo(i - 1, SCE_PL_NUMBER);
-					styler.ColourTo(i, SCE_PL_OPERATOR);
-					state = SCE_PL_DEFAULT;
-				} else { // decimal or vectors allows dots
-					dotCount++;
-					if (numState == PERLNUM_DECIMAL) {
-						if (dotCount > 1) {
-							if (isdigit(chNext)) { // really a vector
-								numState = PERLNUM_VECTOR;
-							} else	// number then dot
-								goto numAtEnd;
-						}
-					} else { // vectors
-						if (!isdigit(chNext))	// vector then dot
-							goto numAtEnd;
-					}
-				}
-			} else if (ch == '_' && numState == PERLNUM_DECIMAL) {
-				if (!isdigit(chNext)) {
-					goto numAtEnd;
-				}
-			} else if (isalnum(ch)) {
-				if (numState == PERLNUM_VECTOR || numState == PERLNUM_V_VECTOR) {
-					if (isalpha(ch)) {
-						if (dotCount == 0) { // change to word
-							state = SCE_PL_IDENTIFIER;
-						} else { // vector then word
-							goto numAtEnd;
-						}
-					}
-				} else if (numState == PERLNUM_DECIMAL) {
-					if (ch == 'E' || ch == 'e') { // exponent
-						numState = PERLNUM_FLOAT;
-						if (chNext == '+' || chNext == '-') {
-							i++;
-							ch = chNext;
-							chNext = chNext2;
-						}
-					} else if (!isdigit(ch)) { // number then word
-						goto numAtEnd;
-					}
-				} else if (numState == PERLNUM_FLOAT) {
-					if (!isdigit(ch)) { // float then word
-						goto numAtEnd;
-					}
-				} else if (numState == PERLNUM_OCTAL) {
-                    if (!isdigit(ch))
-                        goto numAtEnd;
-                    else if (ch > '7')
-                        numState = PERLNUM_BAD;
-                } else if (numState == PERLNUM_BINARY) {
-                    if (!isdigit(ch))
-                        goto numAtEnd;
-                    else if (ch > '1')
-                        numState = PERLNUM_BAD;
-                } else if (numState == PERLNUM_HEX) {
-                    int ch2 = toupper(ch);
-                    if (!isdigit(ch) && !(ch2 >= 'A' && ch2 <= 'F'))
-                        goto numAtEnd;
-				} else {//(numState == PERLNUM_BAD) {
-                    if (!isdigit(ch))
-                        goto numAtEnd;
-                }
-			} else {
-				// complete current number or vector
-			numAtEnd:
-				styler.ColourTo(i - 1, actualNumStyle(numState));
-				state = SCE_PL_DEFAULT;
-				goto restartLexer;
-			}
-		} else if (state == SCE_PL_IDENTIFIER) {
-			if (!iswordstart(chNext) && chNext != '\'') {
-				styler.ColourTo(i, SCE_PL_IDENTIFIER);
-				state = SCE_PL_DEFAULT;
-				ch = ' ';
-			}
-		} else {
-			if (state == SCE_PL_COMMENTLINE) {
-				if (isEOLChar(ch)) {
-					styler.ColourTo(i - 1, state);
-					state = SCE_PL_DEFAULT;
-					goto restartLexer;
-				} else if (isEOLChar(chNext)) {
-					styler.ColourTo(i, state);
-					state = SCE_PL_DEFAULT;
-				}
-			} else if (state == SCE_PL_HERE_DELIM) {
-				//
-				// From perldata.pod:
-				// ------------------
-				// A line-oriented form of quoting is based on the shell ``here-doc''
-				// syntax.
-				// Following a << you specify a string to terminate the quoted material,
-				// and all lines following the current line down to the terminating
-				// string are the value of the item.
-				// The terminating string may be either an identifier (a word),
-				// or some quoted text.
-				// If quoted, the type of quotes you use determines the treatment of
-				// the text, just as in regular quoting.
-				// An unquoted identifier works like double quotes.
-				// There must be no space between the << and the identifier.
-				// (If you put a space it will be treated as a null identifier,
-				// which is valid, and matches the first empty line.)
-				// (This is deprecated, -w warns of this syntax)
-				// The terminating string must appear by itself (unquoted and with no
-				// surrounding whitespace) on the terminating line.
-				//
-				// From Bash info:
-				// ---------------
-				// Specifier format is: <<[-]WORD
-				// Optional '-' is for removal of leading tabs from here-doc.
-				// Whitespace acceptable after <<[-] operator.
-				//
-				if (HereDoc.State == 0) { // '<<' encountered
-                    bool gotspace = false;
-                    unsigned int oldi = i;
-                    if (chNext == ' ' || chNext == '\t') {
-                        // skip whitespace; legal for quoted delimiters
-                        gotspace = true;
-                        do {
-                            i++;
-                            chNext = styler.SafeGetCharAt(i + 1);
-                        } while ((i + 1 < lengthDoc) && (chNext == ' ' || chNext == '\t'));
-                        chNext2 = styler.SafeGetCharAt(i + 2);
-                    }
-					HereDoc.State = 1;
-					HereDoc.Quote = chNext;
-					HereDoc.Quoted = false;
-					HereDoc.DelimiterLength = 0;
-					HereDoc.Delimiter[HereDoc.DelimiterLength] = '\0';
-					if (chNext == '\'' || chNext == '"' || chNext == '`') {
-                        // a quoted here-doc delimiter
-						i++;
-						ch = chNext;
-						chNext = chNext2;
-						HereDoc.Quoted = true;
-					} else if (isspacechar(chNext) || isdigit(chNext) || chNext == '\\'
-						|| chNext == '=' || chNext == '$' || chNext == '@'
-                        || ((isalpha(chNext) || chNext == '_') && gotspace)) {
-						// left shift << or <<= operator cases
-                        // restore position if operator
-                        i = oldi;
-						styler.ColourTo(i, SCE_PL_OPERATOR);
-						state = SCE_PL_DEFAULT;
-						HereDoc.State = 0;
-                        goto restartLexer;
-					} else {
-						// an unquoted here-doc delimiter, no special handling
-                        // (cannot be prefixed by spaces/tabs), or
-						// symbols terminates; deprecated zero-length delimiter
-					}
-
-				} else if (HereDoc.State == 1) { // collect the delimiter
-                    backflag = BACK_NONE;
-					if (HereDoc.Quoted) { // a quoted here-doc delimiter
-						if (ch == HereDoc.Quote) { // closing quote => end of delimiter
-							styler.ColourTo(i, state);
-							state = SCE_PL_DEFAULT;
-						} else {
-							if (ch == '\\' && chNext == HereDoc.Quote) { // escaped quote
-								i++;
-								ch = chNext;
-								chNext = chNext2;
-							}
-							HereDoc.Delimiter[HereDoc.DelimiterLength++] = ch;
-							HereDoc.Delimiter[HereDoc.DelimiterLength] = '\0';
-						}
-					} else { // an unquoted here-doc delimiter
-						if (isalnum(ch) || ch == '_') {
-							HereDoc.Delimiter[HereDoc.DelimiterLength++] = ch;
-							HereDoc.Delimiter[HereDoc.DelimiterLength] = '\0';
-						} else {
-							styler.ColourTo(i - 1, state);
-							state = SCE_PL_DEFAULT;
-							goto restartLexer;
-						}
-					}
-					if (HereDoc.DelimiterLength >= HERE_DELIM_MAX - 1) {
-						styler.ColourTo(i - 1, state);
-						state = SCE_PL_ERROR;
-						goto restartLexer;
-					}
-				}
-			} else if (HereDoc.State == 2) {
-				// state == SCE_PL_HERE_Q || state == SCE_PL_HERE_QQ || state == SCE_PL_HERE_QX
-				if (isEOLChar(chPrev) && isMatch(styler, lengthDoc, i, HereDoc.Delimiter)) {
-					i += HereDoc.DelimiterLength;
-					chPrev = styler.SafeGetCharAt(i - 1);
-					ch = styler.SafeGetCharAt(i);
-					if (isEOLChar(ch)) {
-						styler.ColourTo(i - 1, state);
-						state = SCE_PL_DEFAULT;
-                        backflag = BACK_NONE;
-						HereDoc.State = 0;
-						goto restartLexer;
-					}
-					chNext = styler.SafeGetCharAt(i + 1);
-				}
-			} else if (state == SCE_PL_POD
-				|| state == SCE_PL_POD_VERB) {
-				if (isEOLChar(chPrev)) {
-					if (ch == ' ' || ch == '\t') {
-						styler.ColourTo(i - 1, state);
-						state = SCE_PL_POD_VERB;
-					} else {
-						styler.ColourTo(i - 1, state);
-						state = SCE_PL_POD;
-						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);
-								goto restartLexer;
-							}
-						}
-					}
-				}
-			} else if (state == SCE_PL_SCALAR	// variable names
-				|| state == SCE_PL_ARRAY
-				|| state == SCE_PL_HASH
-				|| state == SCE_PL_SYMBOLTABLE) {
-				if (ch == ':' && chNext == ':') {	// skip ::
-					i++;
-					ch = chNext;
-					chNext = chNext2;
-				}
-				else if (isEndVar(ch)) {
-					if (i == (styler.GetStartSegment() + 1)) {
-						// Special variable: $(, $_ etc.
-						styler.ColourTo(i, state);
-						state = SCE_PL_DEFAULT;
-					} else {
-						styler.ColourTo(i - 1, state);
-						state = SCE_PL_DEFAULT;
-						goto restartLexer;
-					}
-				}
-			} else if (state == SCE_PL_REGEX
-				|| state == SCE_PL_STRING_QR
-				) {
-				if (!Quote.Up && !isspacechar(ch)) {
-					Quote.Open(ch);
-				} else if (ch == '\\' && Quote.Up != '\\') {
-					// SG: Is it save to skip *every* escaped char?
-					i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				} else {
-					if (ch == Quote.Down /*&& chPrev != '\\'*/) {
-						Quote.Count--;
-						if (Quote.Count == 0) {
-							Quote.Rep--;
-							if (Quote.Up == Quote.Down) {
-								Quote.Count++;
-							}
-						}
-						if (!isalpha(chNext)) {
-							if (Quote.Rep <= 0) {
-								styler.ColourTo(i, state);
-								state = SCE_PL_DEFAULT;
-								ch = ' ';
-							}
-						}
-					} else if (ch == Quote.Up /*&& chPrev != '\\'*/) {
-						Quote.Count++;
-					} else if (!isalpha(chNext)) {
-						if (Quote.Rep <= 0) {
-							styler.ColourTo(i, state);
-							state = SCE_PL_DEFAULT;
-							ch = ' ';
-						}
-					}
-				}
-			} else if (state == SCE_PL_REGSUBST) {
-				if (!Quote.Up && !isspacechar(ch)) {
-					Quote.Open(ch);
-				} else if (ch == '\\' && Quote.Up != '\\') {
-					// SG: Is it save to skip *every* escaped char?
-					i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				} else {
-					if (Quote.Count == 0 && Quote.Rep == 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 Quote.Up 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 (isspacechar(ch)) {
-							// Keep going
-						}
-						else if (isalnum(ch)) {
-							styler.ColourTo(i, state);
-							state = SCE_PL_DEFAULT;
-							ch = ' ';
-						} else {
-							Quote.Open(ch);
-						}
-					} else if (ch == Quote.Down /*&& chPrev != '\\'*/) {
-						Quote.Count--;
-						if (Quote.Count == 0) {
-							Quote.Rep--;
-						}
-						if (!isalpha(chNext)) {
-							if (Quote.Rep <= 0) {
-								styler.ColourTo(i, state);
-								state = SCE_PL_DEFAULT;
-								ch = ' ';
-							}
-						}
-						if (Quote.Up == Quote.Down) {
-							Quote.Count++;
-						}
-					} else if (ch == Quote.Up /*&& chPrev != '\\'*/) {
-						Quote.Count++;
-					} else if (!isalpha(chNext)) {
-						if (Quote.Rep <= 0) {
-							styler.ColourTo(i, state);
-							state = SCE_PL_DEFAULT;
-							ch = ' ';
-						}
-					}
-				}
-			} else if (state == SCE_PL_STRING_Q
-				|| state == SCE_PL_STRING_QQ
-				|| state == SCE_PL_STRING_QX
-				|| state == SCE_PL_STRING_QW
-				|| state == SCE_PL_STRING
-				|| state == SCE_PL_CHARACTER
-				|| state == SCE_PL_BACKTICKS
-				) {
-				if (!Quote.Down && !isspacechar(ch)) {
-					Quote.Open(ch);
-				} else if (ch == '\\' && Quote.Up != '\\') {
-					i++;
-					ch = chNext;
-					chNext = styler.SafeGetCharAt(i + 1);
-				} else if (ch == Quote.Down) {
-					Quote.Count--;
-					if (Quote.Count == 0) {
-						Quote.Rep--;
-						if (Quote.Rep <= 0) {
-							styler.ColourTo(i, state);
-							state = SCE_PL_DEFAULT;
-							ch = ' ';
-						}
-						if (Quote.Up == Quote.Down) {
-							Quote.Count++;
-						}
-					}
-				} else if (ch == Quote.Up) {
-					Quote.Count++;
-				}
-			}
-		}
-		if (state == SCE_PL_ERROR) {
-			break;
-		}
-		chPrev = ch;
-	}
-	styler.ColourTo(lengthDoc - 1, state);
-}
-
-static bool IsCommentLine(int line, Accessor &styler) {
-	int pos = styler.LineStart(line);
-	int eol_pos = styler.LineStart(line + 1) - 1;
-	for (int i = pos; i < eol_pos; i++) {
-		char ch = styler[i];
-        int style = styler.StyleAt(i);
-		if (ch == '#' && style == SCE_PL_COMMENTLINE)
-			return true;
-		else if (ch != ' ' && ch != '\t')
-			return false;
-	}
-	return false;
-}
-
-static void FoldPerlDoc(unsigned int startPos, int length, int, WordList *[],
-                            Accessor &styler) {
-	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
-	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-	// Custom folding of POD and packages
-	bool foldPOD = styler.GetPropertyInt("fold.perl.pod", 1) != 0;
-	bool foldPackage = styler.GetPropertyInt("fold.perl.package", 1) != 0;
-	unsigned int endPos = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelPrev = SC_FOLDLEVELBASE;
-	if (lineCurrent > 0)
-		levelPrev = styler.LevelAt(lineCurrent - 1) >> 16;
-	int levelCurrent = levelPrev;
-	char chNext = styler[startPos];
-	char chPrev = styler.SafeGetCharAt(startPos - 1);
-	int styleNext = styler.StyleAt(startPos);
-	// Used at end of line to determine if the line was a package definition
-	bool isPackageLine = false;
-	bool isPodHeading = false;
-	for (unsigned int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		int style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-		bool atLineStart = isEOLChar(chPrev) || i == 0;
-        // Comment folding
-		if (foldComment && atEOL && IsCommentLine(lineCurrent, styler))
-        {
-            if (!IsCommentLine(lineCurrent - 1, styler)
-                && IsCommentLine(lineCurrent + 1, styler))
-                levelCurrent++;
-            else if (IsCommentLine(lineCurrent - 1, styler)
-                     && !IsCommentLine(lineCurrent+1, styler))
-                levelCurrent--;
-        }
-		if (style == SCE_C_OPERATOR) {
-			if (ch == '{') {
-				levelCurrent++;
-			} else if (ch == '}') {
-				levelCurrent--;
-			}
-		}
-		// Custom POD folding
-		if (foldPOD && atLineStart) {
-			int stylePrevCh = (i) ? styler.StyleAt(i - 1):SCE_PL_DEFAULT;
-			if (style == SCE_PL_POD) {
-				if (stylePrevCh != SCE_PL_POD && stylePrevCh != SCE_PL_POD_VERB)
-					levelCurrent++;
-				else if (styler.Match(i, "=cut"))
-					levelCurrent--;
-				else if (styler.Match(i, "=head"))
-					isPodHeading = true;
-			} else if (style == SCE_PL_DATASECTION) {
-                if (ch == '=' && isalpha(chNext) && levelCurrent == SC_FOLDLEVELBASE)
-                    levelCurrent++;
-                else if (styler.Match(i, "=cut") && levelCurrent > SC_FOLDLEVELBASE)
-                    levelCurrent--;
-                else if (styler.Match(i, "=head"))
-					isPodHeading = true;
-                // if package used or unclosed brace, level > SC_FOLDLEVELBASE!
-                // reset needed as level test is vs. SC_FOLDLEVELBASE
-                else if (styler.Match(i, "__END__"))
-                    levelCurrent = SC_FOLDLEVELBASE;
-            }
-		}
-		// Custom package folding
-		if (foldPackage && atLineStart) {
-			if (style == SCE_PL_WORD && styler.Match(i, "package")) {
-				isPackageLine = true;
-			}
-		}
-
-		if (atEOL) {
-			int lev = levelPrev;
-			if (isPodHeading) {
-                lev = levelPrev - 1;
-                lev |= SC_FOLDLEVELHEADERFLAG;
-                isPodHeading = false;
-			}
-			// Check if line was a package declaration
-			// because packages need "special" treatment
-			if (isPackageLine) {
-				lev = SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG;
-				levelCurrent = SC_FOLDLEVELBASE + 1;
-				isPackageLine = false;
-			}
-            lev |= levelCurrent << 16;
-			if (visibleChars == 0 && foldCompact)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			if ((levelCurrent > levelPrev) && (visibleChars > 0))
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			levelPrev = levelCurrent;
-			visibleChars = 0;
-		}
-		if (!isspacechar(ch))
-			visibleChars++;
-		chPrev = ch;
-	}
-	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
-}
-
-static const char * const perlWordListDesc[] = {
-	"Keywords",
-	0
-};
-
-LexerModule lmPerl(SCLEX_PERL, ColourisePerlDoc, "perl", FoldPerlDoc, perlWordListDesc);
-
diff --git a/src/stc/scintilla/src/LexPython.cxx b/src/stc/scintilla/src/LexPython.cxx
deleted file mode 100644
index 1bdebf6ded..0000000000
--- a/src/stc/scintilla/src/LexPython.cxx
+++ /dev/null
@@ -1,449 +0,0 @@
-// Scintilla source code edit control
-/** @file LexPython.cxx
- ** Lexer for Python.
- **/
-// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-enum kwType { kwOther, kwClass, kwDef, kwImport };
-
-static bool IsPyComment(Accessor &styler, int pos, int len) {
-	return len > 0 && styler[pos] == '#';
-}
-
-static bool IsPyStringStart(int ch, int chNext, int chNext2) {
-	if (ch == '\'' || ch == '"')
-		return true;
-	if (ch == 'u' || ch == 'U') {
-		if (chNext == '"' || chNext == '\'')
-			return true;
-		if ((chNext == 'r' || chNext == 'R') && (chNext2 == '"' || chNext2 == '\''))
-			return true;
-	}
-	if ((ch == 'r' || ch == 'R') && (chNext == '"' || chNext == '\''))
-		return true;
-
-	return false;
-}
-
-/* Return the state to use for the string starting at i; *nextIndex will be set to the first index following the quote(s) */
-static int GetPyStringState(Accessor &styler, int i, unsigned int *nextIndex) {
-	char ch = styler.SafeGetCharAt(i);
-	char chNext = styler.SafeGetCharAt(i + 1);
-
-	// Advance beyond r, u, or ur prefix, but bail if there are any unexpected chars
-	if (ch == 'r' || ch == 'R') {
-		i++;
-		ch = styler.SafeGetCharAt(i);
-		chNext = styler.SafeGetCharAt(i + 1);
-	} else if (ch == 'u' || ch == 'U') {
-		if (chNext == 'r' || chNext == 'R')
-			i += 2;
-		else
-			i += 1;
-		ch = styler.SafeGetCharAt(i);
-		chNext = styler.SafeGetCharAt(i + 1);
-	}
-
-	if (ch != '"' && ch != '\'') {
-		*nextIndex = i + 1;
-		return SCE_P_DEFAULT;
-	}
-
-	if (ch == chNext && ch == styler.SafeGetCharAt(i + 2)) {
-		*nextIndex = i + 3;
-
-		if (ch == '"')
-			return SCE_P_TRIPLEDOUBLE;
-		else
-			return SCE_P_TRIPLE;
-	} else {
-		*nextIndex = i + 1;
-
-		if (ch == '"')
-			return SCE_P_STRING;
-		else
-			return SCE_P_CHARACTER;
-	}
-}
-
-static inline bool IsAWordChar(int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_');
-}
-
-static inline bool IsAWordStart(int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '_');
-}
-
-static void ColourisePyDoc(unsigned int startPos, int length, int initStyle,
-                           WordList *keywordlists[], Accessor &styler) {
-
-	int endPos = startPos + length;
-
-	// Backtrack to previous line in case need to fix its tab whinging
-	int lineCurrent = styler.GetLine(startPos);
-	if (startPos > 0) {
-		if (lineCurrent > 0) {
-			lineCurrent--;
-			startPos = styler.LineStart(lineCurrent);
-			if (startPos == 0)
-				initStyle = SCE_P_DEFAULT;
-			else
-				initStyle = styler.StyleAt(startPos - 1);
-		}
-	}
-
-	WordList &keywords = *keywordlists[0];
-	WordList &keywords2 = *keywordlists[1];
-
-	const int whingeLevel = styler.GetPropertyInt("tab.timmy.whinge.level");
-
-	initStyle = initStyle & 31;
-	if (initStyle == SCE_P_STRINGEOL) {
-		initStyle = SCE_P_DEFAULT;
-	}
-
-	kwType kwLast = kwOther;
-	int spaceFlags = 0;
-	styler.IndentAmount(lineCurrent, &spaceFlags, IsPyComment);
-	bool hexadecimal = false;
-
-	// Python uses a different mask because bad indentation is marked by oring with 32
-	StyleContext sc(startPos, endPos - startPos, initStyle, styler, 0x7f);
-
-	for (; sc.More(); sc.Forward()) {
-
-		if (sc.atLineStart) {
-			const char chBad = static_cast<char>(64);
-			const char chGood = static_cast<char>(0);
-			char chFlags = chGood;
-			if (whingeLevel == 1) {
-				chFlags = (spaceFlags & wsInconsistent) ? chBad : chGood;
-			} else if (whingeLevel == 2) {
-				chFlags = (spaceFlags & wsSpaceTab) ? chBad : chGood;
-			} else if (whingeLevel == 3) {
-				chFlags = (spaceFlags & wsSpace) ? chBad : chGood;
-			} else if (whingeLevel == 4) {
-				chFlags = (spaceFlags & wsTab) ? chBad : chGood;
-			}
-			sc.SetState(sc.state);
-			styler.SetFlags(chFlags, static_cast<char>(sc.state));
-		}
-
-		if (sc.atLineEnd) {
-			if ((sc.state == SCE_P_DEFAULT) ||
-			        (sc.state == SCE_P_TRIPLE) ||
-			        (sc.state == SCE_P_TRIPLEDOUBLE)) {
-				// Perform colourisation of white space and triple quoted strings at end of each line to allow
-				// tab marking to work inside white space and triple quoted strings
-				sc.SetState(sc.state);
-			}
-			lineCurrent++;
-			styler.IndentAmount(lineCurrent, &spaceFlags, IsPyComment);
-			if ((sc.state == SCE_P_STRING) || (sc.state == SCE_P_CHARACTER)) {
-				sc.ChangeState(SCE_P_STRINGEOL);
-				sc.ForwardSetState(SCE_P_DEFAULT);
-			}
-			if (!sc.More())
-				break;
-		}
-
-		bool needEOLCheck = false;
-
-		// Check for a state end
-		if (sc.state == SCE_P_OPERATOR) {
-			kwLast = kwOther;
-			sc.SetState(SCE_P_DEFAULT);
-		} else if (sc.state == SCE_P_NUMBER) {
-			if (!IsAWordChar(sc.ch) &&
-			        !(!hexadecimal && ((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E')))) {
-				sc.SetState(SCE_P_DEFAULT);
-			}
-		} else if (sc.state == SCE_P_IDENTIFIER) {
-			if ((sc.ch == '.') || (!IsAWordChar(sc.ch))) {
-				char s[100];
-				sc.GetCurrent(s, sizeof(s));
-				int style = SCE_P_IDENTIFIER;
-				if ((kwLast == kwImport) && (strcmp(s, "as") == 0)) {
-					style = SCE_P_WORD;
-				} else if (keywords.InList(s)) {
-					style = SCE_P_WORD;
-				} else if (kwLast == kwClass) {
-					style = SCE_P_CLASSNAME;
-				} else if (kwLast == kwDef) {
-					style = SCE_P_DEFNAME;
-				} else if (keywords2.InList(s)) {
-					style = SCE_P_WORD2;
-				}
-				sc.ChangeState(style);
-				sc.SetState(SCE_P_DEFAULT);
-				if (style == SCE_P_WORD) {
-					if (0 == strcmp(s, "class"))
-						kwLast = kwClass;
-					else if (0 == strcmp(s, "def"))
-						kwLast = kwDef;
-					else if (0 == strcmp(s, "import"))
-						kwLast = kwImport;
-					else
-						kwLast = kwOther;
-				} else {
-					kwLast = kwOther;
-				}
-			}
-		} else if ((sc.state == SCE_P_COMMENTLINE) || (sc.state == SCE_P_COMMENTBLOCK)) {
-			if (sc.ch == '\r' || sc.ch == '\n') {
-				sc.SetState(SCE_P_DEFAULT);
-			}
-		} else if (sc.state == SCE_P_DECORATOR) {
-			if (sc.ch == '\r' || sc.ch == '\n') {
-				sc.SetState(SCE_P_DEFAULT);
-			} else if (sc.ch == '#') {
-				sc.SetState((sc.chNext == '#') ? SCE_P_COMMENTBLOCK  :  SCE_P_COMMENTLINE);
-			}
-		} else if ((sc.state == SCE_P_STRING) || (sc.state == SCE_P_CHARACTER)) {
-			if (sc.ch == '\\') {
-				if ((sc.chNext == '\r') && (sc.GetRelative(2) == '\n')) {
-					sc.Forward();
-				}
-				sc.Forward();
-			} else if ((sc.state == SCE_P_STRING) && (sc.ch == '\"')) {
-				sc.ForwardSetState(SCE_P_DEFAULT);
-				needEOLCheck = true;
-			} else if ((sc.state == SCE_P_CHARACTER) && (sc.ch == '\'')) {
-				sc.ForwardSetState(SCE_P_DEFAULT);
-				needEOLCheck = true;
-			}
-		} else if (sc.state == SCE_P_TRIPLE) {
-			if (sc.ch == '\\') {
-				sc.Forward();
-			} else if (sc.Match("\'\'\'")) {
-				sc.Forward();
-				sc.Forward();
-				sc.ForwardSetState(SCE_P_DEFAULT);
-				needEOLCheck = true;
-			}
-		} else if (sc.state == SCE_P_TRIPLEDOUBLE) {
-			if (sc.ch == '\\') {
-				sc.Forward();
-			} else if (sc.Match("\"\"\"")) {
-				sc.Forward();
-				sc.Forward();
-				sc.ForwardSetState(SCE_P_DEFAULT);
-				needEOLCheck = true;
-			}
-		}
-
-		// State exit code may have moved on to end of line
-		if (needEOLCheck && sc.atLineEnd) {
-			lineCurrent++;
-			styler.IndentAmount(lineCurrent, &spaceFlags, IsPyComment);
-			if (!sc.More())
-				break;
-		}
-
-		// Check for a new state starting character
-		if (sc.state == SCE_P_DEFAULT) {
-			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
-				if (sc.ch == '0' && (sc.chNext == 'x' || sc.chNext == 'X')) {
-					hexadecimal = true;
-				} else {
-					hexadecimal = false;
-				}
-				sc.SetState(SCE_P_NUMBER);
-			} else if (isascii(sc.ch) && isoperator(static_cast<char>(sc.ch)) || sc.ch == '`') {
-				sc.SetState(SCE_P_OPERATOR);
-			} else if (sc.ch == '#') {
-				sc.SetState(sc.chNext == '#' ? SCE_P_COMMENTBLOCK : SCE_P_COMMENTLINE);
-			} else if (sc.ch == '@') {
-				sc.SetState(SCE_P_DECORATOR);
-			} else if (IsPyStringStart(sc.ch, sc.chNext, sc.GetRelative(2))) {
-				unsigned int nextIndex = 0;
-				sc.SetState(GetPyStringState(styler, sc.currentPos, &nextIndex));
-				while (nextIndex > (sc.currentPos + 1) && sc.More()) {
-					sc.Forward();
-				}
-			} else if (IsAWordStart(sc.ch)) {
-				sc.SetState(SCE_P_IDENTIFIER);
-			}
-		}
-	}
-	sc.Complete();
-}
-
-static bool IsCommentLine(int line, Accessor &styler) {
-	int pos = styler.LineStart(line);
-	int eol_pos = styler.LineStart(line + 1) - 1;
-	for (int i = pos; i < eol_pos; i++) {
-		char ch = styler[i];
-		if (ch == '#')
-			return true;
-		else if (ch != ' ' && ch != '\t')
-			return false;
-	}
-	return false;
-}
-
-static bool IsQuoteLine(int line, Accessor &styler) {
-	int style = styler.StyleAt(styler.LineStart(line)) & 31;
-	return ((style == SCE_P_TRIPLE) || (style == SCE_P_TRIPLEDOUBLE));
-}
-
-
-static void FoldPyDoc(unsigned int startPos, int length, int /*initStyle - unused*/,
-                      WordList *[], Accessor &styler) {
-	const int maxPos = startPos + length;
-	const int maxLines = styler.GetLine(maxPos - 1);             // Requested last line
-	const int docLines = styler.GetLine(styler.Length() - 1);  // Available last line
-	const bool foldComment = styler.GetPropertyInt("fold.comment.python") != 0;
-	const bool foldQuotes = styler.GetPropertyInt("fold.quotes.python") != 0;
-
-	// Backtrack to previous non-blank line so we can determine indent level
-	// for any white space lines (needed esp. within triple quoted strings)
-	// and so we can fix any preceding fold level (which is why we go back
-	// at least one line in all cases)
-	int spaceFlags = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL);
-	while (lineCurrent > 0) {
-		lineCurrent--;
-		indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL);
-		if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG) &&
-		        (!IsCommentLine(lineCurrent, styler)) &&
-		        (!IsQuoteLine(lineCurrent, styler)))
-			break;
-	}
-	int indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK;
-
-	// Set up initial loop state
-	startPos = styler.LineStart(lineCurrent);
-	int prev_state = SCE_P_DEFAULT & 31;
-	if (lineCurrent >= 1)
-		prev_state = styler.StyleAt(startPos - 1) & 31;
-	int prevQuote = foldQuotes && ((prev_state == SCE_P_TRIPLE) || (prev_state == SCE_P_TRIPLEDOUBLE));
-	int prevComment = 0;
-	if (lineCurrent >= 1)
-		prevComment = foldComment && IsCommentLine(lineCurrent - 1, styler);
-
-	// Process all characters to end of requested range or end of any triple quote
-	// or comment that hangs over the end of the range.  Cap processing in all cases
-	// to end of document (in case of unclosed quote or comment at end).
-	while ((lineCurrent <= docLines) && ((lineCurrent <= maxLines) || prevQuote || prevComment)) {
-
-		// Gather info
-		int lev = indentCurrent;
-		int lineNext = lineCurrent + 1;
-		int indentNext = indentCurrent;
-		int quote = false;
-		if (lineNext <= docLines) {
-			// Information about next line is only available if not at end of document
-			indentNext = styler.IndentAmount(lineNext, &spaceFlags, NULL);
-			int style = styler.StyleAt(styler.LineStart(lineNext)) & 31;
-			quote = foldQuotes && ((style == SCE_P_TRIPLE) || (style == SCE_P_TRIPLEDOUBLE));
-		}
-		const int quote_start = (quote && !prevQuote);
-		const int quote_continue = (quote && prevQuote);
-		const int comment = foldComment && IsCommentLine(lineCurrent, styler);
-		const int comment_start = (comment && !prevComment && (lineNext <= docLines) &&
-		                           IsCommentLine(lineNext, styler) && (lev > SC_FOLDLEVELBASE));
-		const int comment_continue = (comment && prevComment);
-		if ((!quote || !prevQuote) && !comment)
-			indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK;
-		if (quote)
-			indentNext = indentCurrentLevel;
-		if (indentNext & SC_FOLDLEVELWHITEFLAG)
-			indentNext = SC_FOLDLEVELWHITEFLAG | indentCurrentLevel;
-
-		if (quote_start) {
-			// Place fold point at start of triple quoted string
-			lev |= SC_FOLDLEVELHEADERFLAG;
-		} else if (quote_continue || prevQuote) {
-			// Add level to rest of lines in the string
-			lev = lev + 1;
-		} else if (comment_start) {
-			// Place fold point at start of a block of comments
-			lev |= SC_FOLDLEVELHEADERFLAG;
-		} else if (comment_continue) {
-			// Add level to rest of lines in the block
-			lev = lev + 1;
-		}
-
-		// Skip past any blank lines for next indent level info; we skip also
-		// comments (all comments, not just those starting in column 0)
-		// which effectively folds them into surrounding code rather
-		// than screwing up folding.
-
-		while (!quote &&
-		        (lineNext < docLines) &&
-		        ((indentNext & SC_FOLDLEVELWHITEFLAG) ||
-		         (lineNext <= docLines && IsCommentLine(lineNext, styler)))) {
-
-			lineNext++;
-			indentNext = styler.IndentAmount(lineNext, &spaceFlags, NULL);
-		}
-
-		const int levelAfterComments = indentNext & SC_FOLDLEVELNUMBERMASK;
-		const int levelBeforeComments = Platform::Maximum(indentCurrentLevel,levelAfterComments);
-
-		// Now set all the indent levels on the lines we skipped
-		// Do this from end to start.  Once we encounter one line
-		// which is indented more than the line after the end of
-		// the comment-block, use the level of the block before
-
-		int skipLine = lineNext;
-		int skipLevel = levelAfterComments;
-
-		while (--skipLine > lineCurrent) {
-			int skipLineIndent = styler.IndentAmount(skipLine, &spaceFlags, NULL);
-
-			if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > levelAfterComments)
-				skipLevel = levelBeforeComments;
-
-			int whiteFlag = skipLineIndent & SC_FOLDLEVELWHITEFLAG;
-
-			styler.SetLevel(skipLine, skipLevel | whiteFlag);
-		}
-
-		// Set fold header on non-quote/non-comment line
-		if (!quote && !comment && !(indentCurrent & SC_FOLDLEVELWHITEFLAG) ) {
-			if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK))
-				lev |= SC_FOLDLEVELHEADERFLAG;
-		}
-
-		// Keep track of triple quote and block comment state of previous line
-		prevQuote = quote;
-		prevComment = comment_start || comment_continue;
-
-		// Set fold level for this line and move to next line
-		styler.SetLevel(lineCurrent, lev);
-		indentCurrent = indentNext;
-		lineCurrent = lineNext;
-	}
-
-	// NOTE: Cannot set level of last line here because indentCurrent doesn't have
-	// header flag set; the loop above is crafted to take care of this case!
-	//styler.SetLevel(lineCurrent, indentCurrent);
-}
-
-static const char * const pythonWordListDesc[] = {
-	"Keywords",
-	"Highlighted identifiers",
-	0
-};
-
-LexerModule lmPython(SCLEX_PYTHON, ColourisePyDoc, "python", FoldPyDoc,
-					 pythonWordListDesc);
diff --git a/src/stc/scintilla/src/LexRebol.cxx b/src/stc/scintilla/src/LexRebol.cxx
deleted file mode 100644
index f829c1e36b..0000000000
--- a/src/stc/scintilla/src/LexRebol.cxx
+++ /dev/null
@@ -1,319 +0,0 @@
-// Scintilla source code edit control
-/** @file LexRebol.cxx
- ** Lexer for REBOL.
- ** Written by Pascal Hurni, inspired from LexLua by Paul Winwood & Marcos E. Wurzius & Philippe Lhoste
- **
- ** History:
- **		2005-04-07	First release.
- **		2005-04-10	Closing parens and brackets go now in default style
- **					String and comment nesting should be more safe
- **/
-// Copyright 2005 by Pascal Hurni <pascal_hurni@fastmail.fm>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-#include "StyleContext.h"
-
-
-static inline bool IsAWordChar(const int ch) {
-	return (isalnum(ch) || ch == '?' || ch == '!' || ch == '.' || ch == '\'' || ch == '+' || ch == '-' || ch == '*' || ch == '&' || ch == '|' || ch == '=' || ch == '_' || ch == '~');
-}
-
-static inline bool IsAWordStart(const int ch, const int ch2) {
-	return ((ch == '+' || ch == '-' || ch == '.') && !isdigit(ch2)) ||
-		(isalpha(ch) || ch == '?' || ch == '!' || ch == '\'' || ch == '*' || ch == '&' || ch == '|' || ch == '=' || ch == '_' || ch == '~');
-}
-
-static inline bool IsAnOperator(const int ch, const int ch2, const int ch3) {
-	// One char operators
-	if (IsASpaceOrTab(ch2)) {
-		return ch == '+' || ch == '-' || ch == '*' || ch == '/' || ch == '<' || ch == '>' || ch == '=' || ch == '?';
-	}
-
-	// Two char operators
-	if (IsASpaceOrTab(ch3)) {
-		return (ch == '*' && ch2 == '*') ||
-			   (ch == '/' && ch2 == '/') ||
-			   (ch == '<' && (ch2 == '=' || ch2 == '>')) ||
-			   (ch == '>' && ch2 == '=') ||
-			   (ch == '=' && (ch2 == '=' || ch2 == '?')) ||
-			   (ch == '?' && ch2 == '?');
-	}
-
-	return false;
-}
-
-static inline bool IsBinaryStart(const int ch, const int ch2, const int ch3, const int ch4) {
-	return (ch == '#' && ch2 == '{') ||
-		   (IsADigit(ch) && ch2 == '#' && ch3 == '{' ) ||
-		   (IsADigit(ch) && IsADigit(ch2) && ch3 == '#' && ch4 == '{' );
-}
-
-
-static void ColouriseRebolDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor &styler) {
-
-	WordList &keywords = *keywordlists[0];
-	WordList &keywords2 = *keywordlists[1];
-	WordList &keywords3 = *keywordlists[2];
-	WordList &keywords4 = *keywordlists[3];
-	WordList &keywords5 = *keywordlists[4];
-	WordList &keywords6 = *keywordlists[5];
-	WordList &keywords7 = *keywordlists[6];
-	WordList &keywords8 = *keywordlists[7];
-
-	int currentLine = styler.GetLine(startPos);
-	// Initialize the braced string {.. { ... } ..} nesting level, if we are inside such a string.
-	int stringLevel = 0;
-	if (initStyle == SCE_REBOL_BRACEDSTRING || initStyle == SCE_REBOL_COMMENTBLOCK) {
-		stringLevel = styler.GetLineState(currentLine - 1);
-	}
-
-	bool blockComment = initStyle == SCE_REBOL_COMMENTBLOCK;
-	int dotCount = 0;
-
-	// Do not leak onto next line
-	if (initStyle == SCE_REBOL_COMMENTLINE) {
-		initStyle = SCE_REBOL_DEFAULT;
-	}
-
-	StyleContext sc(startPos, length, initStyle, styler);
-	if (startPos == 0) {
-		sc.SetState(SCE_REBOL_PREFACE);
-	}
-	for (; sc.More(); sc.Forward()) {
-
-		//--- What to do at line end ?
-		if (sc.atLineEnd) {
-			// Can be either inside a {} string or simply at eol
-			if (sc.state != SCE_REBOL_BRACEDSTRING && sc.state != SCE_REBOL_COMMENTBLOCK &&
-				sc.state != SCE_REBOL_BINARY && sc.state != SCE_REBOL_PREFACE)
-				sc.SetState(SCE_REBOL_DEFAULT);
-
-			// Update the line state, so it can be seen by next line
-			currentLine = styler.GetLine(sc.currentPos);
-			switch (sc.state) {
-			case SCE_REBOL_BRACEDSTRING:
-			case SCE_REBOL_COMMENTBLOCK:
-				// Inside a braced string, we set the line state
-				styler.SetLineState(currentLine, stringLevel);
-				break;
-			default:
-				// Reset the line state
-				styler.SetLineState(currentLine, 0);
-				break;
-			}
-
-			// continue with next char
-			continue;
-		}
-
-		//--- What to do on white-space ?
-		if (IsASpaceOrTab(sc.ch))
-		{
-			// Return to default if any of these states
-			if (sc.state == SCE_REBOL_OPERATOR || sc.state == SCE_REBOL_CHARACTER ||
-				sc.state == SCE_REBOL_NUMBER || sc.state == SCE_REBOL_PAIR ||
-				sc.state == SCE_REBOL_TUPLE || sc.state == SCE_REBOL_FILE ||
-				sc.state == SCE_REBOL_DATE || sc.state == SCE_REBOL_TIME ||
-				sc.state == SCE_REBOL_MONEY || sc.state == SCE_REBOL_ISSUE ||
-				sc.state == SCE_REBOL_URL || sc.state == SCE_REBOL_EMAIL) {
-				sc.SetState(SCE_REBOL_DEFAULT);
-			}
-		}
-
-		//--- Specialize state ?
-		// URL, Email look like identifier
-		if (sc.state == SCE_REBOL_IDENTIFIER)
-		{
-			if (sc.ch == ':' && !IsASpace(sc.chNext)) {
-				sc.ChangeState(SCE_REBOL_URL);
-			} else if (sc.ch == '@') {
-				sc.ChangeState(SCE_REBOL_EMAIL);
-			} else if (sc.ch == '$') {
-				sc.ChangeState(SCE_REBOL_MONEY);
-			}
-		}
-		// Words look like identifiers
-		if (sc.state == SCE_REBOL_IDENTIFIER || (sc.state >= SCE_REBOL_WORD && sc.state <= SCE_REBOL_WORD8)) {
-			// Keywords ?
-			if (!IsAWordChar(sc.ch) || sc.Match('/')) {
-				char s[100];
-				sc.GetCurrentLowered(s, sizeof(s));
-				blockComment = strcmp(s, "comment") == 0;
-				if (keywords8.InList(s)) {
-					sc.ChangeState(SCE_REBOL_WORD8);
-				} else if (keywords7.InList(s)) {
-					sc.ChangeState(SCE_REBOL_WORD7);
-				} else if (keywords6.InList(s)) {
-					sc.ChangeState(SCE_REBOL_WORD6);
-				} else if (keywords5.InList(s)) {
-					sc.ChangeState(SCE_REBOL_WORD5);
-				} else if (keywords4.InList(s)) {
-					sc.ChangeState(SCE_REBOL_WORD4);
-				} else if (keywords3.InList(s)) {
-					sc.ChangeState(SCE_REBOL_WORD3);
-				} else if (keywords2.InList(s)) {
-					sc.ChangeState(SCE_REBOL_WORD2);
-				} else if (keywords.InList(s)) {
-					sc.ChangeState(SCE_REBOL_WORD);
-				}
-				// Keep same style if there are refinements
-				if (!sc.Match('/')) {
-					sc.SetState(SCE_REBOL_DEFAULT);
-				}
-			}
-		// special numbers
-		} else if (sc.state == SCE_REBOL_NUMBER) {
-			switch (sc.ch) {
-			case 'x':	sc.ChangeState(SCE_REBOL_PAIR);
-						break;
-			case ':':	sc.ChangeState(SCE_REBOL_TIME);
-						break;
-			case '-':
-			case '/':	sc.ChangeState(SCE_REBOL_DATE);
-						break;
-			case '.':	if (++dotCount >= 2) sc.ChangeState(SCE_REBOL_TUPLE);
-						break;
-			}
-		}
-
-		//--- Determine if the current state should terminate
-		if (sc.state == SCE_REBOL_QUOTEDSTRING || sc.state == SCE_REBOL_CHARACTER) {
-			if (sc.ch == '^' && sc.chNext == '\"') {
-				sc.Forward();
-			} else if (sc.ch == '\"') {
-				sc.ForwardSetState(SCE_REBOL_DEFAULT);
-			}
-		} else if (sc.state == SCE_REBOL_BRACEDSTRING || sc.state == SCE_REBOL_COMMENTBLOCK) {
-			if (sc.ch == '}') {
-				if (--stringLevel == 0) {
-					sc.ForwardSetState(SCE_REBOL_DEFAULT);
-				}
-			} else if (sc.ch == '{') {
-				stringLevel++;
-			}
-		} else if (sc.state == SCE_REBOL_BINARY) {
-			if (sc.ch == '}') {
-				sc.ForwardSetState(SCE_REBOL_DEFAULT);
-			}
-		} else if (sc.state == SCE_REBOL_TAG) {
-			if (sc.ch == '>') {
-				sc.ForwardSetState(SCE_REBOL_DEFAULT);
-			}
-		} else if (sc.state == SCE_REBOL_PREFACE) {
-			if (sc.MatchIgnoreCase("rebol"))
-			{
-				int i;
-				for (i=5; IsASpaceOrTab(styler.SafeGetCharAt(sc.currentPos+i, 0)); i++);
-				if (sc.GetRelative(i) == '[')
-					sc.SetState(SCE_REBOL_DEFAULT);
-			}
-		}
-
-		//--- Parens and bracket changes to default style when the current is a number
-		if (sc.state == SCE_REBOL_NUMBER || sc.state == SCE_REBOL_PAIR || sc.state == SCE_REBOL_TUPLE ||
-			sc.state == SCE_REBOL_MONEY || sc.state == SCE_REBOL_ISSUE || sc.state == SCE_REBOL_EMAIL ||
-			sc.state == SCE_REBOL_URL || sc.state == SCE_REBOL_DATE || sc.state == SCE_REBOL_TIME) {
-			if (sc.ch == '(' || sc.ch == '[' || sc.ch == ')' || sc.ch == ']') {
-				sc.SetState(SCE_REBOL_DEFAULT);
-			}
-		}
-
-		//--- Determine if a new state should be entered.
-		if (sc.state == SCE_REBOL_DEFAULT) {
-			if (IsAnOperator(sc.ch, sc.chNext, sc.GetRelative(2))) {
-				sc.SetState(SCE_REBOL_OPERATOR);
-			} else if (IsBinaryStart(sc.ch, sc.chNext, sc.GetRelative(2), sc.GetRelative(3))) {
-				sc.SetState(SCE_REBOL_BINARY);
-			} else if (IsAWordStart(sc.ch, sc.chNext)) {
-				sc.SetState(SCE_REBOL_IDENTIFIER);
-			} else if (IsADigit(sc.ch) || sc.ch == '+' || sc.ch == '-' || /*Decimal*/ sc.ch == '.' || sc.ch == ',') {
-				dotCount = 0;
-				sc.SetState(SCE_REBOL_NUMBER);
-			} else if (sc.ch == '\"') {
-				sc.SetState(SCE_REBOL_QUOTEDSTRING);
-			} else if (sc.ch == '{') {
-				sc.SetState(blockComment ? SCE_REBOL_COMMENTBLOCK : SCE_REBOL_BRACEDSTRING);
-				++stringLevel;
-			} else if (sc.ch == ';') {
-				sc.SetState(SCE_REBOL_COMMENTLINE);
-			} else if (sc.ch == '$') {
-				sc.SetState(SCE_REBOL_MONEY);
-			} else if (sc.ch == '%') {
-				sc.SetState(SCE_REBOL_FILE);
-			} else if (sc.ch == '<') {
-				sc.SetState(SCE_REBOL_TAG);
-			} else if (sc.ch == '#' && sc.chNext == '"') {
-				sc.SetState(SCE_REBOL_CHARACTER);
-				sc.Forward();
-			} else if (sc.ch == '#' && sc.chNext != '"' && sc.chNext != '{' ) {
-				sc.SetState(SCE_REBOL_ISSUE);
-			}
-		}
-	}
-	sc.Complete();
-}
-
-
-static void FoldRebolDoc(unsigned int startPos, int length, int /* initStyle */, WordList *[],
-                            Accessor &styler) {
-	unsigned int lengthDoc = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
-	int levelCurrent = levelPrev;
-	char chNext = styler[startPos];
-	int styleNext = styler.StyleAt(startPos);
-	for (unsigned int i = startPos; i < lengthDoc; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		int style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-		if (style == SCE_REBOL_DEFAULT) {
-			if (ch == '[') {
-				levelCurrent++;
-			} else if (ch == ']') {
-				levelCurrent--;
-			}
-		}
-		if (atEOL) {
-			int lev = levelPrev;
-			if (visibleChars == 0)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			if ((levelCurrent > levelPrev) && (visibleChars > 0))
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			levelPrev = levelCurrent;
-			visibleChars = 0;
-		}
-		if (!isspacechar(ch))
-			visibleChars++;
-	}
-	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
-	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
-}
-
-static const char * const rebolWordListDesc[] = {
-	"Keywords",
-	0
-};
-
-LexerModule lmREBOL(SCLEX_REBOL, ColouriseRebolDoc, "rebol", FoldRebolDoc, rebolWordListDesc);
-
diff --git a/src/stc/scintilla/src/LexRuby.cxx b/src/stc/scintilla/src/LexRuby.cxx
deleted file mode 100644
index f5ad020f40..0000000000
--- a/src/stc/scintilla/src/LexRuby.cxx
+++ /dev/null
@@ -1,1542 +0,0 @@
-// Scintilla source code edit control
-/** @file LexRuby.cxx
- ** Lexer for Ruby.
- **/
-// Copyright 2001- by Clemens Wyss <wys@helbling.ch>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-#ifdef SCI_NAMESPACE
-using namespace Scintilla;
-#endif
-
-//XXX Identical to Perl, put in common area
-static inline bool isEOLChar(char ch) {
-	return (ch == '\r') || (ch == '\n');
-}
-
-#define isSafeASCII(ch) ((unsigned int)(ch) <= 127)
-// This one's redundant, but makes for more readable code
-#define isHighBitChar(ch) ((unsigned int)(ch) > 127)
-
-static inline bool isSafeAlpha(char ch) {
-    return (isSafeASCII(ch) && isalpha(ch)) || ch == '_';
-}
-
-static inline bool isSafeAlnum(char ch) {
-    return (isSafeASCII(ch) && isalnum(ch)) || ch == '_';
-}
-
-static inline bool isSafeAlnumOrHigh(char ch) {
-    return isHighBitChar(ch) || isalnum(ch) || ch == '_';
-}
-
-static inline bool isSafeDigit(char ch) {
-    return isSafeASCII(ch) && isdigit(ch);
-}
-
-static inline bool isSafeWordcharOrHigh(char ch) {
-    return isHighBitChar(ch) || iswordchar(ch);
-}
-
-static bool inline iswhitespace(char ch) {
-	return ch == ' ' || ch == '\t';
-}
-
-#define MAX_KEYWORD_LENGTH 200
-
-#define STYLE_MASK 63
-#define actual_style(style) (style & STYLE_MASK)
-
-static bool followsDot(unsigned int pos, Accessor &styler) {
-    styler.Flush();
-    for (; pos >= 1; --pos) {
-        int style = actual_style(styler.StyleAt(pos));
-        char ch;
-        switch (style) {
-            case SCE_RB_DEFAULT:
-                ch = styler[pos];
-                if (ch == ' ' || ch == '\t') {
-                    //continue
-                } else {
-                    return false;
-                }
-                break;
-                
-            case SCE_RB_OPERATOR:
-                return styler[pos] == '.';
-
-            default:
-                return false;
-        }
-    }
-    return false;
-}
-
-// Forward declarations
-static bool keywordIsAmbiguous(const char *prevWord);
-static bool keywordDoStartsLoop(int pos,
-                                Accessor &styler);
-static bool keywordIsModifier(const char *word,
-                              int pos,
-                              Accessor &styler);
-
-static int ClassifyWordRb(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler, char *prevWord) {
-	char s[100];
-    unsigned int i, j;
-	unsigned int lim = end - start + 1; // num chars to copy
-	if (lim >= MAX_KEYWORD_LENGTH) {
-		lim = MAX_KEYWORD_LENGTH - 1;
-	}
-	for (i = start, j = 0; j < lim; i++, j++) {
-		s[j] = styler[i];
-	}
-    s[j] = '\0';
-	int chAttr;
-	if (0 == strcmp(prevWord, "class"))
-		chAttr = SCE_RB_CLASSNAME;
-	else if (0 == strcmp(prevWord, "module"))
-		chAttr = SCE_RB_MODULE_NAME;
-	else if (0 == strcmp(prevWord, "def"))
-		chAttr = SCE_RB_DEFNAME;
-    else if (keywords.InList(s) && !followsDot(start - 1, styler)) {
-        if (keywordIsAmbiguous(s)
-            && keywordIsModifier(s, start, styler)) {
-            
-            // Demoted keywords are colored as keywords,
-            // but do not affect changes in indentation.
-            //
-            // Consider the word 'if':
-            // 1. <<if test ...>> : normal
-            // 2. <<stmt if test>> : demoted
-            // 3. <<lhs = if ...>> : normal: start a new indent level
-            // 4. <<obj.if = 10>> : color as identifer, since it follows '.'
-            
-            chAttr = SCE_RB_WORD_DEMOTED;
-        } else {
-            chAttr = SCE_RB_WORD;
-        }
-	} else
-        chAttr = SCE_RB_IDENTIFIER;
-	styler.ColourTo(end, chAttr);
-	if (chAttr == SCE_RB_WORD) {
-		strcpy(prevWord, s);
-	} else {
-		prevWord[0] = 0;
-	}
-    return chAttr;
-}
-
-
-//XXX Identical to Perl, put in common area
-static bool isMatch(Accessor &styler, int lengthDoc, int pos, const char *val) {
-	if ((pos + static_cast<int>(strlen(val))) >= lengthDoc) {
-		return false;
-	}
-	while (*val) {
-		if (*val != styler[pos++]) {
-			return false;
-		}
-		val++;
-	}
-	return true;
-}
-
-// Do Ruby better -- find the end of the line, work back,
-// and then check for leading white space
-
-// Precondition: the here-doc target can be indented
-static bool lookingAtHereDocDelim(Accessor	   &styler,
-                                  int 			pos,
-                                  int 			lengthDoc,
-                                  const char   *HereDocDelim)
-{
-    if (!isMatch(styler, lengthDoc, pos, HereDocDelim)) {
-        return false;
-    }
-    while (--pos > 0) {
-        char ch = styler[pos];
-        if (isEOLChar(ch)) {
-            return true;
-        } else if (ch != ' ' && ch != '\t') {
-            return false;
-        }
-    }
-    return false;
-}
-
-//XXX Identical to Perl, put in common area
-static char opposite(char ch) {
-	if (ch == '(')
-		return ')';
-	if (ch == '[')
-		return ']';
-	if (ch == '{')
-		return '}';
-	if (ch == '<')
-		return '>';
-	return ch;
-}
-
-// Null transitions when we see we've reached the end
-// and need to relex the curr char.
-
-static void redo_char(int &i, char &ch, char &chNext, char &chNext2,
-                      int &state) {
-    i--;
-    chNext2 = chNext;
-    chNext = ch;
-    state = SCE_RB_DEFAULT;
-}
-
-static void advance_char(int &i, char &ch, char &chNext, char &chNext2) {
-    i++;
-    ch = chNext;
-    chNext = chNext2;
-}
-
-// precondition: startPos points to one after the EOL char
-static bool currLineContainsHereDelims(int& startPos,
-                                       Accessor &styler) {
-    if (startPos <= 1)
-        return false;
-
-    int pos;
-    for (pos = startPos - 1; pos > 0; pos--) {
-        char ch = styler.SafeGetCharAt(pos);
-        if (isEOLChar(ch)) {
-            // Leave the pointers where they are -- there are no
-            // here doc delims on the current line, even if
-            // the EOL isn't default style
-            
-            return false;
-        } else {
-            styler.Flush();
-            if (actual_style(styler.StyleAt(pos)) == SCE_RB_HERE_DELIM) {
-                break;
-            }
-        }
-    }
-    if (pos == 0) {
-        return false;
-    }
-    // Update the pointers so we don't have to re-analyze the string
-    startPos = pos;
-    return true;
-}
-
-
-static bool isEmptyLine(int pos,
-                        Accessor &styler) {
-	int spaceFlags = 0;
-	int lineCurrent = styler.GetLine(pos);
-	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL);
-    return (indentCurrent & SC_FOLDLEVELWHITEFLAG) != 0;
-}
-
-static bool RE_CanFollowKeyword(const char *keyword) {
-    if (!strcmp(keyword, "and")
-        || !strcmp(keyword, "begin")
-        || !strcmp(keyword, "break")
-        || !strcmp(keyword, "case")
-        || !strcmp(keyword, "do")
-        || !strcmp(keyword, "else")
-        || !strcmp(keyword, "elsif")
-        || !strcmp(keyword, "if")
-        || !strcmp(keyword, "next")
-        || !strcmp(keyword, "return")
-        || !strcmp(keyword, "when")
-        || !strcmp(keyword, "unless")
-        || !strcmp(keyword, "until")
-        || !strcmp(keyword, "not")
-        || !strcmp(keyword, "or")) {
-        return true;
-    }
-    return false;
-}
-
-// Look at chars up to but not including endPos
-// Don't look at styles in case we're looking forward
-
-static int skipWhitespace(int startPos,
-                           int endPos,
-                           Accessor &styler) {
-    for (int i = startPos; i < endPos; i++) {
-        if (!iswhitespace(styler[i])) {
-            return i;
-        }
-    }
-    return endPos;
-}
-    
-// This routine looks for false positives like
-// undef foo, <<
-// There aren't too many.
-//
-// iPrev points to the start of <<
-
-static bool sureThisIsHeredoc(int iPrev, 
-                              Accessor &styler,
-                              char *prevWord) {
-                    
-    // Not so fast, since Ruby's so dynamic.  Check the context
-    // to make sure we're OK.
-    int prevStyle;
-    int lineStart = styler.GetLine(iPrev);
-    int lineStartPosn = styler.LineStart(lineStart);
-    styler.Flush();
-
-    // Find the first word after some whitespace
-    int firstWordPosn = skipWhitespace(lineStartPosn, iPrev, styler);
-    if (firstWordPosn >= iPrev) {
-        // Have something like {^     <<}
-		//XXX Look at the first previous non-comment non-white line
-		// to establish the context.  Not too likely though.
-        return true;
-    } else {
-        switch (prevStyle = styler.StyleAt(firstWordPosn)) {
-        case SCE_RB_WORD:
-        case SCE_RB_WORD_DEMOTED:
-        case SCE_RB_IDENTIFIER:
-            break;
-        default:
-            return true;
-        }
-    }
-    int firstWordEndPosn = firstWordPosn;
-    char *dst = prevWord;
-    for (;;) {
-        if (firstWordEndPosn >= iPrev ||
-            styler.StyleAt(firstWordEndPosn) != prevStyle) {
-            *dst = 0;
-            break;
-        }
-        *dst++ = styler[firstWordEndPosn];
-        firstWordEndPosn += 1;
-    }
-    //XXX Write a style-aware thing to regex scintilla buffer objects
-    if (!strcmp(prevWord, "undef")
-        || !strcmp(prevWord, "def")
-        || !strcmp(prevWord, "alias")) {
-        // These keywords are what we were looking for
-        return false;
-    }
-    return true;
-}
-
-// Routine that saves us from allocating a buffer for the here-doc target
-// targetEndPos points one past the end of the current target
-static bool haveTargetMatch(int currPos,
-                            int lengthDoc,
-                            int targetStartPos,
-                            int targetEndPos,
-                            Accessor &styler) {
-    if (lengthDoc - currPos < targetEndPos - targetStartPos) {
-        return false;
-    }
-    int i, j;
-    for (i = targetStartPos, j = currPos;
-         i < targetEndPos && j < lengthDoc;
-         i++, j++) {
-        if (styler[i] != styler[j]) {
-            return false;
-        }
-    }
-    return true;
-}
-
-// We need a check because the form
-// [identifier] <<[target]
-// is ambiguous.  The Ruby lexer/parser resolves it by
-// looking to see if [identifier] names a variable or a
-// function.  If it's the first, it's the start of a here-doc.
-// If it's a var, it's an operator.  This lexer doesn't
-// maintain a symbol table, so it looks ahead to see what's
-// going on, in cases where we have
-// ^[white-space]*[identifier([.|::]identifier)*][white-space]*<<[target]
-//
-// If there's no occurrence of [target] on a line, assume we don't.
-
-// return true == yes, we have no heredocs
-
-static bool sureThisIsNotHeredoc(int lt2StartPos,
-                                 Accessor &styler) {
-    int prevStyle;
-     // Use full document, not just part we're styling
-    int lengthDoc = styler.Length();
-    int lineStart = styler.GetLine(lt2StartPos);
-    int lineStartPosn = styler.LineStart(lineStart);
-    styler.Flush();
-    const bool definitely_not_a_here_doc = true;
-    const bool looks_like_a_here_doc = false;
-    
-    // Find the first word after some whitespace
-    int firstWordPosn = skipWhitespace(lineStartPosn, lt2StartPos, styler);
-    if (firstWordPosn >= lt2StartPos) {
-        return definitely_not_a_here_doc;
-    }
-    prevStyle = styler.StyleAt(firstWordPosn);
-    // If we have '<<' following a keyword, it's not a heredoc
-    if (prevStyle != SCE_RB_IDENTIFIER) {
-        return definitely_not_a_here_doc;
-    }
-    int newStyle = prevStyle;
-    // Some compilers incorrectly warn about uninit newStyle
-    for (firstWordPosn += 1; firstWordPosn <= lt2StartPos; firstWordPosn += 1) {
-        // Inner loop looks at the name
-        for (; firstWordPosn <= lt2StartPos; firstWordPosn += 1) {
-            newStyle = styler.StyleAt(firstWordPosn);
-            if (newStyle != prevStyle) {
-                break;
-            }
-        }
-        // Do we have '::' or '.'?
-        if (firstWordPosn < lt2StartPos && newStyle == SCE_RB_OPERATOR) {
-            char ch = styler[firstWordPosn];
-            if (ch == '.') {
-                // yes
-            } else if (ch == ':') {
-                if (styler.StyleAt(++firstWordPosn) != SCE_RB_OPERATOR) {
-                    return definitely_not_a_here_doc;
-                } else if (styler[firstWordPosn] != ':') {
-                    return definitely_not_a_here_doc;
-                }
-            } else {
-                break;
-            }
-        } else {
-            break;
-        }
-    }
-    // Skip next batch of white-space
-    firstWordPosn = skipWhitespace(firstWordPosn, lt2StartPos, styler);
-    if (firstWordPosn != lt2StartPos) {
-        // Have [[^ws[identifier]ws[*something_else*]ws<<
-        return definitely_not_a_here_doc;
-    }
-    // OK, now 'j' will point to the current spot moving ahead
-	int j = firstWordPosn + 1;
-    if (styler.StyleAt(j) != SCE_RB_OPERATOR || styler[j] != '<') {
-        // This shouldn't happen
-        return definitely_not_a_here_doc;
-    }
-    int nextLineStartPosn = styler.LineStart(lineStart + 1);
-    if (nextLineStartPosn >= lengthDoc) {
-        return definitely_not_a_here_doc;
-    }
-    j = skipWhitespace(j + 1, nextLineStartPosn, styler);
-    if (j >= lengthDoc) {
-        return definitely_not_a_here_doc;
-    }
-    bool allow_indent;
-    int target_start, target_end;
-    // From this point on no more styling, since we're looking ahead
-    if (styler[j] == '-') {
-        allow_indent = true;
-        j++;
-    } else {
-        allow_indent = false;
-    }
-
-    // Allow for quoted targets.
-    char target_quote = 0;
-    switch (styler[j]) {
-    case '\'':
-    case '"':
-    case '`':
-        target_quote = styler[j];
-        j += 1;
-    }
-    
-    if (isSafeAlnum(styler[j])) {
-        // Init target_end because some compilers think it won't
-        // be initialized by the time it's used
-        target_start = target_end = j;
-        j++;
-    } else {
-        return definitely_not_a_here_doc;
-    }
-    for (; j < lengthDoc; j++) {
-        if (!isSafeAlnum(styler[j])) {
-            if (target_quote && styler[j] != target_quote) {
-                // unquoted end
-                return definitely_not_a_here_doc;
-            }
-
-            // And for now make sure that it's a newline
-            // don't handle arbitrary expressions yet
-            
-            target_end = j;
-			if (target_quote) {
-				// Now we can move to the character after the string delimiter.
-				j += 1;
-			}
-            j = skipWhitespace(j, lengthDoc, styler);
-            if (j >= lengthDoc) {
-                return definitely_not_a_here_doc;
-            } else {
-                char ch = styler[j];
-                if (ch == '#' || isEOLChar(ch)) {
-                    // This is OK, so break and continue;
-                    break;
-                } else {
-                    return definitely_not_a_here_doc;
-                }
-            }
-        }
-    }
-
-    // Just look at the start of each line
-    int last_line = styler.GetLine(lengthDoc - 1);
-    // But don't go too far
-    if (last_line > lineStart + 50) {
-        last_line = lineStart + 50;
-    }
-    for (int line_num = lineStart + 1; line_num <= last_line; line_num++) {
-        if (allow_indent) {
-            j = skipWhitespace(styler.LineStart(line_num), lengthDoc, styler);
-        } else {
-            j = styler.LineStart(line_num);
-        }
-        // target_end is one past the end
-        if (haveTargetMatch(j, lengthDoc, target_start, target_end, styler)) {
-            // We got it
-            return looks_like_a_here_doc;
-        }
-    }
-    return definitely_not_a_here_doc;
-}
-
-//todo: if we aren't looking at a stdio character,
-// move to the start of the first line that is not in a 
-// multi-line construct
-
-static void synchronizeDocStart(unsigned int& startPos,
-                                int &length,
-                                int &initStyle,
-                                Accessor &styler,
-                                bool skipWhiteSpace=false) {
-
-    styler.Flush();
-    int style = actual_style(styler.StyleAt(startPos));
-    switch (style) {
-        case SCE_RB_STDIN:
-        case SCE_RB_STDOUT:
-        case SCE_RB_STDERR:
-            // Don't do anything else with these.
-            return;
-    }
-    
-    int pos = startPos;
-    // Quick way to characterize each line
-    int lineStart;
-    for (lineStart = styler.GetLine(pos); lineStart > 0; lineStart--) {
-        // Now look at the style before the previous line's EOL
-        pos = styler.LineStart(lineStart) - 1;
-        if (pos <= 10) {
-            lineStart = 0;
-            break;
-        }
-        char ch = styler.SafeGetCharAt(pos);
-        char chPrev = styler.SafeGetCharAt(pos - 1);
-        if (ch == '\n' && chPrev == '\r') {
-            pos--;
-        }
-        if (styler.SafeGetCharAt(pos - 1) == '\\') {
-            // Continuation line -- keep going
-        } else if (actual_style(styler.StyleAt(pos)) != SCE_RB_DEFAULT) {
-            // Part of multi-line construct -- keep going
-        } else if (currLineContainsHereDelims(pos, styler)) {
-            // Keep going, with pos and length now pointing
-            // at the end of the here-doc delimiter
-        } else if (skipWhiteSpace && isEmptyLine(pos, styler)) {
-            // Keep going
-        } else {
-            break;
-        }
-    }
-    pos = styler.LineStart(lineStart);
-    length += (startPos - pos);
-    startPos = pos;
-    initStyle = SCE_RB_DEFAULT;
-}
-
-static void ColouriseRbDoc(unsigned int startPos, int length, int initStyle,
-						   WordList *keywordlists[], Accessor &styler) {
-
-	// Lexer for Ruby often has to backtrack to start of current style to determine
-	// which characters are being used as quotes, how deeply nested is the
-	// start position and what the termination string is for here documents
-    
-	WordList &keywords = *keywordlists[0];
-
-	class HereDocCls {
-	public:
-		int State;
-        // States
-        // 0: '<<' encountered
-		// 1: collect the delimiter
-        // 1b: text between the end of the delimiter and the EOL
-		// 2: here doc text (lines after the delimiter)
-		char Quote;		// the char after '<<'
-		bool Quoted;		// true if Quote in ('\'','"','`')
-		int DelimiterLength;	// strlen(Delimiter)
-		char Delimiter[256];	// the Delimiter, limit of 256: from Perl
-        bool CanBeIndented;
-		HereDocCls() {
-			State = 0;
-			DelimiterLength = 0;
-			Delimiter[0] = '\0';
-            CanBeIndented = false;
-		}
-	};
-	HereDocCls HereDoc;	
-
-	class QuoteCls {
-		public:
-		int  Count;
-		char Up;
-		char Down;
-		QuoteCls() {
-			this->New();
-		}
-		void New() {
-			Count = 0;
-			Up    = '\0';
-			Down  = '\0';
-		}
-		void Open(char u) {
-			Count++;
-			Up    = u;
-			Down  = opposite(Up);
-		}
-	};
-	QuoteCls Quote;
-
-    int numDots = 0;  // For numbers --
-                      // Don't start lexing in the middle of a num
-
-    synchronizeDocStart(startPos, length, initStyle, styler, // ref args
-                        false);
-
-	bool preferRE = true;
-    int state = initStyle;
-	int lengthDoc = startPos + length;
-
-	char prevWord[MAX_KEYWORD_LENGTH + 1]; // 1 byte for zero
-	prevWord[0] = '\0';
-	if (length == 0)
-		return;
-
-	char chPrev = styler.SafeGetCharAt(startPos - 1);
-	char chNext = styler.SafeGetCharAt(startPos);
-	// Ruby uses a different mask because bad indentation is marked by oring with 32
-	styler.StartAt(startPos, 127);
-	styler.StartSegment(startPos);
-
-    static int q_states[] = {SCE_RB_STRING_Q,
-                             SCE_RB_STRING_QQ,
-                             SCE_RB_STRING_QR,
-                             SCE_RB_STRING_QW,
-                             SCE_RB_STRING_QW,
-                             SCE_RB_STRING_QX};
-    static const char* q_chars = "qQrwWx";
-    
-	for (int i = startPos; i < lengthDoc; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		char chNext2 = styler.SafeGetCharAt(i + 2);
-
-        if (styler.IsLeadByte(ch)) {
-			chNext = chNext2;
-			chPrev = ' ';
-			i += 1;
-			continue;
-		}
-		
-        // skip on DOS/Windows
-        //No, don't, because some things will get tagged on,
-        // so we won't recognize keywords, for example
-#if 0
-		if (ch == '\r' && chNext == '\n') {
-	    	continue;
-        }
-#endif
-            
-        if (HereDoc.State == 1 && isEOLChar(ch)) {
-			// Begin of here-doc (the line after the here-doc delimiter):
-			HereDoc.State = 2;
-			styler.ColourTo(i-1, state);
-            // Don't check for a missing quote, just jump into
-            // the here-doc state
-            state = SCE_RB_HERE_Q;
-        }
-
-        // Regular transitions
-		if (state == SCE_RB_DEFAULT) {
-            if (isSafeDigit(ch)) {
-            	styler.ColourTo(i - 1, state);
-				state = SCE_RB_NUMBER;
-                numDots = 0;
-            } else if (isHighBitChar(ch) || iswordstart(ch)) {
-            	styler.ColourTo(i - 1, state);
-				state = SCE_RB_WORD;
-			} else if (ch == '#') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_RB_COMMENTLINE;
-			} else if (ch == '=') {
-				// =begin indicates the start of a comment (doc) block
-                if (i == 0 || isEOLChar(chPrev)
-                    && chNext == 'b'
-                    && styler.SafeGetCharAt(i + 2) == 'e'
-                    && styler.SafeGetCharAt(i + 3) == 'g'
-                    && styler.SafeGetCharAt(i + 4) == 'i'
-                    && styler.SafeGetCharAt(i + 5) == 'n'
-                    && !isSafeWordcharOrHigh(styler.SafeGetCharAt(i + 6))) {
-                    styler.ColourTo(i - 1, state);
-                    state = SCE_RB_POD;
-				} else {
-					styler.ColourTo(i - 1, state);
-					styler.ColourTo(i, SCE_RB_OPERATOR);
-					preferRE = true;
-				}
-			} else if (ch == '"') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_RB_STRING;
-				Quote.New();
-				Quote.Open(ch);
-			} else if (ch == '\'') {
-                styler.ColourTo(i - 1, state);
-                state = SCE_RB_CHARACTER;
-                Quote.New();
-                Quote.Open(ch);
-			} else if (ch == '`') {
-				styler.ColourTo(i - 1, state);
-				state = SCE_RB_BACKTICKS;
-				Quote.New();
-				Quote.Open(ch);
-			} else if (ch == '@') {
-                // Instance or class var
-				styler.ColourTo(i - 1, state);
-                if (chNext == '@') {
-                    state = SCE_RB_CLASS_VAR;
-                    advance_char(i, ch, chNext, chNext2); // pass by ref
-                } else {
-                    state = SCE_RB_INSTANCE_VAR;
-                }
-			} else if (ch == '$') {
-                // Check for a builtin global
-				styler.ColourTo(i - 1, state);
-                // Recognize it bit by bit
-                state = SCE_RB_GLOBAL;
-            } else if (ch == '/' && preferRE) {
-                // Ambigous operator
-				styler.ColourTo(i - 1, state);
-				state = SCE_RB_REGEX;
-                Quote.New();
-                Quote.Open(ch);
-			} else if (ch == '<' && chNext == '<' && chNext2 != '=') {
-
-                // Recognise the '<<' symbol - either a here document or a binary op
-				styler.ColourTo(i - 1, state);
-                i++;
-                chNext = chNext2;
-				styler.ColourTo(i, SCE_RB_OPERATOR);
-
-                if (! (strchr("\"\'`_-", chNext2) || isSafeAlpha(chNext2))) {
-                    // It's definitely not a here-doc,
-                    // based on Ruby's lexer/parser in the
-                    // heredoc_identifier routine.
-                    // Nothing else to do.
-                } else if (preferRE) {
-                    if (sureThisIsHeredoc(i - 1, styler, prevWord)) {
-                        state = SCE_RB_HERE_DELIM;
-                        HereDoc.State = 0;
-                    }
-                    // else leave it in default state
-                } else {
-                    if (sureThisIsNotHeredoc(i - 1, styler)) {
-                        // leave state as default
-                        // We don't have all the heuristics Perl has for indications
-                        // of a here-doc, because '<<' is overloadable and used
-                        // for so many other classes.
-                    } else {
-                        state = SCE_RB_HERE_DELIM;
-                        HereDoc.State = 0;
-                    }
-                }
-                preferRE = (state != SCE_RB_HERE_DELIM);
-            } else if (ch == ':') {
-				styler.ColourTo(i - 1, state);
-                if (chNext == ':') {
-                    // Mark "::" as an operator, not symbol start
-                    styler.ColourTo(i + 1, SCE_RB_OPERATOR);
-                    advance_char(i, ch, chNext, chNext2); // pass by ref
-                    state = SCE_RB_DEFAULT;
-					preferRE = false;
-                } else if (isSafeWordcharOrHigh(chNext)) {
-					state = SCE_RB_SYMBOL;
-                } else if (strchr("[*!~+-*/%=<>&^|", chNext)) {
-                    // Do the operator analysis in-line, looking ahead
-                    // Based on the table in pickaxe 2nd ed., page 339
-                    bool doColoring = true;
-                    switch (chNext) {
-                    case '[':
-                        if (chNext2 == ']' ) {
-                            char ch_tmp = styler.SafeGetCharAt(i + 3);
-                            if (ch_tmp == '=') {
-                                i += 3;
-                                ch = ch_tmp;
-                                chNext = styler.SafeGetCharAt(i + 1);
-                            } else {
-                                i += 2;
-                                ch = chNext2;
-                                chNext = ch_tmp;
-                            }
-                        } else {
-                            doColoring = false;
-                        }
-                        break;
-
-                    case '*':
-                        if (chNext2 == '*') {
-                            i += 2;
-                            ch = chNext2;
-                            chNext = styler.SafeGetCharAt(i + 1);
-                        } else {
-                            advance_char(i, ch, chNext, chNext2);
-                        }
-                        break;
-
-                    case '!':
-                        if (chNext2 == '=' || chNext2 == '~') {
-                            i += 2;
-                            ch = chNext2;
-                            chNext = styler.SafeGetCharAt(i + 1);
-                        } else {
-                            advance_char(i, ch, chNext, chNext2);
-                        }
-                        break;
-
-                    case '<':
-                        if (chNext2 == '<') {
-                            i += 2;
-                            ch = chNext2;
-                            chNext = styler.SafeGetCharAt(i + 1);
-                        } else if (chNext2 == '=') {
-                            char ch_tmp = styler.SafeGetCharAt(i + 3);
-                            if (ch_tmp == '>') {  // <=> operator
-                                i += 3;
-                                ch = ch_tmp;
-                                chNext = styler.SafeGetCharAt(i + 1);
-                            } else {
-                                i += 2;
-                                ch = chNext2;
-                                chNext = ch_tmp;
-                            }
-                        } else {
-                            advance_char(i, ch, chNext, chNext2);
-                        }
-                        break;
-
-                    default:
-                        // Simple one-character operators
-                        advance_char(i, ch, chNext, chNext2);
-                        break;
-                    }
-                    if (doColoring) {
-                        styler.ColourTo(i, SCE_RB_SYMBOL);
-                        state = SCE_RB_DEFAULT;
-                    }
-				} else if (!preferRE) {
-					// Don't color symbol strings (yet)
-					// Just color the ":" and color rest as string
-					styler.ColourTo(i, SCE_RB_SYMBOL);
-					state = SCE_RB_DEFAULT;
-                } else {
-                    styler.ColourTo(i, SCE_RB_OPERATOR);
-                    state = SCE_RB_DEFAULT;
-                    preferRE = true;
-                }
-            } else if (ch == '%') {
-                styler.ColourTo(i - 1, state);
-                bool have_string = false;
-                if (strchr(q_chars, chNext) && !isSafeWordcharOrHigh(chNext2)) {
-                    Quote.New();
-                    const char *hit = strchr(q_chars, chNext);
-                    if (hit != NULL) {
-                        state = q_states[hit - q_chars];
-                        Quote.Open(chNext2);
-                        i += 2;
-                        ch = chNext2;
-						chNext = styler.SafeGetCharAt(i + 1);
-                        have_string = true;
-                    }
-                } else if (!isSafeWordcharOrHigh(chNext)) {
-                    // Ruby doesn't allow high bit chars here,
-                    // but the editor host might
-                    state = SCE_RB_STRING_QQ;
-                    Quote.Open(chNext);
-                    advance_char(i, ch, chNext, chNext2); // pass by ref
-                    have_string = true;
-                }
-                if (!have_string) {
-                    styler.ColourTo(i, SCE_RB_OPERATOR);
-                    // stay in default
-                    preferRE = true;
-                }
-            } else if (isoperator(ch) || ch == '.') {
-				styler.ColourTo(i - 1, state);
-				styler.ColourTo(i, SCE_RB_OPERATOR);
-                // If we're ending an expression or block,
-                // assume it ends an object, and the ambivalent
-                // constructs are binary operators
-                //
-                // So if we don't have one of these chars,
-                // we aren't ending an object exp'n, and ops
-                // like : << / are unary operators.
-                
-                preferRE = (strchr(")}].", ch) == NULL);
-                // Stay in default state
-            } else if (isEOLChar(ch)) {
-                // Make sure it's a true line-end, with no backslash
-                if ((ch == '\r' || (ch == '\n' && chPrev != '\r'))
-                    && chPrev != '\\') {
-                    // Assume we've hit the end of the statement.
-                    preferRE = true;
-                }
-            }
-        } else if (state == SCE_RB_WORD) {
-            if (ch == '.' || !isSafeWordcharOrHigh(ch)) {
-                // Words include x? in all contexts,
-                // and <letters>= after either 'def' or a dot
-                // Move along until a complete word is on our left
-
-                // Default accessor treats '.' as word-chars,
-                // but we don't for now.
-                
-                if (ch == '='
-                    && isSafeWordcharOrHigh(chPrev)
-                    && (chNext == '('
-                        || strchr(" \t\n\r", chNext) != NULL)
-                    && (!strcmp(prevWord, "def")
-                        || followsDot(styler.GetStartSegment(), styler))) {
-                    // <name>= is a name only when being def'd -- Get it the next time
-                    // This means that <name>=<name> is always lexed as
-                    // <name>, (op, =), <name>
-                } else if ((ch == '?' || ch == '!')
-                           && isSafeWordcharOrHigh(chPrev)
-                           && !isSafeWordcharOrHigh(chNext)) {
-                    // <name>? is a name -- Get it the next time
-                    // But <name>?<name> is always lexed as
-                    // <name>, (op, ?), <name>
-                    // Same with <name>! to indicate a method that
-                    // modifies its target
-                } else if (isEOLChar(ch)
-                           && isMatch(styler, lengthDoc, i - 7, "__END__")) {
-                    styler.ColourTo(i, SCE_RB_DATASECTION);
-                    state = SCE_RB_DATASECTION;
-                    // No need to handle this state -- we'll just move to the end
-                    preferRE = false;
-                } else {
-					int wordStartPos = styler.GetStartSegment();
-                    int word_style = ClassifyWordRb(wordStartPos, i - 1, keywords, styler, prevWord);
-                    switch (word_style) {
-                        case SCE_RB_WORD:
-                            preferRE = RE_CanFollowKeyword(prevWord);
-							break;
-                            
-                        case SCE_RB_WORD_DEMOTED:
-                            preferRE = true;
-							break;
-                            
-                        case SCE_RB_IDENTIFIER:
-                            if (isMatch(styler, lengthDoc, wordStartPos, "print")) {
-                                preferRE = true;
-                            } else if (isEOLChar(ch)) {
-                                preferRE = true;
-                            } else {
-                                preferRE = false;
-                            }
-							break;
-                        default:
-                            preferRE = false;
-                    }
-                    if (ch == '.') {
-                        // We might be redefining an operator-method
-                        preferRE = false;
-                    }
-                    // And if it's the first 
-                    redo_char(i, ch, chNext, chNext2, state); // pass by ref
-                }
-            }
-        } else if (state == SCE_RB_NUMBER) {
-            if (isSafeAlnumOrHigh(ch) || ch == '_') {
-                // Keep going
-            } else if (ch == '.' && ++numDots == 1) {
-                // Keep going
-            } else {
-                styler.ColourTo(i - 1, state);
-                redo_char(i, ch, chNext, chNext2, state); // pass by ref
-                preferRE = false;
-            }
-        } else if (state == SCE_RB_COMMENTLINE) {
-			if (isEOLChar(ch)) {
-                styler.ColourTo(i - 1, state);
-                state = SCE_RB_DEFAULT;
-                // Use whatever setting we had going into the comment
-            }
-        } else if (state == SCE_RB_HERE_DELIM) {
-            // See the comment for SCE_RB_HERE_DELIM in LexPerl.cxx
-            // Slightly different: if we find an immediate '-',
-            // the target can appear indented.
-            
-			if (HereDoc.State == 0) { // '<<' encountered
-				HereDoc.State = 1;
-                HereDoc.DelimiterLength = 0;
-                if (ch == '-') {
-                    HereDoc.CanBeIndented = true;
-                    advance_char(i, ch, chNext, chNext2); // pass by ref
-                } else {
-                    HereDoc.CanBeIndented = false;
-                }
-                if (isEOLChar(ch)) {
-                    // Bail out of doing a here doc if there's no target
-                    state = SCE_RB_DEFAULT;
-                    preferRE = false;
-                } else {
-                    HereDoc.Quote = ch;
-                
-                    if (ch == '\'' || ch == '"' || ch == '`') {
-                        HereDoc.Quoted = true;
-                        HereDoc.Delimiter[0] = '\0';
-                    } else {
-                        HereDoc.Quoted = false;
-                        HereDoc.Delimiter[0] = ch;
-                        HereDoc.Delimiter[1] = '\0';
-                        HereDoc.DelimiterLength = 1;
-                    }
-                }
-			} else if (HereDoc.State == 1) { // collect the delimiter
-                if (isEOLChar(ch)) {
-                    // End the quote now, and go back for more
-                    styler.ColourTo(i - 1, state);
-                    state = SCE_RB_DEFAULT;
-                    i--;
-                    chNext = ch;
-                    chNext2 = chNext;
-                    preferRE = false;
-                } else if (HereDoc.Quoted) {
-					if (ch == HereDoc.Quote) { // closing quote => end of delimiter
-						styler.ColourTo(i, state);
-						state = SCE_RB_DEFAULT;
-                        preferRE = false;
-                    } else {
-						if (ch == '\\' && !isEOLChar(chNext)) {
-                            advance_char(i, ch, chNext, chNext2);
-						}
-						HereDoc.Delimiter[HereDoc.DelimiterLength++] = ch;
-						HereDoc.Delimiter[HereDoc.DelimiterLength] = '\0';
-                    }
-                } else { // an unquoted here-doc delimiter
-					if (isSafeAlnumOrHigh(ch) || ch == '_') {
-						HereDoc.Delimiter[HereDoc.DelimiterLength++] = ch;
-						HereDoc.Delimiter[HereDoc.DelimiterLength] = '\0';
-					} else {
-						styler.ColourTo(i - 1, state);
-                        redo_char(i, ch, chNext, chNext2, state);
-                        preferRE = false;
-					}
-                }
-				if (HereDoc.DelimiterLength >= static_cast<int>(sizeof(HereDoc.Delimiter)) - 1) {
-					styler.ColourTo(i - 1, state);
-					state = SCE_RB_ERROR;
-                    preferRE = false;
-				}
-            }
-        } else if (state == SCE_RB_HERE_Q) {
-            // Not needed: HereDoc.State == 2
-            // Indentable here docs: look backwards
-            // Non-indentable: look forwards, like in Perl
-            //
-            // Why: so we can quickly resolve things like <<-" abc"
-
-            if (!HereDoc.CanBeIndented) {
-                if (isEOLChar(chPrev)
-                    && isMatch(styler, lengthDoc, i, HereDoc.Delimiter)) {
-                    styler.ColourTo(i - 1, state);
-                    i += HereDoc.DelimiterLength - 1;
-                    chNext = styler.SafeGetCharAt(i + 1);
-                    if (isEOLChar(chNext)) {
-                        styler.ColourTo(i, SCE_RB_HERE_DELIM);
-                        state = SCE_RB_DEFAULT;
-                        HereDoc.State = 0;
-                        preferRE = false;
-                    }
-                    // Otherwise we skipped through the here doc faster.
-                }
-            } else if (isEOLChar(chNext)
-                       && lookingAtHereDocDelim(styler,
-                                                i - HereDoc.DelimiterLength + 1,
-                                                lengthDoc,
-                                                HereDoc.Delimiter)) {
-                styler.ColourTo(i - 1 - HereDoc.DelimiterLength, state);
-                styler.ColourTo(i, SCE_RB_HERE_DELIM);
-                state = SCE_RB_DEFAULT;
-                preferRE = false;
-                HereDoc.State = 0;
-            }
-        } else if (state == SCE_RB_CLASS_VAR
-                   || state == SCE_RB_INSTANCE_VAR
-                   || state == SCE_RB_SYMBOL) {
-            if (!isSafeWordcharOrHigh(ch)) {
-                styler.ColourTo(i - 1, state);
-                redo_char(i, ch, chNext, chNext2, state); // pass by ref
-                preferRE = false;
-            }
-        } else if (state == SCE_RB_GLOBAL) {
-            if (!isSafeWordcharOrHigh(ch)) {
-                // handle special globals here as well
-                if (chPrev == '$') {
-                    if (ch == '-') {
-                        // Include the next char, like $-a
-                        advance_char(i, ch, chNext, chNext2);
-                    }
-                    styler.ColourTo(i, state);
-                    state = SCE_RB_DEFAULT;
-                } else {
-                    styler.ColourTo(i - 1, state);
-                    redo_char(i, ch, chNext, chNext2, state); // pass by ref
-                }
-                preferRE = false;
-            }
-        } else if (state == SCE_RB_POD) {
-            // PODs end with ^=end\s, -- any whitespace can follow =end
-            if (strchr(" \t\n\r", ch) != NULL
-                && i > 5
-                && isEOLChar(styler[i - 5])
-                && isMatch(styler, lengthDoc, i - 4, "=end")) {
-                styler.ColourTo(i - 1, state);
-                state = SCE_RB_DEFAULT;
-                preferRE = false;
-            }
-        } else if (state == SCE_RB_REGEX || state == SCE_RB_STRING_QR) {
-            if (ch == '\\' && Quote.Up != '\\') {
-                // Skip one
-                advance_char(i, ch, chNext, chNext2);
-            } else if (ch == Quote.Down) {
-                Quote.Count--;
-                if (Quote.Count == 0) {
-                    // Include the options
-                    while (isSafeAlpha(chNext)) {
-                        i++;
-						ch = chNext;
-                        chNext = styler.SafeGetCharAt(i + 1);
-                    }
-                    styler.ColourTo(i, state);
-                    state = SCE_RB_DEFAULT;
-                    preferRE = false;
-                }
-            } else if (ch == Quote.Up) {
-                // Only if close quoter != open quoter
-                Quote.Count++;
-                
-            } else if (ch == '#' ) {
-                //todo: distinguish comments from pound chars
-                // for now, handle as comment
-                styler.ColourTo(i - 1, state);
-                bool inEscape = false;
-                while (++i < lengthDoc) {
-                    ch = styler.SafeGetCharAt(i);
-                    if (ch == '\\') {
-                        inEscape = true;
-                    } else if (isEOLChar(ch)) {
-                        // Comment inside a regex
-                        styler.ColourTo(i - 1, SCE_RB_COMMENTLINE);
-                        break;
-                    } else if (inEscape) {
-                        inEscape = false;  // don't look at char
-                    } else if (ch == Quote.Down) {
-                        // Have the regular handler deal with this
-                        // to get trailing modifiers.
-                        i--;
-                        ch = styler[i];
-						break;
-                    }
-                }
-                chNext = styler.SafeGetCharAt(i + 1);
-                chNext2 = styler.SafeGetCharAt(i + 2);
-            }
-        // Quotes of all kinds...
-        } else if (state == SCE_RB_STRING_Q || state == SCE_RB_STRING_QQ || 
-                   state == SCE_RB_STRING_QX || state == SCE_RB_STRING_QW ||
-                   state == SCE_RB_STRING || state == SCE_RB_CHARACTER ||
-                   state == SCE_RB_BACKTICKS) {
-            if (!Quote.Down && !isspacechar(ch)) {
-                Quote.Open(ch);
-            } else if (ch == '\\' && Quote.Up != '\\') {
-                //Riddle me this: Is it safe to skip *every* escaped char?
-                advance_char(i, ch, chNext, chNext2);
-            } else if (ch == Quote.Down) {
-                Quote.Count--;
-                if (Quote.Count == 0) {
-                    styler.ColourTo(i, state);
-                    state = SCE_RB_DEFAULT;
-                    preferRE = false;
-                }
-            } else if (ch == Quote.Up) {
-                Quote.Count++;
-            }
-        }
-            
-        if (state == SCE_RB_ERROR) {
-            break;
-        }
-        chPrev = ch;
-    }
-    if (state == SCE_RB_WORD) {
-        // We've ended on a word, possibly at EOF, and need to
-        // classify it.
-        (void) ClassifyWordRb(styler.GetStartSegment(), lengthDoc - 1, keywords, styler, prevWord);
-    } else {
-        styler.ColourTo(lengthDoc - 1, state);
-    }
-}
-
-// Helper functions for folding, disambiguation keywords
-// Assert that there are no high-bit chars 
-
-static void getPrevWord(int pos,
-                        char *prevWord,
-                        Accessor &styler,
-                        int word_state)
-{
-    int i;
-    styler.Flush();
-    for (i = pos - 1; i > 0; i--) {
-        if (actual_style(styler.StyleAt(i)) != word_state) {
-            i++;
-            break;
-        }
-    }
-    if (i < pos - MAX_KEYWORD_LENGTH) // overflow
-        i = pos - MAX_KEYWORD_LENGTH;
-    char *dst = prevWord;
-    for (; i <= pos; i++) {
-        *dst++ = styler[i];
-    }
-	*dst = 0;
-}
-
-static bool keywordIsAmbiguous(const char *prevWord)
-{
-    // Order from most likely used to least likely
-    // Lots of ways to do a loop in Ruby besides 'while/until'
-    if (!strcmp(prevWord, "if")
-        || !strcmp(prevWord, "do")
-        || !strcmp(prevWord, "while")
-        || !strcmp(prevWord, "unless")
-        || !strcmp(prevWord, "until")) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
-// Demote keywords in the following conditions:
-// if, while, unless, until modify a statement
-// do after a while or until, as a noise word (like then after if) 
-
-static bool keywordIsModifier(const char *word,
-                              int pos,
-                              Accessor &styler)
-{
-    if (word[0] == 'd' && word[1] == 'o' && !word[2]) {
-        return keywordDoStartsLoop(pos, styler);
-    }
-    char ch;
-    int style = SCE_RB_DEFAULT;
-	int lineStart = styler.GetLine(pos);
-    int lineStartPosn = styler.LineStart(lineStart);
-    styler.Flush();
-    while (--pos >= lineStartPosn) {
-        style = actual_style(styler.StyleAt(pos));
-		if (style == SCE_RB_DEFAULT) {
-			if (iswhitespace(ch = styler[pos])) {
-				//continue
-			} else if (ch == '\r' || ch == '\n') {
-				// Scintilla's LineStart() and GetLine() routines aren't
-				// platform-independent, so if we have text prepared with
-				// a different system we can't rely on it.
-				return false;
-			}
-		} else {
-            break;
-		}
-    }
-    if (pos < lineStartPosn) {
-        return false; //XXX not quite right if the prev line is a continuation
-    }
-    // First things where the action is unambiguous
-    switch (style) {
-        case SCE_RB_DEFAULT:
-        case SCE_RB_COMMENTLINE:
-        case SCE_RB_POD:
-        case SCE_RB_CLASSNAME:
-        case SCE_RB_DEFNAME:
-        case SCE_RB_MODULE_NAME:
-            return false;
-        case SCE_RB_OPERATOR:
-            break;
-        case SCE_RB_WORD:
-            // Watch out for uses of 'else if'
-            //XXX: Make a list of other keywords where 'if' isn't a modifier
-            //     and can appear legitimately
-            // Formulate this to avoid warnings from most compilers
-            if (strcmp(word, "if") == 0) {
-                char prevWord[MAX_KEYWORD_LENGTH + 1];
-                getPrevWord(pos, prevWord, styler, SCE_RB_WORD);
-                return strcmp(prevWord, "else") != 0;
-            }
-            return true;
-        default:
-            return true;
-    }
-    // Assume that if the keyword follows an operator,
-    // usually it's a block assignment, like
-    // a << if x then y else z
-    
-    ch = styler[pos];
-    switch (ch) {
-        case ')':
-        case ']':
-        case '}':
-            return true;
-        default:
-            return false;
-    }
-}
-
-#define WHILE_BACKWARDS "elihw"
-#define UNTIL_BACKWARDS "litnu"
-
-// Nothing fancy -- look to see if we follow a while/until somewhere
-// on the current line
-
-static bool keywordDoStartsLoop(int pos,
-                                Accessor &styler)
-{
-    char ch;
-    int style;
-	int lineStart = styler.GetLine(pos);
-    int lineStartPosn = styler.LineStart(lineStart);
-    styler.Flush();
-    while (--pos >= lineStartPosn) {
-        style = actual_style(styler.StyleAt(pos));
-		if (style == SCE_RB_DEFAULT) {
-			if ((ch = styler[pos]) == '\r' || ch == '\n') {
-				// Scintilla's LineStart() and GetLine() routines aren't
-				// platform-independent, so if we have text prepared with
-				// a different system we can't rely on it.
-				return false;
-			}
-		} else if (style == SCE_RB_WORD) {
-            // Check for while or until, but write the word in backwards
-            char prevWord[MAX_KEYWORD_LENGTH + 1]; // 1 byte for zero
-            char *dst = prevWord;
-            int wordLen = 0;
-            int start_word;
-            for (start_word = pos;
-                 start_word >= lineStartPosn && actual_style(styler.StyleAt(start_word)) == SCE_RB_WORD;
-                 start_word--) {
-                if (++wordLen < MAX_KEYWORD_LENGTH) {
-                    *dst++ = styler[start_word];
-                }
-            }
-            *dst = 0;
-            // Did we see our keyword?
-            if (!strcmp(prevWord, WHILE_BACKWARDS)
-                || !strcmp(prevWord, UNTIL_BACKWARDS)) {
-                return true;
-            }
-            // We can move pos to the beginning of the keyword, and then
-            // accept another decrement, as we can never have two contiguous
-            // keywords:
-            // word1 word2
-            //           ^
-            //        <-  move to start_word
-            //      ^
-            //      <- loop decrement
-            //     ^  # pointing to end of word1 is fine
-            pos = start_word;
-        }
-    }
-    return false;
-}
-
-/*
- *  Folding Ruby
- * 
- *  The language is quite complex to analyze without a full parse.
- *  For example, this line shouldn't affect fold level:
- * 
- *   print "hello" if feeling_friendly?
- * 
- *  Neither should this:
- * 
- *   print "hello" \
- *      if feeling_friendly?
- * 
- * 
- *  But this should:
- * 
- *   if feeling_friendly?  #++
- *     print "hello" \
- *     print "goodbye"
- *   end                   #--
- * 
- *  So we cheat, by actually looking at the existing indentation
- *  levels for each line, and just echoing it back.  Like Python.
- *  Then if we get better at it, we'll take braces into consideration,
- *  which always affect folding levels.
-
- *  How the keywords should work:
- *  No effect:
- *  __FILE__ __LINE__ BEGIN END alias and 
- *  defined? false in nil not or self super then
- *  true undef
-
- *  Always increment:
- *  begin  class def do for module when {
- * 
- *  Always decrement:
- *  end }
- * 
- *  Increment if these start a statement
- *  if unless until while -- do nothing if they're modifiers
-
- *  These end a block if there's no modifier, but don't bother
- *  break next redo retry return yield
- * 
- *  These temporarily de-indent, but re-indent
- *  case else elsif ensure rescue
- * 
- *  This means that the folder reflects indentation rather
- *  than setting it.  The language-service updates indentation
- *  when users type return and finishes entering de-denters.
- * 
- *  Later offer to fold POD, here-docs, strings, and blocks of comments
- */
-
-static void FoldRbDoc(unsigned int startPos, int length, int initStyle,
-                      WordList *[], Accessor &styler) {
-	const bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
-    
-    synchronizeDocStart(startPos, length, initStyle, styler, // ref args
-                        false);
-	unsigned int endPos = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelPrev = startPos == 0 ? 0 : (styler.LevelAt(lineCurrent)
-                                         & SC_FOLDLEVELNUMBERMASK
-                                         & ~SC_FOLDLEVELBASE);
-	int levelCurrent = levelPrev;
-	char chNext = styler[startPos];
-	int styleNext = styler.StyleAt(startPos);
-	int stylePrev = startPos <= 1 ? SCE_RB_DEFAULT : styler.StyleAt(startPos - 1);
-    bool buffer_ends_with_eol = false;
-	for (unsigned int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		int style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-        if (style == SCE_RB_COMMENTLINE) {
-            if (foldComment && stylePrev != SCE_RB_COMMENTLINE) {
-                if (chNext == '{') {
-					levelCurrent++;
-				} else if (chNext == '}') {
-					levelCurrent--;
-				}
-            }
-        } else if (style == SCE_RB_OPERATOR) {
-			if (strchr("[{(", ch)) {
-				levelCurrent++;
-			} else if (strchr(")}]", ch)) {
-                // Don't decrement below 0
-                if (levelCurrent > 0)
-                    levelCurrent--;
-			}
-        } else if (style == SCE_RB_WORD && styleNext != SCE_RB_WORD) {
-            // Look at the keyword on the left and decide what to do
-            char prevWord[MAX_KEYWORD_LENGTH + 1]; // 1 byte for zero
-            prevWord[0] = 0;
-            getPrevWord(i, prevWord, styler, SCE_RB_WORD);
-            if (!strcmp(prevWord, "end")) {
-                // Don't decrement below 0
-                if (levelCurrent > 0)
-                    levelCurrent--;
-            } else if (   !strcmp(prevWord, "if")
-                       || !strcmp(prevWord, "def")
-                       || !strcmp(prevWord, "class")
-                       || !strcmp(prevWord, "module")
-                       || !strcmp(prevWord, "begin")
-                       || !strcmp(prevWord, "case")
-                       || !strcmp(prevWord, "do")
-                       || !strcmp(prevWord, "while")
-                       || !strcmp(prevWord, "unless")
-                       || !strcmp(prevWord, "until")
-                       || !strcmp(prevWord, "for")
-                          ) {
-				levelCurrent++;
-            }
-        }
-		if (atEOL) {
-			int lev = levelPrev;
-			if (visibleChars == 0 && foldCompact)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			if ((levelCurrent > levelPrev) && (visibleChars > 0))
-				lev |= SC_FOLDLEVELHEADERFLAG;
-            styler.SetLevel(lineCurrent, lev|SC_FOLDLEVELBASE);
-			lineCurrent++;
-			levelPrev = levelCurrent;
-			visibleChars = 0;
-            buffer_ends_with_eol = true;
-		} else if (!isspacechar(ch)) {
-			visibleChars++;
-            buffer_ends_with_eol = false;
-        }
-    }
-	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
-    if (!buffer_ends_with_eol) {
-        lineCurrent++;
-        int new_lev = levelCurrent;
-        if (visibleChars == 0 && foldCompact)
-            new_lev |= SC_FOLDLEVELWHITEFLAG;
-			if ((levelCurrent > levelPrev) && (visibleChars > 0))
-				new_lev |= SC_FOLDLEVELHEADERFLAG;
-            levelCurrent = new_lev;
-    }
-	styler.SetLevel(lineCurrent, levelCurrent|SC_FOLDLEVELBASE);
-}
-
-static const char * const rubyWordListDesc[] = {
-	"Keywords",
-	0
-};
-
-LexerModule lmRuby(SCLEX_RUBY, ColouriseRbDoc, "ruby", FoldRbDoc, rubyWordListDesc);
diff --git a/src/stc/scintilla/src/LexSQL.cxx b/src/stc/scintilla/src/LexSQL.cxx
deleted file mode 100644
index d8e14b9eb1..0000000000
--- a/src/stc/scintilla/src/LexSQL.cxx
+++ /dev/null
@@ -1,342 +0,0 @@
-// Scintilla source code edit control
-/** @file LexSQL.cxx
- ** Lexer for SQL, including PL/SQL and SQL*Plus.
- **/
-// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static inline bool IsAWordChar(int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_');
-}
-
-static inline bool IsAWordStart(int ch) {
-	return (ch < 0x80) && (isalpha(ch) || ch == '_');
-}
-
-static inline bool IsADoxygenChar(int ch) {
-	return (islower(ch) || ch == '$' || ch == '@' ||
-	        ch == '\\' || ch == '&' || ch == '<' ||
-	        ch == '>' || ch == '#' || ch == '{' ||
-	        ch == '}' || ch == '[' || ch == ']');
-}
-
-static inline bool IsANumberChar(int ch) {
-	// Not exactly following number definition (several dots are seen as OK, etc.)
-	// but probably enough in most cases.
-	return (ch < 0x80) &&
-	        (isdigit(ch) || toupper(ch) == 'E' ||
-             ch == '.' || ch == '-' || ch == '+');
-}
-
-static void ColouriseSQLDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-                            Accessor &styler) {
-
-	WordList &keywords1 = *keywordlists[0];
-	WordList &keywords2 = *keywordlists[1];
-	WordList &kw_pldoc = *keywordlists[2];
-	WordList &kw_sqlplus = *keywordlists[3];
-	WordList &kw_user1 = *keywordlists[4];
-	WordList &kw_user2 = *keywordlists[5];
-	WordList &kw_user3 = *keywordlists[6];
-	WordList &kw_user4 = *keywordlists[7];
-
-	StyleContext sc(startPos, length, initStyle, styler);
-
-	bool sqlBackslashEscapes = styler.GetPropertyInt("sql.backslash.escapes", 0) != 0;
-	bool sqlBackticksIdentifier = styler.GetPropertyInt("lexer.sql.backticks.identifier", 0) != 0;
-	int styleBeforeDCKeyword = SCE_SQL_DEFAULT;
-	for (; sc.More(); sc.Forward()) {
-		// Determine if the current state should terminate.
-		switch (sc.state) {
-		case SCE_SQL_OPERATOR:
-			sc.SetState(SCE_SQL_DEFAULT);
-			break;
-		case SCE_SQL_NUMBER:
-			// We stop the number definition on non-numerical non-dot non-eE non-sign char
-			if (!IsANumberChar(sc.ch)) {
-				sc.SetState(SCE_SQL_DEFAULT);
-			}
-			break;
-		case SCE_SQL_IDENTIFIER:
-			if (!IsAWordChar(sc.ch)) {
-				int nextState = SCE_SQL_DEFAULT;
-				char s[1000];
-				sc.GetCurrentLowered(s, sizeof(s));
-				if (keywords1.InList(s)) {
-					sc.ChangeState(SCE_SQL_WORD);
-				} else if (keywords2.InList(s)) {
-					sc.ChangeState(SCE_SQL_WORD2);
-				} else if (kw_sqlplus.InListAbbreviated(s, '~')) {
-					sc.ChangeState(SCE_SQL_SQLPLUS);
-					if (strncmp(s, "rem", 3) == 0) {
-						nextState = SCE_SQL_SQLPLUS_COMMENT;
-					} else if (strncmp(s, "pro", 3) == 0) {
-						nextState = SCE_SQL_SQLPLUS_PROMPT;
-					}
-				} else if (kw_user1.InList(s)) {
-					sc.ChangeState(SCE_SQL_USER1);
-				} else if (kw_user2.InList(s)) {
-					sc.ChangeState(SCE_SQL_USER2);
-				} else if (kw_user3.InList(s)) {
-					sc.ChangeState(SCE_SQL_USER3);
-				} else if (kw_user4.InList(s)) {
-					sc.ChangeState(SCE_SQL_USER4);
-				}
-				sc.SetState(nextState);
-			}
-			break;
-		case SCE_SQL_QUOTEDIDENTIFIER:
-			if (sc.ch == 0x60) {
-				if (sc.chNext == 0x60) {
-					sc.Forward();	// Ignore it
-				} else {
-					sc.ForwardSetState(SCE_SQL_DEFAULT);
-				}
-			}
-			break;
-		case SCE_SQL_COMMENT:
-			if (sc.Match('*', '/')) {
-				sc.Forward();
-				sc.ForwardSetState(SCE_SQL_DEFAULT);
-			}
-			break;
-		case SCE_SQL_COMMENTDOC:
-			if (sc.Match('*', '/')) {
-				sc.Forward();
-				sc.ForwardSetState(SCE_SQL_DEFAULT);
-			} else if (sc.ch == '@' || sc.ch == '\\') { // Doxygen support
-				// Verify that we have the conditions to mark a comment-doc-keyword
-				if ((IsASpace(sc.chPrev) || sc.chPrev == '*') && (!IsASpace(sc.chNext))) {
-					styleBeforeDCKeyword = SCE_SQL_COMMENTDOC;
-					sc.SetState(SCE_SQL_COMMENTDOCKEYWORD);
-				}
-			}
-			break;
-		case SCE_SQL_COMMENTLINE:
-		case SCE_SQL_COMMENTLINEDOC:
-		case SCE_SQL_SQLPLUS_COMMENT:
-		case SCE_SQL_SQLPLUS_PROMPT:
-			if (sc.atLineStart) {
-				sc.SetState(SCE_SQL_DEFAULT);
-			}
-			break;
-		case SCE_SQL_COMMENTDOCKEYWORD:
-			if ((styleBeforeDCKeyword == SCE_SQL_COMMENTDOC) && sc.Match('*', '/')) {
-				sc.ChangeState(SCE_SQL_COMMENTDOCKEYWORDERROR);
-				sc.Forward();
-				sc.ForwardSetState(SCE_SQL_DEFAULT);
-			} else if (!IsADoxygenChar(sc.ch)) {
-				char s[100];
-				sc.GetCurrentLowered(s, sizeof(s));
-				if (!isspace(sc.ch) || !kw_pldoc.InList(s + 1)) {
-					sc.ChangeState(SCE_SQL_COMMENTDOCKEYWORDERROR);
-				}
-				sc.SetState(styleBeforeDCKeyword);
-			}
-			break;
-		case SCE_SQL_CHARACTER:
-			if (sqlBackslashEscapes && sc.ch == '\\') {
-				sc.Forward();
-			} else if (sc.ch == '\'') {
-				if (sc.chNext == '\"') {
-					sc.Forward();
-				} else {
-					sc.ForwardSetState(SCE_SQL_DEFAULT);
-				}
-			}
-			break;
-		case SCE_SQL_STRING:
-			if (sc.ch == '\\') {
-				// Escape sequence
-				sc.Forward();
-			} else if (sc.ch == '\"') {
-				if (sc.chNext == '\"') {
-					sc.Forward();
-				} else {
-					sc.ForwardSetState(SCE_SQL_DEFAULT);
-				}
-			}
-			break;
-		}
-
-		// Determine if a new state should be entered.
-		if (sc.state == SCE_SQL_DEFAULT) {
-			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
-				sc.SetState(SCE_SQL_NUMBER);
-			} else if (IsAWordStart(sc.ch)) {
-				sc.SetState(SCE_SQL_IDENTIFIER);
-			} else if (sc.ch == 0x60 && sqlBackticksIdentifier) {
-				sc.SetState(SCE_SQL_QUOTEDIDENTIFIER);
-			} else if (sc.Match('/', '*')) {
-				if (sc.Match("/**") || sc.Match("/*!")) {	// Support of Doxygen doc. style
-					sc.SetState(SCE_SQL_COMMENTDOC);
-				} else {
-					sc.SetState(SCE_SQL_COMMENT);
-				}
-				sc.Forward();	// Eat the * so it isn't used for the end of the comment
-			} else if (sc.Match('-', '-')) {
-				// MySQL requires a space or control char after --
-				// http://dev.mysql.com/doc/mysql/en/ansi-diff-comments.html
-				// Perhaps we should enforce that with proper property:
-//~ 			} else if (sc.Match("-- ")) {
-				sc.SetState(SCE_SQL_COMMENTLINE);
-			} else if (sc.ch == '#') {
-				sc.SetState(SCE_SQL_COMMENTLINEDOC);
-			} else if (sc.ch == '\'') {
-				sc.SetState(SCE_SQL_CHARACTER);
-			} else if (sc.ch == '\"') {
-				sc.SetState(SCE_SQL_STRING);
-			} else if (isoperator(static_cast<char>(sc.ch))) {
-				sc.SetState(SCE_SQL_OPERATOR);
-			}
-		}
-	}
-	sc.Complete();
-}
-
-static bool IsStreamCommentStyle(int style) {
-	return style == SCE_SQL_COMMENT ||
-	       style == SCE_SQL_COMMENTDOC ||
-	       style == SCE_SQL_COMMENTDOCKEYWORD ||
-	       style == SCE_SQL_COMMENTDOCKEYWORDERROR;
-}
-
-// Store both the current line's fold level and the next lines in the
-// level store to make it easy to pick up with each increment.
-static void FoldSQLDoc(unsigned int startPos, int length, int initStyle,
-                            WordList *[], Accessor &styler) {
-	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
-	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-	bool foldOnlyBegin = styler.GetPropertyInt("fold.sql.only.begin", 0) != 0;
-
-	unsigned int endPos = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelCurrent = SC_FOLDLEVELBASE;
-	if (lineCurrent > 0) {
-		levelCurrent = styler.LevelAt(lineCurrent - 1) >> 16;
-	}
-	int levelNext = levelCurrent;
-	char chNext = styler[startPos];
-	int styleNext = styler.StyleAt(startPos);
-	int style = initStyle;
-	bool endFound = false;
-	for (unsigned int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		int stylePrev = style;
-		style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-		if (foldComment && IsStreamCommentStyle(style)) {
-			if (!IsStreamCommentStyle(stylePrev)) {
-				levelNext++;
-			} else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
-				// Comments don't end at end of line and the next character may be unstyled.
-				levelNext--;
-			}
-		}
-		if (foldComment && (style == SCE_SQL_COMMENTLINE)) {
-			// MySQL needs -- comments to be followed by space or control char
-			if ((ch == '-') && (chNext == '-')) {
-				char chNext2 = styler.SafeGetCharAt(i + 2);
-				char chNext3 = styler.SafeGetCharAt(i + 3);
-				if (chNext2 == '{' || chNext3 == '{') {
-					levelNext++;
-				} else if (chNext2 == '}' || chNext3 == '}') {
-					levelNext--;
-				}
-			}
-		}
-		if (style == SCE_SQL_OPERATOR) {
-			if (ch == '(') {
-				levelNext++;
-			} else if (ch == ')') {
-				levelNext--;
-			}
-		}
-		// If new keyword (cannot trigger on elseif or nullif, does less tests)
-		if (style == SCE_SQL_WORD && stylePrev != SCE_SQL_WORD) {
-			const int MAX_KW_LEN = 6;	// Maximum length of folding keywords
-			char s[MAX_KW_LEN + 2];
-			unsigned int j = 0;
-			for (; j < MAX_KW_LEN + 1; j++) {
-				if (!iswordchar(styler[i + j])) {
-					break;
-				}
-				s[j] = static_cast<char>(tolower(styler[i + j]));
-			}
-			if (j == MAX_KW_LEN + 1) {
-				// Keyword too long, don't test it
-				s[0] = '\0';
-			} else {
-				s[j] = '\0';
-			}
-			if ((!foldOnlyBegin) && (strcmp(s, "if") == 0 || strcmp(s, "loop") == 0)) {
-				if (endFound) {
-					// ignore
-					endFound = false;
-				} else {
-					levelNext++;
-				}
-			} else if (strcmp(s, "begin") == 0) {
-				levelNext++;
-			} else if (strcmp(s, "end") == 0 ||
-						// DROP TABLE IF EXISTS or CREATE TABLE IF NOT EXISTS
-						strcmp(s, "exists") == 0) {
-				endFound = true;
-				levelNext--;
-				if (levelNext < SC_FOLDLEVELBASE) {
-					levelNext = SC_FOLDLEVELBASE;
-				}
-			}
-		}
-		if (atEOL) {
-			int levelUse = levelCurrent;
-			int lev = levelUse | levelNext << 16;
-			if (visibleChars == 0 && foldCompact)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			if (levelUse < levelNext)
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			levelCurrent = levelNext;
-			visibleChars = 0;
-			endFound = false;
-		}
-		if (!isspacechar(ch)) {
-			visibleChars++;
-		}
-	}
-}
-
-static const char * const sqlWordListDesc[] = {
-	"Keywords",
-	"Database Objects",
-	"PLDoc",
-	"SQL*Plus",
-	"User Keywords 1",
-	"User Keywords 2",
-	"User Keywords 3",
-	"User Keywords 4",
-	0
-};
-
-LexerModule lmSQL(SCLEX_SQL, ColouriseSQLDoc, "sql", FoldSQLDoc, sqlWordListDesc);
diff --git a/src/stc/scintilla/src/LexScriptol.cxx b/src/stc/scintilla/src/LexScriptol.cxx
deleted file mode 100644
index faaa2d46df..0000000000
--- a/src/stc/scintilla/src/LexScriptol.cxx
+++ /dev/null
@@ -1,404 +0,0 @@
-// Scintilla source code edit control
-/** @file LexScriptol.cxx
- ** Lexer for Scriptol.
- **/
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static void ClassifyWordSol(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler, char *prevWord)
-{
-    char s[100];
-    bool wordIsNumber = isdigit(styler[start]) != 0;
-    for (unsigned int i = 0; i < end - start + 1 && i < 30; i++)
-     {
-           s[i] = styler[start + i];
-           s[i + 1] = '\0';
-     }
-    char chAttr = SCE_SCRIPTOL_IDENTIFIER;
-    if (0 == strcmp(prevWord, "class"))       chAttr = SCE_SCRIPTOL_CLASSNAME;
-    else if (wordIsNumber)                    chAttr = SCE_SCRIPTOL_NUMBER;
-    else if (keywords.InList(s))              chAttr = SCE_SCRIPTOL_KEYWORD;
-    else for (unsigned int i = 0; i < end - start + 1; i++)  // test dotted idents
-    {
-        if (styler[start + i] == '.')
-        {
-            styler.ColourTo(start + i - 1, chAttr);
-            styler.ColourTo(start + i, SCE_SCRIPTOL_OPERATOR);
-        }
-    }
-    styler.ColourTo(end, chAttr);
-    strcpy(prevWord, s);
-}
-
-static bool IsSolComment(Accessor &styler, int pos, int len)
-{
-   char c;
-   if(len > 0)
-   {
-     c = styler[pos];
-     if(c == '`') return true;
-     if(len > 1)
-     {
-        if(c == '/')
-        {
-          c = styler[pos + 1];
-          if(c == '/') return true;
-          if(c == '*') return true;
-        }
-     }
-   }
-   return false;
-}
-
-static bool IsSolStringStart(char ch)
-{
-    if (ch == '\'' || ch == '"')  return true;
-    return false;
-}
-
-static bool IsSolWordStart(char ch)
-{
-    return (iswordchar(ch) && !IsSolStringStart(ch));
-}
-
-
-static int GetSolStringState(Accessor &styler, int i, int *nextIndex)
-{
-	char ch = styler.SafeGetCharAt(i);
-	char chNext = styler.SafeGetCharAt(i + 1);
-
-        if (ch != '\"' && ch != '\'')
-        {
-            *nextIndex = i + 1;
-            return SCE_SCRIPTOL_DEFAULT;
-	}
-        // ch is either single or double quotes in string
-        // code below seem non-sense but is here for future extensions
-	if (ch == chNext && ch == styler.SafeGetCharAt(i + 2))
-        {
-          *nextIndex = i + 3;
-          if(ch == '\"') return SCE_SCRIPTOL_TRIPLE;
-          if(ch == '\'') return SCE_SCRIPTOL_TRIPLE;
-          return SCE_SCRIPTOL_STRING;
-	}
-        else
-        {
-          *nextIndex = i + 1;
-          if (ch == '"') return SCE_SCRIPTOL_STRING;
-          else           return SCE_SCRIPTOL_STRING;
-	}
-}
-
-
-static void ColouriseSolDoc(unsigned int startPos, int length, int initStyle,
-                            WordList *keywordlists[], Accessor &styler)
- {
-
-	int lengthDoc = startPos + length;
-        char stringType = '\"';
-
-	if (startPos > 0)
-        {
-            int lineCurrent = styler.GetLine(startPos);
-            if (lineCurrent > 0)
-            {
-              startPos = styler.LineStart(lineCurrent-1);
-              if (startPos == 0) initStyle = SCE_SCRIPTOL_DEFAULT;
-              else               initStyle = styler.StyleAt(startPos-1);
-            }
-	}
-
-	styler.StartAt(startPos, 127);
-
-	WordList &keywords = *keywordlists[0];
-
-	int whingeLevel = styler.GetPropertyInt("tab.timmy.whinge.level");
-	char prevWord[200];
-	prevWord[0] = '\0';
-        if (length == 0)  return;
-
-	int state = initStyle & 31;
-
-	int nextIndex = 0;
-        char chPrev  = ' ';
-        char chPrev2 = ' ';
-        char chNext  = styler[startPos];
-	styler.StartSegment(startPos);
-	bool atStartLine = true;
-	int spaceFlags = 0;
-	for (int i = startPos; i < lengthDoc; i++)
-        {
-
-         if (atStartLine)
-         {
-         char chBad = static_cast<char>(64);
-         char chGood = static_cast<char>(0);
-         char chFlags = chGood;
-
-         if (whingeLevel == 1)
-         {
-             chFlags = (spaceFlags & wsInconsistent) ? chBad : chGood;
-         }
-         else if (whingeLevel == 2)
-         {
-             chFlags = (spaceFlags & wsSpaceTab) ? chBad : chGood;
-         }
-         else if (whingeLevel == 3)
-         {
-             chFlags = (spaceFlags & wsSpace) ? chBad : chGood;
-         }
-         else if (whingeLevel == 4)
-         {
-              chFlags = (spaceFlags & wsTab) ? chBad : chGood;
-         }
-         styler.SetFlags(chFlags, static_cast<char>(state));
-         atStartLine = false;
-       }
-
-       char ch = chNext;
-       chNext = styler.SafeGetCharAt(i + 1);
-
-       if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == lengthDoc))
-       {
-          if ((state == SCE_SCRIPTOL_DEFAULT) ||
-              (state == SCE_SCRIPTOL_TRIPLE) ||
-              (state == SCE_SCRIPTOL_COMMENTBLOCK))
-          {
-              styler.ColourTo(i, state);
-          }
-          atStartLine = true;
-        }
-
-        if (styler.IsLeadByte(ch))
-         {
-             chNext = styler.SafeGetCharAt(i + 2);
-             chPrev  = ' ';
-             chPrev2 = ' ';
-             i += 1;
-             continue;
-         }
-
-        if (state == SCE_SCRIPTOL_STRINGEOL)
-         {
-             if (ch != '\r' && ch != '\n')
-             {
-                    styler.ColourTo(i - 1, state);
-                    state = SCE_SCRIPTOL_DEFAULT;
-             }
-         }
-
-        if (state == SCE_SCRIPTOL_DEFAULT)
-         {
-            if (IsSolWordStart(ch))
-            {
-                 styler.ColourTo(i - 1, state);
-                 state = SCE_SCRIPTOL_KEYWORD;
-            }
-            else if (ch == '`')
-            {
-                styler.ColourTo(i - 1, state);
-                state = SCE_SCRIPTOL_COMMENTLINE;
-            }
-            else if (ch == '/')
-            {
-                styler.ColourTo(i - 1, state);
-                if(chNext == '/') state = SCE_SCRIPTOL_CSTYLE;
-                if(chNext == '*') state = SCE_SCRIPTOL_COMMENTBLOCK;
-            }
-
-            else if (IsSolStringStart(ch))
-            {
-               styler.ColourTo(i - 1, state);
-               state = GetSolStringState(styler, i, &nextIndex);
-               if(state == SCE_SCRIPTOL_STRING)
-               {
-                 stringType = ch;
-               }
-               if (nextIndex != i + 1)
-               {
-                   i = nextIndex - 1;
-                   ch = ' ';
-                   chPrev = ' ';
-                   chNext = styler.SafeGetCharAt(i + 1);
-               }
-           }
-            else if (isoperator(ch))
-            {
-                 styler.ColourTo(i - 1, state);
-                 styler.ColourTo(i, SCE_SCRIPTOL_OPERATOR);
-            }
-          }
-          else if (state == SCE_SCRIPTOL_KEYWORD)
-          {
-              if (!iswordchar(ch))
-              {
-                 ClassifyWordSol(styler.GetStartSegment(), i - 1, keywords, styler, prevWord);
-                 state = SCE_SCRIPTOL_DEFAULT;
-                 if (ch == '`')
-                 {
-                     state = chNext == '`' ? SCE_SCRIPTOL_PERSISTENT : SCE_SCRIPTOL_COMMENTLINE;
-                 }
-                 else if (IsSolStringStart(ch))
-                 {
-                    styler.ColourTo(i - 1, state);
-                    state = GetSolStringState(styler, i, &nextIndex);
-                    if (nextIndex != i + 1)
-                    {
-                       i = nextIndex - 1;
-                       ch = ' ';
-                       chPrev = ' ';
-                       chNext = styler.SafeGetCharAt(i + 1);
-                     }
-                 }
-                 else if (isoperator(ch))
-                 {
-                     styler.ColourTo(i, SCE_SCRIPTOL_OPERATOR);
-                 }
-             }
-          }
-          else
-          {
-            if (state == SCE_SCRIPTOL_COMMENTLINE ||
-                state == SCE_SCRIPTOL_PERSISTENT ||
-                state == SCE_SCRIPTOL_CSTYLE)
-            {
-                 if (ch == '\r' || ch == '\n')
-                 {
-                     styler.ColourTo(i - 1, state);
-                     state = SCE_SCRIPTOL_DEFAULT;
-                 }
-            }
-            else if(state == SCE_SCRIPTOL_COMMENTBLOCK)
-            {
-              if(chPrev == '*' && ch == '/')
-              {
-                styler.ColourTo(i, state);
-                state = SCE_SCRIPTOL_DEFAULT;
-              }
-            }
-            else if ((state == SCE_SCRIPTOL_STRING) ||
-                     (state == SCE_SCRIPTOL_CHARACTER))
-            {
-               if ((ch == '\r' || ch == '\n') && (chPrev != '\\'))
-                {
-                    styler.ColourTo(i - 1, state);
-                    state = SCE_SCRIPTOL_STRINGEOL;
-                }
-                else if (ch == '\\')
-                {
-                   if (chNext == '\"' || chNext == '\'' || chNext == '\\')
-                   {
-                        i++;
-                        ch = chNext;
-                        chNext = styler.SafeGetCharAt(i + 1);
-                   }
-                 }
-                else if ((ch == '\"') || (ch == '\''))
-                {
-                    // must match the entered quote type
-                    if(ch == stringType)
-                    {
-                      styler.ColourTo(i, state);
-                      state = SCE_SCRIPTOL_DEFAULT;
-                    }
-                 }
-             }
-             else if (state == SCE_SCRIPTOL_TRIPLE)
-             {
-                if ((ch == '\'' && chPrev == '\'' && chPrev2 == '\'') ||
-                    (ch == '\"' && chPrev == '\"' && chPrev2 == '\"'))
-                 {
-                    styler.ColourTo(i, state);
-                    state = SCE_SCRIPTOL_DEFAULT;
-                 }
-             }
-            
-           }
-          chPrev2 = chPrev;
-          chPrev = ch;
-	}
-        if (state == SCE_SCRIPTOL_KEYWORD)
-        {
-            ClassifyWordSol(styler.GetStartSegment(),
-                 lengthDoc-1, keywords, styler, prevWord);
-	}
-        else
-        {
-            styler.ColourTo(lengthDoc-1, state);
-	}
-}
-
-static void FoldSolDoc(unsigned int startPos, int length, int initStyle,
-						   WordList *[], Accessor &styler)
- {
-	int lengthDoc = startPos + length;
-
-	int lineCurrent = styler.GetLine(startPos);
-	if (startPos > 0)
-        {
-          if (lineCurrent > 0)
-          {
-               lineCurrent--;
-               startPos = styler.LineStart(lineCurrent);
-               if (startPos == 0)
-                    initStyle = SCE_SCRIPTOL_DEFAULT;
-               else
-                    initStyle = styler.StyleAt(startPos-1);
-           }
-	}
-	int state = initStyle & 31;
-	int spaceFlags = 0;
-        int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, IsSolComment);
-        if ((state == SCE_SCRIPTOL_TRIPLE))
-             indentCurrent |= SC_FOLDLEVELWHITEFLAG;
-	char chNext = styler[startPos];
-	for (int i = startPos; i < lengthDoc; i++)
-         {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		int style = styler.StyleAt(i) & 31;
-
-		if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == lengthDoc))
-                {
-                   int lev = indentCurrent;
-                   int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags, IsSolComment);
-                   if (style == SCE_SCRIPTOL_TRIPLE)
-                        indentNext |= SC_FOLDLEVELWHITEFLAG;
-                   if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG))
-                    {
-                        // Only non whitespace lines can be headers
-                        if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK))
-                        {
-                              lev |= SC_FOLDLEVELHEADERFLAG;
-                        }
-                        else if (indentNext & SC_FOLDLEVELWHITEFLAG)
-                        {
-                             // Line after is blank so check the next - maybe should continue further?
-                             int spaceFlags2 = 0;
-                             int indentNext2 = styler.IndentAmount(lineCurrent + 2, &spaceFlags2, IsSolComment);
-                             if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext2 & SC_FOLDLEVELNUMBERMASK))
-                             {
-                                   lev |= SC_FOLDLEVELHEADERFLAG;
-                              }
-                        }
-                    }
-                   indentCurrent = indentNext;
-                   styler.SetLevel(lineCurrent, lev);
-                   lineCurrent++;
-		}
-	}
-}
-
-LexerModule lmScriptol(SCLEX_SCRIPTOL, ColouriseSolDoc, "scriptol", FoldSolDoc);
diff --git a/src/stc/scintilla/src/LexSmalltalk.cxx b/src/stc/scintilla/src/LexSmalltalk.cxx
deleted file mode 100644
index 6f43ec3b30..0000000000
--- a/src/stc/scintilla/src/LexSmalltalk.cxx
+++ /dev/null
@@ -1,317 +0,0 @@
-// Scintilla source code edit control
-/** @file LexSmalltalk.cxx
- ** Lexer for Smalltalk language.
- ** Written by Sergey Philippov, sphilippov-at-gmail-dot-com
- **/
-// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-/*
-| lexTable classificationBlock charClasses |
-charClasses := #(#DecDigit #Letter #Special #Upper #BinSel).
-lexTable := ByteArray new: 128.
-classificationBlock := [ :charClass :chars |
-    | flag |
-    flag := 1 bitShift: (charClasses indexOf: charClass) - 1.
-    chars do: [ :char | lexTable at: char codePoint + 1 put: ((lexTable at: char codePoint + 1) bitOr: flag)]].
-
-classificationBlock
-    value: #DecDigit value: '0123456789';
-    value: #Letter value: '_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-    value: #Special value: '()[]{};.^:';
-    value: #BinSel value: '~@%&*-+=|\/,<>?!';
-    value: #Upper value: 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.
-
-((String new: 500) streamContents: [ :stream |            
-    stream crLf; nextPutAll: 'static int ClassificationTable[256] = {'.
-    lexTable keysAndValuesDo: [ :index :value |
-        ((index - 1) rem: 16) == 0 ifTrue: [
-            stream crLf; tab]
-        ifFalse: [
-            stream space].
-        stream print: value.
-        index ~= 256 ifTrue: [
-            stream nextPut: $,]].
-    stream crLf; nextPutAll: '};'; crLf.
-    
-    charClasses keysAndValuesDo: [ :index :name |
-        stream
-            crLf;
-            nextPutAll: (
-                ('static inline bool is<1s>(int ch) {return (ch > 0) && (ch %< 0x80) && ((ClassificationTable[ch] & <2p>) != 0);}')
-                    expandMacrosWith: name with: (1 bitShift: (index - 1)))
-    ]]) edit
-*/
-
-// autogenerated {{{{
-
-static int ClassificationTable[256] = {
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 16, 0, 0, 0, 16, 16, 0, 4, 4, 16, 16, 16, 16, 4, 16,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 16, 16, 16, 16,
-    16, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-    10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 4, 16, 4, 4, 2,
-    0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 4, 16, 4, 16, 0,
-};
-
-static inline bool isDecDigit(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 1) != 0);}
-static inline bool isLetter(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 2) != 0);}
-static inline bool isSpecial(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 4) != 0);}
-static inline bool isUpper(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 8) != 0);}
-static inline bool isBinSel(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 16) != 0);}
-// autogenerated }}}}
-
-static inline bool isAlphaNumeric(int ch) {
-    return isDecDigit(ch) || isLetter(ch);
-}
-
-static inline bool isDigitOfRadix(int ch, int radix)
-{
-    if (isDecDigit(ch))
-        return (ch - '0') < radix;
-    else if (!isUpper(ch))
-        return false;
-    else
-        return (ch - 'A' + 10) < radix;
-}
-
-static inline void skipComment(StyleContext& sc)
-{    
-    while (sc.More() && sc.ch != '\"')
-        sc.Forward();
-}
-
-static inline void skipString(StyleContext& sc)
-{
-    while (sc.More()) {
-        if (sc.ch == '\'') {
-            if (sc.chNext != '\'')
-                return;
-            sc.Forward();
-        }
-        sc.Forward();
-    }
-}
-
-static void handleHash(StyleContext& sc)
-{
-    if (isSpecial(sc.chNext)) {
-        sc.SetState(SCE_ST_SPECIAL);
-        return;
-    }
-    
-    sc.SetState(SCE_ST_SYMBOL);
-    sc.Forward();
-    if (sc.ch == '\'') {
-        sc.Forward();
-        skipString(sc);
-    }
-    else {
-        if (isLetter(sc.ch)) {
-            while (isAlphaNumeric(sc.chNext) || sc.chNext == ':')
-                sc.Forward();
-        }
-        else if (isBinSel(sc.ch)) {
-            while (isBinSel(sc.chNext))
-                sc.Forward();
-        }
-    }
-}
-
-static inline void handleSpecial(StyleContext& sc)
-{
-    if (sc.ch == ':' && sc.chNext == '=') {
-        sc.SetState(SCE_ST_ASSIGN);
-        sc.Forward();
-    }
-    else {
-        if (sc.ch == '^')
-            sc.SetState(SCE_ST_RETURN);
-        else
-            sc.SetState(SCE_ST_SPECIAL);
-    }
-}
-
-static inline void skipInt(StyleContext& sc, int radix)
-{
-    while (isDigitOfRadix(sc.chNext, radix))
-        sc.Forward();
-}
-
-static void handleNumeric(StyleContext& sc)
-{
-    char num[256];
-    int nl;
-    int radix;
-    
-    sc.SetState(SCE_ST_NUMBER);
-    num[0] = static_cast<char>(sc.ch);
-    nl = 1;
-    while (isDecDigit(sc.chNext)) {
-        num[nl++] = static_cast<char>(sc.chNext);
-        sc.Forward();
-        if (nl+1 == sizeof(num)/sizeof(num[0])) // overrun check
-            break;
-    }
-    if (sc.chNext == 'r') {
-        num[nl] = 0;
-        if (num[0] == '-')
-            radix = atoi(num + 1);
-        else
-            radix = atoi(num);
-        sc.Forward();
-        if (sc.chNext == '-')
-            sc.Forward();
-        skipInt(sc, radix);
-    }
-    else
-        radix = 10;
-    if (sc.chNext != '.' || !isDigitOfRadix(sc.GetRelative(2), radix))
-        return;
-    sc.Forward();
-    skipInt(sc, radix);
-    if (sc.chNext == 's') {
-        // ScaledDecimal
-        sc.Forward();
-        while (isDecDigit(sc.chNext))
-            sc.Forward();
-        return;
-    }
-    else if (sc.chNext != 'e' && sc.chNext != 'd' && sc.chNext != 'q')
-        return;
-    sc.Forward();
-    if (sc.chNext == '+' || sc.chNext == '-')
-        sc.Forward();
-    skipInt(sc, radix);
-}
-
-static inline void handleBinSel(StyleContext& sc)
-{
-    sc.SetState(SCE_ST_BINARY);
-    while (isBinSel(sc.chNext))
-        sc.Forward();
-}
-
-static void handleLetter(StyleContext& sc, WordList* specialSelectorList)
-{
-    char ident[256];
-    int il;
-    int state;
-    bool doubleColonPresent;
-    
-    sc.SetState(SCE_ST_DEFAULT);
-
-    ident[0] = static_cast<char>(sc.ch);
-    il = 1;
-    while (isAlphaNumeric(sc.chNext)) {
-        ident[il++] = static_cast<char>(sc.chNext);
-        sc.Forward();
-        if (il+2 == sizeof(ident)/sizeof(ident[0])) // overrun check
-            break;
-    }
-
-    if (sc.chNext == ':') {
-        doubleColonPresent = true;
-        ident[il++] = ':';
-        sc.Forward();
-    }
-    else
-        doubleColonPresent = false;
-    ident[il] = 0;
-    
-    if (specialSelectorList->InList(ident))
-            state = SCE_ST_SPEC_SEL;
-    else if (doubleColonPresent)
-            state = SCE_ST_KWSEND;
-    else if (isUpper(ident[0]))
-        state = SCE_ST_GLOBAL;
-    else {
-        if (!strcmp(ident, "self"))
-            state = SCE_ST_SELF;
-        else if (!strcmp(ident, "super"))
-            state = SCE_ST_SUPER;
-        else if (!strcmp(ident, "nil"))
-            state = SCE_ST_NIL;
-        else if (!strcmp(ident, "true") || !strcmp(ident, "false"))
-            state = SCE_ST_BOOL;
-        else
-            state = SCE_ST_DEFAULT;
-    }
-    
-    sc.ChangeState(state);
-}
-
-static void colorizeSmalltalkDoc(unsigned int startPos, int length, int initStyle, WordList *wordLists[], Accessor &styler)
-{
-    StyleContext sc(startPos, length, initStyle, styler);
-
-    if (initStyle == SCE_ST_COMMENT) {
-        skipComment(sc);
-        if (sc.More())
-            sc.Forward();
-    }
-    else if (initStyle == SCE_ST_STRING) {
-        skipString(sc);
-        if (sc.More())
-            sc.Forward();
-    }
-
-    for (; sc.More(); sc.Forward()) {
-        int ch;
-        
-        ch = sc.ch;
-        if (ch == '\"') {
-            sc.SetState(SCE_ST_COMMENT);
-            sc.Forward();
-            skipComment(sc);
-        }
-        else if (ch == '\'') {
-            sc.SetState(SCE_ST_STRING);
-            sc.Forward();
-            skipString(sc);
-        }
-        else if (ch == '#')
-            handleHash(sc);
-        else if (ch == '$') {
-            sc.SetState(SCE_ST_CHARACTER);
-            sc.Forward();
-        }
-        else if (isSpecial(ch))
-            handleSpecial(sc);
-        else if (isDecDigit(ch))
-            handleNumeric(sc);
-        else if (isLetter(ch))
-            handleLetter(sc, wordLists[0]);
-        else if (isBinSel(ch)) {
-            if (ch == '-' && isDecDigit(sc.chNext))
-                handleNumeric(sc);
-            else
-                handleBinSel(sc);
-        }
-        else
-            sc.SetState(SCE_ST_DEFAULT);
-    }
-    sc.Complete();
-}
-
-static const char* const smalltalkWordListDesc[] = {
-    "Special selectors",
-    0
-};
-
-LexerModule lmSmalltalk(SCLEX_SMALLTALK, colorizeSmalltalkDoc, "smalltalk", NULL, smalltalkWordListDesc);
diff --git a/src/stc/scintilla/src/LexSpecman.cxx b/src/stc/scintilla/src/LexSpecman.cxx
deleted file mode 100644
index bf5d639a12..0000000000
--- a/src/stc/scintilla/src/LexSpecman.cxx
+++ /dev/null
@@ -1,286 +0,0 @@
-// Scintilla source code edit control
-/** @file LexSpecman.cxx
- ** Lexer for Specman E language.
- ** Written by Avi Yegudin, based on C++ lexer by Neil Hodgson
- **/
-// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-
-static inline bool IsAWordChar(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' || ch == '\'');
-}
-
-static inline bool IsANumberChar(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '\'');
-}
-
-static inline bool IsAWordStart(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '`');
-}
-
-static void ColouriseSpecmanDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-                            Accessor &styler, bool caseSensitive) {
-
-	WordList &keywords = *keywordlists[0];
-	WordList &keywords2 = *keywordlists[1];
-	WordList &keywords3 = *keywordlists[2];
-	WordList &keywords4 = *keywordlists[3];
-
-	// Do not leak onto next line
-	if (initStyle == SCE_SN_STRINGEOL)
-		initStyle = SCE_SN_CODE;
-
-	int visibleChars = 0;
-
-	StyleContext sc(startPos, length, initStyle, styler);
-
-	for (; sc.More(); sc.Forward()) {
-
-		if (sc.atLineStart && (sc.state == SCE_SN_STRING)) {
-			// Prevent SCE_SN_STRINGEOL from leaking back to previous line
-			sc.SetState(SCE_SN_STRING);
-		}
-
-		// Handle line continuation generically.
-		if (sc.ch == '\\') {
-			if (sc.chNext == '\n' || sc.chNext == '\r') {
-				sc.Forward();
-				if (sc.ch == '\r' && sc.chNext == '\n') {
-					sc.Forward();
-				}
-				continue;
-			}
-		}
-
-		// Determine if the current state should terminate.
-		if (sc.state == SCE_SN_OPERATOR) {
-			sc.SetState(SCE_SN_CODE);
-		} else if (sc.state == SCE_SN_NUMBER) {
-			if (!IsANumberChar(sc.ch)) {
-				sc.SetState(SCE_SN_CODE);
-			}
-		} else if (sc.state == SCE_SN_IDENTIFIER) {
-			if (!IsAWordChar(sc.ch) || (sc.ch == '.')) {
-				char s[100];
-				if (caseSensitive) {
-					sc.GetCurrent(s, sizeof(s));
-				} else {
-					sc.GetCurrentLowered(s, sizeof(s));
-				}
-				if (keywords.InList(s)) {
-					sc.ChangeState(SCE_SN_WORD);
-				} else if (keywords2.InList(s)) {
-					sc.ChangeState(SCE_SN_WORD2);
-				} else if (keywords3.InList(s)) {
-                                        sc.ChangeState(SCE_SN_WORD3);
-				} else if (keywords4.InList(s)) {
-					sc.ChangeState(SCE_SN_USER);
-				}
-				sc.SetState(SCE_SN_CODE);
-			}
-		} else if (sc.state == SCE_SN_PREPROCESSOR) {
-                        if (IsASpace(sc.ch)) {
-                                sc.SetState(SCE_SN_CODE);
-                        }
-		} else if (sc.state == SCE_SN_DEFAULT) {
-			if (sc.Match('<', '\'')) {
-				sc.Forward();
-				sc.ForwardSetState(SCE_SN_CODE);
-			}
-		} else if (sc.state == SCE_SN_COMMENTLINE || sc.state == SCE_SN_COMMENTLINEBANG) {
-			if (sc.atLineEnd) {
-				sc.SetState(SCE_SN_CODE);
-				visibleChars = 0;
-			}
-		} else if (sc.state == SCE_SN_STRING) {
-			if (sc.ch == '\\') {
-				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
-					sc.Forward();
-				}
-			} else if (sc.ch == '\"') {
-				sc.ForwardSetState(SCE_SN_CODE);
-			} else if (sc.atLineEnd) {
-				sc.ChangeState(SCE_SN_STRINGEOL);
-				sc.ForwardSetState(SCE_SN_CODE);
-				visibleChars = 0;
-			}
-		} else if (sc.state == SCE_SN_SIGNAL) {
-			if (sc.atLineEnd) {
-				sc.ChangeState(SCE_SN_STRINGEOL);
-				sc.ForwardSetState(SCE_SN_CODE);
-				visibleChars = 0;
-			} else if (sc.ch == '\\') {
-				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
-					sc.Forward();
-				}
-			} else if (sc.ch == '\'') {
-				sc.ForwardSetState(SCE_SN_CODE);
-			}
-		} else if (sc.state == SCE_SN_REGEXTAG) {
-			if (!IsADigit(sc.ch)) {
-				sc.SetState(SCE_SN_CODE);
-			}
-		}
-
-		// Determine if a new state should be entered.
-		if (sc.state == SCE_SN_CODE) {
-			if (sc.ch == '$' && IsADigit(sc.chNext)) {
-				sc.SetState(SCE_SN_REGEXTAG);
-                                sc.Forward();
-			} else if (IsADigit(sc.ch)) {
-                                sc.SetState(SCE_SN_NUMBER);
-			} else if (IsAWordStart(sc.ch)) {
-				sc.SetState(SCE_SN_IDENTIFIER);
-			} else if (sc.Match('\'', '>')) {
-                                sc.SetState(SCE_SN_DEFAULT);
-				sc.Forward();	// Eat the * so it isn't used for the end of the comment
-			} else if (sc.Match('/', '/')) {
-				if (sc.Match("//!"))	// Nice to have a different comment style
-					sc.SetState(SCE_SN_COMMENTLINEBANG);
-				else
-					sc.SetState(SCE_SN_COMMENTLINE);
-			} else if (sc.Match('-', '-')) {
-				if (sc.Match("--!"))	// Nice to have a different comment style
-					sc.SetState(SCE_SN_COMMENTLINEBANG);
-				else
-					sc.SetState(SCE_SN_COMMENTLINE);
-			} else if (sc.ch == '\"') {
-				sc.SetState(SCE_SN_STRING);
-			} else if (sc.ch == '\'') {
-				sc.SetState(SCE_SN_SIGNAL);
-			} else if (sc.ch == '#' && visibleChars == 0) {
-				// Preprocessor commands are alone on their line
-				sc.SetState(SCE_SN_PREPROCESSOR);
-				// Skip whitespace between # and preprocessor word
-				do {
-					sc.Forward();
-				} while ((sc.ch == ' ' || sc.ch == '\t') && sc.More());
-				if (sc.atLineEnd) {
-					sc.SetState(SCE_SN_CODE);
-				}
-			} else if (isoperator(static_cast<char>(sc.ch)) || sc.ch == '@') {
-				sc.SetState(SCE_SN_OPERATOR);
-			}
-		}
-
-		if (sc.atLineEnd) {
-			// Reset states to begining of colourise so no surprises
-			// if different sets of lines lexed.
-			visibleChars = 0;
-		}
-		if (!IsASpace(sc.ch)) {
-			visibleChars++;
-		}
-	}
-	sc.Complete();
-}
-
-// Store both the current line's fold level and the next lines in the
-// level store to make it easy to pick up with each increment
-// and to make it possible to fiddle the current level for "} else {".
-static void FoldNoBoxSpecmanDoc(unsigned int startPos, int length, int,
-                            Accessor &styler) {
-	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
-	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-	bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0;
-	unsigned int endPos = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelCurrent = SC_FOLDLEVELBASE;
-	if (lineCurrent > 0)
-		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
-	int levelMinCurrent = levelCurrent;
-	int levelNext = levelCurrent;
-	char chNext = styler[startPos];
-	int styleNext = styler.StyleAt(startPos);
-	int style;
-	for (unsigned int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		//int stylePrev = style;
-		style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-		if (foldComment && (style == SCE_SN_COMMENTLINE)) {
-			if (((ch == '/') && (chNext == '/')) ||
-                            ((ch == '-') && (chNext == '-'))) {
-				char chNext2 = styler.SafeGetCharAt(i + 2);
-				if (chNext2 == '{') {
-					levelNext++;
-				} else if (chNext2 == '}') {
-					levelNext--;
-				}
-			}
-		}
-		if (style == SCE_SN_OPERATOR) {
-			if (ch == '{') {
-				// Measure the minimum before a '{' to allow
-				// folding on "} else {"
-				if (levelMinCurrent > levelNext) {
-					levelMinCurrent = levelNext;
-				}
-				levelNext++;
-			} else if (ch == '}') {
-				levelNext--;
-			}
-		}
-		if (atEOL) {
-			int levelUse = levelCurrent;
-			if (foldAtElse) {
-				levelUse = levelMinCurrent;
-			}
-			int lev = levelUse | levelNext << 16;
-			if (visibleChars == 0 && foldCompact)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			if (levelUse < levelNext)
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			levelCurrent = levelNext;
-			levelMinCurrent = levelCurrent;
-			visibleChars = 0;
-		}
-		if (!isspacechar(ch))
-			visibleChars++;
-	}
-}
-
-static void FoldSpecmanDoc(unsigned int startPos, int length, int initStyle, WordList *[],
-                       Accessor &styler) {
-	FoldNoBoxSpecmanDoc(startPos, length, initStyle, styler);
-}
-
-static const char * const specmanWordLists[] = {
-            "Primary keywords and identifiers",
-            "Secondary keywords and identifiers",
-            "Sequence keywords and identifiers",
-            "User defined keywords and identifiers",
-            "Unused",
-            0,
-        };
-
-static void ColouriseSpecmanDocSensitive(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-                                     Accessor &styler) {
-	ColouriseSpecmanDoc(startPos, length, initStyle, keywordlists, styler, true);
-}
-
-
-LexerModule lmSpecman(SCLEX_SPECMAN, ColouriseSpecmanDocSensitive, "specman", FoldSpecmanDoc, specmanWordLists);
diff --git a/src/stc/scintilla/src/LexSpice.cxx b/src/stc/scintilla/src/LexSpice.cxx
deleted file mode 100644
index 8a1683f055..0000000000
--- a/src/stc/scintilla/src/LexSpice.cxx
+++ /dev/null
@@ -1,221 +0,0 @@
-// Scintilla source code edit control
-/** @file LexSpice.cxx
- ** Lexer for Spice
- **/
-// Copyright 2006 by Fabien Proriol
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "Platform.h"
-
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "PropSet.h"
-#include "KeyWords.h"
-#include "SciLexer.h"
-#include "SString.h"
-
-/*
- * Interface
- */
-
-static void ColouriseDocument(
-    unsigned int startPos,
-    int length,
-    int initStyle,
-    WordList *keywordlists[],
-    Accessor &styler);
-
-static const char * const spiceWordListDesc[] = {
-    "Keywords",        // SPICE command
-    "Keywords2",    // SPICE functions
-    "Keywords3",    // SPICE params
-    0
-};
-
-LexerModule lmSpice(SCLEX_SPICE, ColouriseDocument, "spice", NULL, spiceWordListDesc);
-
-/*
- * Implementation
- */
-
-static void ColouriseComment(StyleContext& sc, bool& apostropheStartsAttribute);
-static void ColouriseDelimiter(StyleContext& sc, bool& apostropheStartsAttribute);
-static void ColouriseNumber(StyleContext& sc, bool& apostropheStartsAttribute);
-static void ColouriseWhiteSpace(StyleContext& sc, bool& apostropheStartsAttribute);
-static void ColouriseWord(StyleContext& sc, WordList& keywords, WordList& keywords2, WordList& keywords3, bool& apostropheStartsAttribute);
-
-static inline bool IsDelimiterCharacter(int ch);
-static inline bool IsNumberStartCharacter(int ch);
-static inline bool IsNumberCharacter(int ch);
-static inline bool IsSeparatorOrDelimiterCharacter(int ch);
-static inline bool IsWordStartCharacter(int ch);
-static inline bool IsWordCharacter(int ch);
-
-static void ColouriseComment(StyleContext& sc, bool&) {
-    sc.SetState(SCE_SPICE_COMMENTLINE);
-    while (!sc.atLineEnd) {
-        sc.Forward();
-    }
-}
-
-static void ColouriseDelimiter(StyleContext& sc, bool& apostropheStartsAttribute) {
-    apostropheStartsAttribute = sc.Match (')');
-    sc.SetState(SCE_SPICE_DELIMITER);
-    sc.ForwardSetState(SCE_SPICE_DEFAULT);
-}
-
-static void ColouriseNumber(StyleContext& sc, bool& apostropheStartsAttribute) {
-    apostropheStartsAttribute = true;
-    SString number;
-    sc.SetState(SCE_SPICE_NUMBER);
-    // Get all characters up to a delimiter or a separator, including points, but excluding
-    // double points (ranges).
-    while (!IsSeparatorOrDelimiterCharacter(sc.ch) || (sc.ch == '.' && sc.chNext != '.')) {
-        number += static_cast<char>(sc.ch);
-        sc.Forward();
-    }
-    // Special case: exponent with sign
-    if ((sc.chPrev == 'e' || sc.chPrev == 'E') &&
-            (sc.ch == '+' || sc.ch == '-')) {
-        number += static_cast<char>(sc.ch);
-        sc.Forward ();
-        while (!IsSeparatorOrDelimiterCharacter(sc.ch)) {
-            number += static_cast<char>(sc.ch);
-            sc.Forward();
-        }
-    }
-    sc.SetState(SCE_SPICE_DEFAULT);
-}
-
-static void ColouriseWhiteSpace(StyleContext& sc, bool& ) {
-    sc.SetState(SCE_SPICE_DEFAULT);
-    sc.ForwardSetState(SCE_SPICE_DEFAULT);
-}
-
-static void ColouriseWord(StyleContext& sc, WordList& keywords, WordList& keywords2, WordList& keywords3, bool& apostropheStartsAttribute) {
-    apostropheStartsAttribute = true;
-    sc.SetState(SCE_SPICE_IDENTIFIER);
-    SString word;
-    while (!sc.atLineEnd && !IsSeparatorOrDelimiterCharacter(sc.ch)) {
-        word += static_cast<char>(tolower(sc.ch));
-        sc.Forward();
-    }
-    if (keywords.InList(word.c_str())) {
-        sc.ChangeState(SCE_SPICE_KEYWORD);
-        if (word != "all") {
-            apostropheStartsAttribute = false;
-        }
-    }
-    else if (keywords2.InList(word.c_str())) {
-        sc.ChangeState(SCE_SPICE_KEYWORD2);
-        if (word != "all") {
-            apostropheStartsAttribute = false;
-        }
-    }
-    else if (keywords3.InList(word.c_str())) {
-        sc.ChangeState(SCE_SPICE_KEYWORD3);
-        if (word != "all") {
-            apostropheStartsAttribute = false;
-        }
-    }
-    sc.SetState(SCE_SPICE_DEFAULT);
-}
-
-//
-// ColouriseDocument
-//
-static void ColouriseDocument(
-    unsigned int startPos,
-    int length,
-    int initStyle,
-    WordList *keywordlists[],
-    Accessor &styler) {
-    WordList &keywords = *keywordlists[0];
-    WordList &keywords2 = *keywordlists[1];
-    WordList &keywords3 = *keywordlists[2];
-    StyleContext sc(startPos, length, initStyle, styler);
-    int lineCurrent = styler.GetLine(startPos);
-    bool apostropheStartsAttribute = (styler.GetLineState(lineCurrent) & 1) != 0;
-    while (sc.More()) {
-        if (sc.atLineEnd) {
-            // Go to the next line
-            sc.Forward();
-            lineCurrent++;
-            // Remember the line state for future incremental lexing
-            styler.SetLineState(lineCurrent, apostropheStartsAttribute);
-            // Don't continue any styles on the next line
-            sc.SetState(SCE_SPICE_DEFAULT);
-        }
-        // Comments
-        if ((sc.Match('*') && sc.atLineStart) || sc.Match('*','~')) {
-            ColouriseComment(sc, apostropheStartsAttribute);
-        // Whitespace
-        } else if (IsASpace(sc.ch)) {
-            ColouriseWhiteSpace(sc, apostropheStartsAttribute);
-        // Delimiters
-        } else if (IsDelimiterCharacter(sc.ch)) {
-            ColouriseDelimiter(sc, apostropheStartsAttribute);
-        // Numbers
-        } else if (IsADigit(sc.ch) || sc.ch == '#') {
-            ColouriseNumber(sc, apostropheStartsAttribute);
-        // Keywords or identifiers
-        } else {
-            ColouriseWord(sc, keywords, keywords2, keywords3, apostropheStartsAttribute);
-        }
-    }
-    sc.Complete();
-}
-
-static inline bool IsDelimiterCharacter(int ch) {
-    switch (ch) {
-    case '&':
-    case '\'':
-    case '(':
-    case ')':
-    case '*':
-    case '+':
-    case ',':
-    case '-':
-    case '.':
-    case '/':
-    case ':':
-    case ';':
-    case '<':
-    case '=':
-    case '>':
-    case '|':
-        return true;
-    default:
-        return false;
-    }
-}
-
-static inline bool IsNumberCharacter(int ch) {
-    return IsNumberStartCharacter(ch) ||
-           ch == '_' ||
-           ch == '.' ||
-           ch == '#' ||
-           (ch >= 'a' && ch <= 'f') ||
-           (ch >= 'A' && ch <= 'F');
-}
-
-static inline bool IsNumberStartCharacter(int ch) {
-    return IsADigit(ch);
-}
-
-static inline bool IsSeparatorOrDelimiterCharacter(int ch) {
-    return IsASpace(ch) || IsDelimiterCharacter(ch);
-}
-
-static inline bool IsWordCharacter(int ch) {
-    return IsWordStartCharacter(ch) || IsADigit(ch);
-}
-
-static inline bool IsWordStartCharacter(int ch) {
-    return (isascii(ch) && isalpha(ch)) || ch == '_';
-}
diff --git a/src/stc/scintilla/src/LexTADS3.cxx b/src/stc/scintilla/src/LexTADS3.cxx
deleted file mode 100644
index 9938f63745..0000000000
--- a/src/stc/scintilla/src/LexTADS3.cxx
+++ /dev/null
@@ -1,837 +0,0 @@
-// Scintilla source code edit control
-/** @file LexTADS3.cxx
- ** Lexer for TADS3.
- **/
-/* Copyright 2005 by Michael Cartmell
- * Parts copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
- * In particular FoldTADS3Doc is derived from FoldCppDoc
- * The License.txt file describes the conditions under which this software may
- * be distributed.
- */
-
-/*
- * TADS3 is a language designed by Michael J. Roberts for the writing of text
- * based games.  TADS comes from Text Adventure Development System.  It has good
- * support for the processing and outputting of formatted text and much of a
- * TADS program listing consists of strings.
- *
- * TADS has two types of strings, those enclosed in single quotes (') and those
- * enclosed in double quotes (").  These strings have different symantics and
- * can be given different highlighting if desired.
- *
- * There can be embedded within both types of strings html tags
- * ( <tag key=value> ), library directives ( <.directive> ), and message
- * parameters ( {The doctor's/his} ).
- *
- * Double quoted strings can also contain interpolated expressions
- * ( << rug.moved ? ' and a hole in the floor. ' : nil >> ).  These expressions
- * may themselves contain single or double quoted strings, although the double
- * quoted strings may not contain interpolated expressions.
- *
- * These embedded constructs influence the output and formatting and are an
- * important part of a program and require highlighting.
- *
- * LINKS
- * http://www.tads.org/
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static const int T3_SINGLE_QUOTE = 1;
-static const int T3_INT_EXPRESSION = 2;
-
-static inline bool IsEOL(const int ch, const int chNext) {
-	return (ch == '\r' && chNext != '\n') || (ch == '\n');
-}
-
-static inline bool IsASpaceOrTab(const int ch) {
-	return ch == ' ' || ch == '\t';
-}
-
-static inline bool IsATADS3Operator(const int ch) {
-	return ch == '=' || ch == '{' || ch == '}' || ch == '(' || ch == ')'
-		|| ch == '[' || ch == ']' || ch == ',' || ch == ':' || ch == ';'
-		|| ch == '+' || ch == '-' || ch == '*' || ch == '/' || ch == '%'
-		|| ch == '?' || ch == '!' || ch == '<' || ch == '>' || ch == '|'
-		|| ch == '@' || ch == '&' || ch == '~';
-}
-
-static inline bool IsAWordChar(const int ch) {
-	return isalnum(ch) || ch == '_' || ch == '.';
-}
-
-static inline bool IsAWordStart(const int ch) {
-	return isalpha(ch) || ch == '_';
-}
-
-static inline bool IsAHexDigit(const int ch) {
-	int lch = tolower(ch);
-	return isdigit(lch) || lch == 'a' || lch == 'b' || lch == 'c'
-		|| lch == 'd' || lch == 'e' || lch == 'f';
-}
-
-static inline bool IsAnHTMLChar(int ch) {
-	return isalnum(ch) || ch == '-' || ch == '_' || ch == '.';
-}
-
-static inline bool IsADirectiveChar(int ch) {
-	return isalnum(ch) || isspace(ch) || ch == '-' || ch == '/';
-}
-
-static inline bool IsANumberStart(StyleContext &sc) {
-	return isdigit(sc.ch)
-		|| (!isdigit(sc.chPrev) && sc.ch == '.' && isdigit(sc.chNext));
-}
-
-inline static void ColouriseTADS3Operator(StyleContext &sc) {
-	int initState = sc.state;
-	sc.SetState(SCE_T3_OPERATOR);
-	sc.ForwardSetState(initState);
-}
-
-static void ColouriseTADSHTMLString(StyleContext &sc, int &lineState) {
-	int endState = sc.state;
-	int chQuote = sc.ch;
-	if (endState == SCE_T3_HTML_STRING) {
-		if (lineState&T3_SINGLE_QUOTE) {
-			endState = SCE_T3_S_STRING;
-			chQuote = '"';
-		} else if (lineState&T3_INT_EXPRESSION) {
-			endState = SCE_T3_X_STRING;
-			chQuote = '\'';
-		} else {
-			endState = SCE_T3_D_STRING;
-			chQuote = '\'';
-		}
-	} else {
-		sc.SetState(SCE_T3_HTML_STRING);
-		sc.Forward();
-	}
-	int chString = chQuote == '"'? '\'': '"';
-
-	while (sc.More()) {
-		if (IsEOL(sc.ch, sc.chNext)) {
-			return;
-		}
-		if (sc.ch == chQuote) {
-			sc.ForwardSetState(endState);
-			return;
-		}
-		if (sc.ch == chString) {
-			sc.SetState(endState);
-			return;
-		}
-		if (sc.Match('\\', static_cast<char>(chQuote))
-			|| sc.Match('\\', static_cast<char>(chString))) {
-			sc.Forward(2);
-		} else {
-			sc.Forward();
-		}
-	}
-}
-
-static void ColouriseTADS3HTMLTagStart(StyleContext &sc) {
-	sc.SetState(SCE_T3_HTML_TAG);
-	sc.Forward();
-	if (sc.ch == '/') {
-		sc.Forward();
-	}
-	while (IsAnHTMLChar(sc.ch)) {
-		sc.Forward();
-	}
-}
-
-static void ColouriseTADS3HTMLTag(StyleContext &sc, int &lineState) {
-	int endState = sc.state;
-	int chQuote = '"';
-	int chString = '\'';
-	switch (endState) {
-		case SCE_T3_S_STRING:
-			ColouriseTADS3HTMLTagStart(sc);
-			sc.SetState(SCE_T3_HTML_DEFAULT);
-			chQuote = '\'';
-			chString = '"';
-			break;
-		case SCE_T3_D_STRING:
-		case SCE_T3_X_STRING:
-			ColouriseTADS3HTMLTagStart(sc);
-			sc.SetState(SCE_T3_HTML_DEFAULT);
-			break;
-		case SCE_T3_HTML_DEFAULT:
-			if (lineState&T3_SINGLE_QUOTE) {
-				endState = SCE_T3_S_STRING;
-				chQuote = '\'';
-				chString = '"';
-			} else if (lineState&T3_INT_EXPRESSION) {
-				endState = SCE_T3_X_STRING;
-			} else {
-				endState = SCE_T3_D_STRING;
-			}
-			break;
-	}
-
-	while (sc.More()) {
-		if (IsEOL(sc.ch, sc.chNext)) {
-			return;
-		}
-		if (sc.Match('/', '>')) {
-			sc.SetState(SCE_T3_HTML_TAG);
-			sc.Forward(2);
-			sc.SetState(endState);
-			return;
-		}
-		if (sc.ch == '>') {
-			sc.SetState(SCE_T3_HTML_TAG);
-			sc.ForwardSetState(endState);
-			return;
-		}
-		if (sc.ch == chQuote) {
-			sc.SetState(endState);
-			return;
-		}
-		if (sc.ch == chString) {
-			ColouriseTADSHTMLString(sc, lineState);
-		} else if (sc.ch == '=') {
-			ColouriseTADS3Operator(sc);
-		} else {
-			sc.Forward();
-		}
-	}
-}
-
-static void ColouriseTADS3Keyword(StyleContext &sc,
-							WordList *keywordlists[], 	unsigned int endPos) {
-	char s[250];
-	WordList &keywords = *keywordlists[0];
-	WordList &userwords1 = *keywordlists[1];
-	WordList &userwords2 = *keywordlists[2];
-	WordList &userwords3 = *keywordlists[3];
-	int initState = sc.state;
-	sc.SetState(SCE_T3_IDENTIFIER);
-	while (sc.More() && (IsAWordChar(sc.ch))) {
-		sc.Forward();
-	}
-	sc.GetCurrent(s, sizeof(s));
-	if ( strcmp(s, "is") == 0 || strcmp(s, "not") == 0) {
-		// have to find if "in" is next
-		int n = 1;
-		while (n + sc.currentPos < endPos && IsASpaceOrTab(sc.GetRelative(n)))
-			n++;
-		if (sc.GetRelative(n) == 'i' && sc.GetRelative(n+1) == 'n') {
-			sc.Forward(n+2);
-			sc.ChangeState(SCE_T3_KEYWORD);
-		}
-	} else if (keywords.InList(s)) {
-		sc.ChangeState(SCE_T3_KEYWORD);
-	} else if (userwords3.InList(s)) {
-		sc.ChangeState(SCE_T3_USER3);
-	} else if (userwords2.InList(s)) {
-		sc.ChangeState(SCE_T3_USER2);
-	} else if (userwords1.InList(s)) {
-		sc.ChangeState(SCE_T3_USER1);
-	}
-	sc.SetState(initState);
-}
-
-static void ColouriseTADS3MsgParam(StyleContext &sc, int &lineState) {
-	int endState = sc.state;
-	int chQuote = '"';
-	switch (endState) {
-		case SCE_T3_S_STRING:
-			sc.SetState(SCE_T3_MSG_PARAM);
-			sc.Forward();
-			chQuote = '\'';
-			break;
-		case SCE_T3_D_STRING:
-		case SCE_T3_X_STRING:
-			sc.SetState(SCE_T3_MSG_PARAM);
-			sc.Forward();
-			break;
-		case SCE_T3_MSG_PARAM:
-			if (lineState&T3_SINGLE_QUOTE) {
-				endState = SCE_T3_S_STRING;
-				chQuote = '\'';
-			} else if (lineState&T3_INT_EXPRESSION) {
-				endState = SCE_T3_X_STRING;
-			} else {
-				endState = SCE_T3_D_STRING;
-			}
-			break;
-	}
-	while (sc.More() && sc.ch != '}' && sc.ch != chQuote) {
-		if (IsEOL(sc.ch, sc.chNext)) {
-			return;
-		}
-		if (sc.ch == '\\') {
-			sc.Forward();
-		}
-		sc.Forward();
-	}
-	if (sc.ch == chQuote) {
-		sc.SetState(endState);
-	} else {
-		sc.ForwardSetState(endState);
-	}
-}
-
-static void ColouriseTADS3LibDirective(StyleContext &sc, int &lineState) {
-	int initState = sc.state;
-	int chQuote = '"';
-	switch (initState) {
-		case SCE_T3_S_STRING:
-			sc.SetState(SCE_T3_LIB_DIRECTIVE);
-			sc.Forward(2);
-			chQuote = '\'';
-			break;
-		case SCE_T3_D_STRING:
-			sc.SetState(SCE_T3_LIB_DIRECTIVE);
-			sc.Forward(2);
-			break;
-		case SCE_T3_LIB_DIRECTIVE:
-			if (lineState&T3_SINGLE_QUOTE) {
-				initState = SCE_T3_S_STRING;
-				chQuote = '\'';
-			} else {
-				initState = SCE_T3_D_STRING;
-			}
-			break;
-	}
-	while (sc.More() && IsADirectiveChar(sc.ch)) {
-		if (IsEOL(sc.ch, sc.chNext)) {
-			return;
-		}
-		sc.Forward();
-	};
-	if (sc.ch == '>' || !sc.More()) {
-		sc.ForwardSetState(initState);
-	} else if (sc.ch == chQuote) {
-		sc.SetState(initState);
-	} else {
-		sc.ChangeState(initState);
-		sc.Forward();
-	}
-}
-
-static void ColouriseTADS3String(StyleContext &sc, int &lineState) {
-	int chQuote = sc.ch;
-	int endState = sc.state;
-	switch (sc.state) {
-		case SCE_T3_DEFAULT:
-		case SCE_T3_X_DEFAULT:
-			if (chQuote == '"') {
-				if (sc.state == SCE_T3_DEFAULT) {
-					sc.SetState(SCE_T3_D_STRING);
-				} else {
-					sc.SetState(SCE_T3_X_STRING);
-				}
-				lineState &= ~T3_SINGLE_QUOTE;
-			} else {
-				sc.SetState(SCE_T3_S_STRING);
-				lineState |= T3_SINGLE_QUOTE;
-			}
-			sc.Forward();
-			break;
-		case SCE_T3_S_STRING:
-			chQuote = '\'';
-			endState = lineState&T3_INT_EXPRESSION ?
-				SCE_T3_X_DEFAULT : SCE_T3_DEFAULT;
-			break;
-		case SCE_T3_D_STRING:
-			chQuote = '"';
-			endState = SCE_T3_DEFAULT;
-			break;
-		case SCE_T3_X_STRING:
-			chQuote = '"';
-			endState = SCE_T3_X_DEFAULT;
-			break;
-	}
-	while (sc.More()) {
-		if (IsEOL(sc.ch, sc.chNext)) {
-			return;
-		}
-		if (sc.ch == chQuote) {
-			sc.ForwardSetState(endState);
-			return;
-		}
-		if (sc.state == SCE_T3_D_STRING && sc.Match('<', '<')) {
-			lineState |= T3_INT_EXPRESSION;
-			sc.SetState(SCE_T3_X_DEFAULT);
-			sc.Forward(2);
-			return;
-		}
-		if (sc.Match('\\', static_cast<char>(chQuote))) {
-			sc.Forward(2);
-		} else if (sc.ch == '{') {
-			ColouriseTADS3MsgParam(sc, lineState);
-		} else if (sc.Match('<', '.')) {
-			ColouriseTADS3LibDirective(sc, lineState);
-		} else if (sc.ch == '<') {
-			ColouriseTADS3HTMLTag(sc, lineState);
-		} else {
-			sc.Forward();
-		}
-	}
-}
-
-static void ColouriseTADS3Comment(StyleContext &sc, int endState) {
-	sc.SetState(SCE_T3_BLOCK_COMMENT);
-	while (sc.More()) {
-		if (IsEOL(sc.ch, sc.chNext)) {
-			return;
-		}
-		if (sc.Match('*', '/')) {
-			sc.Forward(2);
-			sc.SetState(endState);
-			return;
-		}
-		sc.Forward();
-	}
-}
-
-static void ColouriseToEndOfLine(StyleContext &sc, int initState, int endState) {
-	sc.SetState(initState);
-	while (sc.More()) {
-		if (sc.ch == '\\') {
-			sc.Forward();
-			if (IsEOL(sc.ch, sc.chNext)) {
-					return;
-			}
-		}
-		if (IsEOL(sc.ch, sc.chNext)) {
-			sc.SetState(endState);
-			return;
-		}
-		sc.Forward();
-	}
-}
-
-static void ColouriseTADS3Number(StyleContext &sc) {
-	int endState = sc.state;
-	bool inHexNumber = false;
-	bool seenE = false;
-	bool seenDot = sc.ch == '.';
-	sc.SetState(SCE_T3_NUMBER);
-	if (sc.More()) {
-		sc.Forward();
-	}
-	if (sc.chPrev == '0' && tolower(sc.ch) == 'x') {
-		inHexNumber = true;
-		sc.Forward();
-	}
-	while (sc.More()) {
-		if (inHexNumber) {
-			if (!IsAHexDigit(sc.ch)) {
-				break;
-			}
-		} else if (!isdigit(sc.ch)) {
-			if (!seenE && tolower(sc.ch) == 'e') {
-				seenE = true;
-				seenDot = true;
-				if (sc.chNext == '+' || sc.chNext == '-') {
-					sc.Forward();
-				}
-			} else if (!seenDot && sc.ch == '.') {
-				seenDot = true;
-			} else {
-				break;
-			}
-		}
-		sc.Forward();
-	}
-	sc.SetState(endState);
-}
-
-static void ColouriseTADS3Doc(unsigned int startPos, int length, int initStyle,
-							   WordList *keywordlists[], Accessor &styler) {
-	int visibleChars = 0;
-	int bracketLevel = 0;
-	int lineState = 0;
-	unsigned int endPos = startPos + length;
-	int lineCurrent = styler.GetLine(startPos);
-	if (lineCurrent > 0) {
-		lineState = styler.GetLineState(lineCurrent-1);
-	}
-	StyleContext sc(startPos, length, initStyle, styler);
-
-	while (sc.More()) {
-
-		if (IsEOL(sc.ch, sc.chNext)) {
-			styler.SetLineState(lineCurrent, lineState);
-			lineCurrent++;
-			visibleChars = 0;
-			sc.Forward();
-			if (sc.ch == '\n') {
-				sc.Forward();
-			}
-		}
-
-		switch(sc.state) {
-			case SCE_T3_PREPROCESSOR:
-			case SCE_T3_LINE_COMMENT:
-				ColouriseToEndOfLine(sc, sc.state, lineState&T3_INT_EXPRESSION ?
-					SCE_T3_X_DEFAULT : SCE_T3_DEFAULT);
-				break;
-			case SCE_T3_S_STRING:
-			case SCE_T3_D_STRING:
-			case SCE_T3_X_STRING:
-				ColouriseTADS3String(sc, lineState);
-				visibleChars++;
-				break;
-			case SCE_T3_MSG_PARAM:
-				ColouriseTADS3MsgParam(sc, lineState);
-				break;
-			case SCE_T3_LIB_DIRECTIVE:
-				ColouriseTADS3LibDirective(sc, lineState);
-				break;
-			case SCE_T3_HTML_DEFAULT:
-				ColouriseTADS3HTMLTag(sc, lineState);
-				break;
-			case SCE_T3_HTML_STRING:
-				ColouriseTADSHTMLString(sc, lineState);
-				break;
-			case SCE_T3_BLOCK_COMMENT:
-				ColouriseTADS3Comment(sc, lineState&T3_INT_EXPRESSION ?
-					SCE_T3_X_DEFAULT : SCE_T3_DEFAULT);
-				break;
-			case SCE_T3_DEFAULT:
-			case SCE_T3_X_DEFAULT:
-				if (IsASpaceOrTab(sc.ch)) {
-					sc.Forward();
-				} else if (sc.ch == '#' && visibleChars == 0) {
-					ColouriseToEndOfLine(sc, SCE_T3_PREPROCESSOR, sc.state);
-				} else if (sc.Match('/', '*')) {
-					ColouriseTADS3Comment(sc, sc.state);
-					visibleChars++;
-				} else if (sc.Match('/', '/')) {
-					ColouriseToEndOfLine(sc, SCE_T3_LINE_COMMENT, sc.state);
-				} else if (sc.ch == '"') {
-					bracketLevel = 0;
-					ColouriseTADS3String(sc, lineState);
-					visibleChars++;
-				} else if (sc.ch == '\'') {
-					ColouriseTADS3String(sc, lineState);
-					visibleChars++;
-				} else if (sc.state == SCE_T3_X_DEFAULT && bracketLevel == 0
-						   && sc.Match('>', '>')) {
-					sc.Forward(2);
-					sc.SetState(SCE_T3_D_STRING);
-					lineState &= ~(T3_SINGLE_QUOTE|T3_INT_EXPRESSION);
-				} else if (IsATADS3Operator(sc.ch)) {
-					if (sc.state == SCE_T3_X_DEFAULT) {
-						if (sc.ch == '(') {
-							bracketLevel++;
-						} else if (sc.ch == ')') {
-							bracketLevel--;
-						}
-					}
-					ColouriseTADS3Operator(sc);
-					visibleChars++;
-				} else if (IsANumberStart(sc)) {
-					ColouriseTADS3Number(sc);
-					visibleChars++;
-				} else if (IsAWordStart(sc.ch)) {
-					ColouriseTADS3Keyword(sc, keywordlists, endPos);
-					visibleChars++;
-				} else if (sc.Match("...")) {
-					sc.SetState(SCE_T3_IDENTIFIER);
-					sc.Forward(3);
-					sc.SetState(SCE_T3_DEFAULT);
-				} else {
-					sc.Forward();
-					visibleChars++;
-				}
-				break;
-			default:
-				sc.SetState(SCE_T3_DEFAULT);
-				sc.Forward();
-		}
-	}
-	sc.Complete();
-}
-
-/*
- TADS3 has two styles of top level block (TLB). Eg
-
- // default style
- silverKey : Key 'small silver key' 'small silver key'
-	"A small key glints in the sunlight. "
- ;
-
- and
-
- silverKey : Key {
-	'small silver key'
-	'small silver key'
-	"A small key glints in the sunlight. "
- }
-
- Some constructs mandate one or the other, but usually the author has may choose
- either.
-
- T3_SEENSTART is used to indicate that a braceless TLB has been (potentially)
- seen and is also used to match the closing ';' of the default style.
-
- T3_EXPECTINGIDENTIFIER and T3_EXPECTINGPUNCTUATION are used to keep track of
- what characters may be seen without incrementing the block level.  The general
- pattern is identifier <punc> identifier, acceptable punctuation characters
- are ':', ',', '(' and ')'.  No attempt is made to ensure that punctuation
- characters are syntactically correct, eg parentheses match. A ')' always
- signifies the start of a block.  We just need to check if it is followed by a
- '{', in which case we let the brace handling code handle the folding level.
-
- expectingIdentifier == false && expectingIdentifier == false
- Before the start of a TLB.
-
- expectingIdentifier == true && expectingIdentifier == true
- Currently in an identifier.  Will accept identifier or punctuation.
-
- expectingIdentifier == true && expectingIdentifier == false
- Just seen a punctuation character & now waiting for an identifier to start.
-
- expectingIdentifier == false && expectingIdentifier == truee
- We were in an identifier and have seen space.  Now waiting to see a punctuation
- character
-
- Space, comments & preprocessor directives are always acceptable and are
- equivalent.
-*/
-
-static const int T3_SEENSTART = 1 << 12;
-static const int T3_EXPECTINGIDENTIFIER = 1 << 13;
-static const int T3_EXPECTINGPUNCTUATION = 1 << 14;
-
-static inline bool IsStringTransition(int s1, int s2) {
-	return s1 != s2
-		&& (s1 == SCE_T3_S_STRING || s1 == SCE_T3_X_STRING
-			|| s1 == SCE_T3_D_STRING && s2 != SCE_T3_X_DEFAULT)
-		&& s2 != SCE_T3_LIB_DIRECTIVE
-		&& s2 != SCE_T3_MSG_PARAM
-		&& s2 != SCE_T3_HTML_TAG
-		&& s2 != SCE_T3_HTML_STRING;
-}
-
-static inline bool IsATADS3Punctuation(const int ch) {
-	return ch == ':' || ch == ',' || ch == '(' || ch == ')';
-}
-
-static inline bool IsAnIdentifier(const int style) {
-	return style == SCE_T3_IDENTIFIER
-		|| style == SCE_T3_USER1
-		|| style == SCE_T3_USER2
-		|| style == SCE_T3_USER3;
-}
-
-static inline bool IsSpaceEquivalent(const int ch, const int style) {
-	return isspace(ch)
-		|| style == SCE_T3_BLOCK_COMMENT
-		|| style == SCE_T3_LINE_COMMENT
-		|| style == SCE_T3_PREPROCESSOR;
-}
-
-static char peekAhead(unsigned int startPos, unsigned int endPos,
-					  Accessor &styler) {
-	for (unsigned int i = startPos; i < endPos; i++) {
-		int style = styler.StyleAt(i);
-		char ch = styler[i];
-		if (!IsSpaceEquivalent(ch, style)) {
-			if (IsAnIdentifier(style)) {
-				return 'a';
-			}
-			if (IsATADS3Punctuation(ch)) {
-				return ':';
-			}
-			if (ch == '{') {
-				return '{';
-			}
-			return '*';
-		}
-	}
-	return ' ';
-}
-
-static void FoldTADS3Doc(unsigned int startPos, int length, int initStyle,
-                            WordList *[], Accessor &styler) {
-	unsigned int endPos = startPos + length;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelCurrent = SC_FOLDLEVELBASE;
-	if (lineCurrent > 0)
-		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
-	int seenStart = levelCurrent & T3_SEENSTART;
-	int expectingIdentifier = levelCurrent & T3_EXPECTINGIDENTIFIER;
-	int expectingPunctuation = levelCurrent & T3_EXPECTINGPUNCTUATION;
-	levelCurrent &= SC_FOLDLEVELNUMBERMASK;
-	int levelMinCurrent = levelCurrent;
-	int levelNext = levelCurrent;
-	char chNext = styler[startPos];
-	int styleNext = styler.StyleAt(startPos);
-	int style = initStyle;
-	char ch = chNext;
-	int stylePrev = style;
-	bool redo = false;
-	for (unsigned int i = startPos; i < endPos; i++) {
-		if (redo) {
-			redo = false;
-			i--;
-		} else {
-			ch = chNext;
-			chNext = styler.SafeGetCharAt(i + 1);
-			stylePrev = style;
-			style = styleNext;
-			styleNext = styler.StyleAt(i + 1);
-		}
-		bool atEOL = IsEOL(ch, chNext);
-
-		if (levelNext == SC_FOLDLEVELBASE) {
-			if (IsSpaceEquivalent(ch, style)) {
-				if (expectingPunctuation) {
-					expectingIdentifier = 0;
-				}
-				if (style == SCE_T3_BLOCK_COMMENT) {
-					levelNext++;
-				}
-			} else if (ch == '{') {
-				levelNext++;
-				seenStart = 0;
-			} else if (ch == '\'' || ch == '"' || ch == '[') {
-				levelNext++;
-				if (seenStart) {
-					redo = true;
-				}
-			} else if (ch == ';') {
-				seenStart = 0;
-				expectingIdentifier = 0;
-				expectingPunctuation = 0;
-			} else if (expectingIdentifier && expectingPunctuation) {
-				if (IsATADS3Punctuation(ch)) {
-					if (ch == ')' && peekAhead(i+1, endPos, styler) != '{') {
-						levelNext++;
-					} else {
-						expectingPunctuation = 0;
-					}
-				} else if (!IsAnIdentifier(style)) {
-					levelNext++;
-				}
-			} else if (expectingIdentifier && !expectingPunctuation) {
-				if (!IsAnIdentifier(style)) {
-					levelNext++;
-				} else {
-					expectingPunctuation = T3_EXPECTINGPUNCTUATION;
-				}
-			} else if (!expectingIdentifier && expectingPunctuation) {
-				if (!IsATADS3Punctuation(ch)) {
-					levelNext++;
-				} else {
-					if (ch == ')' && peekAhead(i+1, endPos, styler) != '{') {
-						levelNext++;
-					} else {
-						expectingIdentifier = T3_EXPECTINGIDENTIFIER;
-						expectingPunctuation = 0;
-					}
-				}
-			} else if (!expectingIdentifier && !expectingPunctuation) {
-				if (IsAnIdentifier(style)) {
-					seenStart = T3_SEENSTART;
-					expectingIdentifier = T3_EXPECTINGIDENTIFIER;
-					expectingPunctuation = T3_EXPECTINGPUNCTUATION;
-				}
-			}
-
-			if (levelNext != SC_FOLDLEVELBASE && style != SCE_T3_BLOCK_COMMENT) {
-				expectingIdentifier = 0;
-				expectingPunctuation = 0;
-			}
-
-		} else if (levelNext == SC_FOLDLEVELBASE+1 && seenStart
-				   && ch == ';' && style == SCE_T3_OPERATOR ) {
-			levelNext--;
-			seenStart = 0;
-		} else if (style == SCE_T3_BLOCK_COMMENT) {
-			if (stylePrev != SCE_T3_BLOCK_COMMENT) {
-				levelNext++;
-			} else if (styleNext != SCE_T3_BLOCK_COMMENT && !atEOL) {
-				// Comments don't end at end of line and the next character may be unstyled.
-				levelNext--;
-			}
-		} else if (ch == '\'' || ch == '"') {
-			if (IsStringTransition(style, stylePrev)) {
-				if (levelMinCurrent > levelNext) {
-					levelMinCurrent = levelNext;
-				}
-				levelNext++;
-			} else if (IsStringTransition(style, styleNext)) {
-				levelNext--;
-			}
-		} else if (style == SCE_T3_OPERATOR) {
-			if (ch == '{' || ch == '[') {
-				// Measure the minimum before a '{' to allow
-				// folding on "} else {"
-				if (levelMinCurrent > levelNext) {
-					levelMinCurrent = levelNext;
-				}
-				levelNext++;
-			} else if (ch == '}' || ch == ']') {
-				levelNext--;
-			}
-		}
-
-		if (atEOL) {
-			if (seenStart && levelNext == SC_FOLDLEVELBASE) {
-				switch (peekAhead(i+1, endPos, styler)) {
-					case ' ':
-					case '{':
-						break;
-					case '*':
-						levelNext++;
-						break;
-					case 'a':
-						if (expectingPunctuation) {
-							levelNext++;
-						}
-						break;
-					case ':':
-						if (expectingIdentifier) {
-							levelNext++;
-						}
-						break;
-				}
-				if (levelNext != SC_FOLDLEVELBASE) {
-					expectingIdentifier = 0;
-					expectingPunctuation = 0;
-				}
-			}
-			int lev = levelMinCurrent | (levelNext | expectingIdentifier
-				| expectingPunctuation | seenStart) << 16;
-			if (levelMinCurrent < levelNext)
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			levelCurrent = levelNext;
-			levelMinCurrent = levelCurrent;
-		}
-	}
-}
-
-static const char * const tads3WordList[] = {
-	"TADS3 Keywords",
-	"User defined 1",
-	"User defined 2",
-	"User defined 3",
-	0
-};
-
-LexerModule lmTADS3(SCLEX_TADS3, ColouriseTADS3Doc, "tads3", FoldTADS3Doc, tads3WordList);
diff --git a/src/stc/scintilla/src/LexTCL.cxx b/src/stc/scintilla/src/LexTCL.cxx
deleted file mode 100644
index c782141164..0000000000
--- a/src/stc/scintilla/src/LexTCL.cxx
+++ /dev/null
@@ -1,362 +0,0 @@
-// Scintilla source code edit control
-/** @file LexTCL.cxx
- ** Lexer for TCL language.
- **/
-// Copyright 1998-2001 by Andre Arpin <arpin@kingston.net>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-// Extended to accept accented characters
-static inline bool IsAWordChar(int ch) {
-	return ch >= 0x80 ||
-        (isalnum(ch) || ch == '_' || ch ==':' || ch=='.'); // : name space separator
-}
-
-static inline bool IsAWordStart(int ch) {
-	return ch >= 0x80 || (ch ==':' || isalpha(ch) || ch == '_');
-}
-
-static inline bool IsANumberChar(int ch) {
-	// Not exactly following number definition (several dots are seen as OK, etc.)
-	// but probably enough in most cases.
-	return (ch < 0x80) &&
-	       (IsADigit(ch, 0x10) || toupper(ch) == 'E' ||
-	        ch == '.' || ch == '-' || ch == '+');
-}
-
-static void ColouriseTCLDoc(unsigned int startPos, int length, int , WordList *keywordlists[], Accessor &styler) {
-#define  isComment(s) (s==SCE_TCL_COMMENT || s==SCE_TCL_COMMENTLINE || s==SCE_TCL_COMMENT_BOX || s==SCE_TCL_BLOCK_COMMENT)
-	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
-	bool commentLevel = false;
-    bool subBrace = false; // substitution begin with a brace ${.....}
-	enum tLineState {LS_DEFAULT, LS_OPEN_COMMENT, LS_OPEN_DOUBLE_QUOTE, LS_COMMENT_BOX, LS_MASK_STATE = 0xf, 
-        LS_COMMAND_EXPECTED = 16, LS_BRACE_ONLY = 32 } lineState = LS_DEFAULT;
-	bool prevSlash = false;
-	int currentLevel = 0;
-    bool expected = 0;
-    bool subParen = 0;
-
-	int currentLine = styler.GetLine(startPos);
-    if (currentLine > 0)
-        currentLine--;
-	length += startPos - styler.LineStart(currentLine);
-	// make sure lines overlap
-	startPos = styler.LineStart(currentLine);
-
-	WordList &keywords = *keywordlists[0];
-	WordList &keywords2 = *keywordlists[1];
-	WordList &keywords3 = *keywordlists[2];
-	WordList &keywords4 = *keywordlists[3];
-	WordList &keywords5 = *keywordlists[4];
-	WordList &keywords6 = *keywordlists[5];
-	WordList &keywords7 = *keywordlists[6];
-    WordList &keywords8 = *keywordlists[7];
-    WordList &keywords9 = *keywordlists[8];
-
-	if (currentLine > 0) {
-        int ls = styler.GetLineState(currentLine - 1);
-		lineState = tLineState(ls & LS_MASK_STATE);
-		expected = LS_COMMAND_EXPECTED == tLineState(ls & LS_COMMAND_EXPECTED);
-        subBrace = LS_BRACE_ONLY == tLineState(ls & LS_BRACE_ONLY);
-		currentLevel = styler.LevelAt(currentLine - 1) >> 17;
-		commentLevel = (styler.LevelAt(currentLine - 1) >> 16) & 1;
-	} else
-		styler.SetLevel(0, SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG);
-	bool visibleChars = false;
-
-	int previousLevel = currentLevel;
-    StyleContext sc(startPos, length, SCE_TCL_DEFAULT, styler);
-	for (; ; sc.Forward()) {
-next:
-        if (sc.ch=='\r' && sc.chNext == '\n') // only ignore \r on PC process on the mac 
-            continue;
-        bool atEnd = !sc.More();  // make sure we coloured the last word
-        if (lineState != LS_DEFAULT) {
-            sc.SetState(SCE_TCL_DEFAULT);
-            if (lineState == LS_OPEN_COMMENT)
-                sc.SetState(SCE_TCL_COMMENTLINE);
-            else if (lineState == LS_OPEN_DOUBLE_QUOTE)
-                sc.SetState(SCE_TCL_IN_QUOTE);
-            else if (lineState == LS_COMMENT_BOX && (sc.ch == '#' || (sc.ch == ' ' && sc.chNext=='#')))
-                sc.SetState(SCE_TCL_COMMENT_BOX);
-            lineState = LS_DEFAULT;
-        }
-        if (subBrace) { // ${ overrides every thing even \ except }
-            if (sc.ch == '}') {
-                subBrace = false;
-                sc.SetState(SCE_TCL_OPERATOR);
-                sc.ForwardSetState(SCE_TCL_DEFAULT);
-                goto next;
-            }
-            else
-                sc.SetState(SCE_TCL_SUB_BRACE);
-            if (!sc.atLineEnd)
-                continue;
-        } else if (sc.state == SCE_TCL_DEFAULT || sc.state ==SCE_TCL_OPERATOR) {
-            expected &= isspacechar(static_cast<unsigned char>(sc.ch)) || IsAWordStart(sc.ch) || sc.ch =='#';
-        } else if (sc.state == SCE_TCL_SUBSTITUTION) {
-            switch(sc.ch) {
-            case '(':
-                subParen=true;
-                sc.SetState(SCE_TCL_OPERATOR);
-                sc.ForwardSetState(SCE_TCL_SUBSTITUTION);
-                continue;
-            case ')':
-                sc.SetState(SCE_TCL_OPERATOR);
-                subParen=false;
-                continue;
-            case '$':
-                continue;
-            case ',':
-                sc.SetState(SCE_TCL_OPERATOR);
-                if (subParen)
-                    sc.ForwardSetState(SCE_TCL_SUBSTITUTION);
-                continue;
-            default :
-                // maybe spaces should be allowed ???
-                if (!IsAWordChar(sc.ch)) { // probably the code is wrong
-                    sc.SetState(SCE_TCL_DEFAULT);
-                    subParen = 0;
-                }
-                break;
-            }
-        } else if (isComment(sc.state)) {
-        } else if (!IsAWordChar(sc.ch)) {
-            if ((sc.state == SCE_TCL_IDENTIFIER && expected) ||  sc.state == SCE_TCL_MODIFIER) {
-                char w[100];
-                char *s=w;
-                sc.GetCurrent(w, sizeof(w));
-                if (w[strlen(w)-1]=='\r')
-                    w[strlen(w)-1]=0;
-                while(*s == ':') // ignore leading : like in ::set a 10
-                    ++s;
-                bool quote = sc.state == SCE_TCL_IN_QUOTE;
-                if (commentLevel  || expected) {
-                    if (keywords.InList(s)) {
-                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD);
-                    } else if (keywords2.InList(s)) {
-                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD2);
-                    } else if (keywords3.InList(s)) {
-                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD3);
-                    } else if (keywords4.InList(s)) {
-                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD4);
-                    } else if (sc.GetRelative(-static_cast<int>(strlen(s))-1) == '{' &&
-                        keywords5.InList(s) && sc.ch == '}') { // {keyword} exactly no spaces
-                            sc.ChangeState(SCE_TCL_EXPAND);
-                    }
-                    if (keywords6.InList(s)) {
-                        sc.ChangeState(SCE_TCL_WORD5);
-                    } else if (keywords7.InList(s)) {
-                        sc.ChangeState(SCE_TCL_WORD6);
-                    } else if (keywords8.InList(s)) {
-                        sc.ChangeState(SCE_TCL_WORD7);
-                    } else if (keywords9.InList(s)) {
-                        sc.ChangeState(SCE_TCL_WORD8);
-                    } 
-                }
-                expected = false;
-                sc.SetState(quote ? SCE_TCL_IN_QUOTE : SCE_TCL_DEFAULT);
-            } else if (sc.state == SCE_TCL_MODIFIER || sc.state == SCE_TCL_IDENTIFIER) {
-                sc.SetState(SCE_TCL_DEFAULT);
-            }
-        }
-		if (atEnd)
-			break;
-        if (sc.atLineEnd) {
-            lineState = LS_DEFAULT;
-			currentLine = styler.GetLine(sc.currentPos);
-			if (foldComment && sc.state!=SCE_TCL_COMMENT && isComment(sc.state)) {
-				if (currentLevel == 0) {
-					++currentLevel;
-					commentLevel = true;
-				}
-			} else {
-				if (visibleChars && commentLevel) {
-					--currentLevel;
-					--previousLevel;
-					commentLevel = false;
-				}
-			}
-			int flag = 0;
-			if (!visibleChars)
-				flag = SC_FOLDLEVELWHITEFLAG;
-			if (currentLevel > previousLevel)
-				flag = SC_FOLDLEVELHEADERFLAG;
-			styler.SetLevel(currentLine, flag + previousLevel + SC_FOLDLEVELBASE + (currentLevel << 17) + (commentLevel << 16));
-
-			// Update the line state, so it can be seen by next line
-			if (sc.state == SCE_TCL_IN_QUOTE)
-				lineState = LS_OPEN_DOUBLE_QUOTE;
-			else {
-			     if (prevSlash) {
-				    if (isComment(sc.state))
-					    lineState = LS_OPEN_COMMENT;
-                } else if (sc.state == SCE_TCL_COMMENT_BOX)
-                    lineState = LS_COMMENT_BOX;
-			}
-            styler.SetLineState(currentLine, 
-                (subBrace ? LS_BRACE_ONLY : 0) |
-                (expected ? LS_COMMAND_EXPECTED : 0)  | lineState);
-            if (lineState == LS_COMMENT_BOX)
-                sc.ForwardSetState(SCE_TCL_COMMENT_BOX);
-            else if (lineState == LS_OPEN_DOUBLE_QUOTE)
-                sc.ForwardSetState(SCE_TCL_IN_QUOTE);
-            else
-                sc.ForwardSetState(SCE_TCL_DEFAULT);
-			prevSlash = false;
-			previousLevel = currentLevel;
-			goto next;
-		}
-
-		if (prevSlash) {
-            prevSlash = false;
-            if (sc.ch == '#' && IsANumberChar(sc.chNext))
-                sc.ForwardSetState(SCE_TCL_NUMBER);
-            continue;
-		}
-        prevSlash = sc.ch == '\\';
-        if (isComment(sc.state))
-            continue;
-		if (sc.atLineStart) {
-			visibleChars = false;
-			if (sc.state!=SCE_TCL_IN_QUOTE && !isComment(sc.state))
-            {
-				sc.SetState(SCE_TCL_DEFAULT);
-                expected = IsAWordStart(sc.ch)|| isspacechar(static_cast<unsigned char>(sc.ch));
-            }
-		}
-
-		switch (sc.state) {
-		case SCE_TCL_NUMBER:
-			if (!IsANumberChar(sc.ch))
-				sc.SetState(SCE_TCL_DEFAULT);
-			break;
-		case SCE_TCL_IN_QUOTE:
-			if (sc.ch == '"') {
-				sc.ForwardSetState(SCE_TCL_DEFAULT);
-				visibleChars = true; // necessary if a " is the first and only character on a line
-				goto next;
-			} else if (sc.ch == '[' || sc.ch == ']' || sc.ch == '$') {
-				sc.SetState(SCE_TCL_OPERATOR);
-                expected = sc.ch == '[';
-                sc.ForwardSetState(SCE_TCL_IN_QUOTE);
-				goto next;
-			}
-            continue;
-        case SCE_TCL_OPERATOR:
-			sc.SetState(SCE_TCL_DEFAULT);
-			break;
-		}
-
-		if (sc.ch == '#') {
-			if (visibleChars) {
-                if (sc.state != SCE_TCL_IN_QUOTE && expected)
-					sc.SetState(SCE_TCL_COMMENT);
-			} else {
-                sc.SetState(SCE_TCL_COMMENTLINE);
-                if (sc.chNext == '~')
-                    sc.SetState(SCE_TCL_BLOCK_COMMENT);
-                if (sc.atLineStart && (sc.chNext == '#' || sc.chNext == '-'))
-                        sc.SetState(SCE_TCL_COMMENT_BOX);
-            }
-        }
-
-		if (!isspacechar(static_cast<unsigned char>(sc.ch))) {
-			visibleChars = true;
-		}
-
-		if (sc.ch == '\\') {
-			prevSlash = true;
-			continue;		
-		}
-
-		// Determine if a new state should be entered.
-		if (sc.state == SCE_TCL_DEFAULT) {
-            if (IsAWordStart(sc.ch)) {
-				sc.SetState(SCE_TCL_IDENTIFIER);
-			} else if (IsADigit(sc.ch) && !IsAWordChar(sc.chPrev)) {
-				sc.SetState(SCE_TCL_NUMBER);
-			} else {
-				switch (sc.ch) {
-				case '\"':
-					sc.SetState(SCE_TCL_IN_QUOTE);
-					break;
-				case '{':
-					sc.SetState(SCE_TCL_OPERATOR);
-					expected = true;
-					++currentLevel;
-					break;
-				case '}':
-					sc.SetState(SCE_TCL_OPERATOR);
-					--currentLevel;
-					break;
-				case '[':
-                    expected = true;
-				case ']':
-				case '(':
-				case ')':
-					sc.SetState(SCE_TCL_OPERATOR);
-					break;
-				case ';':
-                    expected = true;
-					break;
-                case '$':
-                    subParen = 0;
-                    if (sc.chNext != '{') {
-                        sc.SetState(SCE_TCL_SUBSTITUTION);
-                    } 
-                    else {
-                        sc.SetState(SCE_TCL_OPERATOR);  // $
-                        sc.Forward();  // {
-                        sc.ForwardSetState(SCE_TCL_SUB_BRACE);
-                        subBrace = true;
-                    }
-                    break;
-                case '#':
-                    if ((isspacechar(static_cast<unsigned char>(sc.chPrev))||
-                            isoperator(static_cast<char>(sc.chPrev))) && IsADigit(sc.chNext,0x10))
-                        sc.SetState(SCE_TCL_NUMBER);
-                    break;
-                case '-':
-                    sc.SetState(IsADigit(sc.chNext)? SCE_TCL_NUMBER: SCE_TCL_MODIFIER);
-                    break;
-                default:
-                    if (isoperator(static_cast<char>(sc.ch))) {
-                        sc.SetState(SCE_TCL_OPERATOR);
-                    }
-				}
-			}
-		}
-	}
-	sc.Complete();
-}
-
-static const char * const tclWordListDesc[] = {
-            "TCL Keywords",
-            "TK Keywords",
-            "iTCL Keywords",
-            "tkCommands",
-            "expand"
-            "user1",
-            "user2",
-            "user3",
-            "user4",
-            0
-        };
-
-// this code supports folding in the colourizer
-LexerModule lmTCL(SCLEX_TCL, ColouriseTCLDoc, "tcl", 0, tclWordListDesc);
diff --git a/src/stc/scintilla/src/LexTeX.cxx b/src/stc/scintilla/src/LexTeX.cxx
deleted file mode 100644
index 65e530adb8..0000000000
--- a/src/stc/scintilla/src/LexTeX.cxx
+++ /dev/null
@@ -1,288 +0,0 @@
-// Scintilla source code edit control
-
-// File: LexTeX.cxx - general context conformant tex coloring scheme
-// Author: Hans Hagen - PRAGMA ADE - Hasselt NL - www.pragma-ade.com
-// Version: September 28, 2003
-
-// Copyright: 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-// This lexer is derived from the one written for the texwork environment (1999++) which in
-// turn is inspired on texedit (1991++) which finds its roots in wdt (1986).
-
-// If you run into strange boundary cases, just tell me and I'll look into it.
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-#include "StyleContext.h"
-
-// val SCE_TEX_DEFAULT = 0
-// val SCE_TEX_SPECIAL = 1
-// val SCE_TEX_GROUP   = 2
-// val SCE_TEX_SYMBOL  = 3
-// val SCE_TEX_COMMAND = 4
-// val SCE_TEX_TEXT    = 5
-
-// Definitions in SciTEGlobal.properties:
-//
-// TeX Highlighting
-//
-// # Default
-// style.tex.0=fore:#7F7F00
-// # Special
-// style.tex.1=fore:#007F7F
-// # Group
-// style.tex.2=fore:#880000
-// # Symbol
-// style.tex.3=fore:#7F7F00
-// # Command
-// style.tex.4=fore:#008800
-// # Text
-// style.tex.5=fore:#000000
-
-// lexer.tex.interface.default=0
-// lexer.tex.comment.process=0
-
-// todo: lexer.tex.auto.if
-
-// Auxiliary functions:
-
-static inline bool endOfLine(Accessor &styler, unsigned int i) {
-	return
-      (styler[i] == '\n') || ((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n')) ;
-}
-
-static inline bool isTeXzero(int ch) {
-	return
-      (ch == '%') ;
-}
-
-static inline bool isTeXone(int ch) {
-	return
-      (ch == '[') || (ch == ']') || (ch == '=') || (ch == '#') ||
-      (ch == '(') || (ch == ')') || (ch == '<') || (ch == '>') ||
-      (ch == '"') ;
-}
-
-static inline bool isTeXtwo(int ch) {
-	return
-      (ch == '{') || (ch == '}') || (ch == '$') ;
-}
-
-static inline bool isTeXthree(int ch) {
-	return
-      (ch == '~') || (ch == '^') || (ch == '_') || (ch == '&') ||
-      (ch == '-') || (ch == '+') || (ch == '\"') || (ch == '`') ||
-      (ch == '/') || (ch == '|') || (ch == '%') ;
-}
-
-static inline bool isTeXfour(int ch) {
-	return
-      (ch == '\\') ;
-}
-
-static inline bool isTeXfive(int ch) {
-	return
-      ((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z')) ||
-      (ch == '@') || (ch == '!') || (ch == '?') ;
-}
-
-static inline bool isTeXsix(int ch) {
-	return
-      (ch == ' ') ;
-}
-
-static inline bool isTeXseven(int ch) {
-	return
-      (ch == '^') ;
-}
-
-// Interface determination
-
-static int CheckTeXInterface(
-    unsigned int startPos,
-    int length,
-    Accessor &styler,
-	int defaultInterface) {
-
-    char lineBuffer[1024] ;
-	unsigned int linePos = 0 ;
-
-    // some day we can make something lexer.tex.mapping=(all,0)(nl,1)(en,2)...
-
-    if (styler.SafeGetCharAt(0) == '%') {
-        for (unsigned int i = 0; i < startPos + length; i++) {
-            lineBuffer[linePos++] = styler.SafeGetCharAt(i) ;
-            if (endOfLine(styler, i) || (linePos >= sizeof(lineBuffer) - 1)) {
-                lineBuffer[linePos] = '\0';
-                if (strstr(lineBuffer, "interface=all")) {
-                    return 0 ;
-				} else if (strstr(lineBuffer, "interface=tex")) {
-                    return 1 ;
-                } else if (strstr(lineBuffer, "interface=nl")) {
-                    return 2 ;
-                } else if (strstr(lineBuffer, "interface=en")) {
-                    return 3 ;
-                } else if (strstr(lineBuffer, "interface=de")) {
-                    return 4 ;
-                } else if (strstr(lineBuffer, "interface=cz")) {
-                    return 5 ;
-                } else if (strstr(lineBuffer, "interface=it")) {
-                    return 6 ;
-                } else if (strstr(lineBuffer, "interface=ro")) {
-                    return 7 ;
-                } else if (strstr(lineBuffer, "interface=latex")) {
-					// we will move latex cum suis up to 91+ when more keyword lists are supported
-                    return 8 ;
-				} else if (styler.SafeGetCharAt(1) == 'D' && strstr(lineBuffer, "%D \\module")) {
-					// better would be to limit the search to just one line
-					return 3 ;
-                } else {
-                    return defaultInterface ;
-                }
-            }
-		}
-    }
-
-    return defaultInterface ;
-}
-
-static void ColouriseTeXDoc(
-    unsigned int startPos,
-    int length,
-    int,
-    WordList *keywordlists[],
-    Accessor &styler) {
-
-	styler.StartAt(startPos) ;
-	styler.StartSegment(startPos) ;
-
-	bool processComment   = styler.GetPropertyInt("lexer.tex.comment.process",   0) == 1 ;
-    bool useKeywords      = styler.GetPropertyInt("lexer.tex.use.keywords",      1) == 1 ;
-	bool autoIf           = styler.GetPropertyInt("lexer.tex.auto.if",           1) == 1 ;
-    int  defaultInterface = styler.GetPropertyInt("lexer.tex.interface.default", 1) ;
-
-	char key[100] ;
-	int  k ;
-	bool newifDone = false ;
-	bool inComment = false ;
-
-	int currentInterface = CheckTeXInterface(startPos,length,styler,defaultInterface) ;
-
-    if (currentInterface == 0) {
-        useKeywords = false ;
-        currentInterface = 1 ;
-    }
-
-    WordList &keywords = *keywordlists[currentInterface-1] ;
-
-	StyleContext sc(startPos, length, SCE_TEX_TEXT, styler);
-
-	bool going = sc.More() ; // needed because of a fuzzy end of file state
-
-	for (; going; sc.Forward()) {
-
-		if (! sc.More()) { going = false ; } // we need to go one behind the end of text
-
-		if (inComment) {
-			if (sc.atLineEnd) {
-				sc.SetState(SCE_TEX_TEXT) ;
-				newifDone = false ;
-				inComment = false ;
-			}
-		} else {
-			if (! isTeXfive(sc.ch)) {
-				if (sc.state == SCE_TEX_COMMAND) {
-					if (sc.LengthCurrent() == 1) { // \<noncstoken>
-						if (isTeXseven(sc.ch) && isTeXseven(sc.chNext)) {
-							sc.Forward(2) ; // \^^ and \^^<token>
-						}
-						sc.ForwardSetState(SCE_TEX_TEXT) ;
-					} else {
-						sc.GetCurrent(key, sizeof(key)-1) ;
-						k = strlen(key) ;
-						memmove(key,key+1,k) ; // shift left over escape token
-						key[k] = '\0' ;
-						k-- ;
-						if (! keywords || ! useKeywords) {
-							sc.SetState(SCE_TEX_COMMAND) ;
-							newifDone = false ;
-						} else if (k == 1) { //\<cstoken>
-							sc.SetState(SCE_TEX_COMMAND) ;
-							newifDone = false ;
-						} else if (keywords.InList(key)) {
-    						sc.SetState(SCE_TEX_COMMAND) ;
-							newifDone = autoIf && (strcmp(key,"newif") == 0) ;
-						} else if (autoIf && ! newifDone && (key[0] == 'i') && (key[1] == 'f') && keywords.InList("if")) {
-	    					sc.SetState(SCE_TEX_COMMAND) ;
-						} else {
-							sc.ChangeState(SCE_TEX_TEXT) ;
-							sc.SetState(SCE_TEX_TEXT) ;
-							newifDone = false ;
-						}
-					}
-				}
-				if (isTeXzero(sc.ch)) {
-					sc.SetState(SCE_TEX_SYMBOL) ;
-					sc.ForwardSetState(SCE_TEX_DEFAULT) ;
-					inComment = ! processComment ;
-					newifDone = false ;
-				} else if (isTeXseven(sc.ch) && isTeXseven(sc.chNext)) {
-					sc.SetState(SCE_TEX_TEXT) ;
-					sc.ForwardSetState(SCE_TEX_TEXT) ;
-				} else if (isTeXone(sc.ch)) {
-					sc.SetState(SCE_TEX_SPECIAL) ;
-					newifDone = false ;
-				} else if (isTeXtwo(sc.ch)) {
-					sc.SetState(SCE_TEX_GROUP) ;
-					newifDone = false ;
-				} else if (isTeXthree(sc.ch)) {
-					sc.SetState(SCE_TEX_SYMBOL) ;
-					newifDone = false ;
-				} else if (isTeXfour(sc.ch)) {
-					sc.SetState(SCE_TEX_COMMAND) ;
-				} else if (isTeXsix(sc.ch)) {
-					sc.SetState(SCE_TEX_TEXT) ;
-				} else if (sc.atLineEnd) {
-					sc.SetState(SCE_TEX_TEXT) ;
-					newifDone = false ;
-					inComment = false ;
-				} else {
-					sc.SetState(SCE_TEX_TEXT) ;
-				}
-			} else if (sc.state != SCE_TEX_COMMAND) {
-				sc.SetState(SCE_TEX_TEXT) ;
-			}
-		}
-	}
-	sc.ChangeState(SCE_TEX_TEXT) ;
-	sc.Complete();
-
-}
-
-
-// Hooks into the system:
-
-static const char * const texWordListDesc[] = {
-    "TeX, eTeX, pdfTeX, Omega",
-    "ConTeXt Dutch",
-    "ConTeXt English",
-    "ConTeXt German",
-    "ConTeXt Czech",
-    "ConTeXt Italian",
-    "ConTeXt Romanian",
-	0,
-} ;
-
-LexerModule lmTeX(SCLEX_TEX, ColouriseTeXDoc, "tex", 0, texWordListDesc);
diff --git a/src/stc/scintilla/src/LexVB.cxx b/src/stc/scintilla/src/LexVB.cxx
deleted file mode 100644
index d9f0286291..0000000000
--- a/src/stc/scintilla/src/LexVB.cxx
+++ /dev/null
@@ -1,270 +0,0 @@
-// Scintilla source code edit control
-/** @file LexVB.cxx
- ** Lexer for Visual Basic and VBScript.
- **/
-// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-// Internal state, highlighted as number
-#define SCE_B_FILENUMBER SCE_B_DEFAULT+100
-
-
-static bool IsVBComment(Accessor &styler, int pos, int len) {
-	return len > 0 && styler[pos] == '\'';
-}
-
-static inline bool IsTypeCharacter(int ch) {
-	return ch == '%' || ch == '&' || ch == '@' || ch == '!' || ch == '#' || ch == '$';
-}
-
-// Extended to accept accented characters
-static inline bool IsAWordChar(int ch) {
-	return ch >= 0x80 ||
-	       (isalnum(ch) || ch == '.' || ch == '_');
-}
-
-static inline bool IsAWordStart(int ch) {
-	return ch >= 0x80 ||
-	       (isalpha(ch) || ch == '_');
-}
-
-static inline bool IsANumberChar(int ch) {
-	// Not exactly following number definition (several dots are seen as OK, etc.)
-	// but probably enough in most cases.
-	return (ch < 0x80) &&
-	        (isdigit(ch) || toupper(ch) == 'E' ||
-             ch == '.' || ch == '-' || ch == '+');
-}
-
-static void ColouriseVBDoc(unsigned int startPos, int length, int initStyle,
-                           WordList *keywordlists[], Accessor &styler, bool vbScriptSyntax) {
-
-	WordList &keywords = *keywordlists[0];
-	WordList &keywords2 = *keywordlists[1];
-	WordList &keywords3 = *keywordlists[2];
-	WordList &keywords4 = *keywordlists[3];
-
-	styler.StartAt(startPos);
-
-	int visibleChars = 0;
-	int fileNbDigits = 0;
-
-	// Do not leak onto next line
-	if (initStyle == SCE_B_STRINGEOL || initStyle == SCE_B_COMMENT || initStyle == SCE_B_PREPROCESSOR) {
-		initStyle = SCE_B_DEFAULT;
-	}
-
-	StyleContext sc(startPos, length, initStyle, styler);
-
-	for (; sc.More(); sc.Forward()) {
-
-		if (sc.state == SCE_B_OPERATOR) {
-			sc.SetState(SCE_B_DEFAULT);
-		} else if (sc.state == SCE_B_IDENTIFIER) {
-			if (!IsAWordChar(sc.ch)) {
-				// In Basic (except VBScript), a variable name or a function name
-				// can end with a special character indicating the type of the value
-				// held or returned.
-				bool skipType = false;
-				if (!vbScriptSyntax && IsTypeCharacter(sc.ch)) {
-					sc.Forward();	// Skip it
-					skipType = true;
-				}
-				if (sc.ch == ']') {
-					sc.Forward();
-				}
-				char s[100];
-				sc.GetCurrentLowered(s, sizeof(s));
-				if (skipType) {
-					s[strlen(s) - 1] = '\0';
-				}
-				if (strcmp(s, "rem") == 0) {
-					sc.ChangeState(SCE_B_COMMENT);
-				} else {
-					if (keywords.InList(s)) {
-						sc.ChangeState(SCE_B_KEYWORD);
-					} else if (keywords2.InList(s)) {
-						sc.ChangeState(SCE_B_KEYWORD2);
-					} else if (keywords3.InList(s)) {
-						sc.ChangeState(SCE_B_KEYWORD3);
-					} else if (keywords4.InList(s)) {
-						sc.ChangeState(SCE_B_KEYWORD4);
-					}	// Else, it is really an identifier...
-					sc.SetState(SCE_B_DEFAULT);
-				}
-			}
-		} else if (sc.state == SCE_B_NUMBER) {
-			// We stop the number definition on non-numerical non-dot non-eE non-sign char
-			// Also accepts A-F for hex. numbers
-			if (!IsANumberChar(sc.ch) && !(tolower(sc.ch) >= 'a' && tolower(sc.ch) <= 'f')) {
-				sc.SetState(SCE_B_DEFAULT);
-			}
-		} else if (sc.state == SCE_B_STRING) {
-			// VB doubles quotes to preserve them, so just end this string
-			// state now as a following quote will start again
-			if (sc.ch == '\"') {
-				if (tolower(sc.chNext) == 'c') {
-					sc.Forward();
-				}
-				sc.ForwardSetState(SCE_B_DEFAULT);
-			} else if (sc.atLineEnd) {
-				sc.ChangeState(SCE_B_STRINGEOL);
-				sc.ForwardSetState(SCE_B_DEFAULT);
-			}
-		} else if (sc.state == SCE_B_COMMENT) {
-			if (sc.atLineEnd) {
-				sc.ForwardSetState(SCE_B_DEFAULT);
-			}
-		} else if (sc.state == SCE_B_PREPROCESSOR) {
-			if (sc.atLineEnd) {
-				sc.ForwardSetState(SCE_B_DEFAULT);
-			}
-		} else if (sc.state == SCE_B_FILENUMBER) {
-			if (IsADigit(sc.ch)) {
-				fileNbDigits++;
-				if (fileNbDigits > 3) {
-					sc.ChangeState(SCE_B_DATE);
-				}
-			} else if (sc.ch == '\r' || sc.ch == '\n' || sc.ch == ',') {
-				// Regular uses: Close #1; Put #1, ...; Get #1, ... etc.
-				// Too bad if date is format #27, Oct, 2003# or something like that...
-				// Use regular number state
-				sc.ChangeState(SCE_B_NUMBER);
-				sc.SetState(SCE_B_DEFAULT);
-			} else if (sc.ch == '#') {
-				sc.ChangeState(SCE_B_DATE);
-				sc.ForwardSetState(SCE_B_DEFAULT);
-			} else {
-				sc.ChangeState(SCE_B_DATE);
-			}
-			if (sc.state != SCE_B_FILENUMBER) {
-				fileNbDigits = 0;
-			}
-		} else if (sc.state == SCE_B_DATE) {
-			if (sc.atLineEnd) {
-				sc.ChangeState(SCE_B_STRINGEOL);
-				sc.ForwardSetState(SCE_B_DEFAULT);
-			} else if (sc.ch == '#') {
-				sc.ForwardSetState(SCE_B_DEFAULT);
-			}
-		}
-
-		if (sc.state == SCE_B_DEFAULT) {
-			if (sc.ch == '\'') {
-				sc.SetState(SCE_B_COMMENT);
-			} else if (sc.ch == '\"') {
-				sc.SetState(SCE_B_STRING);
-			} else if (sc.ch == '#' && visibleChars == 0) {
-				// Preprocessor commands are alone on their line
-				sc.SetState(SCE_B_PREPROCESSOR);
-			} else if (sc.ch == '#') {
-				// It can be a date literal, ending with #, or a file number, from 1 to 511
-				// The date literal depends on the locale, so anything can go between #'s.
-				// Can be #January 1, 1993# or #1 Jan 93# or #05/11/2003#, etc.
-				// So we set the FILENUMBER state, and switch to DATE if it isn't a file number
-				sc.SetState(SCE_B_FILENUMBER);
-			} else if (sc.ch == '&' && tolower(sc.chNext) == 'h') {
-				// Hexadecimal number
-				sc.SetState(SCE_B_NUMBER);
-				sc.Forward();
-			} else if (sc.ch == '&' && tolower(sc.chNext) == 'o') {
-				// Octal number
-				sc.SetState(SCE_B_NUMBER);
-				sc.Forward();
-			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
-				sc.SetState(SCE_B_NUMBER);
-			} else if (IsAWordStart(sc.ch) || (sc.ch == '[')) {
-				sc.SetState(SCE_B_IDENTIFIER);
-			} else if (isoperator(static_cast<char>(sc.ch)) || (sc.ch == '\\')) {	// Integer division
-				sc.SetState(SCE_B_OPERATOR);
-			}
-		}
-
-		if (sc.atLineEnd) {
-			visibleChars = 0;
-		}
-		if (!IsASpace(sc.ch)) {
-			visibleChars++;
-		}
-	}
-	sc.Complete();
-}
-
-static void FoldVBDoc(unsigned int startPos, int length, int,
-						   WordList *[], Accessor &styler) {
-	int endPos = startPos + length;
-
-	// Backtrack to previous line in case need to fix its fold status
-	int lineCurrent = styler.GetLine(startPos);
-	if (startPos > 0) {
-		if (lineCurrent > 0) {
-			lineCurrent--;
-			startPos = styler.LineStart(lineCurrent);
-		}
-	}
-	int spaceFlags = 0;
-	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, IsVBComment);
-	char chNext = styler[startPos];
-	for (int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-
-		if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == endPos)) {
-			int lev = indentCurrent;
-			int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags, IsVBComment);
-			if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
-				// Only non whitespace lines can be headers
-				if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) {
-					lev |= SC_FOLDLEVELHEADERFLAG;
-				} else if (indentNext & SC_FOLDLEVELWHITEFLAG) {
-					// Line after is blank so check the next - maybe should continue further?
-					int spaceFlags2 = 0;
-					int indentNext2 = styler.IndentAmount(lineCurrent + 2, &spaceFlags2, IsVBComment);
-					if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext2 & SC_FOLDLEVELNUMBERMASK)) {
-						lev |= SC_FOLDLEVELHEADERFLAG;
-					}
-				}
-			}
-			indentCurrent = indentNext;
-			styler.SetLevel(lineCurrent, lev);
-			lineCurrent++;
-		}
-	}
-}
-
-static void ColouriseVBNetDoc(unsigned int startPos, int length, int initStyle,
-                           WordList *keywordlists[], Accessor &styler) {
-	ColouriseVBDoc(startPos, length, initStyle, keywordlists, styler, false);
-}
-
-static void ColouriseVBScriptDoc(unsigned int startPos, int length, int initStyle,
-                           WordList *keywordlists[], Accessor &styler) {
-	ColouriseVBDoc(startPos, length, initStyle, keywordlists, styler, true);
-}
-
-static const char * const vbWordListDesc[] = {
-	"Keywords",
-	"user1",
-	"user2",
-	"user3",
-	0
-};
-
-LexerModule lmVB(SCLEX_VB, ColouriseVBNetDoc, "vb", FoldVBDoc, vbWordListDesc);
-LexerModule lmVBScript(SCLEX_VBSCRIPT, ColouriseVBScriptDoc, "vbscript", FoldVBDoc, vbWordListDesc);
-
diff --git a/src/stc/scintilla/src/LexVHDL.cxx b/src/stc/scintilla/src/LexVHDL.cxx
deleted file mode 100644
index 0feef95120..0000000000
--- a/src/stc/scintilla/src/LexVHDL.cxx
+++ /dev/null
@@ -1,473 +0,0 @@
-// Scintilla source code edit control
-/** @file LexVHDL.cxx
- ** Lexer for VHDL
- ** Written by Phil Reid, 
- ** Based on:
- **  - The Verilog Lexer by Avi Yegudin 
- **  - The Fortran Lexer by Chuan-jian Shen
- **  - The C++ lexer by Neil Hodgson
- **/
-// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static void ColouriseVHDLDoc(
-  unsigned int startPos,
-  int length,
-  int initStyle,
-  WordList *keywordlists[],
-  Accessor &styler);
-
-
-/***************************************/
-static inline bool IsAWordChar(const int ch) {
-  return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' );
-}
-
-/***************************************/
-static inline bool IsAWordStart(const int ch) {
-  return (ch < 0x80) && (isalnum(ch) || ch == '_');
-}
-
-/***************************************/
-inline bool IsABlank(unsigned int ch) {
-    return (ch == ' ') || (ch == 0x09) || (ch == 0x0b) ;
-}
-
-/***************************************/
-static void ColouriseVHDLDoc(
-  unsigned int startPos,
-  int length,
-  int initStyle,
-  WordList *keywordlists[],
-  Accessor &styler)
-{
-  WordList &Keywords   = *keywordlists[0];
-  WordList &Operators  = *keywordlists[1];
-  WordList &Attributes = *keywordlists[2];
-  WordList &Functions  = *keywordlists[3];
-  WordList &Packages   = *keywordlists[4];
-  WordList &Types      = *keywordlists[5];
-  WordList &User       = *keywordlists[6];
-
-  StyleContext sc(startPos, length, initStyle, styler);
-
-  for (; sc.More(); sc.Forward())
-  {
-
-    // Determine if the current state should terminate.
-    if (sc.state == SCE_VHDL_OPERATOR) {
-      sc.SetState(SCE_VHDL_DEFAULT);
-    } else if (sc.state == SCE_VHDL_NUMBER) {
-      if (!IsAWordChar(sc.ch) && (sc.ch != '#')) {
-        sc.SetState(SCE_VHDL_DEFAULT);
-      }
-    } else if (sc.state == SCE_VHDL_IDENTIFIER) {
-      if (!IsAWordChar(sc.ch) || (sc.ch == '.')) {
-        char s[100];
-        sc.GetCurrentLowered(s, sizeof(s));
-        if (Keywords.InList(s)) {
-          sc.ChangeState(SCE_VHDL_KEYWORD);
-        } else if (Operators.InList(s)) {
-          sc.ChangeState(SCE_VHDL_STDOPERATOR);
-        } else if (Attributes.InList(s)) {
-          sc.ChangeState(SCE_VHDL_ATTRIBUTE);
-        } else if (Functions.InList(s)) {
-          sc.ChangeState(SCE_VHDL_STDFUNCTION);
-        } else if (Packages.InList(s)) {
-          sc.ChangeState(SCE_VHDL_STDPACKAGE);
-        } else if (Types.InList(s)) {
-          sc.ChangeState(SCE_VHDL_STDTYPE);
-        } else if (User.InList(s)) {
-          sc.ChangeState(SCE_VHDL_USERWORD);
-        }
-        sc.SetState(SCE_VHDL_DEFAULT);
-      }
-    } else if (sc.state == SCE_VHDL_COMMENT || sc.state == SCE_V_COMMENTLINEBANG) {
-      if (sc.atLineEnd) {
-        sc.SetState(SCE_VHDL_DEFAULT);
-      }
-    } else if (sc.state == SCE_VHDL_STRING) {
-      if (sc.ch == '\\') {
-        if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
-          sc.Forward();
-        }
-      } else if (sc.ch == '\"') {
-        sc.ForwardSetState(SCE_VHDL_DEFAULT);
-      } else if (sc.atLineEnd) {
-        sc.ChangeState(SCE_V_STRINGEOL);
-        sc.ForwardSetState(SCE_VHDL_DEFAULT);
-      }
-    }
-
-    // Determine if a new state should be entered.
-    if (sc.state == SCE_VHDL_DEFAULT) {
-      if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
-        sc.SetState(SCE_VHDL_NUMBER);
-      } else if (IsAWordStart(sc.ch)) {
-        sc.SetState(SCE_VHDL_IDENTIFIER);
-      } else if (sc.Match('-', '-')) {
-        sc.SetState(SCE_VHDL_COMMENT);
-        sc.Forward(); 
-      } else if (sc.Match('-', '-')) {
-        if (sc.Match("--!"))  // Nice to have a different comment style
-          sc.SetState(SCE_VHDL_COMMENTLINEBANG);
-        else
-          sc.SetState(SCE_VHDL_COMMENT);
-      } else if (sc.ch == '\"') {
-        sc.SetState(SCE_VHDL_STRING);
-      } else if (isoperator(static_cast<char>(sc.ch))) {
-        sc.SetState(SCE_VHDL_OPERATOR);
-      }
-    }
-  }
-  sc.Complete();
-}
-//=============================================================================
-static bool IsCommentLine(int line, Accessor &styler) {
-	int pos = styler.LineStart(line);
-	int eol_pos = styler.LineStart(line + 1) - 1;
-	for (int i = pos; i < eol_pos; i++) {
-		char ch = styler[i];
-		char chNext = styler[i+1];
-		if ((ch == '-') && (chNext == '-'))
-			return true;
-		else if (ch != ' ' && ch != '\t')
-			return false;
-	}
-	return false;
-}
-
-//=============================================================================
-// Folding the code
-static void FoldNoBoxVHDLDoc(
-  unsigned int startPos,
-  int length,
-  int initStyle,
-  Accessor &styler)
-{
-  // Decided it would be smarter to have the lexer have all keywords included. Therefore I
-  // don't check if the style for the keywords that I use to adjust the levels.
-  char words[] =
-    "architecture begin case component else elsif end entity generate loop package process record then "
-    "procedure function when";
-  WordList keywords;
-  keywords.Set(words);
-
-  bool foldComment      = styler.GetPropertyInt("fold.comment", 1) != 0;
-  bool foldCompact      = styler.GetPropertyInt("fold.compact", 1) != 0;
-  bool foldAtElse       = styler.GetPropertyInt("fold.at.else", 1) != 0;
-  bool foldAtBegin      = styler.GetPropertyInt("fold.at.Begin", 1) != 0;
-  bool foldAtParenthese = styler.GetPropertyInt("fold.at.Parenthese", 1) != 0;
-  //bool foldAtWhen       = styler.GetPropertyInt("fold.at.When", 1) != 0;  //< fold at when in case statements
-
-  int  visibleChars     = 0;
-  unsigned int endPos   = startPos + length;
-
-  int lineCurrent       = styler.GetLine(startPos);
-  int levelCurrent      = SC_FOLDLEVELBASE;
-  if(lineCurrent > 0)
-    levelCurrent        = styler.LevelAt(lineCurrent-1) >> 16;
-  //int levelMinCurrent   = levelCurrent;
-  int levelMinCurrentElse = levelCurrent;   //< Used for folding at 'else'
-  int levelMinCurrentBegin = levelCurrent;  //< Used for folding at 'begin'
-  int levelNext         = levelCurrent;
-
-  /***************************************/
-  int lastStart         = 0;
-  char prevWord[32]     = "";
-
-  /***************************************/
-  // Find prev word
-  // The logic for going up or down a level depends on a the previous keyword
-  // This code could be cleaned up.
-  int end = 0;
-  unsigned int j;
-  for(j = startPos; j>0; j--)
-  {
-    char ch       = styler.SafeGetCharAt(j);
-    char chPrev   = styler.SafeGetCharAt(j-1);
-    int style     = styler.StyleAt(j);
-    int stylePrev = styler.StyleAt(j-1);
-    if ((stylePrev != SCE_VHDL_COMMENT) && (stylePrev != SCE_VHDL_STRING))
-    {
-      if(IsAWordChar(chPrev) && !IsAWordChar(ch))
-      {
-        end = j-1;
-      }
-    }
-    if ((style != SCE_VHDL_COMMENT) && (style != SCE_VHDL_STRING))
-    {
-      if(!IsAWordChar(chPrev) && IsAWordStart(ch) && (end != 0))
-      {
-        char s[32];
-        unsigned int k;
-        for(k=0; (k<31 ) && (k<end-j+1 ); k++) {
-          s[k] = static_cast<char>(tolower(styler[j+k]));
-        }
-        s[k] = '\0';
-
-        if(keywords.InList(s)) {
-          strcpy(prevWord, s);
-          break;
-        }
-      }
-    }
-  }
-  for(j=j+strlen(prevWord); j<endPos; j++)
-  {
-    char ch       = styler.SafeGetCharAt(j);
-    int style     = styler.StyleAt(j);
-    if ((style != SCE_VHDL_COMMENT) && (style != SCE_VHDL_STRING))
-    {
-      if((ch == ';') && (strcmp(prevWord, "end") == 0))
-      {
-        strcpy(prevWord, ";");
-      }
-    }
-  }
-
-  char  chNext          = styler[startPos];
-  char  chPrev          = '\0';
-  char  chNextNonBlank;
-  int   styleNext       = styler.StyleAt(startPos);
-  int   style           = initStyle;
-  //Platform::DebugPrintf("Line[%04d] Prev[%20s] ************************* Level[%x]\n", lineCurrent+1, prevWord, levelCurrent);
-
-  /***************************************/
-  for (unsigned int i = startPos; i < endPos; i++)
-  {
-    char ch         = chNext;
-    chNext          = styler.SafeGetCharAt(i + 1);
-    chPrev          = styler.SafeGetCharAt(i - 1);
-    chNextNonBlank  = chNext;
-    unsigned int j  = i+1;
-    while(IsABlank(chNextNonBlank) && j<endPos)
-    {
-      j ++ ;
-      chNextNonBlank = styler.SafeGetCharAt(j);
-    }
-    style           = styleNext;
-    styleNext       = styler.StyleAt(i + 1);
-    bool atEOL      = (ch == '\r' && chNext != '\n') || (ch == '\n');
-
-		if (foldComment && atEOL && IsCommentLine(lineCurrent, styler)) 
-    {
-      if(!IsCommentLine(lineCurrent-1, styler) && IsCommentLine(lineCurrent+1, styler))
-      {
-        levelNext++;
-      } 
-      else if(IsCommentLine(lineCurrent-1, styler) && !IsCommentLine(lineCurrent+1, styler))
-      {
-        levelNext--;
-      }
-    }
-
-    if ((style == SCE_VHDL_OPERATOR) && foldAtParenthese)
-    {
-      if(ch == '(') {
-        levelNext++;
-      } else if (ch == ')') {
-        levelNext--;
-      }
-    }
-
-    if ((style != SCE_VHDL_COMMENT) && (style != SCE_VHDL_STRING))
-    {
-      if((ch == ';') && (strcmp(prevWord, "end") == 0))
-      {
-        strcpy(prevWord, ";");
-      }
-
-      if(!IsAWordChar(chPrev) && IsAWordStart(ch))
-      {
-        lastStart = i;
-      }
-
-      if(iswordchar(ch) && !iswordchar(chNext)) {
-        char s[32];
-        unsigned int k;
-        for(k=0; (k<31 ) && (k<i-lastStart+1 ); k++) {
-          s[k] = static_cast<char>(tolower(styler[lastStart+k]));
-        }
-        s[k] = '\0';
-
-        if(keywords.InList(s))
-        {
-          if (
-            strcmp(s, "architecture") == 0  ||
-            strcmp(s, "case") == 0          ||
-            strcmp(s, "component") == 0     ||
-            strcmp(s, "entity") == 0        ||
-            strcmp(s, "generate") == 0      ||
-            strcmp(s, "loop") == 0          ||
-            strcmp(s, "package") ==0        ||
-            strcmp(s, "process") == 0       ||
-            strcmp(s, "record") == 0        ||
-            strcmp(s, "then") == 0)
-          {
-            if (strcmp(prevWord, "end") != 0)
-            {
-              if (levelMinCurrentElse > levelNext) {
-                levelMinCurrentElse = levelNext;
-              }
-              levelNext++;
-            }
-          } else if (
-            strcmp(s, "procedure") == 0     ||
-            strcmp(s, "function") == 0)
-          {
-            if (strcmp(prevWord, "end") != 0) // check for "end procedure" etc.
-            { // This code checks to see if the procedure / function is a definition within a "package"
-              // rather than the actual code in the body.
-              int BracketLevel = 0;
-              for(int j=i+1; j<styler.Length(); j++)
-              {
-                int LocalStyle = styler.StyleAt(j);
-                char LocalCh = styler.SafeGetCharAt(j);
-                if(LocalCh == '(') BracketLevel++;
-                if(LocalCh == ')') BracketLevel--;
-                if(
-                  (BracketLevel == 0) &&
-                  (LocalStyle != SCE_VHDL_COMMENT) &&
-                  (LocalStyle != SCE_VHDL_STRING) &&
-                  !iswordchar(styler.SafeGetCharAt(j-1)) &&
-                  styler.Match(j, "is") &&
-                  !iswordchar(styler.SafeGetCharAt(j+2)))
-                {
-                  if (levelMinCurrentElse > levelNext) {
-                    levelMinCurrentElse = levelNext;
-                  }
-                  levelNext++;
-                  break;
-                }
-                if((BracketLevel == 0) && (LocalCh == ';'))
-                {
-                  break;
-                }
-              }
-            }
-
-          } else if (strcmp(s, "end") == 0) {
-            levelNext--;
-          }  else if(strcmp(s, "elsif") == 0) { // elsif is followed by then so folding occurs correctly
-            levelNext--;
-          } else if (strcmp(s, "else") == 0) {
-            if(strcmp(prevWord, "when") != 0)  // ignore a <= x when y else z;
-            {
-              levelMinCurrentElse = levelNext - 1;  // VHDL else is all on its own so just dec. the min level
-            }
-          } else if(
-            ((strcmp(s, "begin") == 0) && (strcmp(prevWord, "architecture") == 0)) ||
-            ((strcmp(s, "begin") == 0) && (strcmp(prevWord, "function") == 0)) ||
-            ((strcmp(s, "begin") == 0) && (strcmp(prevWord, "procedure") == 0)))
-          {
-            levelMinCurrentBegin = levelNext - 1;  
-          }
-          //Platform::DebugPrintf("Line[%04d] Prev[%20s] Cur[%20s] Level[%x]\n", lineCurrent+1, prevWord, s, levelCurrent);
-          strcpy(prevWord, s);
-        }
-      }
-    }
-    if (atEOL) {
-      int levelUse = levelCurrent;
-
-      if (foldAtElse && (levelMinCurrentElse < levelUse)) {
-        levelUse = levelMinCurrentElse;
-      }
-      if (foldAtBegin && (levelMinCurrentBegin < levelUse)) {
-        levelUse = levelMinCurrentBegin;
-      }
-      int lev = levelUse | levelNext << 16;
-      if (visibleChars == 0 && foldCompact)
-        lev |= SC_FOLDLEVELWHITEFLAG;
-
-      if (levelUse < levelNext)
-        lev |= SC_FOLDLEVELHEADERFLAG;
-      if (lev != styler.LevelAt(lineCurrent)) {
-        styler.SetLevel(lineCurrent, lev);
-      }
-      //Platform::DebugPrintf("Line[%04d] ---------------------------------------------------- Level[%x]\n", lineCurrent+1, levelCurrent);
-      lineCurrent++;
-      levelCurrent = levelNext;
-      //levelMinCurrent = levelCurrent;
-      levelMinCurrentElse = levelCurrent;
-      levelMinCurrentBegin = levelCurrent;
-      visibleChars = 0;
-    }
-    /***************************************/
-    if (!isspacechar(ch)) visibleChars++;
-  }
-
-  /***************************************/
-//  Platform::DebugPrintf("Line[%04d] ---------------------------------------------------- Level[%x]\n", lineCurrent+1, levelCurrent);
-}
-
-//=============================================================================
-static void FoldVHDLDoc(unsigned int startPos, int length, int initStyle, WordList *[],
-                       Accessor &styler) {
-  FoldNoBoxVHDLDoc(startPos, length, initStyle, styler);
-}
-
-//=============================================================================
-static const char * const VHDLWordLists[] = {
-            "Keywords",
-            "Operators",
-            "Attributes",
-            "Standard Functions",
-            "Standard Packages",
-            "Standard Types",
-            "User Words",
-            0,
-        };
-
-
-LexerModule lmVHDL(SCLEX_VHDL, ColouriseVHDLDoc, "vhdl", FoldVHDLDoc, VHDLWordLists);
-
-
-// Keyword:
-//    access after alias all architecture array assert attribute begin block body buffer bus case component 
-//    configuration constant disconnect downto else elsif end entity exit file for function generate generic 
-//    group guarded if impure in inertial inout is label library linkage literal loop map new next null of 
-//    on open others out package port postponed procedure process pure range record register reject report 
-//    return select severity shared signal subtype then to transport type unaffected units until use variable 
-//    wait when while with
-//
-// Operators:
-//    abs and mod nand nor not or rem rol ror sla sll sra srl xnor xor
-//
-// Attributes:
-//    left right low high ascending image value pos val succ pred leftof rightof base range reverse_range 
-//    length delayed stable quiet transaction event active last_event last_active last_value driving 
-//    driving_value simple_name path_name instance_name
-//
-// Std Functions:
-//    now readline read writeline write endfile resolved to_bit to_bitvector to_stdulogic to_stdlogicvector 
-//    to_stdulogicvector to_x01 to_x01z to_UX01 rising_edge falling_edge is_x shift_left shift_right rotate_left 
-//    rotate_right resize to_integer to_unsigned to_signed std_match to_01
-//
-// Std Packages:
-//    std ieee work standard textio std_logic_1164 std_logic_arith std_logic_misc std_logic_signed 
-//    std_logic_textio std_logic_unsigned numeric_bit numeric_std math_complex math_real vital_primitives 
-//    vital_timing
-//
-// Std Types:
-//    boolean bit character severity_level integer real time delay_length natural positive string bit_vector 
-//    file_open_kind file_open_status line text side width std_ulogic std_ulogic_vector std_logic 
-//    std_logic_vector X01 X01Z UX01 UX01Z unsigned signed
-//
-
diff --git a/src/stc/scintilla/src/LexVerilog.cxx b/src/stc/scintilla/src/LexVerilog.cxx
deleted file mode 100644
index 43ef7eb37d..0000000000
--- a/src/stc/scintilla/src/LexVerilog.cxx
+++ /dev/null
@@ -1,299 +0,0 @@
-// Scintilla source code edit control
-/** @file LexVerilog.cxx
- ** Lexer for Verilog.
- ** Written by Avi Yegudin, based on C++ lexer by Neil Hodgson
- **/
-// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static inline bool IsAWordChar(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' || ch == '\'');
-}
-
-static inline bool IsAWordStart(const int ch) {
-	return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '$');
-}
-
-static void ColouriseVerilogDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-                            Accessor &styler) {
-
-	WordList &keywords = *keywordlists[0];
-	WordList &keywords2 = *keywordlists[1];
-	WordList &keywords3 = *keywordlists[2];
-	WordList &keywords4 = *keywordlists[3];
-
-	// Do not leak onto next line
-	if (initStyle == SCE_V_STRINGEOL)
-		initStyle = SCE_V_DEFAULT;
-
-	StyleContext sc(startPos, length, initStyle, styler);
-
-	for (; sc.More(); sc.Forward()) {
-
-		if (sc.atLineStart && (sc.state == SCE_V_STRING)) {
-			// Prevent SCE_V_STRINGEOL from leaking back to previous line
-			sc.SetState(SCE_V_STRING);
-		}
-
-		// Handle line continuation generically.
-		if (sc.ch == '\\') {
-			if (sc.chNext == '\n' || sc.chNext == '\r') {
-				sc.Forward();
-				if (sc.ch == '\r' && sc.chNext == '\n') {
-					sc.Forward();
-				}
-				continue;
-			}
-		}
-
-		// Determine if the current state should terminate.
-		if (sc.state == SCE_V_OPERATOR) {
-			sc.SetState(SCE_V_DEFAULT);
-		} else if (sc.state == SCE_V_NUMBER) {
-			if (!IsAWordChar(sc.ch)) {
-				sc.SetState(SCE_V_DEFAULT);
-			}
-		} else if (sc.state == SCE_V_IDENTIFIER) {
-			if (!IsAWordChar(sc.ch) || (sc.ch == '.')) {
-				char s[100];
-                                sc.GetCurrent(s, sizeof(s));
-				if (keywords.InList(s)) {
-					sc.ChangeState(SCE_V_WORD);
-				} else if (keywords2.InList(s)) {
-					sc.ChangeState(SCE_V_WORD2);
-				} else if (keywords3.InList(s)) {
-					sc.ChangeState(SCE_V_WORD3);
-                                } else if (keywords4.InList(s)) {
-					sc.ChangeState(SCE_V_USER);
-				}
-				sc.SetState(SCE_V_DEFAULT);
-			}
-		} else if (sc.state == SCE_V_PREPROCESSOR) {
-                        if (!IsAWordChar(sc.ch)) {
-                                sc.SetState(SCE_V_DEFAULT);
-                        }
-		} else if (sc.state == SCE_V_COMMENT) {
-			if (sc.Match('*', '/')) {
-				sc.Forward();
-				sc.ForwardSetState(SCE_V_DEFAULT);
-			}
-		} else if (sc.state == SCE_V_COMMENTLINE || sc.state == SCE_V_COMMENTLINEBANG) {
-			if (sc.atLineEnd) {
-				sc.SetState(SCE_V_DEFAULT);
-			}
-                } else if (sc.state == SCE_V_STRING) {
-			if (sc.ch == '\\') {
-				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
-					sc.Forward();
-				}
-			} else if (sc.ch == '\"') {
-				sc.ForwardSetState(SCE_V_DEFAULT);
-			} else if (sc.atLineEnd) {
-				sc.ChangeState(SCE_V_STRINGEOL);
-				sc.ForwardSetState(SCE_V_DEFAULT);
-			}
-		}
-
-		// Determine if a new state should be entered.
-		if (sc.state == SCE_V_DEFAULT) {
-			if (IsADigit(sc.ch) || (sc.ch == '\'') || (sc.ch == '.' && IsADigit(sc.chNext))) {
-				sc.SetState(SCE_V_NUMBER);
-			} else if (IsAWordStart(sc.ch)) {
-				sc.SetState(SCE_V_IDENTIFIER);
-			} else if (sc.Match('/', '*')) {
-                                sc.SetState(SCE_V_COMMENT);
-				sc.Forward();	// Eat the * so it isn't used for the end of the comment
-			} else if (sc.Match('/', '/')) {
-				if (sc.Match("//!"))	// Nice to have a different comment style
-					sc.SetState(SCE_V_COMMENTLINEBANG);
-				else
-					sc.SetState(SCE_V_COMMENTLINE);
-			} else if (sc.ch == '\"') {
-				sc.SetState(SCE_V_STRING);
-			} else if (sc.ch == '`') {
-				sc.SetState(SCE_V_PREPROCESSOR);
-				// Skip whitespace between ` and preprocessor word
-				do {
-					sc.Forward();
-				} while ((sc.ch == ' ' || sc.ch == '\t') && sc.More());
-				if (sc.atLineEnd) {
-					sc.SetState(SCE_V_DEFAULT);
-				}
-			} else if (isoperator(static_cast<char>(sc.ch)) || sc.ch == '@' || sc.ch == '#') {
-				sc.SetState(SCE_V_OPERATOR);
-			}
-		}
-	}
-	sc.Complete();
-}
-
-static bool IsStreamCommentStyle(int style) {
-	return style == SCE_V_COMMENT;
-}
-
-// Store both the current line's fold level and the next lines in the
-// level store to make it easy to pick up with each increment
-// and to make it possible to fiddle the current level for "} else {".
-static void FoldNoBoxVerilogDoc(unsigned int startPos, int length, int initStyle,
-                            Accessor &styler) {
-	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
-	bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0;
-	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-	bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0;
-        // Verilog specific folding options:
-        // fold_at_module -
-        //      Generally used methodology in verilog code is
-        //      one module per file, so folding at module definition is useless.
-        // fold_at_brace/parenthese -
-        //      Folding of long port lists can be convenient. 
-	bool foldAtModule = styler.GetPropertyInt("fold.verilog.flags", 0) != 0;
-	bool foldAtBrace  = 1;
-	bool foldAtParenthese  = 1;
-                                
-	unsigned int endPos = startPos + length;
-	int visibleChars = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int levelCurrent = SC_FOLDLEVELBASE;
-	if (lineCurrent > 0)
-		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
-	int levelMinCurrent = levelCurrent;
-	int levelNext = levelCurrent;
-	char chNext = styler[startPos];
-	int styleNext = styler.StyleAt(startPos);
-	int style = initStyle;
-	for (unsigned int i = startPos; i < endPos; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-		int stylePrev = style;
-		style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-		if (foldComment && IsStreamCommentStyle(style)) {
-			if (!IsStreamCommentStyle(stylePrev)) {
-				levelNext++;
-			} else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
-				// Comments don't end at end of line and the next character may be unstyled.
-				levelNext--;
-			}
-		}
-		if (foldComment && (style == SCE_V_COMMENTLINE)) {
-			if ((ch == '/') && (chNext == '/')) {
-				char chNext2 = styler.SafeGetCharAt(i + 2);
-				if (chNext2 == '{') {
-					levelNext++;
-				} else if (chNext2 == '}') {
-					levelNext--;
-				}
-			}
-		}
-		if (foldPreprocessor && (style == SCE_V_PREPROCESSOR)) {
-			if (ch == '`') {
-				unsigned int j = i + 1;
-				while ((j < endPos) && IsASpaceOrTab(styler.SafeGetCharAt(j))) {
-					j++;
-				}
-				if (styler.Match(j, "if")) {
-					levelNext++;
-				} else if (styler.Match(j, "end")) {
-					levelNext--;
-				}
-			}
-		}
-                if (style == SCE_V_OPERATOR) {
-                    if (foldAtParenthese) {
-			if (ch == '(') {
-				levelNext++;
-			} else if (ch == ')') {
-				levelNext--;
-			}
-                    }
-		}
-                if (style == SCE_V_OPERATOR) {
-                    if (foldAtBrace) {
-			if (ch == '{') {
-				levelNext++;
-			} else if (ch == '}') {
-				levelNext--;
-			}
-                    }
-		}
-                if (style == SCE_V_WORD && stylePrev != SCE_V_WORD) {
-                        unsigned int j = i;
-                        if (styler.Match(j, "case") || 
-                            styler.Match(j, "casex") || 
-                            styler.Match(j, "casez") || 
-                            styler.Match(j, "function") || 
-                            styler.Match(j, "fork") || 
-                            styler.Match(j, "table") || 
-                            styler.Match(j, "task") || 
-                            styler.Match(j, "specify") || 
-                            styler.Match(j, "primitive") || 
-                            styler.Match(j, "module") && foldAtModule || 
-                            styler.Match(j, "begin")) {
-                                levelNext++;
-                        } else if (styler.Match(j, "endcase") || 
-                                   styler.Match(j, "endfunction") ||
-                                   styler.Match(j, "join") ||
-                                   styler.Match(j, "endtask") ||
-                                   styler.Match(j, "endtable") ||
-                                   styler.Match(j, "endspecify") ||
-                                   styler.Match(j, "endprimitive") ||
-                                   styler.Match(j, "endmodule") && foldAtModule ||
-                                   styler.Match(j, "end") && !IsAWordChar(styler.SafeGetCharAt(j+3))) {
-                                levelNext--;
-                        }
-		}
-		if (atEOL) {
-			int levelUse = levelCurrent;
-			if (foldAtElse) {
-				levelUse = levelMinCurrent;
-			}
-			int lev = levelUse | levelNext << 16;
-			if (visibleChars == 0 && foldCompact)
-				lev |= SC_FOLDLEVELWHITEFLAG;
-			if (levelUse < levelNext)
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			if (lev != styler.LevelAt(lineCurrent)) {
-				styler.SetLevel(lineCurrent, lev);
-			}
-			lineCurrent++;
-			levelCurrent = levelNext;
-			levelMinCurrent = levelCurrent;
-			visibleChars = 0;
-		}
-		if (!isspacechar(ch))
-			visibleChars++;
-	}
-}
-
-static void FoldVerilogDoc(unsigned int startPos, int length, int initStyle, WordList *[],
-                       Accessor &styler) {
-	FoldNoBoxVerilogDoc(startPos, length, initStyle, styler);
-}
-
-static const char * const verilogWordLists[] = {
-            "Primary keywords and identifiers",
-            "Secondary keywords and identifiers",
-            "System Tasks",
-            "User defined tasks and identifiers",
-            "Unused",
-            0,
-        };
-
-
-LexerModule lmVerilog(SCLEX_VERILOG, ColouriseVerilogDoc, "verilog", FoldVerilogDoc, verilogWordLists);
diff --git a/src/stc/scintilla/src/LexYAML.cxx b/src/stc/scintilla/src/LexYAML.cxx
deleted file mode 100644
index e3053f8140..0000000000
--- a/src/stc/scintilla/src/LexYAML.cxx
+++ /dev/null
@@ -1,305 +0,0 @@
-// Scintilla source code edit control
-/** @file LexYAML.cxx
- ** Lexer for YAML.
- **/
-// Copyright 2003- by Sean O'Dell <sean@celsoft.com>
-// Release under the same license as Scintilla/SciTE.
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-static const char * const yamlWordListDesc[] = {
-	"Keywords",
-	0
-};
-
-static inline bool AtEOL(Accessor &styler, unsigned int i) {
-	return (styler[i] == '\n') ||
-		((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n'));
-}
-
-static unsigned int SpaceCount(char* lineBuffer) {
-	if (lineBuffer == NULL)
-		return 0;
-	
-	char* headBuffer = lineBuffer;
-	
-	while (*headBuffer == ' ')
-		headBuffer++;
-	
-	return headBuffer - lineBuffer;
-}
-
-#define YAML_STATE_BITSIZE 16
-#define YAML_STATE_MASK			(0xFFFF0000)
-#define YAML_STATE_DOCUMENT		(1 << YAML_STATE_BITSIZE)
-#define YAML_STATE_VALUE			(2 << YAML_STATE_BITSIZE)
-#define YAML_STATE_COMMENT		(3 << YAML_STATE_BITSIZE)
-#define YAML_STATE_TEXT_PARENT	(4 << YAML_STATE_BITSIZE)
-#define YAML_STATE_TEXT			(5 << YAML_STATE_BITSIZE)
-
-static void ColouriseYAMLLine(
-	char *lineBuffer,
-	unsigned int currentLine,
-	unsigned int lengthLine,
-	unsigned int startLine,
-	unsigned int endPos,
-	WordList &keywords,
-	Accessor &styler) {
-	    
-	unsigned int i = 0;
-	bool bInQuotes = false;
-	unsigned int indentAmount = SpaceCount(lineBuffer);
-		
-	if (currentLine > 0) {
-		int parentLineState = styler.GetLineState(currentLine - 1);
-	
-		if ((parentLineState&YAML_STATE_MASK) == YAML_STATE_TEXT || (parentLineState&YAML_STATE_MASK) == YAML_STATE_TEXT_PARENT) {
-			unsigned int parentIndentAmount = parentLineState&(~YAML_STATE_MASK);
-			if (indentAmount > parentIndentAmount) {
-				styler.SetLineState(currentLine, YAML_STATE_TEXT | parentIndentAmount);
-				styler.ColourTo(endPos, SCE_YAML_TEXT);
-				return;
-			}
-		}
-	}
-	styler.SetLineState(currentLine, 0);
-	if (strncmp(lineBuffer, "---", 3) == 0) {	// Document marker
-		styler.SetLineState(currentLine, YAML_STATE_DOCUMENT);
-		styler.ColourTo(endPos, SCE_YAML_DOCUMENT);
-		return;
-	}
-	// Skip initial spaces
-	while ((i < lengthLine) && lineBuffer[i] == ' ') { // YAML always uses space, never TABS or anything else
-		i++;
-	}
-	if (lineBuffer[i] == '\t') { // if we skipped all spaces, and we are NOT inside a text block, this is wrong
-		styler.ColourTo(endPos, SCE_YAML_ERROR);
-		return;
-	}
-	if (lineBuffer[i] == '#') {	// Comment
-		styler.SetLineState(currentLine, YAML_STATE_COMMENT);
-		styler.ColourTo(endPos, SCE_YAML_COMMENT);
-		return;
-	}
-	while (i < lengthLine) {
-		if (lineBuffer[i] == '\'' || lineBuffer[i] == '\"') {
-			bInQuotes = !bInQuotes;
-		} else if (lineBuffer[i] == ':' && !bInQuotes) {
-			styler.ColourTo(startLine + i, SCE_YAML_IDENTIFIER);
-			// Non-folding scalar
-			i++;
-			while ((i < lengthLine) && isspacechar(lineBuffer[i]))
-				i++;
-			unsigned int endValue = lengthLine - 1;
-			while ((endValue >= i) && isspacechar(lineBuffer[endValue]))
-				endValue--;
-			lineBuffer[endValue + 1] = '\0';
-			if (lineBuffer[i] == '|' || lineBuffer[i] == '>') {
-				i++;
-				if (lineBuffer[i] == '+' || lineBuffer[i] == '-')
-					i++;
-				while ((i < lengthLine) && isspacechar(lineBuffer[i]))
-					i++;
-				if (lineBuffer[i] == '\0') {
-					styler.SetLineState(currentLine, YAML_STATE_TEXT_PARENT | indentAmount);
-					styler.ColourTo(endPos, SCE_YAML_DEFAULT);
-					return;
-				} else if (lineBuffer[i] == '#') {
-					styler.SetLineState(currentLine, YAML_STATE_TEXT_PARENT | indentAmount);
-					styler.ColourTo(startLine + i - 1, SCE_YAML_DEFAULT);
-					styler.ColourTo(endPos, SCE_YAML_COMMENT);
-					return;
-				} else {
-					styler.ColourTo(endPos, SCE_YAML_ERROR);
-					return;
-				}
-			}
-			styler.SetLineState(currentLine, YAML_STATE_VALUE);
-			if (lineBuffer[i] == '&' || lineBuffer[i] == '*') {
-				styler.ColourTo(endPos, SCE_YAML_REFERENCE);
-				return;
-			}
-			if (keywords.InList(&lineBuffer[i])) { // Convertible value (true/false, etc.)
-				styler.ColourTo(endPos, SCE_YAML_KEYWORD);
-				return;
-			} else {
-				unsigned int i2 = i;
-				while ((i < lengthLine) && lineBuffer[i]) {
-					if (!isdigit(lineBuffer[i]) && lineBuffer[i] != '-' && lineBuffer[i] != '.' && lineBuffer[i] != ',') {
-						styler.ColourTo(endPos, SCE_YAML_DEFAULT);
-						return;
-					}
-					i++;
-				}
-				if (i > i2) {
-					styler.ColourTo(endPos, SCE_YAML_NUMBER);
-					return;
-				}
-			}
-			break; // shouldn't get here, but just in case, the rest of the line is coloured the default
-		}
-		i++;
-	}
-	styler.ColourTo(endPos, SCE_YAML_DEFAULT);
-}
-
-static void ColouriseYAMLDoc(unsigned int startPos, int length, int, WordList *keywordLists[], Accessor &styler) {
-	char lineBuffer[1024];
-	styler.StartAt(startPos);
-	styler.StartSegment(startPos);
-	unsigned int linePos = 0;
-	unsigned int startLine = startPos;
-	unsigned int endPos = startPos + length;
-	unsigned int maxPos = styler.Length();
-	unsigned int lineCurrent = styler.GetLine(startPos);
-	
-	for (unsigned int i = startPos; i < maxPos && i < endPos; i++) {
-		lineBuffer[linePos++] = styler[i];
-		if (AtEOL(styler, i) || (linePos >= sizeof(lineBuffer) - 1)) {
-			// End of line (or of line buffer) met, colourise it
-			lineBuffer[linePos] = '\0';
-			ColouriseYAMLLine(lineBuffer, lineCurrent, linePos, startLine, i, *keywordLists[0], styler);
-			linePos = 0;
-			startLine = i + 1;
-			lineCurrent++;
-		}
-	}
-	if (linePos > 0) {	// Last line does not have ending characters
-		ColouriseYAMLLine(lineBuffer, lineCurrent, linePos, startLine, startPos + length - 1, *keywordLists[0], styler);
-	}
-}
-
-static bool IsCommentLine(int line, Accessor &styler) {
-	int pos = styler.LineStart(line);
-	if (styler[pos] == '#')
-		return true;
-	return false;
-}
-
-static void FoldYAMLDoc(unsigned int startPos, int length, int /*initStyle - unused*/,
-                      WordList *[], Accessor &styler) {
-	const int maxPos = startPos + length;
-	const int maxLines = styler.GetLine(maxPos - 1);             // Requested last line
-	const int docLines = styler.GetLine(styler.Length() - 1);  // Available last line
-	const bool foldComment = styler.GetPropertyInt("fold.comment.yaml") != 0;
-
-	// Backtrack to previous non-blank line so we can determine indent level
-	// for any white space lines
-	// and so we can fix any preceding fold level (which is why we go back
-	// at least one line in all cases)
-	int spaceFlags = 0;
-	int lineCurrent = styler.GetLine(startPos);
-	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL);
-	while (lineCurrent > 0) {
-		lineCurrent--;
-		indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL);
-		if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG) &&
-		        (!IsCommentLine(lineCurrent, styler)))
-			break;
-	}
-	int indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK;
-
-	// Set up initial loop state
-	int prevComment = 0;
-	if (lineCurrent >= 1)
-		prevComment = foldComment && IsCommentLine(lineCurrent - 1, styler);
-
-	// Process all characters to end of requested range
-	// or comment that hangs over the end of the range.  Cap processing in all cases
-	// to end of document (in case of unclosed comment at end).
-	while ((lineCurrent <= docLines) && ((lineCurrent <= maxLines) || prevComment)) {
-
-		// Gather info
-		int lev = indentCurrent;
-		int lineNext = lineCurrent + 1;
-		int indentNext = indentCurrent;
-		if (lineNext <= docLines) {
-			// Information about next line is only available if not at end of document
-			indentNext = styler.IndentAmount(lineNext, &spaceFlags, NULL);
-	}
-		const int comment = foldComment && IsCommentLine(lineCurrent, styler);
-		const int comment_start = (comment && !prevComment && (lineNext <= docLines) &&
-		                           IsCommentLine(lineNext, styler) && (lev > SC_FOLDLEVELBASE));
-		const int comment_continue = (comment && prevComment);
-		if (!comment)
-			indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK;
-		if (indentNext & SC_FOLDLEVELWHITEFLAG)
-			indentNext = SC_FOLDLEVELWHITEFLAG | indentCurrentLevel;
-
-		if (comment_start) {
-			// Place fold point at start of a block of comments
-			lev |= SC_FOLDLEVELHEADERFLAG;
-		} else if (comment_continue) {
-			// Add level to rest of lines in the block
-			lev = lev + 1;
-		}
-
-		// Skip past any blank lines for next indent level info; we skip also
-		// comments (all comments, not just those starting in column 0)
-		// which effectively folds them into surrounding code rather
-		// than screwing up folding.
-
-		while ((lineNext < docLines) &&
-		        ((indentNext & SC_FOLDLEVELWHITEFLAG) ||
-		         (lineNext <= docLines && IsCommentLine(lineNext, styler)))) {
-
-			lineNext++;
-			indentNext = styler.IndentAmount(lineNext, &spaceFlags, NULL);
-		}
-
-		const int levelAfterComments = indentNext & SC_FOLDLEVELNUMBERMASK;
-		const int levelBeforeComments = Platform::Maximum(indentCurrentLevel,levelAfterComments);
-
-		// Now set all the indent levels on the lines we skipped
-		// Do this from end to start.  Once we encounter one line
-		// which is indented more than the line after the end of
-		// the comment-block, use the level of the block before
-
-		int skipLine = lineNext;
-		int skipLevel = levelAfterComments;
-
-		while (--skipLine > lineCurrent) {
-			int skipLineIndent = styler.IndentAmount(skipLine, &spaceFlags, NULL);
-
-			if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > levelAfterComments)
-				skipLevel = levelBeforeComments;
-
-			int whiteFlag = skipLineIndent & SC_FOLDLEVELWHITEFLAG;
-
-			styler.SetLevel(skipLine, skipLevel | whiteFlag);
-		}
-
-		// Set fold header on non-comment line
-		if (!comment && !(indentCurrent & SC_FOLDLEVELWHITEFLAG) ) {
-			if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK))
-				lev |= SC_FOLDLEVELHEADERFLAG;
-		}
-
-		// Keep track of block comment state of previous line
-		prevComment = comment_start || comment_continue;
-
-		// Set fold level for this line and move to next line
-		styler.SetLevel(lineCurrent, lev);
-		indentCurrent = indentNext;
-		lineCurrent = lineNext;
-	}
-
-	// NOTE: Cannot set level of last line here because indentCurrent doesn't have
-	// header flag set; the loop above is crafted to take care of this case!
-	//styler.SetLevel(lineCurrent, indentCurrent);
-}
-
-LexerModule lmYAML(SCLEX_YAML, ColouriseYAMLDoc, "yaml", FoldYAMLDoc, yamlWordListDesc);
diff --git a/src/stc/scintilla/src/LineMarker.cxx b/src/stc/scintilla/src/LineMarker.cxx
deleted file mode 100644
index 6ded13c73a..0000000000
--- a/src/stc/scintilla/src/LineMarker.cxx
+++ /dev/null
@@ -1,301 +0,0 @@
-// Scintilla source code edit control
-/** @file LineMarker.cxx
- ** Defines the look of a line marker in the margin .
- **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <string.h>
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-#include "XPM.h"
-#include "LineMarker.h"
-
-void LineMarker::RefreshColourPalette(Palette &pal, bool want) {
-	pal.WantFind(fore, want);
-	pal.WantFind(back, want);
-	if (pxpm) {
-		pxpm->RefreshColourPalette(pal, want);
-	}
-}
-
-void LineMarker::SetXPM(const char *textForm) {
-	delete pxpm;
-	pxpm = new XPM(textForm);
-	markType = SC_MARK_PIXMAP;
-}
-
-void LineMarker::SetXPM(const char * const *linesForm) {
-	delete pxpm;
-	pxpm = new XPM(linesForm);
-	markType = SC_MARK_PIXMAP;
-}
-
-static void DrawBox(Surface *surface, int centreX, int centreY, int armSize, ColourAllocated fore, ColourAllocated back) {
-	PRectangle rc;
-	rc.left = centreX - armSize;
-	rc.top = centreY - armSize;
-	rc.right = centreX + armSize + 1;
-	rc.bottom = centreY + armSize + 1;
-	surface->RectangleDraw(rc, back, fore);
-}
-
-static void DrawCircle(Surface *surface, int centreX, int centreY, int armSize, ColourAllocated fore, ColourAllocated back) {
-	PRectangle rcCircle;
-	rcCircle.left = centreX - armSize;
-	rcCircle.top = centreY - armSize;
-	rcCircle.right = centreX + armSize + 1;
-	rcCircle.bottom = centreY + armSize + 1;
-	surface->Ellipse(rcCircle, back, fore);
-}
-
-static void DrawPlus(Surface *surface, int centreX, int centreY, int armSize, ColourAllocated fore) {
-	PRectangle rcV(centreX, centreY - armSize + 2, centreX + 1, centreY + armSize - 2 + 1);
-	surface->FillRectangle(rcV, fore);
-	PRectangle rcH(centreX - armSize + 2, centreY, centreX + armSize - 2 + 1, centreY+1);
-	surface->FillRectangle(rcH, fore);
-}
-
-static void DrawMinus(Surface *surface, int centreX, int centreY, int armSize, ColourAllocated fore) {
-	PRectangle rcH(centreX - armSize + 2, centreY, centreX + armSize - 2 + 1, centreY+1);
-	surface->FillRectangle(rcH, fore);
-}
-
-void LineMarker::Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharacter) {
-	if ((markType == SC_MARK_PIXMAP) && (pxpm)) {
-		pxpm->Draw(surface, rcWhole);
-		return;
-	}
-	// Restrict most shapes a bit
-	PRectangle rc = rcWhole;
-	rc.top++;
-	rc.bottom--;
-	int minDim = Platform::Minimum(rc.Width(), rc.Height());
-	minDim--;	// Ensure does not go beyond edge
-	int centreX = (rc.right + rc.left) / 2;
-	int centreY = (rc.bottom + rc.top) / 2;
-	int dimOn2 = minDim / 2;
-	int dimOn4 = minDim / 4;
-	int blobSize = dimOn2-1;
-	int armSize = dimOn2-2;
-	if (rc.Width() > (rc.Height() * 2)) {
-		// Wide column is line number so move to left to try to avoid overlapping number
-		centreX = rc.left + dimOn2 + 1;
-	}
-	if (markType == SC_MARK_ROUNDRECT) {
-		PRectangle rcRounded = rc;
-		rcRounded.left = rc.left + 1;
-		rcRounded.right = rc.right - 1;
-		surface->RoundedRectangle(rcRounded, fore.allocated, back.allocated);
-	} else if (markType == SC_MARK_CIRCLE) {
-		PRectangle rcCircle;
-		rcCircle.left = centreX - dimOn2;
-		rcCircle.top = centreY - dimOn2;
-		rcCircle.right = centreX + dimOn2;
-		rcCircle.bottom = centreY + dimOn2;
-		surface->Ellipse(rcCircle, fore.allocated, back.allocated);
-	} else if (markType == SC_MARK_ARROW) {
-		Point pts[] = {
-    		Point(centreX - dimOn4, centreY - dimOn2),
-    		Point(centreX - dimOn4, centreY + dimOn2),
-    		Point(centreX + dimOn2 - dimOn4, centreY),
-		};
-		surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),
-                 		fore.allocated, back.allocated);
-
-	} else if (markType == SC_MARK_ARROWDOWN) {
-		Point pts[] = {
-    		Point(centreX - dimOn2, centreY - dimOn4),
-    		Point(centreX + dimOn2, centreY - dimOn4),
-    		Point(centreX, centreY + dimOn2 - dimOn4),
-		};
-		surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),
-                 		fore.allocated, back.allocated);
-
-	} else if (markType == SC_MARK_PLUS) {
-		Point pts[] = {
-    		Point(centreX - armSize, centreY - 1),
-    		Point(centreX - 1, centreY - 1),
-    		Point(centreX - 1, centreY - armSize),
-    		Point(centreX + 1, centreY - armSize),
-    		Point(centreX + 1, centreY - 1),
-    		Point(centreX + armSize, centreY -1),
-    		Point(centreX + armSize, centreY +1),
-    		Point(centreX + 1, centreY + 1),
-    		Point(centreX + 1, centreY + armSize),
-    		Point(centreX - 1, centreY + armSize),
-    		Point(centreX - 1, centreY + 1),
-    		Point(centreX - armSize, centreY + 1),
-		};
-		surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),
-                 		fore.allocated, back.allocated);
-
-	} else if (markType == SC_MARK_MINUS) {
-		Point pts[] = {
-    		Point(centreX - armSize, centreY - 1),
-    		Point(centreX + armSize, centreY -1),
-    		Point(centreX + armSize, centreY +1),
-    		Point(centreX - armSize, centreY + 1),
-		};
-		surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),
-                 		fore.allocated, back.allocated);
-
-	} else if (markType == SC_MARK_SMALLRECT) {
-		PRectangle rcSmall;
-		rcSmall.left = rc.left + 1;
-		rcSmall.top = rc.top + 2;
-		rcSmall.right = rc.right - 1;
-		rcSmall.bottom = rc.bottom - 2;
-		surface->RectangleDraw(rcSmall, fore.allocated, back.allocated);
-
-	} else if (markType == SC_MARK_EMPTY || markType == SC_MARK_BACKGROUND) {
-		// An invisible marker so don't draw anything
-
-	} else if (markType == SC_MARK_VLINE) {
-		surface->PenColour(back.allocated);
-		surface->MoveTo(centreX, rcWhole.top);
-		surface->LineTo(centreX, rcWhole.bottom);
-
-	} else if (markType == SC_MARK_LCORNER) {
-		surface->PenColour(back.allocated);
-		surface->MoveTo(centreX, rcWhole.top);
-		surface->LineTo(centreX, rc.top + dimOn2);
-		surface->LineTo(rc.right - 2, rc.top + dimOn2);
-
-	} else if (markType == SC_MARK_TCORNER) {
-		surface->PenColour(back.allocated);
-		surface->MoveTo(centreX, rcWhole.top);
-		surface->LineTo(centreX, rcWhole.bottom);
-		surface->MoveTo(centreX, rc.top + dimOn2);
-		surface->LineTo(rc.right - 2, rc.top + dimOn2);
-
-	} else if (markType == SC_MARK_LCORNERCURVE) {
-		surface->PenColour(back.allocated);
-		surface->MoveTo(centreX, rcWhole.top);
-		surface->LineTo(centreX, rc.top + dimOn2-3);
-		surface->LineTo(centreX+3, rc.top + dimOn2);
-		surface->LineTo(rc.right - 1, rc.top + dimOn2);
-
-	} else if (markType == SC_MARK_TCORNERCURVE) {
-		surface->PenColour(back.allocated);
-		surface->MoveTo(centreX, rcWhole.top);
-		surface->LineTo(centreX, rcWhole.bottom);
-
-		surface->MoveTo(centreX, rc.top + dimOn2-3);
-		surface->LineTo(centreX+3, rc.top + dimOn2);
-		surface->LineTo(rc.right - 1, rc.top + dimOn2);
-
-	} else if (markType == SC_MARK_BOXPLUS) {
-		surface->PenColour(back.allocated);
-		DrawBox(surface, centreX, centreY, blobSize, fore.allocated, back.allocated);
-		DrawPlus(surface, centreX, centreY, blobSize, back.allocated);
-
-	} else if (markType == SC_MARK_BOXPLUSCONNECTED) {
-		surface->PenColour(back.allocated);
-		DrawBox(surface, centreX, centreY, blobSize, fore.allocated, back.allocated);
-		DrawPlus(surface, centreX, centreY, blobSize, back.allocated);
-
-		surface->MoveTo(centreX, centreY + blobSize);
-		surface->LineTo(centreX, rcWhole.bottom);
-
-		surface->MoveTo(centreX, rcWhole.top);
-		surface->LineTo(centreX, centreY - blobSize);
-
-	} else if (markType == SC_MARK_BOXMINUS) {
-		surface->PenColour(back.allocated);
-		DrawBox(surface, centreX, centreY, blobSize, fore.allocated, back.allocated);
-		DrawMinus(surface, centreX, centreY, blobSize, back.allocated);
-
-		surface->MoveTo(centreX, centreY + blobSize);
-		surface->LineTo(centreX, rcWhole.bottom);
-
-	} else if (markType == SC_MARK_BOXMINUSCONNECTED) {
-		surface->PenColour(back.allocated);
-		DrawBox(surface, centreX, centreY, blobSize, fore.allocated, back.allocated);
-		DrawMinus(surface, centreX, centreY, blobSize, back.allocated);
-
-		surface->MoveTo(centreX, centreY + blobSize);
-		surface->LineTo(centreX, rcWhole.bottom);
-
-		surface->MoveTo(centreX, rcWhole.top);
-		surface->LineTo(centreX, centreY - blobSize);
-
-	} else if (markType == SC_MARK_CIRCLEPLUS) {
-		DrawCircle(surface, centreX, centreY, blobSize, fore.allocated, back.allocated);
-		surface->PenColour(back.allocated);
-		DrawPlus(surface, centreX, centreY, blobSize, back.allocated);
-
-	} else if (markType == SC_MARK_CIRCLEPLUSCONNECTED) {
-		DrawCircle(surface, centreX, centreY, blobSize, fore.allocated, back.allocated);
-		surface->PenColour(back.allocated);
-		DrawPlus(surface, centreX, centreY, blobSize, back.allocated);
-
-		surface->MoveTo(centreX, centreY + blobSize);
-		surface->LineTo(centreX, rcWhole.bottom);
-
-		surface->MoveTo(centreX, rcWhole.top);
-		surface->LineTo(centreX, centreY - blobSize);
-
-	} else if (markType == SC_MARK_CIRCLEMINUS) {
-		DrawCircle(surface, centreX, centreY, blobSize, fore.allocated, back.allocated);
-		surface->PenColour(back.allocated);
-		DrawMinus(surface, centreX, centreY, blobSize, back.allocated);
-
-		surface->MoveTo(centreX, centreY + blobSize);
-		surface->LineTo(centreX, rcWhole.bottom);
-
-	} else if (markType == SC_MARK_CIRCLEMINUSCONNECTED) {
-		DrawCircle(surface, centreX, centreY, blobSize, fore.allocated, back.allocated);
-		surface->PenColour(back.allocated);
-		DrawMinus(surface, centreX, centreY, blobSize, back.allocated);
-
-		surface->MoveTo(centreX, centreY + blobSize);
-		surface->LineTo(centreX, rcWhole.bottom);
-
-		surface->MoveTo(centreX, rcWhole.top);
-		surface->LineTo(centreX, centreY - blobSize);
-
-	} else if (markType >= SC_MARK_CHARACTER) {
-		char character[1];
-		character[0] = static_cast<char>(markType - SC_MARK_CHARACTER);
-		int width = surface->WidthText(fontForCharacter, character, 1);
-		rc.left += (rc.Width() - width) / 2;
-		rc.right = rc.left + width;
-		surface->DrawTextClipped(rc, fontForCharacter, rc.bottom - 2,
-			character, 1, fore.allocated, back.allocated);
-
-	} else if (markType == SC_MARK_DOTDOTDOT) {
-		int right = centreX - 6;
-		for (int b=0; b<3; b++) {
-			PRectangle rcBlob(right, rc.bottom - 4, right + 2, rc.bottom-2);
-			surface->FillRectangle(rcBlob, fore.allocated);
-			right += 5;
-		}
-	} else if (markType == SC_MARK_ARROWS) {
-		surface->PenColour(fore.allocated);
-		int right = centreX - 2;
-		for (int b=0; b<3; b++) {
-			surface->MoveTo(right - 4, centreY - 4);
-			surface->LineTo(right, centreY);
-			surface->LineTo(right - 5, centreY + 5);
-			right += 4;
-		}
-	} else if (markType == SC_MARK_SHORTARROW) {
-		Point pts[] = {
-			Point(centreX, centreY + dimOn2),
-			Point(centreX + dimOn2, centreY),
-			Point(centreX, centreY - dimOn2),
-			Point(centreX, centreY - dimOn4),
-			Point(centreX - dimOn4, centreY - dimOn4),
-			Point(centreX - dimOn4, centreY + dimOn4),
-			Point(centreX, centreY + dimOn4),
-			Point(centreX, centreY + dimOn2),
-		};
-		surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),
-				fore.allocated, back.allocated);
-	} else { // SC_MARK_FULLRECT
-		surface->FillRectangle(rcWhole, back.allocated);
-	}
-}
diff --git a/src/stc/scintilla/src/LineMarker.h b/src/stc/scintilla/src/LineMarker.h
deleted file mode 100644
index 8ebdce4918..0000000000
--- a/src/stc/scintilla/src/LineMarker.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Scintilla source code edit control
-/** @file LineMarker.h
- ** Defines the look of a line marker in the margin .
- **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef LINEMARKER_H
-#define LINEMARKER_H
-
-/**
- */
-class LineMarker {
-public:
-	int markType;
-	ColourPair fore;
-	ColourPair back;
-	int alpha;
-	XPM *pxpm;
-	LineMarker() {
-		markType = SC_MARK_CIRCLE;
-		fore = ColourDesired(0,0,0);
-		back = ColourDesired(0xff,0xff,0xff);
-		alpha = SC_ALPHA_NOALPHA;
-		pxpm = NULL;
-	}
-	LineMarker(const LineMarker &) {
-		// Defined to avoid pxpm being blindly copied, not as real copy constructor
-		markType = SC_MARK_CIRCLE;
-		fore = ColourDesired(0,0,0);
-		back = ColourDesired(0xff,0xff,0xff);
-		alpha = SC_ALPHA_NOALPHA;
-		pxpm = NULL;
-	}
-	~LineMarker() {
-		delete pxpm;
-	}
-	LineMarker &operator=(const LineMarker &) {
-		// Defined to avoid pxpm being blindly copied, not as real assignment operator
-		markType = SC_MARK_CIRCLE;
-		fore = ColourDesired(0,0,0);
-		back = ColourDesired(0xff,0xff,0xff);
-		alpha = SC_ALPHA_NOALPHA;
-		delete pxpm;
-		pxpm = NULL;
-		return *this;
-	}
-	void RefreshColourPalette(Palette &pal, bool want);
-	void SetXPM(const char *textForm);
-	void SetXPM(const char * const *linesForm);
-	void Draw(Surface *surface, PRectangle &rc, Font &fontForCharacter);
-};
-
-#endif
diff --git a/src/stc/scintilla/src/PropSet.cxx b/src/stc/scintilla/src/PropSet.cxx
deleted file mode 100644
index b4011a04c7..0000000000
--- a/src/stc/scintilla/src/PropSet.cxx
+++ /dev/null
@@ -1,1170 +0,0 @@
-// SciTE - Scintilla based Text Editor
-/** @file PropSet.cxx
- ** A Java style properties file module.
- **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-// Maintain a dictionary of properties
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-
-// The comparison and case changing functions here assume ASCII
-// or extended ASCII such as the normal Windows code page.
-
-static inline char MakeUpperCase(char ch) {
-	if (ch < 'a' || ch > 'z')
-		return ch;
-	else
-		return static_cast<char>(ch - 'a' + 'A');
-}
-
-static inline bool IsLetter(char ch) {
-	return ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'));
-}
-
-inline bool IsASpace(unsigned int ch) {
-    return (ch == ' ') || ((ch >= 0x09) && (ch <= 0x0d));
-}
-
-int CompareCaseInsensitive(const char *a, const char *b) {
-	while (*a && *b) {
-		if (*a != *b) {
-			char upperA = MakeUpperCase(*a);
-			char upperB = MakeUpperCase(*b);
-			if (upperA != upperB)
-				return upperA - upperB;
-		}
-		a++;
-		b++;
-	}
-	// Either *a or *b is nul
-	return *a - *b;
-}
-
-int CompareNCaseInsensitive(const char *a, const char *b, size_t len) {
-	while (*a && *b && len) {
-		if (*a != *b) {
-			char upperA = MakeUpperCase(*a);
-			char upperB = MakeUpperCase(*b);
-			if (upperA != upperB)
-				return upperA - upperB;
-		}
-		a++;
-		b++;
-		len--;
-	}
-	if (len == 0)
-		return 0;
-	else
-		// Either *a or *b is nul
-		return *a - *b;
-}
-
-bool EqualCaseInsensitive(const char *a, const char *b) {
-	return 0 == CompareCaseInsensitive(a, b);
-}
-
-// Since the CaseInsensitive functions declared in SString
-// are implemented here, I will for now put the non-inline
-// implementations of the SString members here as well, so
-// that I can quickly see what effect this has.
-
-SString::SString(int i) : sizeGrowth(sizeGrowthDefault) {
-	char number[32];
-	sprintf(number, "%0d", i);
-	s = StringAllocate(number);
-	sSize = sLen = (s) ? strlen(s) : 0;
-}
-
-SString::SString(double d, int precision) : sizeGrowth(sizeGrowthDefault) {
-	char number[32];
-	sprintf(number, "%.*f", precision, d);
-	s = StringAllocate(number);
-	sSize = sLen = (s) ? strlen(s) : 0;
-}
-
-bool SString::grow(lenpos_t lenNew) {
-	while (sizeGrowth * 6 < lenNew) {
-		sizeGrowth *= 2;
-	}
-	char *sNew = new char[lenNew + sizeGrowth + 1];
-	if (sNew) {
-		if (s) {
-			memcpy(sNew, s, sLen);
-			delete []s;
-		}
-		s = sNew;
-		s[sLen] = '\0';
-		sSize = lenNew + sizeGrowth;
-	}
-	return sNew != 0;
-}
-
-SString &SString::assign(const char *sOther, lenpos_t sSize_) {
-	if (!sOther) {
-		sSize_ = 0;
-	} else if (sSize_ == measure_length) {
-		sSize_ = strlen(sOther);
-	}
-	if (sSize > 0 && sSize_ <= sSize) {	// Does not allocate new buffer if the current is big enough
-		if (s && sSize_) {
-			memcpy(s, sOther, sSize_);
-		}
-		s[sSize_] = '\0';
-		sLen = sSize_;
-	} else {
-		delete []s;
-		s = StringAllocate(sOther, sSize_);
-		if (s) {
-			sSize = sSize_;	// Allow buffer bigger than real string, thus providing space to grow
-			sLen = sSize_;
-		} else {
-			sSize = sLen = 0;
-		}
-	}
-	return *this;
-}
-
-bool SString::operator==(const SString &sOther) const {
-	if ((s == 0) && (sOther.s == 0))
-		return true;
-	if ((s == 0) || (sOther.s == 0))
-		return false;
-	return strcmp(s, sOther.s) == 0;
-}
-
-bool SString::operator==(const char *sOther) const {
-	if ((s == 0) && (sOther == 0))
-		return true;
-	if ((s == 0) || (sOther == 0))
-		return false;
-	return strcmp(s, sOther) == 0;
-}
-
-SString SString::substr(lenpos_t subPos, lenpos_t subLen) const {
-	if (subPos >= sLen) {
-		return SString();					// return a null string if start index is out of bounds
-	}
-	if ((subLen == measure_length) || (subPos + subLen > sLen)) {
-		subLen = sLen - subPos;		// can't substr past end of source string
-	}
-	return SString(s, subPos, subPos + subLen);
-}
-
-SString &SString::lowercase(lenpos_t subPos, lenpos_t subLen) {
-	if ((subLen == measure_length) || (subPos + subLen > sLen)) {
-		subLen = sLen - subPos;		// don't apply past end of string
-	}
-	for (lenpos_t i = subPos; i < subPos + subLen; i++) {
-		if (s[i] < 'A' || s[i] > 'Z')
-			continue;
-		else
-			s[i] = static_cast<char>(s[i] - 'A' + 'a');
-	}
-	return *this;
-}
-
-SString &SString::uppercase(lenpos_t subPos, lenpos_t subLen) {
-	if ((subLen == measure_length) || (subPos + subLen > sLen)) {
-		subLen = sLen - subPos;		// don't apply past end of string
-	}
-	for (lenpos_t i = subPos; i < subPos + subLen; i++) {
-		if (s[i] < 'a' || s[i] > 'z')
-			continue;
-		else
-			s[i] = static_cast<char>(s[i] - 'a' + 'A');
-	}
-	return *this;
-}
-
-SString &SString::append(const char *sOther, lenpos_t sLenOther, char sep) {
-	if (!sOther) {
-		return *this;
-	}
-	if (sLenOther == measure_length) {
-		sLenOther = strlen(sOther);
-	}
-	int lenSep = 0;
-	if (sLen && sep) {	// Only add a separator if not empty
-		lenSep = 1;
-	}
-	lenpos_t lenNew = sLen + sLenOther + lenSep;
-	// Conservative about growing the buffer: don't do it, unless really needed
-	if ((lenNew < sSize) || (grow(lenNew))) {
-		if (lenSep) {
-			s[sLen] = sep;
-			sLen++;
-		}
-		memcpy(&s[sLen], sOther, sLenOther);
-		sLen += sLenOther;
-		s[sLen] = '\0';
-	}
-	return *this;
-}
-
-SString &SString::insert(lenpos_t pos, const char *sOther, lenpos_t sLenOther) {
-	if (!sOther || pos > sLen) {
-		return *this;
-	}
-	if (sLenOther == measure_length) {
-		sLenOther = strlen(sOther);
-	}
-	lenpos_t lenNew = sLen + sLenOther;
-	// Conservative about growing the buffer: don't do it, unless really needed
-	if ((lenNew < sSize) || grow(lenNew)) {
-		lenpos_t moveChars = sLen - pos + 1;
-		for (lenpos_t i = moveChars; i > 0; i--) {
-			s[pos + sLenOther + i - 1] = s[pos + i - 1];
-		}
-		memcpy(s + pos, sOther, sLenOther);
-		sLen = lenNew;
-	}
-	return *this;
-}
-
-/**
- * Remove @a len characters from the @a pos position, included.
- * Characters at pos + len and beyond replace characters at pos.
- * If @a len is 0, or greater than the length of the string
- * starting at @a pos, the string is just truncated at @a pos.
- */
-void SString::remove(lenpos_t pos, lenpos_t len) {
-	if (pos >= sLen) {
-		return;
-	}
-	if (len < 1 || pos + len >= sLen) {
-		s[pos] = '\0';
-		sLen = pos;
-	} else {
-		for (lenpos_t i = pos; i < sLen - len + 1; i++) {
-			s[i] = s[i+len];
-		}
-		sLen -= len;
-	}
-}
-
-bool SString::startswith(const char *prefix) {
-	lenpos_t lenPrefix = strlen(prefix);
-	if (lenPrefix > sLen) {
-		return false;
-	}
-	return strncmp(s, prefix, lenPrefix) == 0;
-}
-
-bool SString::endswith(const char *suffix) {
-	lenpos_t lenSuffix = strlen(suffix);
-	if (lenSuffix > sLen) {
-		return false;
-	}
-	return strncmp(s + sLen - lenSuffix, suffix, lenSuffix) == 0;
-}
-
-int SString::search(const char *sFind, lenpos_t start) const {
-	if (start < sLen) {
-		const char *sFound = strstr(s + start, sFind);
-		if (sFound) {
-			return sFound - s;
-		}
-	}
-	return -1;
-}
-
-int SString::substitute(char chFind, char chReplace) {
-	int c = 0;
-	char *t = s;
-	while (t) {
-		t = strchr(t, chFind);
-		if (t) {
-			*t = chReplace;
-			t++;
-			c++;
-		}
-	}
-	return c;
-}
-
-int SString::substitute(const char *sFind, const char *sReplace) {
-	int c = 0;
-	lenpos_t lenFind = strlen(sFind);
-	lenpos_t lenReplace = strlen(sReplace);
-	int posFound = search(sFind);
-	while (posFound >= 0) {
-		remove(posFound, lenFind);
-		insert(posFound, sReplace, lenReplace);
-		posFound = search(sFind, posFound + lenReplace);
-		c++;
-	}
-	return c;
-}
-
-char *SContainer::StringAllocate(lenpos_t len) {
-	if (len != measure_length) {
-		return new char[len + 1];
-	} else {
-		return 0;
-	}
-}
-
-char *SContainer::StringAllocate(const char *s, lenpos_t len) {
-	if (s == 0) {
-		return 0;
-	}
-	if (len == measure_length) {
-		len = strlen(s);
-	}
-	char *sNew = new char[len + 1];
-	if (sNew) {
-		memcpy(sNew, s, len);
-		sNew[len] = '\0';
-	}
-	return sNew;
-}
-
-// End SString functions
-
-bool PropSet::caseSensitiveFilenames = false;
-
-PropSet::PropSet() {
-	superPS = 0;
-	for (int root = 0; root < hashRoots; root++)
-		props[root] = 0;
-}
-
-PropSet::~PropSet() {
-	superPS = 0;
-	Clear();
-}
-
-void PropSet::Set(const char *key, const char *val, int lenKey, int lenVal) {
-	if (!*key)	// Empty keys are not supported
-		return;
-	if (lenKey == -1)
-		lenKey = static_cast<int>(strlen(key));
-	if (lenVal == -1)
-		lenVal = static_cast<int>(strlen(val));
-	unsigned int hash = HashString(key, lenKey);
-	for (Property *p = props[hash % hashRoots]; p; p = p->next) {
-		if ((hash == p->hash) &&
-			((strlen(p->key) == static_cast<unsigned int>(lenKey)) &&
-				(0 == strncmp(p->key, key, lenKey)))) {
-			// Replace current value
-			delete [](p->val);
-			p->val = StringDup(val, lenVal);
-			return;
-		}
-	}
-	// Not found
-	Property *pNew = new Property;
-	if (pNew) {
-		pNew->hash = hash;
-		pNew->key = StringDup(key, lenKey);
-		pNew->val = StringDup(val, lenVal);
-		pNew->next = props[hash % hashRoots];
-		props[hash % hashRoots] = pNew;
-	}
-}
-
-void PropSet::Set(const char *keyVal) {
-	while (IsASpace(*keyVal))
-		keyVal++;
-	const char *endVal = keyVal;
-	while (*endVal && (*endVal != '\n'))
-		endVal++;
-	const char *eqAt = strchr(keyVal, '=');
-	if (eqAt) {
-		Set(keyVal, eqAt + 1, eqAt-keyVal, endVal - eqAt - 1);
-	} else if (*keyVal) {	// No '=' so assume '=1'
-		Set(keyVal, "1", endVal-keyVal, 1);
-	}
-}
-
-void PropSet::Unset(const char *key, int lenKey) {
-	if (!*key)	// Empty keys are not supported
-		return;
-	if (lenKey == -1)
-		lenKey = static_cast<int>(strlen(key));
-	unsigned int hash = HashString(key, lenKey);
-	Property *pPrev = NULL;
-	for (Property *p = props[hash % hashRoots]; p; p = p->next) {
-		if ((hash == p->hash) &&
-			((strlen(p->key) == static_cast<unsigned int>(lenKey)) &&
-				(0 == strncmp(p->key, key, lenKey)))) {
-			if (pPrev)
-				pPrev->next = p->next;
-			else
-				props[hash % hashRoots] = p->next;
-			if (p == enumnext)
-				enumnext = p->next; // Not that anyone should mix enum and Set / Unset.
-			delete [](p->key);
-			delete [](p->val);
-			delete p;
-			return;
-		} else {
-			pPrev = p;
-		}
-	}
-}
-
-void PropSet::SetMultiple(const char *s) {
-	const char *eol = strchr(s, '\n');
-	while (eol) {
-		Set(s);
-		s = eol + 1;
-		eol = strchr(s, '\n');
-	}
-	Set(s);
-}
-
-SString PropSet::Get(const char *key) {
-	unsigned int hash = HashString(key, strlen(key));
-	for (Property *p = props[hash % hashRoots]; p; p = p->next) {
-		if ((hash == p->hash) && (0 == strcmp(p->key, key))) {
-			return p->val;
-		}
-	}
-	if (superPS) {
-		// Failed here, so try in base property set
-		return superPS->Get(key);
-	} else {
-		return "";
-	}
-}
-
-bool PropSet::IncludesVar(const char *value, const char *key) {
-	const char *var = strstr(value, "$(");
-	while (var) {
-		if (isprefix(var + 2, key) && (var[2 + strlen(key)] == ')')) {
-			// Found $(key) which would lead to an infinite loop so exit
-			return true;
-		}
-		var = strstr(var + 2, ")");
-		if (var)
-			var = strstr(var + 1, "$(");
-	}
-	return false;
-}
-
-
-// There is some inconsistency between GetExpanded("foo") and Expand("$(foo)").
-// A solution is to keep a stack of variables that have been expanded, so that
-// recursive expansions can be skipped.  For now I'll just use the C++ stack
-// for that, through a recursive function and a simple chain of pointers.
-
-struct VarChain {
-	VarChain(const char*var_=NULL, const VarChain *link_=NULL): var(var_), link(link_) {}
-
-	bool contains(const char *testVar) const {
-		return (var && (0 == strcmp(var, testVar)))
-			|| (link && link->contains(testVar));
-	}
-
-	const char *var;
-	const VarChain *link;
-};
-
-static int ExpandAllInPlace(PropSet &props, SString &withVars, int maxExpands, const VarChain &blankVars = VarChain()) {
-	int varStart = withVars.search("$(");
-	while ((varStart >= 0) && (maxExpands > 0)) {
-		int varEnd = withVars.search(")", varStart+2);
-		if (varEnd < 0) {
-			break;
-		}
-
-		// For consistency, when we see '$(ab$(cde))', expand the inner variable first,
-		// regardless whether there is actually a degenerate variable named 'ab$(cde'.
-		int innerVarStart = withVars.search("$(", varStart+2);
-		while ((innerVarStart > varStart) && (innerVarStart < varEnd)) {
-			varStart = innerVarStart;
-			innerVarStart = withVars.search("$(", varStart+2);
-		}
-
-		SString var(withVars.c_str(), varStart + 2, varEnd);
-		SString val = props.Get(var.c_str());
-
-		if (blankVars.contains(var.c_str())) {
-			val.clear(); // treat blankVar as an empty string (e.g. to block self-reference)
-		}
-
-		if (--maxExpands >= 0) {
-			maxExpands = ExpandAllInPlace(props, val, maxExpands, VarChain(var.c_str(), &blankVars));
-		}
-
-		withVars.remove(varStart, varEnd-varStart+1);
-		withVars.insert(varStart, val.c_str(), val.length());
-
-		varStart = withVars.search("$(");
-	}
-
-	return maxExpands;
-}
-
-
-SString PropSet::GetExpanded(const char *key) {
-	SString val = Get(key);
-	ExpandAllInPlace(*this, val, 100, VarChain(key));
-	return val;
-}
-
-SString PropSet::Expand(const char *withVars, int maxExpands) {
-	SString val = withVars;
-	ExpandAllInPlace(*this, val, maxExpands);
-	return val;
-}
-
-int PropSet::GetInt(const char *key, int defaultValue) {
-	SString val = GetExpanded(key);
-	if (val.length())
-		return val.value();
-	return defaultValue;
-}
-
-bool isprefix(const char *target, const char *prefix) {
-	while (*target && *prefix) {
-		if (*target != *prefix)
-			return false;
-		target++;
-		prefix++;
-	}
-	if (*prefix)
-		return false;
-	else
-		return true;
-}
-
-static bool IsSuffix(const char *target, const char *suffix, bool caseSensitive) {
-	size_t lentarget = strlen(target);
-	size_t lensuffix = strlen(suffix);
-	if (lensuffix > lentarget)
-		return false;
-	if (caseSensitive) {
-		for (int i = static_cast<int>(lensuffix) - 1; i >= 0; i--) {
-			if (target[i + lentarget - lensuffix] != suffix[i])
-				return false;
-		}
-	} else {
-	for (int i = static_cast<int>(lensuffix) - 1; i >= 0; i--) {
-		if (MakeUpperCase(target[i + lentarget - lensuffix]) !=
-		        MakeUpperCase(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;
-
-				if (strstr(orgkeyfile, "$(") == orgkeyfile) {
-					char *cpendvar = strchr(orgkeyfile, ')');
-					if (cpendvar) {
-						*cpendvar = '\0';
-						SString s = GetExpanded(orgkeyfile + 2);
-						*cpendvar = ')';
-						keyfile = StringDup(s.c_str());
-					}
-				}
-				char *keyptr = keyfile;
-
-				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, caseSensitiveFilenames)) {
-							*del = delchr;
-							delete []keyptr;
-							return p->val;
-						}
-					} else if (0 == strcmp(keyfile, filename)) {
-						*del = delchr;
-						delete []keyptr;
-						return p->val;
-					}
-					if (delchr == '\0')
-						break;
-					*del = delchr;
-					keyfile = del + 1;
-				}
-				delete []keyptr;
-
-				if (0 == strcmp(p->key, keybase)) {
-					return p->val;
-				}
-			}
-		}
-	}
-	if (superPS) {
-		// Failed here, so try in base property set
-		return superPS->GetWild(keybase, filename);
-	} else {
-		return "";
-	}
-}
-
-
-
-// GetNewExpand does not use Expand as it has to use GetWild with the filename for each
-// variable reference found.
-SString PropSet::GetNewExpand(const char *keybase, const char *filename) {
-	char *base = StringDup(GetWild(keybase, filename).c_str());
-	char *cpvar = strstr(base, "$(");
-	int maxExpands = 1000;	// Avoid infinite expansion of recursive definitions
-	while (cpvar && (maxExpands > 0)) {
-		char *cpendvar = strchr(cpvar, ')');
-		if (cpendvar) {
-			int lenvar = cpendvar - cpvar - 2;  	// Subtract the $()
-			char *var = StringDup(cpvar + 2, lenvar);
-			SString val = GetWild(var, filename);
-			if (0 == strcmp(var, keybase))
-				val.clear(); // Self-references evaluate to empty string
-			size_t 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, "$(");
-		maxExpands--;
-	}
-	SString sret = base;
-	delete []base;
-	return sret;
-}
-
-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;
-	}
-}
-
-char *PropSet::ToString() {
-	size_t len=0;
-	for (int r = 0; r < hashRoots; r++) {
-		for (Property *p = props[r]; p; p = p->next) {
-			len += strlen(p->key) + 1;
-			len += strlen(p->val) + 1;
-		}
-	}
-	if (len == 0)
-		len = 1;	// Return as empty string
-	char *ret = new char [len];
-	if (ret) {
-		char *w = ret;
-		for (int root = 0; root < hashRoots; root++) {
-			for (Property *p = props[root]; p; p = p->next) {
-				strcpy(w, p->key);
-				w += strlen(p->key);
-				*w++ = '=';
-				strcpy(w, p->val);
-				w += strlen(p->val);
-				*w++ = '\n';
-			}
-		}
-		ret[len-1] = '\0';
-	}
-	return ret;
-}
-
-/**
- * Initiate enumeration.
- */
-bool PropSet::GetFirst(char **key, char **val) {
-	for (int i = 0; i < hashRoots; i++) {
-		for (Property *p = props[i]; p; p = p->next) {
-			if (p) {
-				*key = p->key;
-				*val = p->val;
-				enumnext = p->next; // GetNext will begin here ...
-				enumhash = i;		  // ... in this block
-				return true;
-			}
-		}
-	}
-	return false;
-}
-
-/**
- * Continue enumeration.
- */
-bool PropSet::GetNext(char ** key, char ** val) {
-	bool firstloop = true;
-
-	// search begins where we left it : in enumhash block
-	for (int i = enumhash; i < hashRoots; i++) {
-		if (!firstloop)
-			enumnext = props[i]; // Begin with first property in block
-		// else : begin where we left
-		firstloop = false;
-
-		for (Property *p = enumnext; p; p = p->next) {
-			if (p) {
-				*key = p->key;
-				*val = p->val;
-				enumnext = p->next; // for GetNext
-				enumhash = i;
-				return true;
-			}
-		}
-	}
-	return false;
-}
-
-/**
- * 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) {
-	int prev = '\n';
-	int words = 0;
-	// For rapid determination of whether a character is a separator, build
-	// a look up table.
-	bool wordSeparator[256];
-	for (int i=0;i<256; i++) {
-		wordSeparator[i] = false;
-	}
-	wordSeparator['\r'] = true;
-	wordSeparator['\n'] = true;
-	if (!onlyLineEnds) {
-		wordSeparator[' '] = true;
-		wordSeparator['\t'] = true;
-	}
-	for (int j = 0; wordlist[j]; j++) {
-		int curr = static_cast<unsigned char>(wordlist[j]);
-		if (!wordSeparator[curr] && wordSeparator[prev])
-			words++;
-		prev = curr;
-	}
-	char **keywords = new char *[words + 1];
-	if (keywords) {
-		words = 0;
-		prev = '\0';
-		size_t slen = strlen(wordlist);
-		for (size_t k = 0; k < slen; k++) {
-			if (!wordSeparator[static_cast<unsigned char>(wordlist[k])]) {
-				if (!prev) {
-					keywords[words] = &wordlist[k];
-					words++;
-				}
-			} else {
-				wordlist[k] = '\0';
-			}
-			prev = wordlist[k];
-		}
-		keywords[words] = &wordlist[slen];
-		*len = words;
-	} else {
-		*len = 0;
-	}
-	return keywords;
-}
-
-void WordList::Clear() {
-	if (words) {
-		delete []list;
-		delete []words;
-		delete []wordsNoCase;
-	}
-	words = 0;
-	wordsNoCase = 0;
-	list = 0;
-	len = 0;
-	sorted = false;
-	sortedNoCase = false;
-}
-
-void WordList::Set(const char *s) {
-	list = StringDup(s);
-	sorted = false;
-	sortedNoCase = false;
-	words = ArrayFromWordList(list, &len, onlyLineEnds);
-	wordsNoCase = new char * [len + 1];
-	memcpy(wordsNoCase, words, (len + 1) * sizeof (*words));
-}
-
-char *WordList::Allocate(int size) {
-	list = new char[size + 1];
-	list[size] = '\0';
-	return list;
-}
-
-void WordList::SetFromAllocated() {
-	sorted = false;
-	sortedNoCase = false;
-	words = ArrayFromWordList(list, &len, onlyLineEnds);
-	wordsNoCase = new char * [len + 1];
-	memcpy(wordsNoCase, words, (len + 1) * sizeof (*words));
-}
-
-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));
-}
-
-int cmpStringNoCase(const void *a1, const void *a2) {
-	// Can't work out the correct incantation to use modern casts here
-	return CompareCaseInsensitive(*(char**)(a1), *(char**)(a2));
-}
-
-static void SortWordList(char **words, unsigned int len) {
-	qsort(reinterpret_cast<void*>(words), len, sizeof(*words),
-	      cmpString);
-}
-
-static void SortWordListNoCase(char **wordsNoCase, unsigned int len) {
-	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, len);
-		for (unsigned int k = 0; k < (sizeof(starts) / sizeof(starts[0])); k++)
-			starts[k] = -1;
-		for (int l = len - 1; l >= 0; l--) {
-			unsigned char indexChar = words[l][0];
-			starts[indexChar] = l;
-		}
-	}
-	unsigned char firstChar = s[0];
-	int j = starts[firstChar];
-	if (j >= 0) {
-		while (words[j][0] == firstChar) {
-			if (s[1] == words[j][1]) {
-				const char *a = words[j] + 1;
-				const char *b = s + 1;
-				while (*a && *a == *b) {
-					a++;
-					b++;
-				}
-				if (!*a && !*b)
-					return true;
-			}
-			j++;
-		}
-	}
-	j = starts['^'];
-	if (j >= 0) {
-		while (words[j][0] == '^') {
-			const char *a = words[j] + 1;
-			const char *b = s;
-			while (*a && *a == *b) {
-				a++;
-				b++;
-			}
-			if (!*a)
-				return true;
-			j++;
-		}
-	}
-	return false;
-}
-
-/** similar to InList, but word s can be a substring of keyword.
- * eg. the keyword define is defined as def~ine. This means the word must start
- * with def to be a keyword, but also defi, defin and define are valid.
- * The marker is ~ in this case.
- */
-bool WordList::InListAbbreviated(const char *s, const char marker) {
-	if (0 == words)
-		return false;
-	if (!sorted) {
-		sorted = true;
-		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--) {
-			unsigned char indexChar = words[l][0];
-			starts[indexChar] = l;
-		}
-	}
-	unsigned char firstChar = s[0];
-	int j = starts[firstChar];
-	if (j >= 0) {
-		while (words[j][0] == firstChar) {
-			bool isSubword = false;
-			int start = 1;
-			if (words[j][1] == marker) {
-				isSubword = true;
-				start++;
-			}
-			if (s[1] == words[j][start]) {
-				const char *a = words[j] + start;
-				const char *b = s + 1;
-				while (*a && *a == *b) {
-					a++;
-					if (*a == marker) {
-						isSubword = true;
-						a++;
-					}
-					b++;
-				}
-				if ((!*a || isSubword) && !*b)
-					return true;
-			}
-			j++;
-		}
-	}
-	j = starts['^'];
-	if (j >= 0) {
-		while (words[j][0] == '^') {
-			const char *a = words[j] + 1;
-			const char *b = s;
-			while (*a && *a == *b) {
-				a++;
-				b++;
-			}
-			if (!*a)
-				return true;
-			j++;
-		}
-	}
-	return false;
-}
-
-/**
- * Returns an element (complete) of the wordlist array which has
- * the same beginning 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, bool ignoreCase /*= false*/, SString wordCharacters /*='/0' */, int wordIndex /*= -1 */) {
-	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 (ignoreCase) {
-		if (!sortedNoCase) {
-			sortedNoCase = true;
-			SortWordListNoCase(wordsNoCase, len);
-		}
-		while (start <= end) { // binary searching loop
-			pivot = (start + end) >> 1;
-			word = wordsNoCase[pivot];
-			cond = CompareNCaseInsensitive(wordStart, word, searchLen);
-			if (!cond) {
-				// find first word
-				start = pivot;
-				while (start > 0 && !CompareNCaseInsensitive(wordStart, wordsNoCase[start-1], searchLen)) {
-					start--;
-				}
-				// find last word
-				end = pivot;
-				while (end < len-1 && !CompareNCaseInsensitive(wordStart, wordsNoCase[end+1], searchLen)) {
-					end++;
-				}
-
-				// Finds first word in a series of equal words
-				for (pivot = start; pivot <= end; pivot++) {
-					word = wordsNoCase[pivot];
-					if (!wordCharacters.contains(word[searchLen])) {
-						if (wordIndex <= 0) // Checks if a specific index was requested
-							return word; // result must not be freed with free()
-						wordIndex--;
-					}
-				}
-				return NULL;
-			}
-			else if (cond > 0)
-				start = pivot + 1;
-			else if (cond < 0)
-				end = pivot - 1;
-		}
-	} else { // preserve the letter case
-		if (!sorted) {
-			sorted = true;
-			SortWordList(words, len);
-		}
-		while (start <= end) { // binary searching loop
-			pivot = (start + end) >> 1;
-			word = words[pivot];
-			cond = strncmp(wordStart, word, searchLen);
-			if (!cond) {
-				// find first word
-				start = pivot;
-				while (start > 0 && !strncmp(wordStart, words[start-1], searchLen)) {
-					start--;
-				}
-				// find last word
-				end = pivot;
-				while (end < len-1 && !strncmp(wordStart, words[end+1], searchLen)) {
-					end++;
-				}
-
-				// Finds first word in a series of equal words
-				pivot = start;
-				while (pivot <= end) {
-					word = words[pivot];
-					if (!wordCharacters.contains(word[searchLen])) {
-						if (wordIndex <= 0) // Checks if a specific index was requested
-							return word; // result must not be freed with free()
-						wordIndex--;
-					}
-					pivot++;
-				}
-				return NULL;
-			}
-			else if (cond > 0)
-				start = pivot + 1;
-			else if (cond < 0)
-				end = pivot - 1;
-		}
-	}
-	return NULL;
-}
-
-/**
- * Find the length of a 'word' which is actually an identifier in a string
- * which looks like "identifier(..." or "identifier" and where
- * there may be extra spaces after the identifier that should not be
- * counted in the length.
- */
-static unsigned int LengthWord(const char *word, char otherSeparator) {
-	// Find a '('. If that fails go to the end of the string.
-	const char *endWord = strchr(word, '(');
-	if (!endWord && otherSeparator)
-		endWord = strchr(word, otherSeparator);
-	if (!endWord)
-		endWord = word + strlen(word);
-	// Last case always succeeds so endWord != 0
-
-	// Drop any space characters.
-	if (endWord > word) {
-		endWord--;	// Back from the '(', otherSeparator, or '\0'
-		// Move backwards over any spaces
-		while ((endWord > word) && (IsASpace(*endWord))) {
-			endWord--;
-		}
-	}
-	return endWord - word;
-}
-
-/**
- * Returns elements (first words of them) of the wordlist array which have
- * the same beginning 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 delete[].
- */
-char *WordList::GetNearestWords(
-    const char *wordStart,
-    int searchLen,
-    bool ignoreCase /*= false*/,
-    char otherSeparator /*= '\0'*/,
-    bool exactLen /*=false*/) {
-	unsigned int wordlen; // length of the word part (before the '(' brace) of the api array element
-	SString wordsNear;
-	wordsNear.setsizegrowth(1000);
-	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)
-
-	if (0 == words)
-		return NULL;
-	if (ignoreCase) {
-		if (!sortedNoCase) {
-			sortedNoCase = true;
-			SortWordListNoCase(wordsNoCase, len);
-		}
-		while (start <= end) { // Binary searching loop
-			pivot = (start + end) / 2;
-			cond = CompareNCaseInsensitive(wordStart, wordsNoCase[pivot], searchLen);
-			if (!cond) {
-				// Find first match
-				while ((pivot > start) &&
-					(0 == CompareNCaseInsensitive(wordStart,
-						wordsNoCase[pivot-1], searchLen))) {
-					--pivot;
-				}
-				// Grab each match
-				while ((pivot <= end) &&
-					(0 == CompareNCaseInsensitive(wordStart,
-						wordsNoCase[pivot], searchLen))) {
-					wordlen = LengthWord(wordsNoCase[pivot], otherSeparator) + 1;
-					++pivot;
-					if (exactLen && wordlen != LengthWord(wordStart, otherSeparator) + 1)
-						continue;
-					wordsNear.append(wordsNoCase[pivot-1], wordlen, ' ');
-				}
-				return wordsNear.detach();
-			} else if (cond < 0) {
-				end = pivot - 1;
-			} else if (cond > 0) {
-				start = pivot + 1;
-			}
-		}
-	} else {	// Preserve the letter case
-		if (!sorted) {
-			sorted = true;
-			SortWordList(words, len);
-		}
-		while (start <= end) { // Binary searching loop
-			pivot = (start + end) / 2;
-			cond = strncmp(wordStart, words[pivot], searchLen);
-			if (!cond) {
-				// Find first match
-				while ((pivot > start) &&
-					(0 == strncmp(wordStart,
-						words[pivot-1], searchLen))) {
-					--pivot;
-				}
-				// Grab each match
-				while ((pivot <= end) &&
-					(0 == strncmp(wordStart,
-						words[pivot], searchLen))) {
-					wordlen = LengthWord(words[pivot], otherSeparator) + 1;
-					++pivot;
-					if (exactLen && wordlen != LengthWord(wordStart, otherSeparator) + 1)
-						continue;
-					wordsNear.append(words[pivot-1], wordlen, ' ');
-				}
-				return wordsNear.detach();
-			} else if (cond < 0) {
-				end = pivot - 1;
-			} else if (cond > 0) {
-				start = pivot + 1;
-			}
-		}
-	}
-	return NULL;
-}
diff --git a/src/stc/scintilla/src/RESearch.cxx b/src/stc/scintilla/src/RESearch.cxx
deleted file mode 100644
index 00e183060a..0000000000
--- a/src/stc/scintilla/src/RESearch.cxx
+++ /dev/null
@@ -1,788 +0,0 @@
-// Scintilla source code edit control
-/** @file RESearch.cxx
- ** Regular expression search library.
- **/
-
-/*
- * regex - Regular expression pattern matching and replacement
- *
- * By:  Ozan S. Yigit (oz)
- *      Dept. of Computer Science
- *      York University
- *
- * Original code available from http://www.cs.yorku.ca/~oz/
- * Translation to C++ by Neil Hodgson neilh@scintilla.org
- * Removed all use of register.
- * Converted to modern function prototypes.
- * Put all global/static variables into an object so this code can be
- * used from multiple threads, etc.
- *
- * These routines are the PUBLIC DOMAIN equivalents of regex
- * routines as found in 4.nBSD UN*X, with minor extensions.
- *
- * These routines are derived from various implementations found
- * in software tools books, and Conroy's grep. They are NOT derived
- * from licensed/restricted software.
- * For more interesting/academic/complicated implementations,
- * see Henry Spencer's regexp routines, or GNU Emacs pattern
- * matching module.
- *
- * Modification history removed.
- *
- * Interfaces:
- *  RESearch::Compile:      compile a regular expression into a NFA.
- *
- *          const char *RESearch::Compile(const char *pat, int length,
- *                                        bool caseSensitive, bool posix)
- *
- * Returns a short error string if they fail.
- *
- *  RESearch::Execute:      execute the NFA to match a pattern.
- *
- *          int RESearch::Execute(characterIndexer &ci, int lp, int endp)
- *
- *  RESearch::Substitute:   substitute the matched portions in a new string.
- *
- *          int RESearch::Substitute(CharacterIndexer &ci, char *src, char *dst)
- *
- *  re_fail:                failure routine for RESearch::Execute. (no longer used)
- *
- *          void re_fail(char *msg, char op)
- *
- * Regular Expressions:
- *
- *      [1]     char    matches itself, unless it is a special
- *                      character (metachar): . \ [ ] * + ^ $
- *                      and ( ) if posix option.
- *
- *      [2]     .       matches any character.
- *
- *      [3]     \       matches the character following it, except:
- *                      - \a, \b, \f, \n, \t, \v match the
- *                      corresponding C escape char;
- *                      - if not in posix mode, when followed by a
- *                      left or right round bracket (see [7]);
- *                      - when followed by a digit 1 to 9 (see [8]);
- *                      - when followed by a left or right angle bracket
- *                      (see [9]).
- *                      It is used as an escape character for all
- *                      other meta-characters, and itself. When used
- *                      in a set ([4]), it is treated as an ordinary
- *                      character (except for escape chars).
- *
- *      [4]     [set]   matches one of the characters in the set.
- *                      If the first character in the set is "^",
- *                      it matches a character NOT in the set, i.e.
- *                      complements the set. A shorthand S-E (start-end)
- *                      is used to specify a set of characters S upto
- *                      E, inclusive. The special characters "]" and
- *                      "-" have no special meaning if they appear
- *                      as the first chars in the set. To include both,
- *                      put - first: [-]A-Z]:
- *                      [-]|] matches these 2 chars,
- *                      []-|] matches from ] to | chars.
- *                      examples:        match:
- *
- *                              [a-z]    any lowercase alpha
- *
- *                              [^-]]    any char except - and ]
- *
- *                              [^A-Z]   any char except uppercase
- *                                       alpha
- *
- *                              [a-zA-Z] any alpha
- *
- *      [5]     *       any regular expression form [1] to [4], followed by
- *                      closure char (*) matches zero or more matches of
- *                      that form.
- *
- *      [6]     +       same as [5], except it matches one or more.
- *
- *      [7]             a regular expression in the form [1] to [10], enclosed
- *                      as \(form\) (or (form) with posix flag) matches what
- *                      form matches. The enclosure creates a set of tags,
- *                      used for [8] and for pattern substitution.
- *                      The tagged forms are numbered starting from 1.
- *
- *      [8]             a \ followed by a digit 1 to 9 matches whatever a
- *                      previously tagged regular expression ([7]) matched.
- *
- *      [9]     \<      a regular expression starting with a \< construct
- *              \>      and/or ending with a \> construct, restricts the
- *                      pattern matching to the beginning of a word, and/or
- *                      the end of a word. A word is defined to be a character
- *                      string beginning and/or ending with the characters
- *                      A-Z a-z 0-9 and _. It must also be preceded and/or
- *                      followed by any character outside those mentioned.
- *
- *      [10]            a composite regular expression xy where x and y
- *                      are in the form [1] to [10] matches the longest
- *                      match of x followed by a match for y.
- *
- *      [11]    ^       a regular expression starting with a ^ character
- *              $       and/or ending with a $ character, restricts the
- *                      pattern matching to the beginning of the line,
- *                      or the end of line. [anchors] Elsewhere in the
- *                      pattern, ^ and $ are treated as ordinary characters.
- *
- *
- * Acknowledgements:
- *
- *  HCR's Hugh Redelmeier has been most helpful in various
- *  stages of development. He convinced me to include BOW
- *  and EOW constructs, originally invented by Rob Pike at
- *  the University of Toronto.
- *
- * References:
- *              Software tools                  Kernighan & Plauger
- *              Software tools in Pascal        Kernighan & Plauger
- *              Grep [rsx-11 C dist]            David Conroy
- *              ed - text editor                Un*x Programmer's Manual
- *              Advanced editing on Un*x        B. W. Kernighan
- *              RegExp routines                 Henry Spencer
- *
- * Notes:
- *
- *	This implementation uses a bit-set representation for character
- *	classes for speed and compactness. Each character is represented
- *	by one bit in a 256-bit block. Thus, CCL always takes a
- *	constant 32 bytes in the internal nfa, and RESearch::Execute does a single
- *	bit comparison to locate the character in the set.
- *
- * Examples:
- *
- *  pattern:    foo*.*
- *  compile:    CHR f CHR o CLO CHR o END CLO ANY END END
- *  matches:    fo foo fooo foobar fobar foxx ...
- *
- *  pattern:    fo[ob]a[rz]
- *  compile:    CHR f CHR o CCL bitset CHR a CCL bitset END
- *  matches:    fobar fooar fobaz fooaz
- *
- *  pattern:    foo\\+
- *  compile:    CHR f CHR o CHR o CHR \ CLO CHR \ END END
- *  matches:    foo\ foo\\ foo\\\  ...
- *
- *  pattern:    \(foo\)[1-3]\1  (same as foo[1-3]foo)
- *  compile:    BOT 1 CHR f CHR o CHR o EOT 1 CCL bitset REF 1 END
- *  matches:    foo1foo foo2foo foo3foo
- *
- *  pattern:    \(fo.*\)-\1
- *  compile:    BOT 1 CHR f CHR o CLO ANY END EOT 1 CHR - REF 1 END
- *  matches:    foo-foo fo-fo fob-fob foobar-foobar ...
- */
-
-#include "CharClassify.h"
-#include "RESearch.h"
-
-// Shut up annoying Visual C++ warnings:
-#ifdef _MSC_VER
-#pragma warning(disable: 4514)
-#endif
-
-#define OKP     1
-#define NOP     0
-
-#define CHR     1
-#define ANY     2
-#define CCL     3
-#define BOL     4
-#define EOL     5
-#define BOT     6
-#define EOT     7
-#define BOW     8
-#define EOW     9
-#define REF     10
-#define CLO     11
-
-#define END     0
-
-/*
- * The following defines are not meant to be changeable.
- * They are for readability only.
- */
-#define BLKIND  0370
-#define BITIND  07
-
-const char bitarr[] = {1,2,4,8,16,32,64,'\200'};
-
-#define badpat(x)	(*nfa = END, x)
-
-/*
- * Character classification table for word boundary operators BOW
- * and EOW is passed in by the creator of this object (Scintilla
- * Document). The Document default state is that word chars are:
- * 0-9,a-z, A-Z and _
- */
-
-RESearch::RESearch(CharClassify *charClassTable) {
-	charClass = charClassTable;
-	Init();
-}
-
-RESearch::~RESearch() {
-	Clear();
-}
-
-void RESearch::Init() {
-	sta = NOP;                  /* status of lastpat */
-	bol = 0;
-	for (int i=0; i<MAXTAG; i++)
-		pat[i] = 0;
-	for (int j=0; j<BITBLK; j++)
-		bittab[j] = 0;
-}
-
-void RESearch::Clear() {
-	for (int i=0; i<MAXTAG; i++) {
-		delete []pat[i];
-		pat[i] = 0;
-		bopat[i] = NOTFOUND;
-		eopat[i] = NOTFOUND;
-	}
-}
-
-bool RESearch::GrabMatches(CharacterIndexer &ci) {
-	bool success = true;
-	for (unsigned int i=0; i<MAXTAG; i++) {
-		if ((bopat[i] != NOTFOUND) && (eopat[i] != NOTFOUND)) {
-			unsigned int len = eopat[i] - bopat[i];
-			pat[i] = new char[len + 1];
-			if (pat[i]) {
-				for (unsigned int j=0; j<len; j++)
-					pat[i][j] = ci.CharAt(bopat[i] + j);
-				pat[i][len] = '\0';
-			} else {
-				success = false;
-			}
-		}
-	}
-	return success;
-}
-
-void RESearch::ChSet(char c) {
-	bittab[((c) & BLKIND) >> 3] |= bitarr[(c) & BITIND];
-}
-
-void RESearch::ChSetWithCase(char c, bool caseSensitive) {
-	if (caseSensitive) {
-		ChSet(c);
-	} else {
-		if ((c >= 'a') && (c <= 'z')) {
-			ChSet(c);
-			ChSet(static_cast<char>(c - 'a' + 'A'));
-		} else if ((c >= 'A') && (c <= 'Z')) {
-			ChSet(c);
-			ChSet(static_cast<char>(c - 'A' + 'a'));
-		} else {
-			ChSet(c);
-		}
-	}
-}
-
-const char escapeValue(char ch) {
-	switch (ch) {
-	case 'a':	return '\a';
-	case 'b':	return '\b';
-	case 'f':	return '\f';
-	case 'n':	return '\n';
-	case 'r':	return '\r';
-	case 't':	return '\t';
-	case 'v':	return '\v';
-	}
-	return 0;
-}
-
-const char *RESearch::Compile(const char *pat, int length, bool caseSensitive, bool posix) {
-	char *mp=nfa;          /* nfa pointer       */
-	char *lp;              /* saved pointer     */
-	char *sp=nfa;          /* another one       */
-	char *mpMax = mp + MAXNFA - BITBLK - 10;
-
-	int tagi = 0;          /* tag stack index   */
-	int tagc = 1;          /* actual tag count  */
-
-	int n;
-	char mask;             /* xor mask -CCL/NCL */
-	int c1, c2;
-
-	if (!pat || !length)
-		if (sta)
-			return 0;
-		else
-			return badpat("No previous regular expression");
-	sta = NOP;
-
-	const char *p=pat;     /* pattern pointer   */
-	for (int i=0; i<length; i++, p++) {
-		if (mp > mpMax)
-			return badpat("Pattern too long");
-		lp = mp;
-		switch(*p) {
-
-		case '.':               /* match any char  */
-			*mp++ = ANY;
-			break;
-
-		case '^':               /* match beginning */
-			if (p == pat)
-				*mp++ = BOL;
-			else {
-				*mp++ = CHR;
-				*mp++ = *p;
-			}
-			break;
-
-		case '$':               /* match endofline */
-			if (!*(p+1))
-				*mp++ = EOL;
-			else {
-				*mp++ = CHR;
-				*mp++ = *p;
-			}
-			break;
-
-		case '[':               /* match char class */
-			*mp++ = CCL;
-
-			i++;
-			if (*++p == '^') {
-				mask = '\377';
-				i++;
-				p++;
-			} else
-				mask = 0;
-
-			if (*p == '-') {	/* real dash */
-				i++;
-				ChSet(*p++);
-			}
-			if (*p == ']') {	/* real brace */
-				i++;
-				ChSet(*p++);
-			}
-			while (*p && *p != ']') {
-				if (*p == '-' && *(p+1) && *(p+1) != ']') {
-					i++;
-					p++;
-					c1 = *(p-2) + 1;
-					i++;
-					c2 = *p++;
-					while (c1 <= c2) {
-						ChSetWithCase(static_cast<char>(c1++), caseSensitive);
-					}
-				} else if (*p == '\\' && *(p+1)) {
-					i++;
-					p++;
-					char escape = escapeValue(*p);
-					if (escape)
-						ChSetWithCase(escape, caseSensitive);
-					else
-						ChSetWithCase(*p, caseSensitive);
-					i++;
-					p++;
-				} else {
-					i++;
-					ChSetWithCase(*p++, caseSensitive);
-				}
-			}
-			if (!*p)
-				return badpat("Missing ]");
-
-			for (n = 0; n < BITBLK; bittab[n++] = (char) 0)
-				*mp++ = static_cast<char>(mask ^ bittab[n]);
-
-			break;
-
-		case '*':               /* match 0 or more... */
-		case '+':               /* match 1 or more... */
-			if (p == pat)
-				return badpat("Empty closure");
-			lp = sp;		/* previous opcode */
-			if (*lp == CLO)		/* equivalence... */
-				break;
-			switch(*lp) {
-
-			case BOL:
-			case BOT:
-			case EOT:
-			case BOW:
-			case EOW:
-			case REF:
-				return badpat("Illegal closure");
-			default:
-				break;
-			}
-
-			if (*p == '+')
-				for (sp = mp; lp < sp; lp++)
-					*mp++ = *lp;
-
-			*mp++ = END;
-			*mp++ = END;
-			sp = mp;
-			while (--mp > lp)
-				*mp = mp[-1];
-			*mp = CLO;
-			mp = sp;
-			break;
-
-		case '\\':              /* tags, backrefs... */
-			i++;
-			switch(*++p) {
-
-			case '<':
-				*mp++ = BOW;
-				break;
-			case '>':
-				if (*sp == BOW)
-					return badpat("Null pattern inside \\<\\>");
-				*mp++ = EOW;
-				break;
-			case '1':
-			case '2':
-			case '3':
-			case '4':
-			case '5':
-			case '6':
-			case '7':
-			case '8':
-			case '9':
-				n = *p-'0';
-				if (tagi > 0 && tagstk[tagi] == n)
-					return badpat("Cyclical reference");
-				if (tagc > n) {
-					*mp++ = static_cast<char>(REF);
-					*mp++ = static_cast<char>(n);
-				}
-				else
-					return badpat("Undetermined reference");
-				break;
-			case 'a':
-			case 'b':
-			case 'n':
-			case 'f':
-			case 'r':
-			case 't':
-			case 'v':
-				*mp++ = CHR;
-				*mp++ = escapeValue(*p);
-				break;
-			default:
-				if (!posix && *p == '(') {
-					if (tagc < MAXTAG) {
-						tagstk[++tagi] = tagc;
-						*mp++ = BOT;
-						*mp++ = static_cast<char>(tagc++);
-					}
-					else
-						return badpat("Too many \\(\\) pairs");
-				} else if (!posix && *p == ')') {
-					if (*sp == BOT)
-						return badpat("Null pattern inside \\(\\)");
-					if (tagi > 0) {
-						*mp++ = static_cast<char>(EOT);
-						*mp++ = static_cast<char>(tagstk[tagi--]);
-					}
-					else
-						return badpat("Unmatched \\)");
-				} else {
-					*mp++ = CHR;
-					*mp++ = *p;
-				}
-			}
-			break;
-
-		default :               /* an ordinary char */
-			if (posix && *p == '(') {
-				if (tagc < MAXTAG) {
-					tagstk[++tagi] = tagc;
-					*mp++ = BOT;
-					*mp++ = static_cast<char>(tagc++);
-				}
-				else
-					return badpat("Too many () pairs");
-			} else if (posix && *p == ')') {
-				if (*sp == BOT)
-					return badpat("Null pattern inside ()");
-				if (tagi > 0) {
-					*mp++ = static_cast<char>(EOT);
-					*mp++ = static_cast<char>(tagstk[tagi--]);
-				}
-				else
-					return badpat("Unmatched )");
-			} else if (caseSensitive) {
-				*mp++ = CHR;
-				*mp++ = *p;
-			} else {
-				*mp++ = CCL;
-				mask = 0;
-				ChSetWithCase(*p, false);
-				for (n = 0; n < BITBLK; bittab[n++] = (char) 0)
-					*mp++ = static_cast<char>(mask ^ bittab[n]);
-			}
-			break;
-		}
-		sp = lp;
-	}
-	if (tagi > 0)
-		return badpat((posix ? "Unmatched (" : "Unmatched \\("));
-	*mp = END;
-	sta = OKP;
-	return 0;
-}
-
-/*
- * RESearch::Execute:
- *   execute nfa to find a match.
- *
- *  special cases: (nfa[0])
- *      BOL
- *          Match only once, starting from the
- *          beginning.
- *      CHR
- *          First locate the character without
- *          calling PMatch, and if found, call
- *          PMatch for the remaining string.
- *      END
- *          RESearch::Compile failed, poor luser did not
- *          check for it. Fail fast.
- *
- *  If a match is found, bopat[0] and eopat[0] are set
- *  to the beginning and the end of the matched fragment,
- *  respectively.
- *
- */
-
-int RESearch::Execute(CharacterIndexer &ci, int lp, int endp) {
-	char c;
-	int ep = NOTFOUND;
-	char *ap = nfa;
-
-	bol = lp;
-	failure = 0;
-
-	Clear();
-
-	switch(*ap) {
-
-	case BOL:			/* anchored: match from BOL only */
-		ep = PMatch(ci, lp, endp, ap);
-		break;
-	case EOL:			/* just searching for end of line normal path doesn't work */
-		if (*(ap+1) == END) {
-			lp = endp;
-			ep = lp;
-			break;
-		} else {
-			return 0;
-		}
-	case CHR:			/* ordinary char: locate it fast */
-		c = *(ap+1);
-		while ((lp < endp) && (ci.CharAt(lp) != c))
-			lp++;
-		if (lp >= endp)	/* if EOS, fail, else fall thru. */
-			return 0;
-	default:			/* regular matching all the way. */
-		while (lp < endp) {
-			ep = PMatch(ci, lp, endp, ap);
-			if (ep != NOTFOUND)
-				break;
-			lp++;
-		}
-		break;
-	case END:			/* munged automaton. fail always */
-		return 0;
-	}
-	if (ep == NOTFOUND)
-		return 0;
-
-	bopat[0] = lp;
-	eopat[0] = ep;
-	return 1;
-}
-
-/*
- * PMatch: internal routine for the hard part
- *
- *  This code is partly snarfed from an early grep written by
- *  David Conroy. The backref and tag stuff, and various other
- *  innovations are by oz.
- *
- *  special case optimizations: (nfa[n], nfa[n+1])
- *      CLO ANY
- *          We KNOW .* will match everything upto the
- *          end of line. Thus, directly go to the end of
- *          line, without recursive PMatch calls. As in
- *          the other closure cases, the remaining pattern
- *          must be matched by moving backwards on the
- *          string recursively, to find a match for xy
- *          (x is ".*" and y is the remaining pattern)
- *          where the match satisfies the LONGEST match for
- *          x followed by a match for y.
- *      CLO CHR
- *          We can again scan the string forward for the
- *          single char and at the point of failure, we
- *          execute the remaining nfa recursively, same as
- *          above.
- *
- *  At the end of a successful match, bopat[n] and eopat[n]
- *  are set to the beginning and end of subpatterns matched
- *  by tagged expressions (n = 1 to 9).
- */
-
-extern void re_fail(char *,char);
-
-#define isinset(x,y)	((x)[((y)&BLKIND)>>3] & bitarr[(y)&BITIND])
-
-/*
- * skip values for CLO XXX to skip past the closure
- */
-
-#define ANYSKIP 2 	/* [CLO] ANY END          */
-#define CHRSKIP 3	/* [CLO] CHR chr END      */
-#define CCLSKIP 34	/* [CLO] CCL 32 bytes END */
-
-int RESearch::PMatch(CharacterIndexer &ci, int lp, int endp, char *ap) {
-	int op, c, n;
-	int e;		/* extra pointer for CLO  */
-	int bp;		/* beginning of subpat... */
-	int ep;		/* ending of subpat...    */
-	int are;	/* to save the line ptr.  */
-
-	while ((op = *ap++) != END)
-		switch(op) {
-
-		case CHR:
-			if (ci.CharAt(lp++) != *ap++)
-				return NOTFOUND;
-			break;
-		case ANY:
-			if (lp++ >= endp)
-				return NOTFOUND;
-			break;
-		case CCL:
-			c = ci.CharAt(lp++);
-			if (!isinset(ap,c))
-				return NOTFOUND;
-			ap += BITBLK;
-			break;
-		case BOL:
-			if (lp != bol)
-				return NOTFOUND;
-			break;
-		case EOL:
-			if (lp < endp)
-				return NOTFOUND;
-			break;
-		case BOT:
-			bopat[*ap++] = lp;
-			break;
-		case EOT:
-			eopat[*ap++] = lp;
-			break;
- 		case BOW:
-			if (lp!=bol && iswordc(ci.CharAt(lp-1)) || !iswordc(ci.CharAt(lp)))
-				return NOTFOUND;
-			break;
-		case EOW:
-			if (lp==bol || !iswordc(ci.CharAt(lp-1)) || iswordc(ci.CharAt(lp)))
-				return NOTFOUND;
-			break;
-		case REF:
-			n = *ap++;
-			bp = bopat[n];
-			ep = eopat[n];
-			while (bp < ep)
-				if (ci.CharAt(bp++) != ci.CharAt(lp++))
-					return NOTFOUND;
-			break;
-		case CLO:
-			are = lp;
-			switch(*ap) {
-
-			case ANY:
-				while (lp < endp)
-					lp++;
-				n = ANYSKIP;
-				break;
-			case CHR:
-				c = *(ap+1);
-				while ((lp < endp) && (c == ci.CharAt(lp)))
-					lp++;
-				n = CHRSKIP;
-				break;
-			case CCL:
-				while ((lp < endp) && isinset(ap+1,ci.CharAt(lp)))
-					lp++;
-				n = CCLSKIP;
-				break;
-			default:
-				failure = true;
-				//re_fail("closure: bad nfa.", *ap);
-				return NOTFOUND;
-			}
-
-			ap += n;
-
-			while (lp >= are) {
-				if ((e = PMatch(ci, lp, endp, ap)) != NOTFOUND)
-					return e;
-				--lp;
-			}
-			return NOTFOUND;
-		default:
-			//re_fail("RESearch::Execute: bad nfa.", static_cast<char>(op));
-			return NOTFOUND;
-		}
-	return lp;
-}
-
-/*
- * RESearch::Substitute:
- *  substitute the matched portions of the src in dst.
- *
- *  &    substitute the entire matched pattern.
- *
- *  \digit  substitute a subpattern, with the given tag number.
- *      Tags are numbered from 1 to 9. If the particular
- *      tagged subpattern does not exist, null is substituted.
- */
-int RESearch::Substitute(CharacterIndexer &ci, char *src, char *dst) {
-	char c;
-	int  pin;
-	int bp;
-	int ep;
-
-	if (!*src || !bopat[0])
-		return 0;
-
-	while ((c = *src++) != 0) {
-		switch(c) {
-
-		case '&':
-			pin = 0;
-			break;
-
-		case '\\':
-			c = *src++;
-			if (c >= '0' && c <= '9') {
-				pin = c - '0';
-				break;
-			}
-
-		default:
-			*dst++ = c;
-			continue;
-		}
-
-		if ((bp = bopat[pin]) != 0 && (ep = eopat[pin]) != 0) {
-			while (ci.CharAt(bp) && bp < ep)
-				*dst++ = ci.CharAt(bp++);
-			if (bp < ep)
-				return 0;
-		}
-	}
-	*dst = (char) 0;
-	return 1;
-}
diff --git a/src/stc/scintilla/src/RESearch.h b/src/stc/scintilla/src/RESearch.h
deleted file mode 100644
index aa85579184..0000000000
--- a/src/stc/scintilla/src/RESearch.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Scintilla source code edit control
-/** @file RESearch.h
- ** Interface to the regular expression search library.
- **/
-// Written by Neil Hodgson <neilh@scintilla.org>
-// Based on the work of Ozan S. Yigit.
-// This file is in the public domain.
-
-#ifndef RESEARCH_H
-#define RESEARCH_H
-
-/*
- * The following defines are not meant to be changeable.
- * They are for readability only.
- */
-#define MAXCHR	256
-#define CHRBIT	8
-#define BITBLK	MAXCHR/CHRBIT
-
-class CharacterIndexer {
-public:
-	virtual char CharAt(int index)=0;
-	virtual ~CharacterIndexer() {
-	}
-};
-
-class RESearch {
-
-public:
-	RESearch(CharClassify *charClassTable);
-	~RESearch();
-	bool GrabMatches(CharacterIndexer &ci);
-	const char *Compile(const char *pat, int length, bool caseSensitive, bool posix);
-	int Execute(CharacterIndexer &ci, int lp, int endp);
-	int Substitute(CharacterIndexer &ci, char *src, char *dst);
-
-	enum {MAXTAG=10};
-	enum {MAXNFA=2048};
-	enum {NOTFOUND=-1};
-
-	int bopat[MAXTAG];
-	int eopat[MAXTAG];
-	char *pat[MAXTAG];
-
-private:
-	void Init();
-	void Clear();
-	void ChSet(char c);
-	void ChSetWithCase(char c, bool caseSensitive);
-
-	int PMatch(CharacterIndexer &ci, int lp, int endp, char *ap);
-
-	int bol;
-	int  tagstk[MAXTAG]; /* subpat tag stack */
-	char nfa[MAXNFA];    /* automaton */
-	int sta;
-	char bittab[BITBLK]; /* bit table for CCL pre-set bits */
-	int failure;
-	CharClassify *charClass;
-	bool iswordc(unsigned char x) {
-		return charClass->IsWord(x);
-	}
-};
-
-#endif
diff --git a/src/stc/scintilla/src/SVector.h b/src/stc/scintilla/src/SVector.h
deleted file mode 100644
index c8edb513bc..0000000000
--- a/src/stc/scintilla/src/SVector.h
+++ /dev/null
@@ -1,127 +0,0 @@
-// Scintilla source code edit control
-/** @file SVector.h
- ** A simple expandable vector.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@hare.net.au>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef SVECTOR_H
-#define SVECTOR_H
-
-/**
- * A simple expandable integer vector.
- * 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.
- */
-class SVector {
-	enum { allocSize = 4000 };
-	
-	int *v;				///< The vector
-	unsigned int size;	///< Number of elements allocated
-	unsigned int len;	///< Number of elements used in vector
-	bool allocFailure;	///< A memory allocation call has failed
-	
-	/** Internally allocate more elements than the user wants
-	 * to avoid thrashing the memory allocator. */
-	void SizeTo(int newSize) {
-		if (newSize < allocSize)
-			newSize += allocSize;
-		else 
-			newSize = (newSize * 3) / 2;
-		int* newv = new int[newSize];
-		if (!newv) {
-			allocFailure = true;
-			return;
-		}
-		size = newSize;
-        	unsigned int i=0;
-		for (; i<len; i++) {
-			newv[i] = v[i];
-		}
-		for (; i<size; i++) {
-			newv[i] = 0;
-		}
-		delete []v;
-		v = newv;
-	}
-	
-public:
-	SVector() {
-		allocFailure = false;
-		v = 0;
-		len = 0;
-		size = 0;
-	}
-	~SVector() {
-		Free();
-	}
-	/// Constructor from another vector.
-	SVector(const SVector &other) {
-		allocFailure = false;
-		v = 0;
-		len = 0;
-		size = 0;
-		if (other.Length() > 0) {
-			SizeTo(other.Length());
-			if (!allocFailure) {
-				for (int i=0;i<other.Length();i++)
-					v[i] = other.v[i];
-				len = other.Length();
-			}
-		}
-	}
-	/// Copy constructor.
-	SVector &operator=(const SVector &other) {
-		if (this != &other) {
-			delete []v;
-			allocFailure = false;
-			v = 0;
-			len = 0;
-			size = 0;
-			if (other.Length() > 0) {
-				SizeTo(other.Length());
-				if (!allocFailure) {
-					for (int i=0;i<other.Length();i++)
-						v[i] = other.v[i];
-				}
-				len = other.Length();
-			}
-		}
-		return *this;
-	}
-	/** @brief Accessor.
-	 * Allows to access values from the list, and grows it if accessing
-	 * outside the current bounds. The returned value in this case is 0. */
-	int &operator[](unsigned int i) {
-		if (i >= len) {
-			if (i >= size) {
-				SizeTo(i);
-			}
-			len = i+1;
-		}
-		return v[i];
-	}
-	/// Reset vector.
-	void Free() {
-		delete []v;
-		v = 0;
-		size = 0;
-		len = 0;
-	}
-	/** @brief Grow vector size.
-	 * Doesn't allow a vector to be shrinked. */
-	void SetLength(unsigned int newLength) {
-		if (newLength > len) {
-			if (newLength >= size) {
-				SizeTo(newLength);
-			}
-		}
-		len = newLength;
-	}
-	/// Get the current length (number of used elements) of the vector.
-	int Length() const {
-		return len;
-	}
-};
-
-#endif
diff --git a/src/stc/scintilla/src/ScintillaBase.cxx b/src/stc/scintilla/src/ScintillaBase.cxx
deleted file mode 100644
index bcb0a77e29..0000000000
--- a/src/stc/scintilla/src/ScintillaBase.cxx
+++ /dev/null
@@ -1,727 +0,0 @@
-// Scintilla source code edit control
-/** @file ScintillaBase.cxx
- ** An enhanced subclass of Editor with calltips, autocomplete and context menu.
- **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-#include "PropSet.h"
-#ifdef SCI_LEXER
-#include "SciLexer.h"
-#include "Accessor.h"
-#include "DocumentAccessor.h"
-#include "KeyWords.h"
-#endif
-#include "ContractionState.h"
-#include "SVector.h"
-#include "CellBuffer.h"
-#include "CallTip.h"
-#include "KeyMap.h"
-#include "Indicator.h"
-#include "XPM.h"
-#include "LineMarker.h"
-#include "Style.h"
-#include "ViewStyle.h"
-#include "AutoComplete.h"
-#include "CharClassify.h"
-#include "Document.h"
-#include "Editor.h"
-#include "ScintillaBase.h"
-
-ScintillaBase::ScintillaBase() {
-	displayPopupMenu = true;
-	listType = 0;
-	maxListWidth = 0;
-#ifdef SCI_LEXER
-	lexLanguage = SCLEX_CONTAINER;
-	performingStyle = false;
-	lexCurrent = 0;
-	for (int wl = 0;wl < numWordLists;wl++)
-		keyWordLists[wl] = new WordList;
-	keyWordLists[numWordLists] = 0;
-#endif
-}
-
-ScintillaBase::~ScintillaBase() {
-#ifdef SCI_LEXER
-	for (int wl = 0;wl < numWordLists;wl++)
-		delete keyWordLists[wl];
-#endif
-}
-
-void ScintillaBase::Finalise() {
-	Editor::Finalise();
-	popup.Destroy();
-}
-
-void ScintillaBase::RefreshColourPalette(Palette &pal, bool want) {
-	Editor::RefreshColourPalette(pal, want);
-	ct.RefreshColourPalette(pal, want);
-}
-
-void ScintillaBase::AddCharUTF(char *s, unsigned int len, bool treatAsDBCS) {
-	bool isFillUp = ac.Active() && ac.IsFillUpChar(*s);
-	if (!isFillUp) {
-		Editor::AddCharUTF(s, len, treatAsDBCS);
-	}
-	if (ac.Active()) {
-		AutoCompleteCharacterAdded(s[0]);
-		// For fill ups add the character after the autocompletion has
-		// triggered so containers see the key so can display a calltip.
-		if (isFillUp) {
-			Editor::AddCharUTF(s, len, treatAsDBCS);
-		}
-	}
-}
-
-void ScintillaBase::Command(int cmdId) {
-
-	switch (cmdId) {
-
-	case idAutoComplete:  	// Nothing to do
-
-		break;
-
-	case idCallTip:  	// Nothing to do
-
-		break;
-
-	case idcmdUndo:
-		WndProc(SCI_UNDO, 0, 0);
-		break;
-
-	case idcmdRedo:
-		WndProc(SCI_REDO, 0, 0);
-		break;
-
-	case idcmdCut:
-		WndProc(SCI_CUT, 0, 0);
-		break;
-
-	case idcmdCopy:
-		WndProc(SCI_COPY, 0, 0);
-		break;
-
-	case idcmdPaste:
-		WndProc(SCI_PASTE, 0, 0);
-		break;
-
-	case idcmdDelete:
-		WndProc(SCI_CLEAR, 0, 0);
-		break;
-
-	case idcmdSelectAll:
-		WndProc(SCI_SELECTALL, 0, 0);
-		break;
-	}
-}
-
-int ScintillaBase::KeyCommand(unsigned int iMessage) {
-	// Most key commands cancel autocompletion mode
-	if (ac.Active()) {
-		switch (iMessage) {
-			// Except for these
-		case SCI_LINEDOWN:
-			AutoCompleteMove(1);
-			return 0;
-		case SCI_LINEUP:
-			AutoCompleteMove( -1);
-			return 0;
-		case SCI_PAGEDOWN:
-			AutoCompleteMove(5);
-			return 0;
-		case SCI_PAGEUP:
-			AutoCompleteMove( -5);
-			return 0;
-		case SCI_VCHOME:
-			AutoCompleteMove( -5000);
-			return 0;
-		case SCI_LINEEND:
-			AutoCompleteMove(5000);
-			return 0;
-		case SCI_DELETEBACK:
-			DelCharBack(true);
-			AutoCompleteCharacterDeleted();
-			EnsureCaretVisible();
-			return 0;
-		case SCI_DELETEBACKNOTLINE:
-			DelCharBack(false);
-			AutoCompleteCharacterDeleted();
-			EnsureCaretVisible();
-			return 0;
-		case SCI_TAB:
-			AutoCompleteCompleted();
-			return 0;
-		case SCI_NEWLINE:
-			AutoCompleteCompleted();
-			return 0;
-
-		default:
-			ac.Cancel();
-		}
-	}
-
-	if (ct.inCallTipMode) {
-		if (
-		    (iMessage != SCI_CHARLEFT) &&
-		    (iMessage != SCI_CHARLEFTEXTEND) &&
-		    (iMessage != SCI_CHARRIGHT) &&
-		    (iMessage != SCI_CHARLEFTEXTEND) &&
-		    (iMessage != SCI_EDITTOGGLEOVERTYPE) &&
-		    (iMessage != SCI_DELETEBACK) &&
-		    (iMessage != SCI_DELETEBACKNOTLINE)
-		) {
-			ct.CallTipCancel();
-		}
-		if ((iMessage == SCI_DELETEBACK) || (iMessage == SCI_DELETEBACKNOTLINE)) {
-			if (currentPos <= ct.posStartCallTip) {
-				ct.CallTipCancel();
-			}
-		}
-	}
-	return Editor::KeyCommand(iMessage);
-}
-
-void ScintillaBase::AutoCompleteDoubleClick(void* p) {
-	ScintillaBase* sci = reinterpret_cast<ScintillaBase*>(p);
-	sci->AutoCompleteCompleted();
-}
-
-void ScintillaBase::AutoCompleteStart(int lenEntered, const char *list) {
-	//Platform::DebugPrintf("AutoComplete %s\n", list);
-	ct.CallTipCancel();
-
-	if (ac.chooseSingle && (listType == 0)) {
-		if (list && !strchr(list, ac.GetSeparator())) {
-			const char *typeSep = strchr(list, ac.GetTypesep());
-			size_t lenInsert = (typeSep) ? (typeSep-list) : strlen(list);
-			if (ac.ignoreCase) {
-				SetEmptySelection(currentPos - lenEntered);
-				pdoc->DeleteChars(currentPos, lenEntered);
-				SetEmptySelection(currentPos);
-				pdoc->InsertString(currentPos, list, lenInsert);
-				SetEmptySelection(currentPos + lenInsert);
-			} else {
-				SetEmptySelection(currentPos);
-				pdoc->InsertString(currentPos, list + lenEntered, lenInsert - lenEntered);
-				SetEmptySelection(currentPos + lenInsert - lenEntered);
-			}
-			return;
-		}
-	}
-	ac.Start(wMain, idAutoComplete, currentPos, LocationFromPosition(currentPos),
-				lenEntered, vs.lineHeight, IsUnicodeMode());
-
-	PRectangle rcClient = GetClientRectangle();
-	Point pt = LocationFromPosition(currentPos - lenEntered);
-
-	int heightLB = 100;
-	int widthLB = 100;
-	if (pt.x >= rcClient.right - widthLB) {
-		HorizontalScrollTo(xOffset + pt.x - rcClient.right + widthLB);
-		Redraw();
-		pt = LocationFromPosition(currentPos);
-	}
-	PRectangle rcac;
-	rcac.left = pt.x - ac.lb->CaretFromEdge();
-	if (pt.y >= rcClient.bottom - heightLB &&  // Wont fit below.
-	        pt.y >= (rcClient.bottom + rcClient.top) / 2) { // and there is more room above.
-		rcac.top = pt.y - heightLB;
-		if (rcac.top < 0) {
-			heightLB += rcac.top;
-			rcac.top = 0;
-		}
-	} else {
-		rcac.top = pt.y + vs.lineHeight;
-	}
-	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);
-	unsigned int aveCharWidth = vs.styles[STYLE_DEFAULT].aveCharWidth;
-	ac.lb->SetAverageCharWidth(aveCharWidth);
-	ac.lb->SetDoubleClickAction(AutoCompleteDoubleClick, this);
-
-	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();
-	int heightAlloced = rcList.bottom - rcList.top;
-	widthLB = Platform::Maximum(widthLB, rcList.right - rcList.left);
-	if (maxListWidth != 0)
-		widthLB = Platform::Minimum(widthLB, aveCharWidth*maxListWidth);
-	// Make an allowance for large strings in list
-	rcList.left = pt.x - ac.lb->CaretFromEdge();
-	rcList.right = rcList.left + widthLB;
-	if (((pt.y + vs.lineHeight) >= (rcClient.bottom - heightAlloced)) &&  // Wont fit below.
-	        ((pt.y + vs.lineHeight / 2) >= (rcClient.bottom + rcClient.top) / 2)) { // and there is more room above.
-		rcList.top = pt.y - heightAlloced;
-	} else {
-		rcList.top = pt.y + vs.lineHeight;
-	}
-	rcList.bottom = rcList.top + heightAlloced;
-	ac.lb->SetPositionRelative(rcList, wMain);
-	ac.Show(true);
-	if (lenEntered != 0) {
-		AutoCompleteMoveToCurrentWord();
-	}
-}
-
-void ScintillaBase::AutoCompleteCancel() {
-	ac.Cancel();
-}
-
-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 - startWord < 1000; i++)
-		wordCurrent[i - startWord] = pdoc->CharAt(i);
-	wordCurrent[Platform::Minimum(i - startWord, 999)] = '\0';
-	ac.Select(wordCurrent);
-}
-
-void ScintillaBase::AutoCompleteCharacterAdded(char ch) {
-	if (ac.IsFillUpChar(ch)) {
-		AutoCompleteCompleted();
-	} else if (ac.IsStopChar(ch)) {
-		ac.Cancel();
-	} else {
-		AutoCompleteMoveToCurrentWord();
-	}
-}
-
-void ScintillaBase::AutoCompleteCharacterDeleted() {
-	if (currentPos < ac.posStart - ac.startLen) {
-		ac.Cancel();
-	} else if (ac.cancelAtStartPos && (currentPos <= ac.posStart)) {
-		ac.Cancel();
-	} else {
-		AutoCompleteMoveToCurrentWord();
-	}
-}
-
-void ScintillaBase::AutoCompleteCompleted() {
-	int item = ac.lb->GetSelection();
-	char selected[1000];
-	selected[0] = '\0';
-	if (item != -1) {
-		ac.lb->GetValue(item, selected, sizeof(selected));
-	} else {
-		ac.Cancel();
-		return;
-	}
-
-	ac.Show(false);
-
-	listSelected = selected;
-	SCNotification scn = {0};
-	scn.nmhdr.code = listType > 0 ? SCN_USERLISTSELECTION : SCN_AUTOCSELECTION;
-	scn.message = 0;
-	scn.wParam = listType;
-	scn.listType = listType;
-	Position firstPos = ac.posStart - ac.startLen;
-	scn.lParam = firstPos;
-	scn.text = listSelected.c_str();
-	NotifyParent(scn);
-
-	if (!ac.Active())
-		return;
-	ac.Cancel();
-
-	if (listType > 0)
-		return;
-
-	Position endPos = currentPos;
-	if (ac.dropRestOfWord)
-		endPos = pdoc->ExtendWordSelect(endPos, 1, true);
-	if (endPos < firstPos)
-		return;
-	pdoc->BeginUndoAction();
-	if (endPos != firstPos) {
-		pdoc->DeleteChars(firstPos, endPos - firstPos);
-	}
-	SetEmptySelection(ac.posStart);
-	if (item != -1) {
-		SString piece = selected;
-		pdoc->InsertString(firstPos, piece.c_str());
-		SetEmptySelection(firstPos + static_cast<int>(piece.length()));
-	}
-	pdoc->EndUndoAction();
-}
-
-int ScintillaBase::AutoCompleteGetCurrent() {
-	return ac.lb->GetSelection();
-}
-
-void ScintillaBase::CallTipShow(Point pt, const char *defn) {
-	AutoCompleteCancel();
-	pt.y += vs.lineHeight;
-	// If container knows about STYLE_CALLTIP then use it in place of the
-	// STYLE_DEFAULT for the face name, size and character set. Also use it
-	// for the foreground and background colour.
-	int ctStyle = ct.UseStyleCallTip() ? STYLE_CALLTIP : STYLE_DEFAULT;
-	if (ct.UseStyleCallTip()) {
-		ct.SetForeBack(vs.styles[STYLE_CALLTIP].fore, vs.styles[STYLE_CALLTIP].back);
-	}
-	PRectangle rc = ct.CallTipStart(currentPos, pt,
-		defn,
-		vs.styles[ctStyle].fontName,
-		vs.styles[ctStyle].sizeZoomed,
-		CodePage(),
-		vs.styles[ctStyle].characterSet,
-		wMain);
-	// If the call-tip window would be out of the client
-	// space, adjust so it displays above the text.
-	PRectangle rcClient = GetClientRectangle();
-	if (rc.bottom > rcClient.bottom) {
-		int offset = vs.lineHeight + rc.Height();
-		rc.top -= offset;
-		rc.bottom -= offset;
-	}
-	// Now display the window.
-	CreateCallTipWindow(rc);
-	ct.wCallTip.SetPositionRelative(rc, wMain);
-	ct.wCallTip.Show();
-}
-
-void ScintillaBase::CallTipClick() {
-	SCNotification scn = {0};
-	scn.nmhdr.code = SCN_CALLTIPCLICK;
-	scn.position = ct.clickPlace;
-	NotifyParent(scn);
-}
-
-void ScintillaBase::ContextMenu(Point pt) {
-	if (displayPopupMenu) {
-		bool writable = !WndProc(SCI_GETREADONLY, 0, 0);
-		popup.CreatePopUp();
-		AddToPopUp("Undo", idcmdUndo, writable && pdoc->CanUndo());
-		AddToPopUp("Redo", idcmdRedo, writable && pdoc->CanRedo());
-		AddToPopUp("");
-		AddToPopUp("Cut", idcmdCut, writable && currentPos != anchor);
-		AddToPopUp("Copy", idcmdCopy, currentPos != anchor);
-		AddToPopUp("Paste", idcmdPaste, writable && WndProc(SCI_CANPASTE, 0, 0));
-		AddToPopUp("Delete", idcmdDelete, writable && currentPos != anchor);
-		AddToPopUp("");
-		AddToPopUp("Select All", idcmdSelectAll);
-		popup.Show(pt, wMain);
-	}
-}
-
-void ScintillaBase::CancelModes() {
-	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);
-}
-
-#ifdef SCI_LEXER
-void ScintillaBase::SetLexer(uptr_t wParam) {
-	lexLanguage = wParam;
-	lexCurrent = LexerModule::Find(lexLanguage);
-	if (!lexCurrent)
-		lexCurrent = LexerModule::Find(SCLEX_NULL);
-}
-
-void ScintillaBase::SetLexerLanguage(const char *languageName) {
-	lexLanguage = SCLEX_CONTAINER;
-	lexCurrent = LexerModule::Find(languageName);
-	if (!lexCurrent)
-		lexCurrent = LexerModule::Find(SCLEX_NULL);
-	if (lexCurrent)
-		lexLanguage = lexCurrent->GetLanguage();
-}
-
-void ScintillaBase::Colourise(int start, int end) {
-	if (!performingStyle) {
-		// Protect against reentrance, which may occur, for example, when
-		// fold points are discovered while performing styling and the folding
-		// code looks for child lines which may trigger styling.
-		performingStyle = true;
-
-		int lengthDoc = pdoc->Length();
-		if (end == -1)
-			end = lengthDoc;
-		int len = end - start;
-
-		PLATFORM_ASSERT(len >= 0);
-		PLATFORM_ASSERT(start + len <= lengthDoc);
-
-		//WindowAccessor styler(wMain.GetID(), props);
-		DocumentAccessor styler(pdoc, props, wMain.GetID());
-
-		int styleStart = 0;
-		if (start > 0)
-			styleStart = styler.StyleAt(start - 1) & pdoc->stylingBitsMask;
-		styler.SetCodePage(pdoc->dbcsCodePage);
-
-		if (lexCurrent && (len > 0)) {	// Should always succeed as null lexer should always be available
-			lexCurrent->Lex(start, len, styleStart, keyWordLists, styler);
-			styler.Flush();
-			if (styler.GetPropertyInt("fold")) {
-				lexCurrent->Fold(start, len, styleStart, keyWordLists, styler);
-				styler.Flush();
-			}
-		}
-
-		performingStyle = false;
-	}
-}
-#endif
-
-void ScintillaBase::NotifyStyleToNeeded(int endStyleNeeded) {
-#ifdef SCI_LEXER
-	if (lexLanguage != SCLEX_CONTAINER) {
-		int endStyled = WndProc(SCI_GETENDSTYLED, 0, 0);
-		int lineEndStyled = WndProc(SCI_LINEFROMPOSITION, endStyled, 0);
-		endStyled = WndProc(SCI_POSITIONFROMLINE, lineEndStyled, 0);
-		Colourise(endStyled, endStyleNeeded);
-		return;
-	}
-#endif
-	Editor::NotifyStyleToNeeded(endStyleNeeded);
-}
-
-sptr_t ScintillaBase::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
-	switch (iMessage) {
-	case SCI_AUTOCSHOW:
-		listType = 0;
-		AutoCompleteStart(wParam, reinterpret_cast<const char *>(lParam));
-		break;
-
-	case SCI_AUTOCCANCEL:
-		AutoCompleteCancel();
-		break;
-
-	case SCI_AUTOCACTIVE:
-		return ac.Active();
-
-	case SCI_AUTOCPOSSTART:
-		return ac.posStart;
-
-	case SCI_AUTOCCOMPLETE:
-		AutoCompleteCompleted();
-		break;
-
-	case SCI_AUTOCSETSEPARATOR:
-		ac.SetSeparator(static_cast<char>(wParam));
-		break;
-
-	case SCI_AUTOCGETSEPARATOR:
-		return ac.GetSeparator();
-
-	case SCI_AUTOCSTOPS:
-		ac.SetStopChars(reinterpret_cast<char *>(lParam));
-		break;
-
-	case SCI_AUTOCSELECT:
-		ac.Select(reinterpret_cast<char *>(lParam));
-		break;
-
-	case SCI_AUTOCGETCURRENT:
-		return AutoCompleteGetCurrent();
-
-	case SCI_AUTOCSETCANCELATSTART:
-		ac.cancelAtStartPos = wParam != 0;
-		break;
-
-	case SCI_AUTOCGETCANCELATSTART:
-		return ac.cancelAtStartPos;
-
-	case SCI_AUTOCSETFILLUPS:
-		ac.SetFillUpChars(reinterpret_cast<char *>(lParam));
-		break;
-
-	case SCI_AUTOCSETCHOOSESINGLE:
-		ac.chooseSingle = wParam != 0;
-		break;
-
-	case SCI_AUTOCGETCHOOSESINGLE:
-		return ac.chooseSingle;
-
-	case SCI_AUTOCSETIGNORECASE:
-		ac.ignoreCase = wParam != 0;
-		break;
-
-	case SCI_AUTOCGETIGNORECASE:
-		return ac.ignoreCase;
-
-	case SCI_USERLISTSHOW:
-		listType = wParam;
-		AutoCompleteStart(0, reinterpret_cast<const char *>(lParam));
-		break;
-
-	case SCI_AUTOCSETAUTOHIDE:
-		ac.autoHide = wParam != 0;
-		break;
-
-	case SCI_AUTOCGETAUTOHIDE:
-		return ac.autoHide;
-
-	case SCI_AUTOCSETDROPRESTOFWORD:
-		ac.dropRestOfWord = wParam != 0;
-		break;
-
-	case SCI_AUTOCGETDROPRESTOFWORD:
-		return ac.dropRestOfWord;
-
-	case SCI_AUTOCSETMAXHEIGHT:
-		ac.lb->SetVisibleRows(wParam);
-		break;
-
-	case SCI_AUTOCGETMAXHEIGHT:
-		return ac.lb->GetVisibleRows();
-
-	case SCI_AUTOCSETMAXWIDTH:
-		maxListWidth = wParam;
-		break;
-
-	case SCI_AUTOCGETMAXWIDTH:
-		return maxListWidth;
-
-	case SCI_REGISTERIMAGE:
-		ac.lb->RegisterImage(wParam, reinterpret_cast<const char *>(lParam));
-		break;
-
-	case SCI_CLEARREGISTEREDIMAGES:
-		ac.lb->ClearRegisteredImages();
-		break;
-
-	case SCI_AUTOCSETTYPESEPARATOR:
-		ac.SetTypesep(static_cast<char>(wParam));
-		break;
-
-	case SCI_AUTOCGETTYPESEPARATOR:
-		return ac.GetTypesep();
-
-	case SCI_CALLTIPSHOW:
-		CallTipShow(LocationFromPosition(wParam),
-			reinterpret_cast<const char *>(lParam));
-		break;
-
-	case SCI_CALLTIPCANCEL:
-		ct.CallTipCancel();
-		break;
-
-	case SCI_CALLTIPACTIVE:
-		return ct.inCallTipMode;
-
-	case SCI_CALLTIPPOSSTART:
-		return ct.posStartCallTip;
-
-	case SCI_CALLTIPSETHLT:
-		ct.SetHighlight(wParam, lParam);
-		break;
-
-	case SCI_CALLTIPSETBACK:
-		ct.colourBG = ColourDesired(wParam);
-		vs.styles[STYLE_CALLTIP].fore = ct.colourBG;
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_CALLTIPSETFORE:
-		ct.colourUnSel = ColourDesired(wParam);
-		vs.styles[STYLE_CALLTIP].fore = ct.colourUnSel;
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_CALLTIPSETFOREHLT:
-		ct.colourSel = ColourDesired(wParam);
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_CALLTIPUSESTYLE:
-		ct.SetTabSize((int)wParam);
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_USEPOPUP:
-		displayPopupMenu = wParam != 0;
-		break;
-
-#ifdef SCI_LEXER
-	case SCI_SETLEXER:
-		SetLexer(wParam);
-		lexLanguage = wParam;
-		break;
-
-	case SCI_GETLEXER:
-		return lexLanguage;
-
-	case SCI_COLOURISE:
-		if (lexLanguage == SCLEX_CONTAINER) {
-			pdoc->ModifiedAt(wParam);
-			NotifyStyleToNeeded((lParam == -1) ? pdoc->Length() : lParam);
-		} else {
-			Colourise(wParam, lParam);
-		}
-		Redraw();
-		break;
-
-	case SCI_SETPROPERTY:
-		props.Set(reinterpret_cast<const char *>(wParam),
-		          reinterpret_cast<const char *>(lParam));
-		break;
-
-	case SCI_GETPROPERTY: {
-			SString val = props.Get(reinterpret_cast<const char *>(wParam));
-			const int n = val.length();
-			if (lParam != 0) {
-				char *ptr = reinterpret_cast<char *>(lParam);
-				memcpy(ptr, val.c_str(), n);
-				ptr[n] = '\0';	// terminate
-			}
-			return n;	// Not including NUL
-		}
-
-	case SCI_GETPROPERTYEXPANDED: {
-			SString val = props.GetExpanded(reinterpret_cast<const char *>(wParam));
-			const int n = val.length();
-			if (lParam != 0) {
-				char *ptr = reinterpret_cast<char *>(lParam);
-				memcpy(ptr, val.c_str(), n);
-				ptr[n] = '\0';	// terminate
-			}
-			return n;	// Not including NUL
-		}
-
-	case SCI_GETPROPERTYINT:
-		return props.GetInt(reinterpret_cast<const char *>(wParam), lParam);
-
-	case SCI_SETKEYWORDS:
-		if (wParam < numWordLists) {
-			keyWordLists[wParam]->Clear();
-			keyWordLists[wParam]->Set(reinterpret_cast<const char *>(lParam));
-		}
-		break;
-
-	case SCI_SETLEXERLANGUAGE:
-		SetLexerLanguage(reinterpret_cast<const char *>(lParam));
-		break;
-
-	case SCI_GETSTYLEBITSNEEDED:
-		return lexCurrent ? lexCurrent->GetStyleBitsNeeded() : 5;
-#endif
-
-	default:
-		return Editor::WndProc(iMessage, wParam, lParam);
-	}
-	return 0l;
-}
diff --git a/src/stc/scintilla/src/ScintillaBase.h b/src/stc/scintilla/src/ScintillaBase.h
deleted file mode 100644
index cb85b55b51..0000000000
--- a/src/stc/scintilla/src/ScintillaBase.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// Scintilla source code edit control
-/** @file ScintillaBase.h
- ** Defines an enhanced subclass of Editor with calltips, autocomplete and context menu.
- **/
-// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef SCINTILLABASE_H
-#define SCINTILLABASE_H
-
-/**
- */
-class ScintillaBase : public Editor {
-	// Private so ScintillaBase objects can not be copied
-	ScintillaBase(const ScintillaBase &) : Editor() {}
-	ScintillaBase &operator=(const ScintillaBase &) { return *this; }
-
-protected:
-	/** Enumeration of commands and child windows. */
-	enum {
-		idCallTip=1,
-		idAutoComplete=2,
-
-		idcmdUndo=10,
-		idcmdRedo=11,
-		idcmdCut=12,
-		idcmdCopy=13,
-		idcmdPaste=14,
-		idcmdDelete=15,
-		idcmdSelectAll=16
-	};
-
-	bool displayPopupMenu;
-	Menu popup;
-	AutoComplete ac;
-
-	CallTip ct;
-
-	int listType;			///< 0 is an autocomplete list
-	SString listSelected;	///< Receives listbox selected string
-	int maxListWidth;		/// Maximum width of list, in average character widths
-
-	bool performingStyle;	///< Prevent reentrance
-
-#ifdef SCI_LEXER
-	int lexLanguage;
-	const LexerModule *lexCurrent;
-	PropSet props;
-	enum {numWordLists=KEYWORDSET_MAX+1};
-	WordList *keyWordLists[numWordLists+1];
-	void SetLexer(uptr_t wParam);
-	void SetLexerLanguage(const char *languageName);
-	void Colourise(int start, int end);
-#endif
-
-	ScintillaBase();
-	virtual ~ScintillaBase();
-	virtual void Initialise() = 0;
-	virtual void Finalise() = 0;
-
-	virtual void RefreshColourPalette(Palette &pal, bool want);
-
-	virtual void AddCharUTF(char *s, unsigned int len, bool treatAsDBCS=false);
-	void Command(int cmdId);
-	virtual void CancelModes();
-	virtual int KeyCommand(unsigned int iMessage);
-
-	void AutoCompleteStart(int lenEntered, const char *list);
-	void AutoCompleteCancel();
-	void AutoCompleteMove(int delta);
-	int AutoCompleteGetCurrent();
-	void AutoCompleteCharacterAdded(char ch);
-	void AutoCompleteCharacterDeleted();
-	void AutoCompleteCompleted();
-	void AutoCompleteMoveToCurrentWord();
-	static void AutoCompleteDoubleClick(void* p);
-
-	void CallTipClick();
-	void CallTipShow(Point pt, const char *defn);
-	virtual void CreateCallTipWindow(PRectangle rc) = 0;
-
-	virtual void AddToPopUp(const char *label, int cmd=0, bool enabled=true) = 0;
-	void ContextMenu(Point pt);
-
-	virtual void ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt);
-
-	virtual void NotifyStyleToNeeded(int endStyleNeeded);
-public:
-	// Public so scintilla_send_message can use it
-	virtual sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
-};
-
-#endif
diff --git a/src/stc/scintilla/src/Style.cxx b/src/stc/scintilla/src/Style.cxx
deleted file mode 100644
index f01aee0826..0000000000
--- a/src/stc/scintilla/src/Style.cxx
+++ /dev/null
@@ -1,154 +0,0 @@
-// Scintilla source code edit control
-/** @file Style.cxx
- ** Defines the font and colour style for a class of text.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <string.h>
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-#include "Style.h"
-
-Style::Style() {
-	aliasOfDefaultFont = true;
-	Clear(ColourDesired(0, 0, 0), ColourDesired(0xff, 0xff, 0xff),
-	      Platform::DefaultFontSize(), 0, SC_CHARSET_DEFAULT,
-	      false, false, false, false, caseMixed, true, true, false);
-}
-
-Style::Style(const Style &source) {
-	Clear(ColourDesired(0, 0, 0), ColourDesired(0xff, 0xff, 0xff),
-	      0, 0, 0,
-	      false, false, false, false, caseMixed, true, true, false);
-	fore.desired = source.fore.desired;
-	back.desired = source.back.desired;
-	characterSet = source.characterSet;
-	bold = source.bold;
-	italic = source.italic;
-	size = source.size;
-	eolFilled = source.eolFilled;
-	underline = source.underline;
-	caseForce = source.caseForce;
-	visible = source.visible;
-	changeable = source.changeable;
-	hotspot = source.hotspot;
-}
-
-Style::~Style() {
-	if (aliasOfDefaultFont)
-		font.SetID(0);
-	else
-		font.Release();
-	aliasOfDefaultFont = false;
-}
-
-Style &Style::operator=(const Style &source) {
-	if (this == &source)
-		return * this;
-	Clear(ColourDesired(0, 0, 0), ColourDesired(0xff, 0xff, 0xff),
-	      0, 0, SC_CHARSET_DEFAULT,
-	      false, false, false, false, caseMixed, true, true, false);
-	fore.desired = source.fore.desired;
-	back.desired = source.back.desired;
-	characterSet = source.characterSet;
-	bold = source.bold;
-	italic = source.italic;
-	size = source.size;
-	eolFilled = source.eolFilled;
-	underline = source.underline;
-	caseForce = source.caseForce;
-	visible = source.visible;
-	changeable = source.changeable;
-	return *this;
-}
-
-void Style::Clear(ColourDesired fore_, ColourDesired back_, int size_,
-                  const char *fontName_, int characterSet_,
-                  bool bold_, bool italic_, bool eolFilled_,
-                  bool underline_, ecaseForced caseForce_,
-		  bool visible_, bool changeable_, bool hotspot_) {
-	fore.desired = fore_;
-	back.desired = back_;
-	characterSet = characterSet_;
-	bold = bold_;
-	italic = italic_;
-	size = size_;
-	fontName = fontName_;
-	eolFilled = eolFilled_;
-	underline = underline_;
-	caseForce = caseForce_;
-	visible = visible_;
-	changeable = changeable_;
-	hotspot = hotspot_;
-	if (aliasOfDefaultFont)
-		font.SetID(0);
-	else
-		font.Release();
-	aliasOfDefaultFont = false;
-}
-
-void Style::ClearTo(const Style &source) {
-	Clear(
-		source.fore.desired,
-		source.back.desired,
-		source.size,
-		source.fontName,
-		source.characterSet,
-		source.bold,
-		source.italic,
-		source.eolFilled,
-		source.underline,
-		source.caseForce,
-		source.visible,
-		source.changeable,
-		source.hotspot);
-}
-
-bool Style::EquivalentFontTo(const Style *other) const {
-	if (bold != other->bold ||
-	        italic != other->italic ||
-	        size != other->size ||
-	        characterSet != other->characterSet)
-		return false;
-	if (fontName == other->fontName)
-		return true;
-	if (!fontName)
-		return false;
-	if (!other->fontName)
-		return false;
-	return strcmp(fontName, other->fontName) == 0;
-}
-
-void Style::Realise(Surface &surface, int zoomLevel, Style *defaultStyle, bool extraFontFlag) {
-	sizeZoomed = size + zoomLevel;
-	if (sizeZoomed <= 2)	// Hangs if sizeZoomed <= 1
-		sizeZoomed = 2;
-
-	if (aliasOfDefaultFont)
-		font.SetID(0);
-	else
-		font.Release();
-	int deviceHeight = surface.DeviceHeightFont(sizeZoomed);
-	aliasOfDefaultFont = defaultStyle &&
-	                     (EquivalentFontTo(defaultStyle) || !fontName);
-	if (aliasOfDefaultFont) {
-		font.SetID(defaultStyle->font.GetID());
-	} else if (fontName) {
-		font.Create(fontName, characterSet, deviceHeight, bold, italic, extraFontFlag);
-	} else {
-		font.SetID(0);
-	}
-
-	ascent = surface.Ascent(font);
-	descent = surface.Descent(font);
-	// Probably more typographically correct to include leading
-	// but that means more complex drawing as leading must be erased
-	//lineHeight = surface.ExternalLeading() + surface.Height();
-	externalLeading = surface.ExternalLeading(font);
-	lineHeight = surface.Height(font);
-	aveCharWidth = surface.AverageCharWidth(font);
-	spaceWidth = surface.WidthChar(font, ' ');
-}
diff --git a/src/stc/scintilla/src/Style.h b/src/stc/scintilla/src/Style.h
deleted file mode 100644
index c0f7eca266..0000000000
--- a/src/stc/scintilla/src/Style.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Scintilla source code edit control
-/** @file Style.h
- ** Defines the font and colour style for a class of text.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef STYLE_H
-#define STYLE_H
-
-/**
- */
-class Style {
-public:
-	ColourPair fore;
-	ColourPair back;
-	bool aliasOfDefaultFont;
-	bool bold;
-	bool italic;
-	int size;
-	const char *fontName;
-	int characterSet;
-	bool eolFilled;
-	bool underline;
-	enum ecaseForced {caseMixed, caseUpper, caseLower};
-	ecaseForced caseForce;
-	bool visible;
-	bool changeable;
-	bool hotspot;
-
-	Font font;
-	int sizeZoomed;
-	unsigned int lineHeight;
-	unsigned int ascent;
-	unsigned int descent;
-	unsigned int externalLeading;
-	unsigned int aveCharWidth;
-	unsigned int spaceWidth;
-
-	Style();
-	Style(const Style &source);
-	~Style();
-	Style &operator=(const Style &source);
-	void Clear(ColourDesired fore_, ColourDesired back_,
-	           int size_,
-	           const char *fontName_, int characterSet_,
-	           bool bold_, bool italic_, bool eolFilled_,
-	           bool underline_, ecaseForced caseForce_,
-		   bool visible_, bool changeable_, bool hotspot_);
-	void ClearTo(const Style &source);
-	bool EquivalentFontTo(const Style *other) const;
-	void Realise(Surface &surface, int zoomLevel, Style *defaultStyle = 0, bool extraFontFlag = false);
-	bool IsProtected() const { return !(changeable && visible);};
-};
-
-#endif
diff --git a/src/stc/scintilla/src/StyleContext.cxx b/src/stc/scintilla/src/StyleContext.cxx
deleted file mode 100644
index d9da0edc47..0000000000
--- a/src/stc/scintilla/src/StyleContext.cxx
+++ /dev/null
@@ -1,51 +0,0 @@
-// Scintilla source code edit control
-/** @file StyleContext.cxx
- ** Lexer infrastructure.
- **/
-// Copyright 1998-2004 by Neil Hodgson <neilh@scintilla.org>
-// This file is in the public domain.
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "StyleContext.h"
-
-static void getRange(unsigned int start,
-		unsigned int end,
-		Accessor &styler,
-		char *s,
-		unsigned int len) {
-	unsigned int i = 0;
-	while ((i < end - start + 1) && (i < len-1)) {
-		s[i] = styler[start + i];
-		i++;
-	}
-	s[i] = '\0';
-}
-
-void StyleContext::GetCurrent(char *s, unsigned int len) {
-	getRange(styler.GetStartSegment(), currentPos - 1, styler, s, len);
-}
-
-static void getRangeLowered(unsigned int start,
-		unsigned int end,
-		Accessor &styler,
-		char *s,
-		unsigned int len) {
-	unsigned int i = 0;
-	while ((i < end - start + 1) && (i < len-1)) {
-		s[i] = static_cast<char>(tolower(styler[start + i]));
-		i++;
-	}
-	s[i] = '\0';
-}
-
-void StyleContext::GetCurrentLowered(char *s, unsigned int len) {
-	getRangeLowered(styler.GetStartSegment(), currentPos - 1, styler, s, len);
-}
diff --git a/src/stc/scintilla/src/StyleContext.h b/src/stc/scintilla/src/StyleContext.h
deleted file mode 100644
index 36b50f9142..0000000000
--- a/src/stc/scintilla/src/StyleContext.h
+++ /dev/null
@@ -1,169 +0,0 @@
-// Scintilla source code edit control
-/** @file StyleContext.cxx
- ** Lexer infrastructure.
- **/
-// Copyright 1998-2004 by Neil Hodgson <neilh@scintilla.org>
-// This file is in the public domain.
-
-// All languages handled so far can treat all characters >= 0x80 as one class
-// which just continues the current token or starts an identifier if in default.
-// DBCS treated specially as the second character can be < 0x80 and hence
-// syntactically significant. UTF-8 avoids this as all trail bytes are >= 0x80
-class StyleContext {
-	Accessor &styler;
-	unsigned int endPos;
-	StyleContext& operator=(const StyleContext&) {
-		return *this;
-	}
-	void GetNextChar(unsigned int pos) {
-		chNext = static_cast<unsigned char>(styler.SafeGetCharAt(pos+1));
-		if (styler.IsLeadByte(static_cast<char>(chNext))) {
-			chNext = chNext << 8;
-			chNext |= static_cast<unsigned char>(styler.SafeGetCharAt(pos+2));
-		}
-		// End of line?
-		// 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.
-		atLineEnd = (ch == '\r' && chNext != '\n') ||
-					(ch == '\n') ||
-					(currentPos >= endPos);
-	}
-
-public:
-	unsigned int currentPos;
-	bool atLineStart;
-	bool atLineEnd;
-	int state;
-	int chPrev;
-	int ch;
-	int chNext;
-
-	StyleContext(unsigned int startPos, unsigned int length,
-                        int initStyle, Accessor &styler_, char chMask=31) :
-		styler(styler_),
-		endPos(startPos + length),
-		currentPos(startPos),
-		atLineStart(true),
-		atLineEnd(false),
-		state(initStyle & chMask), // Mask off all bits which aren't in the chMask.
-		chPrev(0),
-		ch(0),
-		chNext(0) {
-		styler.StartAt(startPos, chMask);
-		styler.StartSegment(startPos);
-		unsigned int pos = currentPos;
-		ch = static_cast<unsigned char>(styler.SafeGetCharAt(pos));
-		if (styler.IsLeadByte(static_cast<char>(ch))) {
-			pos++;
-			ch = ch << 8;
-			ch |= static_cast<unsigned char>(styler.SafeGetCharAt(pos));
-		}
-		GetNextChar(pos);
-	}
-	void Complete() {
-		styler.ColourTo(currentPos - 1, state);
-	}
-	bool More() {
-		return currentPos < endPos;
-	}
-	void Forward() {
-		if (currentPos < endPos) {
-			atLineStart = atLineEnd;
-			chPrev = ch;
-			currentPos++;
-			if (ch >= 0x100)
-				currentPos++;
-			ch = chNext;
-			GetNextChar(currentPos + ((ch >= 0x100) ? 1 : 0));
-		} else {
-			atLineStart = false;
-			chPrev = ' ';
-			ch = ' ';
-			chNext = ' ';
-			atLineEnd = true;
-		}
-	}
-	void Forward(int nb) {
-		for (int i = 0; i < nb; i++) {
-			Forward();
-		}
-	}
-	void ChangeState(int state_) {
-		state = state_;
-	}
-	void SetState(int state_) {
-		styler.ColourTo(currentPos - 1, state);
-		state = state_;
-	}
-	void ForwardSetState(int state_) {
-		Forward();
-		styler.ColourTo(currentPos - 1, state);
-		state = state_;
-	}
-	int LengthCurrent() {
-		return currentPos - styler.GetStartSegment();
-	}
-	int GetRelative(int n) {
-		return static_cast<unsigned char>(styler.SafeGetCharAt(currentPos+n));
-	}
-	bool Match(char ch0) {
-		return ch == ch0;
-	}
-	bool Match(char ch0, char ch1) {
-		return (ch == ch0) && (chNext == ch1);
-	}
-	bool Match(const char *s) {
-		if (ch != *s)
-			return false;
-		s++;
-		if (chNext != *s)
-			return false;
-		s++;
-		for (int n=2; *s; n++) {
-			if (*s != styler.SafeGetCharAt(currentPos+n))
-				return false;
-			s++;
-		}
-		return true;
-	}
-	bool MatchIgnoreCase(const char *s) {
-		if (tolower(ch) != *s)
-			return false;
-		s++;
-		if (tolower(chNext) != *s)
-			return false;
-		s++;
-		for (int n=2; *s; n++) {
-			if (*s !=
-				tolower(static_cast<unsigned char>(styler.SafeGetCharAt(currentPos+n))))
-				return false;
-			s++;
-		}
-		return true;
-	}
-	// Non-inline
-	void GetCurrent(char *s, unsigned int len);
-	void GetCurrentLowered(char *s, unsigned int len);
-};
-
-inline bool IsASpace(unsigned int ch) {
-    return (ch == ' ') || ((ch >= 0x09) && (ch <= 0x0d));
-}
-
-inline bool IsASpaceOrTab(unsigned int ch) {
-	return (ch == ' ') || (ch == '\t');
-}
-
-inline bool IsADigit(unsigned int ch) {
-	return (ch >= '0') && (ch <= '9');
-}
-
-inline bool IsADigit(unsigned int ch, unsigned int base) {
-	if (base <= 10) {
-		return (ch >= '0') && (ch < '0' + base);
-	} else {
-		return ((ch >= '0') && (ch <= '9')) ||
-		       ((ch >= 'A') && (ch < 'A' + base - 10)) ||
-		       ((ch >= 'a') && (ch < 'a' + base - 10));
-	}
-}
diff --git a/src/stc/scintilla/src/UniConversion.cxx b/src/stc/scintilla/src/UniConversion.cxx
deleted file mode 100644
index 363db90f45..0000000000
--- a/src/stc/scintilla/src/UniConversion.cxx
+++ /dev/null
@@ -1,76 +0,0 @@
-// Scintilla source code edit control
-/** @file UniConversion.cxx
- ** Functions to handle UFT-8 and UCS-2 strings.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h>
-
-#include "UniConversion.h"
-
-unsigned int UTF8Length(const wchar_t *uptr, unsigned int tlen) {
-	unsigned int len = 0;
-	for (unsigned int i = 0; i < tlen && uptr[i]; i++) {
-		unsigned int uch = uptr[i];
-		if (uch < 0x80)
-			len++;
-		else if (uch < 0x800)
-			len += 2;
-		else
-			len +=3;
-	}
-	return len;
-}
-
-void UTF8FromUCS2(const wchar_t *uptr, unsigned int tlen, char *putf, unsigned int len) {
-	int k = 0;
-	for (unsigned int i = 0; i < tlen && uptr[i]; i++) {
-		unsigned int uch = uptr[i];
-		if (uch < 0x80) {
-			putf[k++] = static_cast<char>(uch);
-		} else if (uch < 0x800) {
-			putf[k++] = static_cast<char>(0xC0 | (uch >> 6));
-			putf[k++] = static_cast<char>(0x80 | (uch & 0x3f));
-		} else {
-			putf[k++] = static_cast<char>(0xE0 | (uch >> 12));
-			putf[k++] = static_cast<char>(0x80 | ((uch >> 6) & 0x3f));
-			putf[k++] = static_cast<char>(0x80 | (uch & 0x3f));
-		}
-	}
-	putf[len] = '\0';
-}
-
-unsigned int UCS2Length(const char *s, unsigned int len) {
-	unsigned int ulen = 0;
-	for (unsigned int i=0;i<len;i++) {
-		unsigned char ch = static_cast<unsigned char>(s[i]);
-		if ((ch < 0x80) || (ch > (0x80 + 0x40)))
-			ulen++;
-	}
-	return ulen;
-}
-
-unsigned int UCS2FromUTF8(const char *s, unsigned int len, wchar_t *tbuf, unsigned int tlen) {
-	unsigned int ui=0;
-	const unsigned char *us = reinterpret_cast<const unsigned char *>(s);
-	unsigned int i=0;
-	while ((i<len) && (ui<tlen)) {
-		unsigned char ch = us[i++];
-		if (ch < 0x80) {
-			tbuf[ui] = ch;
-		} else if (ch < 0x80 + 0x40 + 0x20) {
-			tbuf[ui] = static_cast<wchar_t>((ch & 0x1F) << 6);
-			ch = us[i++];
-			tbuf[ui] = static_cast<wchar_t>(tbuf[ui] + (ch & 0x7F));
-		} else {
-			tbuf[ui] = static_cast<wchar_t>((ch & 0xF) << 12);
-			ch = us[i++];
-			tbuf[ui] = static_cast<wchar_t>(tbuf[ui] + ((ch & 0x7F) << 6));
-			ch = us[i++];
-			tbuf[ui] = static_cast<wchar_t>(tbuf[ui] + (ch & 0x7F));
-		}
-		ui++;
-	}
-	return ui;
-}
diff --git a/src/stc/scintilla/src/UniConversion.h b/src/stc/scintilla/src/UniConversion.h
deleted file mode 100644
index bd1d7754d4..0000000000
--- a/src/stc/scintilla/src/UniConversion.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Scintilla source code edit control
-/** @file UniConversion.h
- ** Functions to handle UFT-8 and UCS-2 strings.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-unsigned int UTF8Length(const wchar_t *uptr, unsigned int tlen);
-void UTF8FromUCS2(const wchar_t *uptr, unsigned int tlen, char *putf, unsigned int len);
-unsigned int UCS2Length(const char *s, unsigned int len);
-unsigned int UCS2FromUTF8(const char *s, unsigned int len, wchar_t *tbuf, unsigned int tlen);
-
diff --git a/src/stc/scintilla/src/ViewStyle.cxx b/src/stc/scintilla/src/ViewStyle.cxx
deleted file mode 100644
index b4da30ace3..0000000000
--- a/src/stc/scintilla/src/ViewStyle.cxx
+++ /dev/null
@@ -1,297 +0,0 @@
-// Scintilla source code edit control
-/** @file ViewStyle.cxx
- ** Store information on how the document is to be viewed.
- **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <string.h>
-
-#include "Platform.h"
-
-#include "Scintilla.h"
-#include "Indicator.h"
-#include "XPM.h"
-#include "LineMarker.h"
-#include "Style.h"
-#include "ViewStyle.h"
-
-MarginStyle::MarginStyle() :
-	style(SC_MARGIN_SYMBOL), width(0), mask(0), sensitive(false) {
-}
-
-// A list of the fontnames - avoids wasting space in each style
-FontNames::FontNames() {
-	max = 0;
-}
-
-FontNames::~FontNames() {
-	Clear();
-}
-
-void FontNames::Clear() {
-	for (int i=0;i<max;i++) {
-		delete []names[i];
-	}
-	max = 0;
-}
-
-const char *FontNames::Save(const char *name) {
-	if (!name)
-		return 0;
-	for (int i=0;i<max;i++) {
-		if (strcmp(names[i], name) == 0) {
-			return names[i];
-		}
-	}
-	names[max] = new char[strlen(name) + 1];
-	strcpy(names[max], name);
-	max++;
-	return names[max-1];
-}
-
-ViewStyle::ViewStyle() {
-	Init();
-}
-
-ViewStyle::ViewStyle(const ViewStyle &source) {
-	Init();
-	for (unsigned int sty=0;sty<(sizeof(styles)/sizeof(styles[0]));sty++) {
-		styles[sty] = source.styles[sty];
-		// Can't just copy fontname as its lifetime is relative to its owning ViewStyle
-		styles[sty].fontName = fontNames.Save(source.styles[sty].fontName);
-	}
-	for (int mrk=0;mrk<=MARKER_MAX;mrk++) {
-		markers[mrk] = source.markers[mrk];
-	}
-	for (int ind=0;ind<=INDIC_MAX;ind++) {
-		indicators[ind] = source.indicators[ind];
-	}
-
-	selforeset = source.selforeset;
-	selforeground.desired = source.selforeground.desired;
-	selbackset = source.selbackset;
-	selbackground.desired = source.selbackground.desired;
-	selbackground2.desired = source.selbackground2.desired;
-	selAlpha = source.selAlpha;
-
-	foldmarginColourSet = source.foldmarginColourSet;
-	foldmarginColour.desired = source.foldmarginColour.desired;
-	foldmarginHighlightColourSet = source.foldmarginHighlightColourSet;
-	foldmarginHighlightColour.desired = source.foldmarginHighlightColour.desired;
-
-	hotspotForegroundSet = source.hotspotForegroundSet;
-	hotspotForeground.desired = source.hotspotForeground.desired;
-	hotspotBackgroundSet = source.hotspotBackgroundSet;
-	hotspotBackground.desired = source.hotspotBackground.desired;
-	hotspotUnderline = source.hotspotUnderline;
-	hotspotSingleLine = source.hotspotSingleLine;
-
-	whitespaceForegroundSet = source.whitespaceForegroundSet;
-	whitespaceForeground.desired = source.whitespaceForeground.desired;
-	whitespaceBackgroundSet = source.whitespaceBackgroundSet;
-	whitespaceBackground.desired = source.whitespaceBackground.desired;
-	selbar.desired = source.selbar.desired;
-	selbarlight.desired = source.selbarlight.desired;
-	caretcolour.desired = source.caretcolour.desired;
-	showCaretLineBackground = source.showCaretLineBackground;
-	caretLineBackground.desired = source.caretLineBackground.desired;
-	caretLineAlpha = source.caretLineAlpha;
-	edgecolour.desired = source.edgecolour.desired;
-	edgeState = source.edgeState;
-	caretWidth = source.caretWidth;
-	someStylesProtected = false;
-	leftMarginWidth = source.leftMarginWidth;
-	rightMarginWidth = source.rightMarginWidth;
-	for (int i=0;i < margins; i++) {
-		ms[i] = source.ms[i];
-	}
-	symbolMargin = source.symbolMargin;
-	maskInLine = source.maskInLine;
-	fixedColumnWidth = source.fixedColumnWidth;
-	zoomLevel = source.zoomLevel;
-	viewWhitespace = source.viewWhitespace;
-	viewIndentationGuides = source.viewIndentationGuides;
-	viewEOL = source.viewEOL;
-	showMarkedLines = source.showMarkedLines;
-	extraFontFlag = source.extraFontFlag;
-}
-
-ViewStyle::~ViewStyle() {
-}
-
-void ViewStyle::Init() {
-	fontNames.Clear();
-	ResetDefaultStyle();
-
-	indicators[0].style = INDIC_SQUIGGLE;
-	indicators[0].fore = ColourDesired(0, 0x7f, 0);
-	indicators[1].style = INDIC_TT;
-	indicators[1].fore = ColourDesired(0, 0, 0xff);
-	indicators[2].style = INDIC_PLAIN;
-	indicators[2].fore = ColourDesired(0xff, 0, 0);
-
-	lineHeight = 1;
-	maxAscent = 1;
-	maxDescent = 1;
-	aveCharWidth = 8;
-	spaceWidth = 8;
-
-	selforeset = false;
-	selforeground.desired = ColourDesired(0xff, 0, 0);
-	selbackset = true;
-	selbackground.desired = ColourDesired(0xc0, 0xc0, 0xc0);
-	selbackground2.desired = ColourDesired(0xb0, 0xb0, 0xb0);
-	selAlpha = SC_ALPHA_NOALPHA;
-
-	foldmarginColourSet = false;
-	foldmarginColour.desired = ColourDesired(0xff, 0, 0);
-	foldmarginHighlightColourSet = false;
-	foldmarginHighlightColour.desired = ColourDesired(0xc0, 0xc0, 0xc0);
-
-	whitespaceForegroundSet = false;
-	whitespaceForeground.desired = ColourDesired(0, 0, 0);
-	whitespaceBackgroundSet = false;
-	whitespaceBackground.desired = ColourDesired(0xff, 0xff, 0xff);
-	selbar.desired = Platform::Chrome();
-	selbarlight.desired = Platform::ChromeHighlight();
-	styles[STYLE_LINENUMBER].fore.desired = ColourDesired(0, 0, 0);
-	styles[STYLE_LINENUMBER].back.desired = Platform::Chrome();
-	caretcolour.desired = ColourDesired(0, 0, 0);
-	showCaretLineBackground = false;
-	caretLineBackground.desired = ColourDesired(0xff, 0xff, 0);
-	caretLineAlpha = SC_ALPHA_NOALPHA;
-	edgecolour.desired = ColourDesired(0xc0, 0xc0, 0xc0);
-	edgeState = EDGE_NONE;
-	caretWidth = 1;
-	someStylesProtected = false;
-
-	hotspotForegroundSet = false;
-	hotspotForeground.desired = ColourDesired(0, 0, 0xff);
-	hotspotBackgroundSet = false;
-	hotspotBackground.desired = ColourDesired(0xff, 0xff, 0xff);
-	hotspotUnderline = true;
-	hotspotSingleLine = true;
-
-	leftMarginWidth = 1;
-	rightMarginWidth = 1;
-	ms[0].style = SC_MARGIN_NUMBER;
-	ms[0].width = 0;
-	ms[0].mask = 0;
-	ms[1].style = SC_MARGIN_SYMBOL;
-	ms[1].width = 16;
-	ms[1].mask = ~SC_MASK_FOLDERS;
-	ms[2].style = SC_MARGIN_SYMBOL;
-	ms[2].width = 0;
-	ms[2].mask = 0;
-	fixedColumnWidth = leftMarginWidth;
-	symbolMargin = false;
-	maskInLine = 0xffffffff;
-	for (int margin=0; margin < margins; margin++) {
-		fixedColumnWidth += ms[margin].width;
-		symbolMargin = symbolMargin || (ms[margin].style != SC_MARGIN_NUMBER);
-		if (ms[margin].width > 0)
-			maskInLine &= ~ms[margin].mask;
-	}
-	zoomLevel = 0;
-	viewWhitespace = wsInvisible;
-	viewIndentationGuides = false;
-	viewEOL = false;
-	showMarkedLines = true;
-	extraFontFlag = false;
-}
-
-void ViewStyle::RefreshColourPalette(Palette &pal, bool want) {
-	unsigned int i;
-	for (i=0;i<(sizeof(styles)/sizeof(styles[0]));i++) {
-		pal.WantFind(styles[i].fore, want);
-		pal.WantFind(styles[i].back, want);
-	}
-	for (i=0;i<(sizeof(indicators)/sizeof(indicators[0]));i++) {
-		pal.WantFind(indicators[i].fore, want);
-	}
-	for (i=0;i<(sizeof(markers)/sizeof(markers[0]));i++) {
-		markers[i].RefreshColourPalette(pal, want);
-	}
-	pal.WantFind(selforeground, want);
-	pal.WantFind(selbackground, want);
-	pal.WantFind(selbackground2, want);
-
-	pal.WantFind(foldmarginColour, want);
-	pal.WantFind(foldmarginHighlightColour, want);
-
-	pal.WantFind(whitespaceForeground, want);
-	pal.WantFind(whitespaceBackground, want);
-	pal.WantFind(selbar, want);
-	pal.WantFind(selbarlight, want);
-	pal.WantFind(caretcolour, want);
-	pal.WantFind(caretLineBackground, want);
-	pal.WantFind(edgecolour, want);
-	pal.WantFind(hotspotForeground, want);
-	pal.WantFind(hotspotBackground, want);
-}
-
-void ViewStyle::Refresh(Surface &surface) {
-	selbar.desired = Platform::Chrome();
-	selbarlight.desired = Platform::ChromeHighlight();
-	styles[STYLE_DEFAULT].Realise(surface, zoomLevel, NULL, extraFontFlag);
-	maxAscent = styles[STYLE_DEFAULT].ascent;
-	maxDescent = styles[STYLE_DEFAULT].descent;
-	someStylesProtected = false;
-	for (unsigned int i=0;i<(sizeof(styles)/sizeof(styles[0]));i++) {
-		if (i != STYLE_DEFAULT) {
-			styles[i].Realise(surface, zoomLevel, &styles[STYLE_DEFAULT], extraFontFlag);
-			if (maxAscent < styles[i].ascent)
-				maxAscent = styles[i].ascent;
-			if (maxDescent < styles[i].descent)
-				maxDescent = styles[i].descent;
-		}
-		if (styles[i].IsProtected()) {
-			someStylesProtected = true;
-		}
-	}
-
-	lineHeight = maxAscent + maxDescent;
-	aveCharWidth = styles[STYLE_DEFAULT].aveCharWidth;
-	spaceWidth = styles[STYLE_DEFAULT].spaceWidth;
-
-	fixedColumnWidth = leftMarginWidth;
-	symbolMargin = false;
-	maskInLine = 0xffffffff;
-	for (int margin=0; margin < margins; margin++) {
-		fixedColumnWidth += ms[margin].width;
-		symbolMargin = symbolMargin || (ms[margin].style != SC_MARGIN_NUMBER);
-		if (ms[margin].width > 0)
-			maskInLine &= ~ms[margin].mask;
-	}
-}
-
-void ViewStyle::ResetDefaultStyle() {
-	styles[STYLE_DEFAULT].Clear(ColourDesired(0,0,0),
-		ColourDesired(0xff,0xff,0xff),
-	        Platform::DefaultFontSize(), fontNames.Save(Platform::DefaultFont()),
-		SC_CHARSET_DEFAULT,
-		false, false, false, false, Style::caseMixed, true, true, false);
-}
-
-void ViewStyle::ClearStyles() {
-	// Reset all styles to be like the default style
-	for (unsigned int i=0;i<(sizeof(styles)/sizeof(styles[0]));i++) {
-		if (i != STYLE_DEFAULT) {
-			styles[i].ClearTo(styles[STYLE_DEFAULT]);
-		}
-	}
-	styles[STYLE_LINENUMBER].back.desired = Platform::Chrome();
-
-	// Set call tip fore/back to match the values previously set for call tips
-	styles[STYLE_CALLTIP].back.desired = ColourDesired(0xff, 0xff, 0xff);
-	styles[STYLE_CALLTIP].fore.desired = ColourDesired(0x80, 0x80, 0x80);
-}
-
-void ViewStyle::SetStyleFontName(int styleIndex, const char *name) {
-	styles[styleIndex].fontName = fontNames.Save(name);
-}
-
-bool ViewStyle::ProtectionActive() const {
-    return someStylesProtected;
-}
diff --git a/src/stc/scintilla/src/ViewStyle.h b/src/stc/scintilla/src/ViewStyle.h
deleted file mode 100644
index 75f899d974..0000000000
--- a/src/stc/scintilla/src/ViewStyle.h
+++ /dev/null
@@ -1,108 +0,0 @@
-// Scintilla source code edit control
-/** @file ViewStyle.h
- ** Store information on how the document is to be viewed.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef VIEWSTYLE_H
-#define VIEWSTYLE_H
-
-/**
- */
-class MarginStyle {
-public:
-	int style;
-	int width;
-	int mask;
-	bool sensitive;
-	MarginStyle();
-};
-
-/**
- */
-class FontNames {
-private:
-	char *names[STYLE_MAX + 1];
-	int max;
-
-public:
-	FontNames();
-	~FontNames();
-	void Clear();
-	const char *Save(const char *name);
-};
-
-enum WhiteSpaceVisibility {wsInvisible=0, wsVisibleAlways=1, wsVisibleAfterIndent=2};
-
-/**
- */
-class ViewStyle {
-public:
-	FontNames fontNames;
-	Style styles[STYLE_MAX + 1];
-	LineMarker markers[MARKER_MAX + 1];
-	Indicator indicators[INDIC_MAX + 1];
-	int lineHeight;
-	unsigned int maxAscent;
-	unsigned int maxDescent;
-	unsigned int aveCharWidth;
-	unsigned int spaceWidth;
-	bool selforeset;
-	ColourPair selforeground;
-	bool selbackset;
-	ColourPair selbackground;
-	ColourPair selbackground2;
-	int selAlpha;
-	bool whitespaceForegroundSet;
-	ColourPair whitespaceForeground;
-	bool whitespaceBackgroundSet;
-	ColourPair whitespaceBackground;
-	ColourPair selbar;
-	ColourPair selbarlight;
-	bool foldmarginColourSet;
-	ColourPair foldmarginColour;
-	bool foldmarginHighlightColourSet;
-	ColourPair foldmarginHighlightColour;
-	bool hotspotForegroundSet;
-	ColourPair hotspotForeground;
-	bool hotspotBackgroundSet;
-	ColourPair hotspotBackground;
-	bool hotspotUnderline;
-	bool hotspotSingleLine;
-	/// Margins are ordered: Line Numbers, Selection Margin, Spacing Margin
-	enum { margins=5 };
-	int leftMarginWidth;	///< Spacing margin on left of text
-	int rightMarginWidth;	///< Spacing margin on left of text
-	bool symbolMargin;
-	int maskInLine;	///< Mask for markers to be put into text because there is nowhere for them to go in margin
-	MarginStyle ms[margins];
-	int fixedColumnWidth;
-	int zoomLevel;
-	WhiteSpaceVisibility viewWhitespace;
-	bool viewIndentationGuides;
-	bool viewEOL;
-	bool showMarkedLines;
-	ColourPair caretcolour;
-	bool showCaretLineBackground;
-	ColourPair caretLineBackground;
-	int caretLineAlpha;
-	ColourPair edgecolour;
-	int edgeState;
-	int caretWidth;
-	bool someStylesProtected;
-	bool extraFontFlag;
-
-	ViewStyle();
-	ViewStyle(const ViewStyle &source);
-	~ViewStyle();
-	void Init();
-	void RefreshColourPalette(Palette &pal, bool want);
-	void Refresh(Surface &surface);
-	void ResetDefaultStyle();
-	void ClearStyles();
-	void SetStyleFontName(int styleIndex, const char *name);
-	bool ProtectionActive() const;
-};
-
-#endif
diff --git a/src/stc/scintilla/src/WindowAccessor.cxx b/src/stc/scintilla/src/WindowAccessor.cxx
deleted file mode 100644
index ce42534e7b..0000000000
--- a/src/stc/scintilla/src/WindowAccessor.cxx
+++ /dev/null
@@ -1,178 +0,0 @@
-// Scintilla source code edit control
-/** @file WindowAccessor.cxx
- ** Rapid easy access to contents of a Scintilla.
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// 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>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "WindowAccessor.h"
-#include "Scintilla.h"
-
-WindowAccessor::~WindowAccessor() {
-}
-
-bool WindowAccessor::InternalIsLeadByte(char ch) {
-	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 Platform::IsDBCSLeadByte(codePage, ch);
-}
-
-void WindowAccessor::Fill(int position) {
-	if (lenDoc == -1)
-		lenDoc = Platform::SendScintilla(id, SCI_GETTEXTLENGTH, 0, 0);
-	startPos = position - slopSize;
-	if (startPos + bufferSize > lenDoc)
-		startPos = lenDoc - bufferSize;
-	if (startPos < 0)
-		startPos = 0;
-	endPos = startPos + bufferSize;
-	if (endPos > lenDoc)
-		endPos = lenDoc;
-
-	TextRange tr = {{startPos, endPos}, buf};
-	Platform::SendScintillaPointer(id, SCI_GETTEXTRANGE, 0, &tr);
-}
-
-bool WindowAccessor::Match(int pos, const char *s) {
-	for (int i=0; *s; i++) {
-		if (*s != SafeGetCharAt(pos+i))
-			return false;
-		s++;
-	}
-	return true;
-}
-
-char WindowAccessor::StyleAt(int position) {
-	return static_cast<char>(Platform::SendScintilla(
-		id, SCI_GETSTYLEAT, position, 0));
-}
-
-int WindowAccessor::GetLine(int position) {
-	return Platform::SendScintilla(id, SCI_LINEFROMPOSITION, position, 0);
-}
-
-int WindowAccessor::LineStart(int line) {
-	return Platform::SendScintilla(id, SCI_POSITIONFROMLINE, line, 0);
-}
-
-int WindowAccessor::LevelAt(int line) {
-	return Platform::SendScintilla(id, SCI_GETFOLDLEVEL, line, 0);
-}
-
-int WindowAccessor::Length() { 
-	if (lenDoc == -1) 
-		lenDoc = Platform::SendScintilla(id, SCI_GETTEXTLENGTH, 0, 0);
-	return lenDoc; 
-}
-
-int WindowAccessor::GetLineState(int line) {
-	return Platform::SendScintilla(id, SCI_GETLINESTATE, line);
-}
-
-int WindowAccessor::SetLineState(int line, int state) {
-	return Platform::SendScintilla(id, SCI_SETLINESTATE, line, state);
-}
-
-void WindowAccessor::StartAt(unsigned int start, char chMask) {
-	Platform::SendScintilla(id, SCI_STARTSTYLING, start, chMask);
-}
-
-void WindowAccessor::StartSegment(unsigned int pos) {
-	startSeg = pos;
-}
-
-void WindowAccessor::ColourTo(unsigned int pos, int chAttr) {
-	// Only perform styling if non empty range
-	if (pos != startSeg - 1) {
-		if (pos < startSeg) {
-			Platform::DebugPrintf("Bad colour positions %d - %d\n", startSeg, pos);
-		}
-
-		if (validLen + (pos - startSeg + 1) >= bufferSize)
-			Flush();
-		if (validLen + (pos - startSeg + 1) >= bufferSize) {
-			// Too big for buffer so send directly
-			Platform::SendScintilla(id, SCI_SETSTYLING, pos - startSeg + 1, chAttr);
-		} else {
-			if (chAttr != chWhile)
-				chFlags = 0;
-			chAttr |= chFlags;
-			for (unsigned int i = startSeg; i <= pos; i++) {
-				styleBuf[validLen++] = static_cast<char>(chAttr);
-			}
-		}
-	}
-	startSeg = pos+1;
-}
-
-void WindowAccessor::SetLevel(int line, int level) {
-	Platform::SendScintilla(id, SCI_SETFOLDLEVEL, line, level);
-}
-
-void WindowAccessor::Flush() {
-	startPos = extremePosition;
-	lenDoc = -1;
-	if (validLen > 0) {
-		Platform::SendScintillaPointer(id, SCI_SETSTYLINGEX, validLen, 
-			styleBuf);
-		validLen = 0;
-	}
-}
-
-int WindowAccessor::IndentAmount(int line, int *flags, PFNIsCommentLeader pfnIsCommentLeader) {
-	int end = Length();
-	int spaceFlags = 0;
-	
-	// Determines the indentation level of the current line and also checks for consistent 
-	// indentation compared to the previous line.
-	// Indentation is judged consistent when the indentation whitespace of each line lines 
-	// the same or the indentation of one line is a prefix of the other.
-	
-	int pos = LineStart(line);
-	char ch = (*this)[pos];
-	int indent = 0;
-	bool inPrevPrefix = line > 0;
-	int posPrev = inPrevPrefix ? LineStart(line-1) : 0;
-	while ((ch == ' ' || ch == '\t') && (pos < end)) {
-		if (inPrevPrefix) {
-			char chPrev = (*this)[posPrev++];
-			if (chPrev == ' ' || chPrev == '\t') {
-				if (chPrev != ch)
-					spaceFlags |= wsInconsistent;
-			} else {
-				inPrevPrefix = false;
-			}
-		}
-		if (ch == ' ') {
-			spaceFlags |= wsSpace;
-			indent++;
-		} else {	// Tab
-			spaceFlags |= wsTab;
-			if (spaceFlags & wsSpace)
-				spaceFlags |= wsSpaceTab;
-			indent = (indent / 8 + 1) * 8;
-		}
-		ch = (*this)[++pos];
-	}
-	
-	*flags = spaceFlags;
-	indent += SC_FOLDLEVELBASE;
-	// if completely empty line or the start of a comment...
-	if (isspace(ch) || (pfnIsCommentLeader && (*pfnIsCommentLeader)(*this, pos, end-pos)) )
-		return indent | SC_FOLDLEVELWHITEFLAG;
-	else
-		return indent;
-}
-
diff --git a/src/stc/scintilla/src/XPM.cxx b/src/stc/scintilla/src/XPM.cxx
deleted file mode 100644
index 36e7994f46..0000000000
--- a/src/stc/scintilla/src/XPM.cxx
+++ /dev/null
@@ -1,322 +0,0 @@
-// Scintilla source code edit control
-/** @file XPM.cxx
- ** Define a class that holds data in the X Pixmap (XPM) format.
- **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <string.h>
-#include <stdlib.h>
-
-#include "Platform.h"
-
-#include "XPM.h"
-
-static const char *NextField(const char *s) {
-	// In case there are leading spaces in the string
-	while (*s && *s == ' ') {
-		s++;
-	}
-	while (*s && *s != ' ') {
-		s++;
-	}
-	while (*s && *s == ' ') {
-		s++;
-	}
-	return s;
-}
-
-// Data lines in XPM can be terminated either with NUL or "
-static size_t MeasureLength(const char *s) {
-	size_t i = 0;
-	while (s[i] && (s[i] != '\"'))
-		i++;
-	return i;
-}
-
-ColourAllocated XPM::ColourFromCode(int ch) {
-	return colourCodeTable[ch]->allocated;
-#ifdef SLOW
-	for (int i=0; i<nColours; i++) {
-		if (codes[i] == ch) {
-			return colours[i].allocated;
-		}
-	}
-	return colours[0].allocated;
-#endif
-}
-
-void XPM::FillRun(Surface *surface, int code, int startX, int y, int x) {
-	if ((code != codeTransparent) && (startX != x)) {
-		PRectangle rc(startX, y, x, y+1);
-		surface->FillRectangle(rc, ColourFromCode(code));
-	}
-}
-
-XPM::XPM(const char *textForm) :
-	data(0), codes(0), colours(0), lines(0) {
-	Init(textForm);
-}
-
-XPM::XPM(const char * const *linesForm) :
-	data(0), codes(0), colours(0), lines(0) {
-	Init(linesForm);
-}
-
-XPM::~XPM() {
-	Clear();
-}
-
-void XPM::Init(const char *textForm) {
-	Clear();
-	// Test done is two parts to avoid possibility of overstepping the memory
-	// if memcmp implemented strangely. Must be 4 bytes at least at destination.
-	if ((0 == memcmp(textForm, "/* X", 4)) && (0 == memcmp(textForm, "/* XPM */", 9))) {
-		// Build the lines form out of the text form
-		const char **linesForm = LinesFormFromTextForm(textForm);
-		if (linesForm != 0) {
-			Init(linesForm);
-			delete []linesForm;
-		}
-	} else {
-		// It is really in line form
-		Init(reinterpret_cast<const char * const *>(textForm));
-	}
-}
-
-void XPM::Init(const char * const *linesForm) {
-	Clear();
-	height = 1;
-	width = 1;
-	nColours = 1;
-	data = NULL;
-	codeTransparent = ' ';
-	codes = NULL;
-	colours = NULL;
-	lines = NULL;
-	if (!linesForm)
-		return;
-
-	const char *line0 = linesForm[0];
-	width = atoi(line0);
-	line0 = NextField(line0);
-	height = atoi(line0);
-	line0 = NextField(line0);
-	nColours = atoi(line0);
-	line0 = NextField(line0);
-	if (atoi(line0) != 1) {
-		// Only one char per pixel is supported
-		return;
-	}
-	codes = new char[nColours];
-	colours = new ColourPair[nColours];
-
-	int strings = 1+height+nColours;
-	lines = new char *[strings];
-	size_t allocation = 0;
-	for (int i=0; i<strings; i++) {
-		allocation += MeasureLength(linesForm[i]) + 1;
-	}
-	data = new char[allocation];
-	char *nextBit = data;
-	for (int j=0; j<strings; j++) {
-		lines[j] = nextBit;
-		size_t len = MeasureLength(linesForm[j]);
-		memcpy(nextBit, linesForm[j], len);
-		nextBit += len;
-		*nextBit++ = '\0';
-	}
-
-	for (int code=0; code<256; code++) {
-		colourCodeTable[code] = 0;
-	}
-
-	for (int c=0; c<nColours; c++) {
-		const char *colourDef = linesForm[c+1];
-		codes[c] = colourDef[0];
-		colourDef += 4;
-		if (*colourDef == '#') {
-			colours[c].desired.Set(colourDef);
-		} else {
-			colours[c].desired = ColourDesired(0xff, 0xff, 0xff);
-			codeTransparent = codes[c];
-		}
-		colourCodeTable[static_cast<unsigned char>(codes[c])] = &(colours[c]);
-	}
-}
-
-void XPM::Clear() {
-	delete []data;
-	data = 0;
-	delete []codes;
-	codes = 0;
-	delete []colours;
-	colours = 0;
-	delete []lines;
-	lines = 0;
-}
-
-void XPM::RefreshColourPalette(Palette &pal, bool want) {
-	if (!data || !codes || !colours || !lines) {
-		return;
-	}
-	for (int i=0; i<nColours; i++) {
-		pal.WantFind(colours[i], want);
-	}
-}
-
-void XPM::CopyDesiredColours() {
-	if (!data || !codes || !colours || !lines) {
-		return;
-	}
-	for (int i=0; i<nColours; i++) {
-		colours[i].Copy();
-	}
-}
-
-void XPM::Draw(Surface *surface, PRectangle &rc) {
-	if (!data || !codes || !colours || !lines) {
-		return;
-	}
-	// Centre the pixmap
-	int startY = rc.top + (rc.Height() - height) / 2;
-	int startX = rc.left + (rc.Width() - width) / 2;
-	for (int y=0;y<height;y++) {
-		int prevCode = 0;
-		int xStartRun = 0;
-		for (int x=0; x<width; x++) {
-			int code = lines[y+nColours+1][x];
-			if (code != prevCode) {
-				FillRun(surface, prevCode, startX + xStartRun, startY + y, startX + x);
-				xStartRun = x;
-				prevCode = code;
-			}
-		}
-		FillRun(surface, prevCode, startX + xStartRun, startY + y, startX + width);
-	}
-}
-
-const char **XPM::LinesFormFromTextForm(const char *textForm) {
-	// Build the lines form out of the text form
-	const char **linesForm = 0;
-	int countQuotes = 0;
-	int strings=1;
-	int j=0;
-	for (; countQuotes < (2*strings) && textForm[j] != '\0'; j++) {
-		if (textForm[j] == '\"') {
-			if (countQuotes == 0) {
-				// First field: width, height, number of colors, chars per pixel
-				const char *line0 = textForm + j + 1;
-				// Skip width
-				line0 = NextField(line0);
-				// Add 1 line for each pixel of height
-				strings += atoi(line0);
-				line0 = NextField(line0);
-				// Add 1 line for each colour
-				strings += atoi(line0);
-				linesForm = new const char *[strings];
-				if (linesForm == 0) {
-					break;	// Memory error!
-				}
-			}
-			if (countQuotes / 2 >= strings) {
-				break;	// Bad height or number of colors!
-			}
-			if ((countQuotes & 1) == 0) {
-				linesForm[countQuotes / 2] = textForm + j + 1;
-			}
-			countQuotes++;
-		}
-	}
-	if (textForm[j] == '\0' || countQuotes / 2 > strings) {
-		// Malformed XPM! Height + number of colors too high or too low
-		delete []linesForm;
-		linesForm = 0;
-	}
-	return linesForm;
-}
-
-// In future, may want to minimize search time by sorting and using a binary search.
-
-XPMSet::XPMSet() : set(0), len(0), maximum(0), height(-1), width(-1) {
-}
-
-XPMSet::~XPMSet() {
-	Clear();
-}
-
-void XPMSet::Clear() {
-	for (int i = 0; i < len; i++) {
-		delete set[i];
-	}
-	delete []set;
-	set = 0;
-	len = 0;
-	maximum = 0;
-	height = -1;
-	width = -1;
-}
-
-void XPMSet::Add(int id, const char *textForm) {
-	// Invalidate cached dimensions
-	height = -1;
-	width = -1;
-
-	// Replace if this id already present
-	for (int i = 0; i < len; i++) {
-		if (set[i]->GetId() == id) {
-			set[i]->Init(textForm);
-			set[i]->CopyDesiredColours();
-			return;
-		}
-	}
-
-	// Not present, so add to end
-	XPM *pxpm = new XPM(textForm);
-	if (pxpm) {
-		pxpm->SetId(id);
-		pxpm->CopyDesiredColours();
-		if (len == maximum) {
-			maximum += 64;
-			XPM **setNew = new XPM *[maximum];
-			for (int i = 0; i < len; i++) {
-				setNew[i] = set[i];
-			}
-			delete []set;
-			set = setNew;
-		}
-		set[len] = pxpm;
-		len++;
-	}
-}
-
-XPM *XPMSet::Get(int id) {
-	for (int i = 0; i < len; i++) {
-		if (set[i]->GetId() == id) {
-			return set[i];
-		}
-	}
-	return 0;
-}
-
-int XPMSet::GetHeight() {
-	if (height < 0) {
-		for (int i = 0; i < len; i++) {
-			if (height < set[i]->GetHeight()) {
-				height = set[i]->GetHeight();
-			}
-		}
-	}
-	return (height > 0) ? height : 0;
-}
-
-int XPMSet::GetWidth() {
-	if (width < 0) {
-		for (int i = 0; i < len; i++) {
-			if (width < set[i]->GetWidth()) {
-				width = set[i]->GetWidth();
-			}
-		}
-	}
-	return (width > 0) ? width : 0;
-}
diff --git a/src/stc/scintilla/src/XPM.h b/src/stc/scintilla/src/XPM.h
deleted file mode 100644
index 4d3da28d36..0000000000
--- a/src/stc/scintilla/src/XPM.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Scintilla source code edit control
-/** @file XPM.h
- ** Define a class that holds data in the X Pixmap (XPM) format.
- **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#ifndef XPM_H
-#define XPM_H
-
-/**
- * Hold a pixmap in XPM format.
- */
-class XPM {
-	int id;		// Assigned by container
-	int height;
-	int width;
-	int nColours;
-	char *data;
-	char codeTransparent;
-	char *codes;
-	ColourPair *colours;
-	ColourAllocated ColourFromCode(int ch);
-	void FillRun(Surface *surface, int code, int startX, int y, int x);
-	char **lines;
-	ColourPair *colourCodeTable[256];
-public:
-	XPM(const char *textForm);
-	XPM(const char * const *linesForm);
-	~XPM();
-	void Init(const char *textForm);
-	void Init(const char * const *linesForm);
-	void Clear();
-	/// Similar to same named method in ViewStyle:
-	void RefreshColourPalette(Palette &pal, bool want);
-	/// No palette used, so just copy the desired colours to the allocated colours
-	void CopyDesiredColours();
-	/// Decompose image into runs and use FillRectangle for each run
-	void Draw(Surface *surface, PRectangle &rc);
-	char **InLinesForm() { return lines; }
-	void SetId(int id_) { id = id_; }
-	int GetId() { return id; }
-	int GetHeight() { return height; }
-	int GetWidth() { return width; }
-	static const char **LinesFormFromTextForm(const char *textForm);
-};
-
-/**
- * A collection of pixmaps indexed by integer id.
- */
-class XPMSet {
-	XPM **set;	///< The stored XPMs.
-	int len;	///< Current number of XPMs.
-	int maximum;	///< Current maximum number of XPMs, increased by steps if reached.
-	int height;	///< Memorize largest height of the set.
-	int width;	///< Memorize largest width of the set.
-public:
-	XPMSet();
-	~XPMSet();
-	/// Remove all XPMs.
-	void Clear();
-	/// Add a XPM.
-	void Add(int id, const char *textForm);
-	/// Get XPM by id.
-	XPM *Get(int id);
-	/// Give the largest height of the set.
-	int GetHeight();
-	/// Give the largest width of the set.
-	int GetWidth();
-};
-
-#endif
diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
deleted file mode 100644
index 0bf46f60b4..0000000000
--- a/src/stc/stc.cpp
+++ /dev/null
@@ -1,3423 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Name:        stc.cpp
-// Purpose:     A wxWidgets 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/wx.h"
-#include "wx/tokenzr.h"
-#include "wx/mstream.h"
-#include "wx/image.h"
-#include "wx/file.h"
-
-#include "wx/stc/stc.h"
-#include "ScintillaWX.h"
-
-//----------------------------------------------------------------------
-
-const wxChar* wxSTCNameStr = wxT("stcwindow");
-
-#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((unsigned char)(c & 0xff),
-            (unsigned char)((c >> 8) & 0xff),
-            (unsigned char)((c >> 16) & 0xff));
-    return clr;
-}
-
-
-static wxColour wxColourFromSpec(const wxString& spec) {
-    // spec should be a colour name or "#RRGGBB"
-    if (spec.GetChar(0) == wxT('#')) {
-
-        long red, green, blue;
-        red = green = blue = 0;
-        spec.Mid(1,2).ToLong(&red,   16);
-        spec.Mid(3,2).ToLong(&green, 16);
-        spec.Mid(5,2).ToLong(&blue,  16);
-        return wxColour((unsigned char)red,
-                        (unsigned char)green,
-                        (unsigned char)blue);
-    }
-    else
-        return wxColour(spec);
-}
-
-//----------------------------------------------------------------------
-
-DEFINE_EVENT_TYPE( wxEVT_STC_CHANGE )
-DEFINE_EVENT_TYPE( wxEVT_STC_STYLENEEDED )
-DEFINE_EVENT_TYPE( wxEVT_STC_CHARADDED )
-DEFINE_EVENT_TYPE( wxEVT_STC_SAVEPOINTREACHED )
-DEFINE_EVENT_TYPE( wxEVT_STC_SAVEPOINTLEFT )
-DEFINE_EVENT_TYPE( wxEVT_STC_ROMODIFYATTEMPT )
-DEFINE_EVENT_TYPE( wxEVT_STC_KEY )
-DEFINE_EVENT_TYPE( wxEVT_STC_DOUBLECLICK )
-DEFINE_EVENT_TYPE( wxEVT_STC_UPDATEUI )
-DEFINE_EVENT_TYPE( wxEVT_STC_MODIFIED )
-DEFINE_EVENT_TYPE( wxEVT_STC_MACRORECORD )
-DEFINE_EVENT_TYPE( wxEVT_STC_MARGINCLICK )
-DEFINE_EVENT_TYPE( wxEVT_STC_NEEDSHOWN )
-DEFINE_EVENT_TYPE( wxEVT_STC_PAINTED )
-DEFINE_EVENT_TYPE( wxEVT_STC_USERLISTSELECTION )
-DEFINE_EVENT_TYPE( wxEVT_STC_URIDROPPED )
-DEFINE_EVENT_TYPE( wxEVT_STC_DWELLSTART )
-DEFINE_EVENT_TYPE( wxEVT_STC_DWELLEND )
-DEFINE_EVENT_TYPE( wxEVT_STC_START_DRAG )
-DEFINE_EVENT_TYPE( wxEVT_STC_DRAG_OVER )
-DEFINE_EVENT_TYPE( wxEVT_STC_DO_DROP )
-DEFINE_EVENT_TYPE( wxEVT_STC_ZOOM )
-DEFINE_EVENT_TYPE( wxEVT_STC_HOTSPOT_CLICK )
-DEFINE_EVENT_TYPE( wxEVT_STC_HOTSPOT_DCLICK )
-DEFINE_EVENT_TYPE( wxEVT_STC_CALLTIP_CLICK )
-DEFINE_EVENT_TYPE( wxEVT_STC_AUTOCOMP_SELECTION )    
-
-
-
-BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
-    EVT_PAINT                   (wxStyledTextCtrl::OnPaint)
-    EVT_SCROLLWIN               (wxStyledTextCtrl::OnScrollWin)
-    EVT_SCROLL                  (wxStyledTextCtrl::OnScroll)
-    EVT_SIZE                    (wxStyledTextCtrl::OnSize)
-    EVT_LEFT_DOWN               (wxStyledTextCtrl::OnMouseLeftDown)
-    // Let Scintilla see the double click as a second click
-    EVT_LEFT_DCLICK             (wxStyledTextCtrl::OnMouseLeftDown)
-    EVT_MOTION                  (wxStyledTextCtrl::OnMouseMove)
-    EVT_LEFT_UP                 (wxStyledTextCtrl::OnMouseLeftUp)
-#if defined(__WXGTK__) || defined(__WXMAC__)
-    EVT_RIGHT_UP                (wxStyledTextCtrl::OnMouseRightUp)
-#else
-    EVT_CONTEXT_MENU            (wxStyledTextCtrl::OnContextMenu)
-#endif
-    EVT_MOUSEWHEEL              (wxStyledTextCtrl::OnMouseWheel)
-    EVT_MIDDLE_UP               (wxStyledTextCtrl::OnMouseMiddleUp)
-    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              (10, 16, wxStyledTextCtrl::OnMenu)
-    EVT_LISTBOX_DCLICK          (wxID_ANY, wxStyledTextCtrl::OnListBox)
-END_EVENT_TABLE()
-
-
-IMPLEMENT_CLASS(wxStyledTextCtrl, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxStyledTextEvent, wxCommandEvent)
-
-#ifdef LINK_LEXERS
-// forces the linking of the lexer modules
-int Scintilla_LinkLexers();
-#endif
-
-//----------------------------------------------------------------------
-// Constructor and Destructor
-
-wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
-                                   wxWindowID id,
-                                   const wxPoint& pos,
-                                   const wxSize& size,
-                                   long style,
-                                   const wxString& name)
-{
-    m_swx = NULL;
-    Create(parent, id, pos, size, style, name);
-}
-
-
-bool wxStyledTextCtrl::Create(wxWindow *parent,
-                              wxWindowID id,
-                              const wxPoint& pos,
-                              const wxSize& size,
-                              long style,
-                              const wxString& name)
-{
-#ifdef __WXMAC__
-    style |= wxVSCROLL | wxHSCROLL;
-#endif
-    if (!wxControl::Create(parent, id, pos, size,
-                           style | wxWANTS_CHARS | wxCLIP_CHILDREN,
-                           wxDefaultValidator, name))
-        return false;
-
-#ifdef LINK_LEXERS
-    Scintilla_LinkLexers();
-#endif
-    m_swx = new ScintillaWX(this);
-    m_stopWatch.Start();
-    m_lastKeyDownConsumed = false;
-    m_vScrollBar = NULL;
-    m_hScrollBar = NULL;
-#if wxUSE_UNICODE
-    // Put Scintilla into unicode (UTF-8) mode
-    SetCodePage(wxSTC_CP_UTF8);
-#endif
-
-    SetInitialSize(size);
-
-    // Reduces flicker on GTK+/X11
-    SetBackgroundStyle(wxBG_STYLE_CUSTOM);
-    return true;
-}
-
-
-wxStyledTextCtrl::~wxStyledTextCtrl() {
-    delete m_swx;
-}
-
-
-//----------------------------------------------------------------------
-
-long wxStyledTextCtrl::SendMsg(int msg, long wp, long lp) {
-
-    return m_swx->WndProc(msg, wp, lp);
-}
-
-//----------------------------------------------------------------------
-
-// Set the vertical scrollbar to use instead of the ont that's built-in.
-void wxStyledTextCtrl::SetVScrollBar(wxScrollBar* bar)  {
-    m_vScrollBar = bar;
-    if (bar != NULL) {
-        // ensure that the built-in scrollbar is not visible
-        SetScrollbar(wxVERTICAL, 0, 0, 0);
-    }
-}
-
-
-// Set the horizontal scrollbar to use instead of the ont that's built-in.
-void wxStyledTextCtrl::SetHScrollBar(wxScrollBar* bar)  {
-    m_hScrollBar = bar;
-    if (bar != NULL) {
-        // ensure that the built-in scrollbar is not visible
-        SetScrollbar(wxHORIZONTAL, 0, 0, 0);
-    }
-}
-
-//----------------------------------------------------------------------
-// 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.
-
-
-// Add text to the document at current position.
-void wxStyledTextCtrl::AddText(const wxString& text) {
-                    wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-                    SendMsg(2001, strlen(buf), (long)(const char*)buf);
-}
-
-// Add array of cells to document.
-void wxStyledTextCtrl::AddStyledText(const wxMemoryBuffer& data) {
-                          SendMsg(2002, data.GetDataLen(), (long)data.GetData());
-}
-
-// Insert string at a position.
-void wxStyledTextCtrl::InsertText(int pos, const wxString& text) {
-    SendMsg(2003, pos, (long)(const char*)wx2stc(text));
-}
-
-// Delete all text in the document.
-void wxStyledTextCtrl::ClearAll() {
-    SendMsg(2004, 0, 0);
-}
-
-// Set all style bytes to 0, remove all folding information.
-void wxStyledTextCtrl::ClearDocumentStyle() {
-    SendMsg(2005, 0, 0);
-}
-
-// Returns the number of characters in the document.
-int wxStyledTextCtrl::GetLength() {
-    return SendMsg(2006, 0, 0);
-}
-
-// Returns the character byte at the position.
-int wxStyledTextCtrl::GetCharAt(int pos) {
-         return (unsigned char)SendMsg(2007, pos, 0);
-}
-
-// Returns the position of the caret.
-int wxStyledTextCtrl::GetCurrentPos() {
-    return SendMsg(2008, 0, 0);
-}
-
-// Returns the position of the opposite end of the selection to the caret.
-int wxStyledTextCtrl::GetAnchor() {
-    return SendMsg(2009, 0, 0);
-}
-
-// Returns the style byte at the position.
-int wxStyledTextCtrl::GetStyleAt(int pos) {
-         return (unsigned char)SendMsg(2010, pos, 0);
-}
-
-// Redoes the next action on the undo history.
-void wxStyledTextCtrl::Redo() {
-    SendMsg(2011, 0, 0);
-}
-
-// Choose between collecting actions into the undo
-// history and discarding them.
-void wxStyledTextCtrl::SetUndoCollection(bool collectUndo) {
-    SendMsg(2012, collectUndo, 0);
-}
-
-// Select all the text in the document.
-void wxStyledTextCtrl::SelectAll() {
-    SendMsg(2013, 0, 0);
-}
-
-// Remember the current position in the undo history as the position
-// at which the document was saved.
-void wxStyledTextCtrl::SetSavePoint() {
-    SendMsg(2014, 0, 0);
-}
-
-// Retrieve a buffer of cells.
-wxMemoryBuffer wxStyledTextCtrl::GetStyledText(int startPos, int endPos) {
-        wxMemoryBuffer buf;
-        if (endPos < startPos) {
-            int temp = startPos;
-            startPos = endPos;
-            endPos = temp;
-        }
-        int len = endPos - startPos;
-        if (!len) return buf;
-        TextRange tr;
-        tr.lpstrText = (char*)buf.GetWriteBuf(len*2+1);
-        tr.chrg.cpMin = startPos;
-        tr.chrg.cpMax = endPos;
-        len = SendMsg(2015, 0, (long)&tr);
-        buf.UngetWriteBuf(len);
-        return buf;
-}
-
-// Are there any redoable actions in the undo history?
-bool wxStyledTextCtrl::CanRedo() {
-    return SendMsg(2016, 0, 0) != 0;
-}
-
-// Retrieve the line number at which a particular marker is located.
-int wxStyledTextCtrl::MarkerLineFromHandle(int handle) {
-    return SendMsg(2017, handle, 0);
-}
-
-// Delete a marker.
-void wxStyledTextCtrl::MarkerDeleteHandle(int handle) {
-    SendMsg(2018, handle, 0);
-}
-
-// Is undo history being collected?
-bool wxStyledTextCtrl::GetUndoCollection() {
-    return SendMsg(2019, 0, 0) != 0;
-}
-
-// Are white space characters currently visible?
-// Returns one of SCWS_* constants.
-int wxStyledTextCtrl::GetViewWhiteSpace() {
-    return SendMsg(2020, 0, 0);
-}
-
-// Make white space characters invisible, always visible or visible outside indentation.
-void wxStyledTextCtrl::SetViewWhiteSpace(int viewWS) {
-    SendMsg(2021, viewWS, 0);
-}
-
-// Find the position from a point within the window.
-int wxStyledTextCtrl::PositionFromPoint(wxPoint pt) {
-        return SendMsg(2022, pt.x, pt.y);
-}
-
-// Find the position from a point within the window but return
-// INVALID_POSITION if not close to text.
-int wxStyledTextCtrl::PositionFromPointClose(int x, int y) {
-    return SendMsg(2023, x, y);
-}
-
-// Set caret to start of a line and ensure it is visible.
-void wxStyledTextCtrl::GotoLine(int line) {
-    SendMsg(2024, line, 0);
-}
-
-// Set caret to a position and ensure it is visible.
-void wxStyledTextCtrl::GotoPos(int pos) {
-    SendMsg(2025, pos, 0);
-}
-
-// Set the selection anchor to a position. The anchor is the opposite
-// end of the selection from the caret.
-void wxStyledTextCtrl::SetAnchor(int posAnchor) {
-    SendMsg(2026, posAnchor, 0);
-}
-
-// Retrieve the text of the line containing the caret.
-// Returns the index of the caret on the line.
-wxString wxStyledTextCtrl::GetCurLine(int* linePos) {
-        int len = LineLength(GetCurrentLine());
-        if (!len) {
-            if (linePos)  *linePos = 0;
-            return wxEmptyString;
-        }
-
-        wxMemoryBuffer mbuf(len+1);
-        char* buf = (char*)mbuf.GetWriteBuf(len+1);
-
-        int pos = SendMsg(2027, len+1, (long)buf);
-        mbuf.UngetWriteBuf(len);
-        mbuf.AppendByte(0);
-        if (linePos)  *linePos = pos;
-        return stc2wx(buf);
-}
-
-// Retrieve the position of the last correctly styled character.
-int wxStyledTextCtrl::GetEndStyled() {
-    return SendMsg(2028, 0, 0);
-}
-
-// Convert all line endings in the document to one mode.
-void wxStyledTextCtrl::ConvertEOLs(int eolMode) {
-    SendMsg(2029, eolMode, 0);
-}
-
-// Retrieve the current end of line mode - one of CRLF, CR, or LF.
-int wxStyledTextCtrl::GetEOLMode() {
-    return SendMsg(2030, 0, 0);
-}
-
-// Set the current end of line mode.
-void wxStyledTextCtrl::SetEOLMode(int eolMode) {
-    SendMsg(2031, eolMode, 0);
-}
-
-// Set the current styling position to pos and the styling mask to mask.
-// The styling mask can be used to protect some bits in each styling byte from modification.
-void wxStyledTextCtrl::StartStyling(int pos, int mask) {
-    SendMsg(2032, pos, mask);
-}
-
-// Change style from current styling position for length characters to a style
-// and move the current styling position to after this newly styled segment.
-void wxStyledTextCtrl::SetStyling(int length, int style) {
-    SendMsg(2033, length, style);
-}
-
-// Is drawing done first into a buffer or direct to the screen?
-bool wxStyledTextCtrl::GetBufferedDraw() {
-    return SendMsg(2034, 0, 0) != 0;
-}
-
-// If drawing is buffered then each line of text is drawn into a bitmap buffer
-// before drawing it to the screen to avoid flicker.
-void wxStyledTextCtrl::SetBufferedDraw(bool buffered) {
-    SendMsg(2035, buffered, 0);
-}
-
-// Change the visible size of a tab to be a multiple of the width of a space character.
-void wxStyledTextCtrl::SetTabWidth(int tabWidth) {
-    SendMsg(2036, tabWidth, 0);
-}
-
-// Retrieve the visible size of a tab.
-int wxStyledTextCtrl::GetTabWidth() {
-    return SendMsg(2121, 0, 0);
-}
-
-// Set the code page used to interpret the bytes of the document as characters.
-void wxStyledTextCtrl::SetCodePage(int codePage) {
-#if wxUSE_UNICODE
-    wxASSERT_MSG(codePage == wxSTC_CP_UTF8,
-                 wxT("Only wxSTC_CP_UTF8 may be used when wxUSE_UNICODE is on."));
-#else
-    wxASSERT_MSG(codePage != wxSTC_CP_UTF8,
-                 wxT("wxSTC_CP_UTF8 may not be used when wxUSE_UNICODE is off."));
-#endif
-    SendMsg(2037, codePage);
-}
-
-// Set the symbol used for a particular marker number,
-// and optionally the fore and background colours.
-void wxStyledTextCtrl::MarkerDefine(int markerNumber, int markerSymbol,
-                const wxColour& foreground,
-                const wxColour& background) {
-
-                SendMsg(2040, markerNumber, markerSymbol);
-                if (foreground.Ok())
-                    MarkerSetForeground(markerNumber, foreground);
-                if (background.Ok())
-                    MarkerSetBackground(markerNumber, background);
-}
-
-// Set the foreground colour used for a particular marker number.
-void wxStyledTextCtrl::MarkerSetForeground(int markerNumber, const wxColour& fore) {
-    SendMsg(2041, markerNumber, wxColourAsLong(fore));
-}
-
-// Set the background colour used for a particular marker number.
-void wxStyledTextCtrl::MarkerSetBackground(int markerNumber, const wxColour& back) {
-    SendMsg(2042, markerNumber, wxColourAsLong(back));
-}
-
-// Add a marker to a line, returning an ID which can be used to find or delete the marker.
-int wxStyledTextCtrl::MarkerAdd(int line, int markerNumber) {
-    return SendMsg(2043, line, markerNumber);
-}
-
-// Delete a marker from a line.
-void wxStyledTextCtrl::MarkerDelete(int line, int markerNumber) {
-    SendMsg(2044, line, markerNumber);
-}
-
-// Delete all markers with a particular number from all lines.
-void wxStyledTextCtrl::MarkerDeleteAll(int markerNumber) {
-    SendMsg(2045, markerNumber, 0);
-}
-
-// Get a bit mask of all the markers set on a line.
-int wxStyledTextCtrl::MarkerGet(int line) {
-    return SendMsg(2046, line, 0);
-}
-
-// Find the next line after lineStart that includes a marker in mask.
-int wxStyledTextCtrl::MarkerNext(int lineStart, int markerMask) {
-    return SendMsg(2047, lineStart, markerMask);
-}
-
-// Find the previous line before lineStart that includes a marker in mask.
-int wxStyledTextCtrl::MarkerPrevious(int lineStart, int markerMask) {
-    return SendMsg(2048, lineStart, markerMask);
-}
-
-// Define a marker from a bitmap
-void wxStyledTextCtrl::MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp) {
-        // convert bmp to a xpm in a string
-        wxMemoryOutputStream strm;
-        wxImage img = bmp.ConvertToImage();
-        if (img.HasAlpha())
-            img.ConvertAlphaToMask();
-        img.SaveFile(strm, wxBITMAP_TYPE_XPM);
-        size_t len = strm.GetSize();
-        char* buff = new char[len+1];
-        strm.CopyTo(buff, len);
-        buff[len] = 0;
-        SendMsg(2049, markerNumber, (long)buff);
-        delete [] buff;
-        
-}
-
-// Add a set of markers to a line.
-void wxStyledTextCtrl::MarkerAddSet(int line, int set) {
-    SendMsg(2466, line, set);
-}
-
-// Set the alpha used for a marker that is drawn in the text area, not the margin.
-void wxStyledTextCtrl::MarkerSetAlpha(int markerNumber, int alpha) {
-    SendMsg(2476, markerNumber, alpha);
-}
-
-// Set a margin to be either numeric or symbolic.
-void wxStyledTextCtrl::SetMarginType(int margin, int marginType) {
-    SendMsg(2240, margin, marginType);
-}
-
-// Retrieve the type of a margin.
-int wxStyledTextCtrl::GetMarginType(int margin) {
-    return SendMsg(2241, margin, 0);
-}
-
-// Set the width of a margin to a width expressed in pixels.
-void wxStyledTextCtrl::SetMarginWidth(int margin, int pixelWidth) {
-    SendMsg(2242, margin, pixelWidth);
-}
-
-// Retrieve the width of a margin in pixels.
-int wxStyledTextCtrl::GetMarginWidth(int margin) {
-    return SendMsg(2243, margin, 0);
-}
-
-// Set a mask that determines which markers are displayed in a margin.
-void wxStyledTextCtrl::SetMarginMask(int margin, int mask) {
-    SendMsg(2244, margin, mask);
-}
-
-// Retrieve the marker mask of a margin.
-int wxStyledTextCtrl::GetMarginMask(int margin) {
-    return SendMsg(2245, margin, 0);
-}
-
-// Make a margin sensitive or insensitive to mouse clicks.
-void wxStyledTextCtrl::SetMarginSensitive(int margin, bool sensitive) {
-    SendMsg(2246, margin, sensitive);
-}
-
-// Retrieve the mouse click sensitivity of a margin.
-bool wxStyledTextCtrl::GetMarginSensitive(int margin) {
-    return SendMsg(2247, margin, 0) != 0;
-}
-
-// Clear all the styles and make equivalent to the global default style.
-void wxStyledTextCtrl::StyleClearAll() {
-    SendMsg(2050, 0, 0);
-}
-
-// Set the foreground colour of a style.
-void wxStyledTextCtrl::StyleSetForeground(int style, const wxColour& fore) {
-    SendMsg(2051, style, wxColourAsLong(fore));
-}
-
-// Set the background colour of a style.
-void wxStyledTextCtrl::StyleSetBackground(int style, const wxColour& back) {
-    SendMsg(2052, style, wxColourAsLong(back));
-}
-
-// Set a style to be bold or not.
-void wxStyledTextCtrl::StyleSetBold(int style, bool bold) {
-    SendMsg(2053, style, bold);
-}
-
-// Set a style to be italic or not.
-void wxStyledTextCtrl::StyleSetItalic(int style, bool italic) {
-    SendMsg(2054, style, italic);
-}
-
-// Set the size of characters of a style.
-void wxStyledTextCtrl::StyleSetSize(int style, int sizePoints) {
-    SendMsg(2055, style, sizePoints);
-}
-
-// Set the font of a style.
-void wxStyledTextCtrl::StyleSetFaceName(int style, const wxString& fontName) {
-    SendMsg(2056, style, (long)(const char*)wx2stc(fontName));
-}
-
-// Set a style to have its end of line filled or not.
-void wxStyledTextCtrl::StyleSetEOLFilled(int style, bool filled) {
-    SendMsg(2057, style, filled);
-}
-
-// Reset the default style to its state at startup
-void wxStyledTextCtrl::StyleResetDefault() {
-    SendMsg(2058, 0, 0);
-}
-
-// Set a style to be underlined or not.
-void wxStyledTextCtrl::StyleSetUnderline(int style, bool underline) {
-    SendMsg(2059, style, underline);
-}
-
-// Set a style to be mixed case, or to force upper or lower case.
-void wxStyledTextCtrl::StyleSetCase(int style, int caseForce) {
-    SendMsg(2060, style, caseForce);
-}
-
-// Set a style to be a hotspot or not.
-void wxStyledTextCtrl::StyleSetHotSpot(int style, bool hotspot) {
-    SendMsg(2409, style, hotspot);
-}
-
-// Set the foreground colour of the selection and whether to use this setting.
-void wxStyledTextCtrl::SetSelForeground(bool useSetting, const wxColour& fore) {
-    SendMsg(2067, useSetting, wxColourAsLong(fore));
-}
-
-// Set the background colour of the selection and whether to use this setting.
-void wxStyledTextCtrl::SetSelBackground(bool useSetting, const wxColour& back) {
-    SendMsg(2068, useSetting, wxColourAsLong(back));
-}
-
-// Get the alpha of the selection.
-int wxStyledTextCtrl::GetSelAlpha() {
-    return SendMsg(2477, 0, 0);
-}
-
-// Set the alpha of the selection.
-void wxStyledTextCtrl::SetSelAlpha(int alpha) {
-    SendMsg(2478, alpha, 0);
-}
-
-// Set the foreground colour of the caret.
-void wxStyledTextCtrl::SetCaretForeground(const wxColour& fore) {
-    SendMsg(2069, wxColourAsLong(fore), 0);
-}
-
-// When key+modifier combination km is pressed perform msg.
-void wxStyledTextCtrl::CmdKeyAssign(int key, int modifiers, int cmd) {
-         SendMsg(2070, MAKELONG(key, modifiers), cmd);
-}
-
-// When key+modifier combination km is pressed do nothing.
-void wxStyledTextCtrl::CmdKeyClear(int key, int modifiers) {
-         SendMsg(2071, MAKELONG(key, modifiers));
-}
-
-// Drop all key mappings.
-void wxStyledTextCtrl::CmdKeyClearAll() {
-    SendMsg(2072, 0, 0);
-}
-
-// Set the styles for a segment of the document.
-void wxStyledTextCtrl::SetStyleBytes(int length, char* styleBytes) {
-        SendMsg(2073, length, (long)styleBytes);
-}
-
-// Set a style to be visible or not.
-void wxStyledTextCtrl::StyleSetVisible(int style, bool visible) {
-    SendMsg(2074, style, visible);
-}
-
-// Get the time in milliseconds that the caret is on and off.
-int wxStyledTextCtrl::GetCaretPeriod() {
-    return SendMsg(2075, 0, 0);
-}
-
-// Get the time in milliseconds that the caret is on and off. 0 = steady on.
-void wxStyledTextCtrl::SetCaretPeriod(int periodMilliseconds) {
-    SendMsg(2076, periodMilliseconds, 0);
-}
-
-// Set the set of characters making up words for when moving or selecting by word.
-// First sets deaults like SetCharsDefault.
-void wxStyledTextCtrl::SetWordChars(const wxString& characters) {
-    SendMsg(2077, 0, (long)(const char*)wx2stc(characters));
-}
-
-// Start a sequence of actions that is undone and redone as a unit.
-// May be nested.
-void wxStyledTextCtrl::BeginUndoAction() {
-    SendMsg(2078, 0, 0);
-}
-
-// End a sequence of actions that is undone and redone as a unit.
-void wxStyledTextCtrl::EndUndoAction() {
-    SendMsg(2079, 0, 0);
-}
-
-// Set an indicator to plain, squiggle or TT.
-void wxStyledTextCtrl::IndicatorSetStyle(int indic, int style) {
-    SendMsg(2080, indic, style);
-}
-
-// Retrieve the style of an indicator.
-int wxStyledTextCtrl::IndicatorGetStyle(int indic) {
-    return SendMsg(2081, indic, 0);
-}
-
-// Set the foreground colour of an indicator.
-void wxStyledTextCtrl::IndicatorSetForeground(int indic, const wxColour& fore) {
-    SendMsg(2082, indic, wxColourAsLong(fore));
-}
-
-// Retrieve the foreground colour of an indicator.
-wxColour wxStyledTextCtrl::IndicatorGetForeground(int indic) {
-    long c = SendMsg(2083, indic, 0);
-    return wxColourFromLong(c);
-}
-
-// Set the foreground colour of all whitespace and whether to use this setting.
-void wxStyledTextCtrl::SetWhitespaceForeground(bool useSetting, const wxColour& fore) {
-    SendMsg(2084, useSetting, wxColourAsLong(fore));
-}
-
-// Set the background colour of all whitespace and whether to use this setting.
-void wxStyledTextCtrl::SetWhitespaceBackground(bool useSetting, const wxColour& back) {
-    SendMsg(2085, useSetting, wxColourAsLong(back));
-}
-
-// Divide each styling byte into lexical class bits (default: 5) and indicator
-// bits (default: 3). If a lexer requires more than 32 lexical states, then this
-// is used to expand the possible states.
-void wxStyledTextCtrl::SetStyleBits(int bits) {
-    SendMsg(2090, bits, 0);
-}
-
-// Retrieve number of bits in style bytes used to hold the lexical state.
-int wxStyledTextCtrl::GetStyleBits() {
-    return SendMsg(2091, 0, 0);
-}
-
-// Used to hold extra styling information for each line.
-void wxStyledTextCtrl::SetLineState(int line, int state) {
-    SendMsg(2092, line, state);
-}
-
-// Retrieve the extra styling information for a line.
-int wxStyledTextCtrl::GetLineState(int line) {
-    return SendMsg(2093, line, 0);
-}
-
-// Retrieve the last line number that has line state.
-int wxStyledTextCtrl::GetMaxLineState() {
-    return SendMsg(2094, 0, 0);
-}
-
-// Is the background of the line containing the caret in a different colour?
-bool wxStyledTextCtrl::GetCaretLineVisible() {
-    return SendMsg(2095, 0, 0) != 0;
-}
-
-// Display the background of the line containing the caret in a different colour.
-void wxStyledTextCtrl::SetCaretLineVisible(bool show) {
-    SendMsg(2096, show, 0);
-}
-
-// Get the colour of the background of the line containing the caret.
-wxColour wxStyledTextCtrl::GetCaretLineBackground() {
-    long c = SendMsg(2097, 0, 0);
-    return wxColourFromLong(c);
-}
-
-// Set the colour of the background of the line containing the caret.
-void wxStyledTextCtrl::SetCaretLineBackground(const wxColour& back) {
-    SendMsg(2098, wxColourAsLong(back), 0);
-}
-
-// Set a style to be changeable or not (read only).
-// Experimental feature, currently buggy.
-void wxStyledTextCtrl::StyleSetChangeable(int style, bool changeable) {
-    SendMsg(2099, style, changeable);
-}
-
-// Display a auto-completion list.
-// The lenEntered parameter indicates how many characters before
-// the caret should be used to provide context.
-void wxStyledTextCtrl::AutoCompShow(int lenEntered, const wxString& itemList) {
-    SendMsg(2100, lenEntered, (long)(const char*)wx2stc(itemList));
-}
-
-// Remove the auto-completion list from the screen.
-void wxStyledTextCtrl::AutoCompCancel() {
-    SendMsg(2101, 0, 0);
-}
-
-// Is there an auto-completion list visible?
-bool wxStyledTextCtrl::AutoCompActive() {
-    return SendMsg(2102, 0, 0) != 0;
-}
-
-// Retrieve the position of the caret when the auto-completion list was displayed.
-int wxStyledTextCtrl::AutoCompPosStart() {
-    return SendMsg(2103, 0, 0);
-}
-
-// User has selected an item so remove the list and insert the selection.
-void wxStyledTextCtrl::AutoCompComplete() {
-    SendMsg(2104, 0, 0);
-}
-
-// Define a set of character that when typed cancel the auto-completion list.
-void wxStyledTextCtrl::AutoCompStops(const wxString& characterSet) {
-    SendMsg(2105, 0, (long)(const char*)wx2stc(characterSet));
-}
-
-// Change the separator character in the string setting up an auto-completion list.
-// Default is space but can be changed if items contain space.
-void wxStyledTextCtrl::AutoCompSetSeparator(int separatorCharacter) {
-    SendMsg(2106, separatorCharacter, 0);
-}
-
-// Retrieve the auto-completion list separator character.
-int wxStyledTextCtrl::AutoCompGetSeparator() {
-    return SendMsg(2107, 0, 0);
-}
-
-// Select the item in the auto-completion list that starts with a string.
-void wxStyledTextCtrl::AutoCompSelect(const wxString& text) {
-    SendMsg(2108, 0, (long)(const char*)wx2stc(text));
-}
-
-// Should the auto-completion list be cancelled if the user backspaces to a
-// position before where the box was created.
-void wxStyledTextCtrl::AutoCompSetCancelAtStart(bool cancel) {
-    SendMsg(2110, cancel, 0);
-}
-
-// Retrieve whether auto-completion cancelled by backspacing before start.
-bool wxStyledTextCtrl::AutoCompGetCancelAtStart() {
-    return SendMsg(2111, 0, 0) != 0;
-}
-
-// Define a set of characters that when typed will cause the autocompletion to
-// choose the selected item.
-void wxStyledTextCtrl::AutoCompSetFillUps(const wxString& characterSet) {
-    SendMsg(2112, 0, (long)(const char*)wx2stc(characterSet));
-}
-
-// Should a single item auto-completion list automatically choose the item.
-void wxStyledTextCtrl::AutoCompSetChooseSingle(bool chooseSingle) {
-    SendMsg(2113, chooseSingle, 0);
-}
-
-// Retrieve whether a single item auto-completion list automatically choose the item.
-bool wxStyledTextCtrl::AutoCompGetChooseSingle() {
-    return SendMsg(2114, 0, 0) != 0;
-}
-
-// Set whether case is significant when performing auto-completion searches.
-void wxStyledTextCtrl::AutoCompSetIgnoreCase(bool ignoreCase) {
-    SendMsg(2115, ignoreCase, 0);
-}
-
-// Retrieve state of ignore case flag.
-bool wxStyledTextCtrl::AutoCompGetIgnoreCase() {
-    return SendMsg(2116, 0, 0) != 0;
-}
-
-// Display a list of strings and send notification when user chooses one.
-void wxStyledTextCtrl::UserListShow(int listType, const wxString& itemList) {
-    SendMsg(2117, listType, (long)(const char*)wx2stc(itemList));
-}
-
-// Set whether or not autocompletion is hidden automatically when nothing matches.
-void wxStyledTextCtrl::AutoCompSetAutoHide(bool autoHide) {
-    SendMsg(2118, autoHide, 0);
-}
-
-// Retrieve whether or not autocompletion is hidden automatically when nothing matches.
-bool wxStyledTextCtrl::AutoCompGetAutoHide() {
-    return SendMsg(2119, 0, 0) != 0;
-}
-
-// Set whether or not autocompletion deletes any word characters
-// after the inserted text upon completion.
-void wxStyledTextCtrl::AutoCompSetDropRestOfWord(bool dropRestOfWord) {
-    SendMsg(2270, dropRestOfWord, 0);
-}
-
-// Retrieve whether or not autocompletion deletes any word characters
-// after the inserted text upon completion.
-bool wxStyledTextCtrl::AutoCompGetDropRestOfWord() {
-    return SendMsg(2271, 0, 0) != 0;
-}
-
-// Register an image for use in autocompletion lists.
-void wxStyledTextCtrl::RegisterImage(int type, const wxBitmap& bmp) {
-        // convert bmp to a xpm in a string
-        wxMemoryOutputStream strm;
-        wxImage img = bmp.ConvertToImage();
-        if (img.HasAlpha())
-            img.ConvertAlphaToMask();
-        img.SaveFile(strm, wxBITMAP_TYPE_XPM);
-        size_t len = strm.GetSize();
-        char* buff = new char[len+1];
-        strm.CopyTo(buff, len);
-        buff[len] = 0;
-        SendMsg(2405, type, (long)buff);
-        delete [] buff;
-     
-}
-
-// Clear all the registered images.
-void wxStyledTextCtrl::ClearRegisteredImages() {
-    SendMsg(2408, 0, 0);
-}
-
-// Retrieve the auto-completion list type-separator character.
-int wxStyledTextCtrl::AutoCompGetTypeSeparator() {
-    return SendMsg(2285, 0, 0);
-}
-
-// Change the type-separator character in the string setting up an auto-completion list.
-// Default is '?' but can be changed if items contain '?'.
-void wxStyledTextCtrl::AutoCompSetTypeSeparator(int separatorCharacter) {
-    SendMsg(2286, separatorCharacter, 0);
-}
-
-// Set the maximum width, in characters, of auto-completion and user lists.
-// Set to 0 to autosize to fit longest item, which is the default.
-void wxStyledTextCtrl::AutoCompSetMaxWidth(int characterCount) {
-    SendMsg(2208, characterCount, 0);
-}
-
-// Get the maximum width, in characters, of auto-completion and user lists.
-int wxStyledTextCtrl::AutoCompGetMaxWidth() {
-    return SendMsg(2209, 0, 0);
-}
-
-// Set the maximum height, in rows, of auto-completion and user lists.
-// The default is 5 rows.
-void wxStyledTextCtrl::AutoCompSetMaxHeight(int rowCount) {
-    SendMsg(2210, rowCount, 0);
-}
-
-// Set the maximum height, in rows, of auto-completion and user lists.
-int wxStyledTextCtrl::AutoCompGetMaxHeight() {
-    return SendMsg(2211, 0, 0);
-}
-
-// Set the number of spaces used for one level of indentation.
-void wxStyledTextCtrl::SetIndent(int indentSize) {
-    SendMsg(2122, indentSize, 0);
-}
-
-// Retrieve indentation size.
-int wxStyledTextCtrl::GetIndent() {
-    return SendMsg(2123, 0, 0);
-}
-
-// Indentation will only use space characters if useTabs is false, otherwise
-// it will use a combination of tabs and spaces.
-void wxStyledTextCtrl::SetUseTabs(bool useTabs) {
-    SendMsg(2124, useTabs, 0);
-}
-
-// Retrieve whether tabs will be used in indentation.
-bool wxStyledTextCtrl::GetUseTabs() {
-    return SendMsg(2125, 0, 0) != 0;
-}
-
-// Change the indentation of a line to a number of columns.
-void wxStyledTextCtrl::SetLineIndentation(int line, int indentSize) {
-    SendMsg(2126, line, indentSize);
-}
-
-// Retrieve the number of columns that a line is indented.
-int wxStyledTextCtrl::GetLineIndentation(int line) {
-    return SendMsg(2127, line, 0);
-}
-
-// Retrieve the position before the first non indentation character on a line.
-int wxStyledTextCtrl::GetLineIndentPosition(int line) {
-    return SendMsg(2128, line, 0);
-}
-
-// Retrieve the column number of a position, taking tab width into account.
-int wxStyledTextCtrl::GetColumn(int pos) {
-    return SendMsg(2129, pos, 0);
-}
-
-// Show or hide the horizontal scroll bar.
-void wxStyledTextCtrl::SetUseHorizontalScrollBar(bool show) {
-    SendMsg(2130, show, 0);
-}
-
-// Is the horizontal scroll bar visible?
-bool wxStyledTextCtrl::GetUseHorizontalScrollBar() {
-    return SendMsg(2131, 0, 0) != 0;
-}
-
-// Show or hide indentation guides.
-void wxStyledTextCtrl::SetIndentationGuides(bool show) {
-    SendMsg(2132, show, 0);
-}
-
-// Are the indentation guides visible?
-bool wxStyledTextCtrl::GetIndentationGuides() {
-    return SendMsg(2133, 0, 0) != 0;
-}
-
-// Set the highlighted indentation guide column.
-// 0 = no highlighted guide.
-void wxStyledTextCtrl::SetHighlightGuide(int column) {
-    SendMsg(2134, column, 0);
-}
-
-// Get the highlighted indentation guide column.
-int wxStyledTextCtrl::GetHighlightGuide() {
-    return SendMsg(2135, 0, 0);
-}
-
-// Get the position after the last visible characters on a line.
-int wxStyledTextCtrl::GetLineEndPosition(int line) {
-    return SendMsg(2136, line, 0);
-}
-
-// Get the code page used to interpret the bytes of the document as characters.
-int wxStyledTextCtrl::GetCodePage() {
-    return SendMsg(2137, 0, 0);
-}
-
-// Get the foreground colour of the caret.
-wxColour wxStyledTextCtrl::GetCaretForeground() {
-    long c = SendMsg(2138, 0, 0);
-    return wxColourFromLong(c);
-}
-
-// In read-only mode?
-bool wxStyledTextCtrl::GetReadOnly() {
-    return SendMsg(2140, 0, 0) != 0;
-}
-
-// Sets the position of the caret.
-void wxStyledTextCtrl::SetCurrentPos(int pos) {
-    SendMsg(2141, pos, 0);
-}
-
-// Sets the position that starts the selection - this becomes the anchor.
-void wxStyledTextCtrl::SetSelectionStart(int pos) {
-    SendMsg(2142, pos, 0);
-}
-
-// Returns the position at the start of the selection.
-int wxStyledTextCtrl::GetSelectionStart() {
-    return SendMsg(2143, 0, 0);
-}
-
-// Sets the position that ends the selection - this becomes the currentPosition.
-void wxStyledTextCtrl::SetSelectionEnd(int pos) {
-    SendMsg(2144, pos, 0);
-}
-
-// Returns the position at the end of the selection.
-int wxStyledTextCtrl::GetSelectionEnd() {
-    return SendMsg(2145, 0, 0);
-}
-
-// Sets the print magnification added to the point size of each style for printing.
-void wxStyledTextCtrl::SetPrintMagnification(int magnification) {
-    SendMsg(2146, magnification, 0);
-}
-
-// Returns the print magnification.
-int wxStyledTextCtrl::GetPrintMagnification() {
-    return SendMsg(2147, 0, 0);
-}
-
-// Modify colours when printing for clearer printed text.
-void wxStyledTextCtrl::SetPrintColourMode(int mode) {
-    SendMsg(2148, mode, 0);
-}
-
-// Returns the print colour mode.
-int wxStyledTextCtrl::GetPrintColourMode() {
-    return SendMsg(2149, 0, 0);
-}
-
-// Find some text in the document.
-int wxStyledTextCtrl::FindText(int minPos, int maxPos,
-               const wxString& text,
-               int flags) {
-            TextToFind  ft;
-            ft.chrg.cpMin = minPos;
-            ft.chrg.cpMax = maxPos;
-            wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-            ft.lpstrText = (char*)(const char*)buf;
-
-            return SendMsg(2150, flags, (long)&ft);
-}
-
-// On Windows, will draw the document into a display context such as a printer.
- int wxStyledTextCtrl::FormatRange(bool   doDraw,
-                int    startPos,
-                int    endPos,
-                wxDC*  draw,
-                wxDC*  target, 
-                wxRect renderRect,
-                wxRect pageRect) {
-             RangeToFormat fr;
-
-             if (endPos < startPos) {
-                 int temp = startPos;
-                 startPos = endPos;
-                 endPos = temp;
-             }
-             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(2151, doDraw, (long)&fr);
-}
-
-// Retrieve the display line at the top of the display.
-int wxStyledTextCtrl::GetFirstVisibleLine() {
-    return SendMsg(2152, 0, 0);
-}
-
-// Retrieve the contents of a line.
-wxString wxStyledTextCtrl::GetLine(int line) {
-         int len = LineLength(line);
-         if (!len) return wxEmptyString;
-
-         wxMemoryBuffer mbuf(len+1);
-         char* buf = (char*)mbuf.GetWriteBuf(len+1);
-         SendMsg(2153, line, (long)buf);
-         mbuf.UngetWriteBuf(len);
-         mbuf.AppendByte(0);
-         return stc2wx(buf);
-}
-
-// Returns the number of lines in the document. There is always at least one.
-int wxStyledTextCtrl::GetLineCount() {
-    return SendMsg(2154, 0, 0);
-}
-
-// Sets the size in pixels of the left margin.
-void wxStyledTextCtrl::SetMarginLeft(int pixelWidth) {
-    SendMsg(2155, 0, pixelWidth);
-}
-
-// Returns the size in pixels of the left margin.
-int wxStyledTextCtrl::GetMarginLeft() {
-    return SendMsg(2156, 0, 0);
-}
-
-// Sets the size in pixels of the right margin.
-void wxStyledTextCtrl::SetMarginRight(int pixelWidth) {
-    SendMsg(2157, 0, pixelWidth);
-}
-
-// Returns the size in pixels of the right margin.
-int wxStyledTextCtrl::GetMarginRight() {
-    return SendMsg(2158, 0, 0);
-}
-
-// Is the document different from when it was last saved?
-bool wxStyledTextCtrl::GetModify() {
-    return SendMsg(2159, 0, 0) != 0;
-}
-
-// Select a range of text.
-void wxStyledTextCtrl::SetSelection(int start, int end) {
-    SendMsg(2160, start, end);
-}
-
-// Retrieve the selected text.
-wxString wxStyledTextCtrl::GetSelectedText() {
-         int   start;
-         int   end;
-
-         GetSelection(&start, &end);
-         int   len  = end - start;
-         if (!len) return wxEmptyString;
-
-         wxMemoryBuffer mbuf(len+2);
-         char* buf = (char*)mbuf.GetWriteBuf(len+1);
-         SendMsg(2161, 0, (long)buf);
-         mbuf.UngetWriteBuf(len);
-         mbuf.AppendByte(0);
-         return stc2wx(buf);
-}
-
-// Retrieve a range of text.
-wxString wxStyledTextCtrl::GetTextRange(int startPos, int endPos) {
-         if (endPos < startPos) {
-             int temp = startPos;
-             startPos = endPos;
-             endPos = temp;
-         }
-         int   len  = endPos - startPos;
-         if (!len) return wxEmptyString;
-         wxMemoryBuffer mbuf(len+1);
-         char* buf = (char*)mbuf.GetWriteBuf(len);
-         TextRange tr;
-         tr.lpstrText = buf;
-         tr.chrg.cpMin = startPos;
-         tr.chrg.cpMax = endPos;
-         SendMsg(2162, 0, (long)&tr);
-         mbuf.UngetWriteBuf(len);
-         mbuf.AppendByte(0);
-         return stc2wx(buf);
-}
-
-// Draw the selection in normal style or with selection highlighted.
-void wxStyledTextCtrl::HideSelection(bool normal) {
-    SendMsg(2163, normal, 0);
-}
-
-// Retrieve the line containing a position.
-int wxStyledTextCtrl::LineFromPosition(int pos) {
-    return SendMsg(2166, pos, 0);
-}
-
-// Retrieve the position at the start of a line.
-int wxStyledTextCtrl::PositionFromLine(int line) {
-    return SendMsg(2167, line, 0);
-}
-
-// Scroll horizontally and vertically.
-void wxStyledTextCtrl::LineScroll(int columns, int lines) {
-    SendMsg(2168, columns, lines);
-}
-
-// Ensure the caret is visible.
-void wxStyledTextCtrl::EnsureCaretVisible() {
-    SendMsg(2169, 0, 0);
-}
-
-// Replace the selected text with the argument text.
-void wxStyledTextCtrl::ReplaceSelection(const wxString& text) {
-    SendMsg(2170, 0, (long)(const char*)wx2stc(text));
-}
-
-// Set to read only or read write.
-void wxStyledTextCtrl::SetReadOnly(bool readOnly) {
-    SendMsg(2171, readOnly, 0);
-}
-
-// Will a paste succeed?
-bool wxStyledTextCtrl::CanPaste() {
-    return SendMsg(2173, 0, 0) != 0;
-}
-
-// Are there any undoable actions in the undo history?
-bool wxStyledTextCtrl::CanUndo() {
-    return SendMsg(2174, 0, 0) != 0;
-}
-
-// Delete the undo history.
-void wxStyledTextCtrl::EmptyUndoBuffer() {
-    SendMsg(2175, 0, 0);
-}
-
-// Undo one action in the undo history.
-void wxStyledTextCtrl::Undo() {
-    SendMsg(2176, 0, 0);
-}
-
-// Cut the selection to the clipboard.
-void wxStyledTextCtrl::Cut() {
-    SendMsg(2177, 0, 0);
-}
-
-// Copy the selection to the clipboard.
-void wxStyledTextCtrl::Copy() {
-    SendMsg(2178, 0, 0);
-}
-
-// Paste the contents of the clipboard into the document replacing the selection.
-void wxStyledTextCtrl::Paste() {
-    SendMsg(2179, 0, 0);
-}
-
-// Clear the selection.
-void wxStyledTextCtrl::Clear() {
-    SendMsg(2180, 0, 0);
-}
-
-// Replace the contents of the document with the argument text.
-void wxStyledTextCtrl::SetText(const wxString& text) {
-    SendMsg(2181, 0, (long)(const char*)wx2stc(text));
-}
-
-// Retrieve all the text in the document.
-wxString wxStyledTextCtrl::GetText() {
-         int len  = GetTextLength();
-         wxMemoryBuffer mbuf(len+1);   // leave room for the null...
-         char* buf = (char*)mbuf.GetWriteBuf(len+1);
-         SendMsg(2182, len+1, (long)buf);
-         mbuf.UngetWriteBuf(len);
-         mbuf.AppendByte(0);
-         return stc2wx(buf);
-}
-
-// Retrieve the number of characters in the document.
-int wxStyledTextCtrl::GetTextLength() {
-    return SendMsg(2183, 0, 0);
-}
-
-// Set to overtype (true) or insert mode.
-void wxStyledTextCtrl::SetOvertype(bool overtype) {
-    SendMsg(2186, overtype, 0);
-}
-
-// Returns true if overtype mode is active otherwise false is returned.
-bool wxStyledTextCtrl::GetOvertype() {
-    return SendMsg(2187, 0, 0) != 0;
-}
-
-// Set the width of the insert mode caret.
-void wxStyledTextCtrl::SetCaretWidth(int pixelWidth) {
-    SendMsg(2188, pixelWidth, 0);
-}
-
-// Returns the width of the insert mode caret.
-int wxStyledTextCtrl::GetCaretWidth() {
-    return SendMsg(2189, 0, 0);
-}
-
-// Sets the position that starts the target which is used for updating the
-// document without affecting the scroll position.
-void wxStyledTextCtrl::SetTargetStart(int pos) {
-    SendMsg(2190, pos, 0);
-}
-
-// Get the position that starts the target.
-int wxStyledTextCtrl::GetTargetStart() {
-    return SendMsg(2191, 0, 0);
-}
-
-// Sets the position that ends the target which is used for updating the
-// document without affecting the scroll position.
-void wxStyledTextCtrl::SetTargetEnd(int pos) {
-    SendMsg(2192, pos, 0);
-}
-
-// Get the position that ends the target.
-int wxStyledTextCtrl::GetTargetEnd() {
-    return SendMsg(2193, 0, 0);
-}
-
-// Replace the target text with the argument text.
-// Text is counted so it can contain NULs.
-// Returns the length of the replacement text.
-
-     int wxStyledTextCtrl::ReplaceTarget(const wxString& text) {
-         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-         return SendMsg(2194, strlen(buf), (long)(const char*)buf);
-}
-
-// Replace the target text with the argument text after \d processing.
-// Text is counted so it can contain NULs.
-// Looks for \d where d is between 1 and 9 and replaces these with the strings
-// matched in the last search operation which were surrounded by \( and \).
-// Returns the length of the replacement text including any change
-// caused by processing the \d patterns.
-
-     int wxStyledTextCtrl::ReplaceTargetRE(const wxString& text) {
-         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-         return SendMsg(2195, strlen(buf), (long)(const char*)buf);
-}
-
-// Search for a counted string in the target and set the target to the found
-// range. Text is counted so it can contain NULs.
-// Returns length of range or -1 for failure in which case target is not moved.
-
-     int wxStyledTextCtrl::SearchInTarget(const wxString& text) {
-         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-         return SendMsg(2197, strlen(buf), (long)(const char*)buf);
-}
-
-// Set the search flags used by SearchInTarget.
-void wxStyledTextCtrl::SetSearchFlags(int flags) {
-    SendMsg(2198, flags, 0);
-}
-
-// Get the search flags used by SearchInTarget.
-int wxStyledTextCtrl::GetSearchFlags() {
-    return SendMsg(2199, 0, 0);
-}
-
-// Show a call tip containing a definition near position pos.
-void wxStyledTextCtrl::CallTipShow(int pos, const wxString& definition) {
-    SendMsg(2200, pos, (long)(const char*)wx2stc(definition));
-}
-
-// Remove the call tip from the screen.
-void wxStyledTextCtrl::CallTipCancel() {
-    SendMsg(2201, 0, 0);
-}
-
-// Is there an active call tip?
-bool wxStyledTextCtrl::CallTipActive() {
-    return SendMsg(2202, 0, 0) != 0;
-}
-
-// Retrieve the position where the caret was before displaying the call tip.
-int wxStyledTextCtrl::CallTipPosAtStart() {
-    return SendMsg(2203, 0, 0);
-}
-
-// Highlight a segment of the definition.
-void wxStyledTextCtrl::CallTipSetHighlight(int start, int end) {
-    SendMsg(2204, start, end);
-}
-
-// Set the background colour for the call tip.
-void wxStyledTextCtrl::CallTipSetBackground(const wxColour& back) {
-    SendMsg(2205, wxColourAsLong(back), 0);
-}
-
-// Set the foreground colour for the call tip.
-void wxStyledTextCtrl::CallTipSetForeground(const wxColour& fore) {
-    SendMsg(2206, wxColourAsLong(fore), 0);
-}
-
-// Set the foreground colour for the highlighted part of the call tip.
-void wxStyledTextCtrl::CallTipSetForegroundHighlight(const wxColour& fore) {
-    SendMsg(2207, wxColourAsLong(fore), 0);
-}
-
-// Enable use of STYLE_CALLTIP and set call tip tab size in pixels.
-void wxStyledTextCtrl::CallTipUseStyle(int tabSize) {
-    SendMsg(2212, tabSize, 0);
-}
-
-// Find the display line of a document line taking hidden lines into account.
-int wxStyledTextCtrl::VisibleFromDocLine(int line) {
-    return SendMsg(2220, line, 0);
-}
-
-// Find the document line of a display line taking hidden lines into account.
-int wxStyledTextCtrl::DocLineFromVisible(int lineDisplay) {
-    return SendMsg(2221, lineDisplay, 0);
-}
-
-// The number of display lines needed to wrap a document line
-int wxStyledTextCtrl::WrapCount(int line) {
-    return SendMsg(2235, line, 0);
-}
-
-// Set the fold level of a line.
-// This encodes an integer level along with flags indicating whether the
-// line is a header and whether it is effectively white space.
-void wxStyledTextCtrl::SetFoldLevel(int line, int level) {
-    SendMsg(2222, line, level);
-}
-
-// Retrieve the fold level of a line.
-int wxStyledTextCtrl::GetFoldLevel(int line) {
-    return SendMsg(2223, line, 0);
-}
-
-// Find the last child line of a header line.
-int wxStyledTextCtrl::GetLastChild(int line, int level) {
-    return SendMsg(2224, line, level);
-}
-
-// Find the parent line of a child line.
-int wxStyledTextCtrl::GetFoldParent(int line) {
-    return SendMsg(2225, line, 0);
-}
-
-// Make a range of lines visible.
-void wxStyledTextCtrl::ShowLines(int lineStart, int lineEnd) {
-    SendMsg(2226, lineStart, lineEnd);
-}
-
-// Make a range of lines invisible.
-void wxStyledTextCtrl::HideLines(int lineStart, int lineEnd) {
-    SendMsg(2227, lineStart, lineEnd);
-}
-
-// Is a line visible?
-bool wxStyledTextCtrl::GetLineVisible(int line) {
-    return SendMsg(2228, line, 0) != 0;
-}
-
-// Show the children of a header line.
-void wxStyledTextCtrl::SetFoldExpanded(int line, bool expanded) {
-    SendMsg(2229, line, expanded);
-}
-
-// Is a header line expanded?
-bool wxStyledTextCtrl::GetFoldExpanded(int line) {
-    return SendMsg(2230, line, 0) != 0;
-}
-
-// Switch a header line between expanded and contracted.
-void wxStyledTextCtrl::ToggleFold(int line) {
-    SendMsg(2231, line, 0);
-}
-
-// Ensure a particular line is visible by expanding any header line hiding it.
-void wxStyledTextCtrl::EnsureVisible(int line) {
-    SendMsg(2232, line, 0);
-}
-
-// Set some style options for folding.
-void wxStyledTextCtrl::SetFoldFlags(int flags) {
-    SendMsg(2233, flags, 0);
-}
-
-// Ensure a particular line is visible by expanding any header line hiding it.
-// Use the currently set visibility policy to determine which range to display.
-void wxStyledTextCtrl::EnsureVisibleEnforcePolicy(int line) {
-    SendMsg(2234, line, 0);
-}
-
-// Sets whether a tab pressed when caret is within indentation indents.
-void wxStyledTextCtrl::SetTabIndents(bool tabIndents) {
-    SendMsg(2260, tabIndents, 0);
-}
-
-// Does a tab pressed when caret is within indentation indent?
-bool wxStyledTextCtrl::GetTabIndents() {
-    return SendMsg(2261, 0, 0) != 0;
-}
-
-// Sets whether a backspace pressed when caret is within indentation unindents.
-void wxStyledTextCtrl::SetBackSpaceUnIndents(bool bsUnIndents) {
-    SendMsg(2262, bsUnIndents, 0);
-}
-
-// Does a backspace pressed when caret is within indentation unindent?
-bool wxStyledTextCtrl::GetBackSpaceUnIndents() {
-    return SendMsg(2263, 0, 0) != 0;
-}
-
-// Sets the time the mouse must sit still to generate a mouse dwell event.
-void wxStyledTextCtrl::SetMouseDwellTime(int periodMilliseconds) {
-    SendMsg(2264, periodMilliseconds, 0);
-}
-
-// Retrieve the time the mouse must sit still to generate a mouse dwell event.
-int wxStyledTextCtrl::GetMouseDwellTime() {
-    return SendMsg(2265, 0, 0);
-}
-
-// Get position of start of word.
-int wxStyledTextCtrl::WordStartPosition(int pos, bool onlyWordCharacters) {
-    return SendMsg(2266, pos, onlyWordCharacters);
-}
-
-// Get position of end of word.
-int wxStyledTextCtrl::WordEndPosition(int pos, bool onlyWordCharacters) {
-    return SendMsg(2267, pos, onlyWordCharacters);
-}
-
-// Sets whether text is word wrapped.
-void wxStyledTextCtrl::SetWrapMode(int mode) {
-    SendMsg(2268, mode, 0);
-}
-
-// Retrieve whether text is word wrapped.
-int wxStyledTextCtrl::GetWrapMode() {
-    return SendMsg(2269, 0, 0);
-}
-
-// Set the display mode of visual flags for wrapped lines.
-void wxStyledTextCtrl::SetWrapVisualFlags(int wrapVisualFlags) {
-    SendMsg(2460, wrapVisualFlags, 0);
-}
-
-// Retrive the display mode of visual flags for wrapped lines.
-int wxStyledTextCtrl::GetWrapVisualFlags() {
-    return SendMsg(2461, 0, 0);
-}
-
-// Set the location of visual flags for wrapped lines.
-void wxStyledTextCtrl::SetWrapVisualFlagsLocation(int wrapVisualFlagsLocation) {
-    SendMsg(2462, wrapVisualFlagsLocation, 0);
-}
-
-// Retrive the location of visual flags for wrapped lines.
-int wxStyledTextCtrl::GetWrapVisualFlagsLocation() {
-    return SendMsg(2463, 0, 0);
-}
-
-// Set the start indent for wrapped lines.
-void wxStyledTextCtrl::SetWrapStartIndent(int indent) {
-    SendMsg(2464, indent, 0);
-}
-
-// Retrive the start indent for wrapped lines.
-int wxStyledTextCtrl::GetWrapStartIndent() {
-    return SendMsg(2465, 0, 0);
-}
-
-// Sets the degree of caching of layout information.
-void wxStyledTextCtrl::SetLayoutCache(int mode) {
-    SendMsg(2272, mode, 0);
-}
-
-// Retrieve the degree of caching of layout information.
-int wxStyledTextCtrl::GetLayoutCache() {
-    return SendMsg(2273, 0, 0);
-}
-
-// Sets the document width assumed for scrolling.
-void wxStyledTextCtrl::SetScrollWidth(int pixelWidth) {
-    SendMsg(2274, pixelWidth, 0);
-}
-
-// Retrieve the document width assumed for scrolling.
-int wxStyledTextCtrl::GetScrollWidth() {
-    return SendMsg(2275, 0, 0);
-}
-
-// Measure the pixel width of some text in a particular style.
-// NUL terminated text argument.
-// Does not handle tab or control characters.
-int wxStyledTextCtrl::TextWidth(int style, const wxString& text) {
-    return SendMsg(2276, style, (long)(const char*)wx2stc(text));
-}
-
-// Sets the scroll range so that maximum scroll position has
-// the last line at the bottom of the view (default).
-// Setting this to false allows scrolling one page below the last line.
-void wxStyledTextCtrl::SetEndAtLastLine(bool endAtLastLine) {
-    SendMsg(2277, endAtLastLine, 0);
-}
-
-// Retrieve whether the maximum scroll position has the last
-// line at the bottom of the view.
-bool wxStyledTextCtrl::GetEndAtLastLine() {
-    return SendMsg(2278, 0, 0) != 0;
-}
-
-// Retrieve the height of a particular line of text in pixels.
-int wxStyledTextCtrl::TextHeight(int line) {
-    return SendMsg(2279, line, 0);
-}
-
-// Show or hide the vertical scroll bar.
-void wxStyledTextCtrl::SetUseVerticalScrollBar(bool show) {
-    SendMsg(2280, show, 0);
-}
-
-// Is the vertical scroll bar visible?
-bool wxStyledTextCtrl::GetUseVerticalScrollBar() {
-    return SendMsg(2281, 0, 0) != 0;
-}
-
-// Append a string to the end of the document without changing the selection.
-void wxStyledTextCtrl::AppendText(const wxString& text) {
-                    wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-                    SendMsg(2282, strlen(buf), (long)(const char*)buf);
-}
-
-// Is drawing done in two phases with backgrounds drawn before foregrounds?
-bool wxStyledTextCtrl::GetTwoPhaseDraw() {
-    return SendMsg(2283, 0, 0) != 0;
-}
-
-// In twoPhaseDraw mode, drawing is performed in two phases, first the background
-// and then the foreground. This avoids chopping off characters that overlap the next run.
-void wxStyledTextCtrl::SetTwoPhaseDraw(bool twoPhase) {
-    SendMsg(2284, twoPhase, 0);
-}
-
-// Make the target range start and end be the same as the selection range start and end.
-void wxStyledTextCtrl::TargetFromSelection() {
-    SendMsg(2287, 0, 0);
-}
-
-// Join the lines in the target.
-void wxStyledTextCtrl::LinesJoin() {
-    SendMsg(2288, 0, 0);
-}
-
-// Split the lines in the target into lines that are less wide than pixelWidth
-// where possible.
-void wxStyledTextCtrl::LinesSplit(int pixelWidth) {
-    SendMsg(2289, pixelWidth, 0);
-}
-
-// Set the colours used as a chequerboard pattern in the fold margin
-void wxStyledTextCtrl::SetFoldMarginColour(bool useSetting, const wxColour& back) {
-    SendMsg(2290, useSetting, wxColourAsLong(back));
-}
-void wxStyledTextCtrl::SetFoldMarginHiColour(bool useSetting, const wxColour& fore) {
-    SendMsg(2291, useSetting, wxColourAsLong(fore));
-}
-
-// Move caret down one line.
-void wxStyledTextCtrl::LineDown() {
-    SendMsg(2300, 0, 0);
-}
-
-// Move caret down one line extending selection to new caret position.
-void wxStyledTextCtrl::LineDownExtend() {
-    SendMsg(2301, 0, 0);
-}
-
-// Move caret up one line.
-void wxStyledTextCtrl::LineUp() {
-    SendMsg(2302, 0, 0);
-}
-
-// Move caret up one line extending selection to new caret position.
-void wxStyledTextCtrl::LineUpExtend() {
-    SendMsg(2303, 0, 0);
-}
-
-// Move caret left one character.
-void wxStyledTextCtrl::CharLeft() {
-    SendMsg(2304, 0, 0);
-}
-
-// Move caret left one character extending selection to new caret position.
-void wxStyledTextCtrl::CharLeftExtend() {
-    SendMsg(2305, 0, 0);
-}
-
-// Move caret right one character.
-void wxStyledTextCtrl::CharRight() {
-    SendMsg(2306, 0, 0);
-}
-
-// Move caret right one character extending selection to new caret position.
-void wxStyledTextCtrl::CharRightExtend() {
-    SendMsg(2307, 0, 0);
-}
-
-// Move caret left one word.
-void wxStyledTextCtrl::WordLeft() {
-    SendMsg(2308, 0, 0);
-}
-
-// Move caret left one word extending selection to new caret position.
-void wxStyledTextCtrl::WordLeftExtend() {
-    SendMsg(2309, 0, 0);
-}
-
-// Move caret right one word.
-void wxStyledTextCtrl::WordRight() {
-    SendMsg(2310, 0, 0);
-}
-
-// Move caret right one word extending selection to new caret position.
-void wxStyledTextCtrl::WordRightExtend() {
-    SendMsg(2311, 0, 0);
-}
-
-// Move caret to first position on line.
-void wxStyledTextCtrl::Home() {
-    SendMsg(2312, 0, 0);
-}
-
-// Move caret to first position on line extending selection to new caret position.
-void wxStyledTextCtrl::HomeExtend() {
-    SendMsg(2313, 0, 0);
-}
-
-// Move caret to last position on line.
-void wxStyledTextCtrl::LineEnd() {
-    SendMsg(2314, 0, 0);
-}
-
-// Move caret to last position on line extending selection to new caret position.
-void wxStyledTextCtrl::LineEndExtend() {
-    SendMsg(2315, 0, 0);
-}
-
-// Move caret to first position in document.
-void wxStyledTextCtrl::DocumentStart() {
-    SendMsg(2316, 0, 0);
-}
-
-// Move caret to first position in document extending selection to new caret position.
-void wxStyledTextCtrl::DocumentStartExtend() {
-    SendMsg(2317, 0, 0);
-}
-
-// Move caret to last position in document.
-void wxStyledTextCtrl::DocumentEnd() {
-    SendMsg(2318, 0, 0);
-}
-
-// Move caret to last position in document extending selection to new caret position.
-void wxStyledTextCtrl::DocumentEndExtend() {
-    SendMsg(2319, 0, 0);
-}
-
-// Move caret one page up.
-void wxStyledTextCtrl::PageUp() {
-    SendMsg(2320, 0, 0);
-}
-
-// Move caret one page up extending selection to new caret position.
-void wxStyledTextCtrl::PageUpExtend() {
-    SendMsg(2321, 0, 0);
-}
-
-// Move caret one page down.
-void wxStyledTextCtrl::PageDown() {
-    SendMsg(2322, 0, 0);
-}
-
-// Move caret one page down extending selection to new caret position.
-void wxStyledTextCtrl::PageDownExtend() {
-    SendMsg(2323, 0, 0);
-}
-
-// Switch from insert to overtype mode or the reverse.
-void wxStyledTextCtrl::EditToggleOvertype() {
-    SendMsg(2324, 0, 0);
-}
-
-// Cancel any modes such as call tip or auto-completion list display.
-void wxStyledTextCtrl::Cancel() {
-    SendMsg(2325, 0, 0);
-}
-
-// Delete the selection or if no selection, the character before the caret.
-void wxStyledTextCtrl::DeleteBack() {
-    SendMsg(2326, 0, 0);
-}
-
-// If selection is empty or all on one line replace the selection with a tab character.
-// If more than one line selected, indent the lines.
-void wxStyledTextCtrl::Tab() {
-    SendMsg(2327, 0, 0);
-}
-
-// Dedent the selected lines.
-void wxStyledTextCtrl::BackTab() {
-    SendMsg(2328, 0, 0);
-}
-
-// Insert a new line, may use a CRLF, CR or LF depending on EOL mode.
-void wxStyledTextCtrl::NewLine() {
-    SendMsg(2329, 0, 0);
-}
-
-// Insert a Form Feed character.
-void wxStyledTextCtrl::FormFeed() {
-    SendMsg(2330, 0, 0);
-}
-
-// Move caret to before first visible character on line.
-// If already there move to first character on line.
-void wxStyledTextCtrl::VCHome() {
-    SendMsg(2331, 0, 0);
-}
-
-// Like VCHome but extending selection to new caret position.
-void wxStyledTextCtrl::VCHomeExtend() {
-    SendMsg(2332, 0, 0);
-}
-
-// Magnify the displayed text by increasing the sizes by 1 point.
-void wxStyledTextCtrl::ZoomIn() {
-    SendMsg(2333, 0, 0);
-}
-
-// Make the displayed text smaller by decreasing the sizes by 1 point.
-void wxStyledTextCtrl::ZoomOut() {
-    SendMsg(2334, 0, 0);
-}
-
-// Delete the word to the left of the caret.
-void wxStyledTextCtrl::DelWordLeft() {
-    SendMsg(2335, 0, 0);
-}
-
-// Delete the word to the right of the caret.
-void wxStyledTextCtrl::DelWordRight() {
-    SendMsg(2336, 0, 0);
-}
-
-// Cut the line containing the caret.
-void wxStyledTextCtrl::LineCut() {
-    SendMsg(2337, 0, 0);
-}
-
-// Delete the line containing the caret.
-void wxStyledTextCtrl::LineDelete() {
-    SendMsg(2338, 0, 0);
-}
-
-// Switch the current line with the previous.
-void wxStyledTextCtrl::LineTranspose() {
-    SendMsg(2339, 0, 0);
-}
-
-// Duplicate the current line.
-void wxStyledTextCtrl::LineDuplicate() {
-    SendMsg(2404, 0, 0);
-}
-
-// Transform the selection to lower case.
-void wxStyledTextCtrl::LowerCase() {
-    SendMsg(2340, 0, 0);
-}
-
-// Transform the selection to upper case.
-void wxStyledTextCtrl::UpperCase() {
-    SendMsg(2341, 0, 0);
-}
-
-// Scroll the document down, keeping the caret visible.
-void wxStyledTextCtrl::LineScrollDown() {
-    SendMsg(2342, 0, 0);
-}
-
-// Scroll the document up, keeping the caret visible.
-void wxStyledTextCtrl::LineScrollUp() {
-    SendMsg(2343, 0, 0);
-}
-
-// Delete the selection or if no selection, the character before the caret.
-// Will not delete the character before at the start of a line.
-void wxStyledTextCtrl::DeleteBackNotLine() {
-    SendMsg(2344, 0, 0);
-}
-
-// Move caret to first position on display line.
-void wxStyledTextCtrl::HomeDisplay() {
-    SendMsg(2345, 0, 0);
-}
-
-// Move caret to first position on display line extending selection to
-// new caret position.
-void wxStyledTextCtrl::HomeDisplayExtend() {
-    SendMsg(2346, 0, 0);
-}
-
-// Move caret to last position on display line.
-void wxStyledTextCtrl::LineEndDisplay() {
-    SendMsg(2347, 0, 0);
-}
-
-// Move caret to last position on display line extending selection to new
-// caret position.
-void wxStyledTextCtrl::LineEndDisplayExtend() {
-    SendMsg(2348, 0, 0);
-}
-
-// These are like their namesakes Home(Extend)?, LineEnd(Extend)?, VCHome(Extend)?
-// except they behave differently when word-wrap is enabled:
-// They go first to the start / end of the display line, like (Home|LineEnd)Display
-// The difference is that, the cursor is already at the point, it goes on to the start
-// or end of the document line, as appropriate for (Home|LineEnd|VCHome)(Extend)?.
-void wxStyledTextCtrl::HomeWrap() {
-    SendMsg(2349, 0, 0);
-}
-void wxStyledTextCtrl::HomeWrapExtend() {
-    SendMsg(2450, 0, 0);
-}
-void wxStyledTextCtrl::LineEndWrap() {
-    SendMsg(2451, 0, 0);
-}
-void wxStyledTextCtrl::LineEndWrapExtend() {
-    SendMsg(2452, 0, 0);
-}
-void wxStyledTextCtrl::VCHomeWrap() {
-    SendMsg(2453, 0, 0);
-}
-void wxStyledTextCtrl::VCHomeWrapExtend() {
-    SendMsg(2454, 0, 0);
-}
-
-// Copy the line containing the caret.
-void wxStyledTextCtrl::LineCopy() {
-    SendMsg(2455, 0, 0);
-}
-
-// Move the caret inside current view if it's not there already.
-void wxStyledTextCtrl::MoveCaretInsideView() {
-    SendMsg(2401, 0, 0);
-}
-
-// How many characters are on a line, not including end of line characters?
-int wxStyledTextCtrl::LineLength(int line) {
-    return SendMsg(2350, line, 0);
-}
-
-// Highlight the characters at two positions.
-void wxStyledTextCtrl::BraceHighlight(int pos1, int pos2) {
-    SendMsg(2351, pos1, pos2);
-}
-
-// Highlight the character at a position indicating there is no matching brace.
-void wxStyledTextCtrl::BraceBadLight(int pos) {
-    SendMsg(2352, pos, 0);
-}
-
-// Find the position of a matching brace or INVALID_POSITION if no match.
-int wxStyledTextCtrl::BraceMatch(int pos) {
-    return SendMsg(2353, pos, 0);
-}
-
-// Are the end of line characters visible?
-bool wxStyledTextCtrl::GetViewEOL() {
-    return SendMsg(2355, 0, 0) != 0;
-}
-
-// Make the end of line characters visible or invisible.
-void wxStyledTextCtrl::SetViewEOL(bool visible) {
-    SendMsg(2356, visible, 0);
-}
-
-// Retrieve a pointer to the document object.
-void* wxStyledTextCtrl::GetDocPointer() {
-         return (void*)SendMsg(2357);
-}
-
-// Change the document object used.
-void wxStyledTextCtrl::SetDocPointer(void* docPointer) {
-         SendMsg(2358, 0, (long)docPointer);
-}
-
-// Set which document modification events are sent to the container.
-void wxStyledTextCtrl::SetModEventMask(int mask) {
-    SendMsg(2359, mask, 0);
-}
-
-// Retrieve the column number which text should be kept within.
-int wxStyledTextCtrl::GetEdgeColumn() {
-    return SendMsg(2360, 0, 0);
-}
-
-// Set the column number of the edge.
-// If text goes past the edge then it is highlighted.
-void wxStyledTextCtrl::SetEdgeColumn(int column) {
-    SendMsg(2361, column, 0);
-}
-
-// Retrieve the edge highlight mode.
-int wxStyledTextCtrl::GetEdgeMode() {
-    return SendMsg(2362, 0, 0);
-}
-
-// The edge may be displayed by a line (EDGE_LINE) or by highlighting text that
-// goes beyond it (EDGE_BACKGROUND) or not displayed at all (EDGE_NONE).
-void wxStyledTextCtrl::SetEdgeMode(int mode) {
-    SendMsg(2363, mode, 0);
-}
-
-// Retrieve the colour used in edge indication.
-wxColour wxStyledTextCtrl::GetEdgeColour() {
-    long c = SendMsg(2364, 0, 0);
-    return wxColourFromLong(c);
-}
-
-// Change the colour used in edge indication.
-void wxStyledTextCtrl::SetEdgeColour(const wxColour& edgeColour) {
-    SendMsg(2365, wxColourAsLong(edgeColour), 0);
-}
-
-// Sets the current caret position to be the search anchor.
-void wxStyledTextCtrl::SearchAnchor() {
-    SendMsg(2366, 0, 0);
-}
-
-// Find some text starting at the search anchor.
-// Does not ensure the selection is visible.
-int wxStyledTextCtrl::SearchNext(int flags, const wxString& text) {
-    return SendMsg(2367, flags, (long)(const char*)wx2stc(text));
-}
-
-// Find some text starting at the search anchor and moving backwards.
-// Does not ensure the selection is visible.
-int wxStyledTextCtrl::SearchPrev(int flags, const wxString& text) {
-    return SendMsg(2368, flags, (long)(const char*)wx2stc(text));
-}
-
-// Retrieves the number of lines completely visible.
-int wxStyledTextCtrl::LinesOnScreen() {
-    return SendMsg(2370, 0, 0);
-}
-
-// Set whether a pop up menu is displayed automatically when the user presses
-// the wrong mouse button.
-void wxStyledTextCtrl::UsePopUp(bool allowPopUp) {
-    SendMsg(2371, allowPopUp, 0);
-}
-
-// Is the selection rectangular? The alternative is the more common stream selection.
-bool wxStyledTextCtrl::SelectionIsRectangle() {
-    return SendMsg(2372, 0, 0) != 0;
-}
-
-// Set the zoom level. This number of points is added to the size of all fonts.
-// It may be positive to magnify or negative to reduce.
-void wxStyledTextCtrl::SetZoom(int zoom) {
-    SendMsg(2373, zoom, 0);
-}
-
-// Retrieve the zoom level.
-int wxStyledTextCtrl::GetZoom() {
-    return SendMsg(2374, 0, 0);
-}
-
-// Create a new document object.
-// Starts with reference count of 1 and not selected into editor.
-void* wxStyledTextCtrl::CreateDocument() {
-         return (void*)SendMsg(2375);
-}
-
-// Extend life of document.
-void wxStyledTextCtrl::AddRefDocument(void* docPointer) {
-         SendMsg(2376, 0, (long)docPointer);
-}
-
-// Release a reference to the document, deleting document if it fades to black.
-void wxStyledTextCtrl::ReleaseDocument(void* docPointer) {
-         SendMsg(2377, 0, (long)docPointer);
-}
-
-// Get which document modification events are sent to the container.
-int wxStyledTextCtrl::GetModEventMask() {
-    return SendMsg(2378, 0, 0);
-}
-
-// Change internal focus flag.
-void wxStyledTextCtrl::SetSTCFocus(bool focus) {
-    SendMsg(2380, focus, 0);
-}
-
-// Get internal focus flag.
-bool wxStyledTextCtrl::GetSTCFocus() {
-    return SendMsg(2381, 0, 0) != 0;
-}
-
-// Change error status - 0 = OK.
-void wxStyledTextCtrl::SetStatus(int statusCode) {
-    SendMsg(2382, statusCode, 0);
-}
-
-// Get error status.
-int wxStyledTextCtrl::GetStatus() {
-    return SendMsg(2383, 0, 0);
-}
-
-// Set whether the mouse is captured when its button is pressed.
-void wxStyledTextCtrl::SetMouseDownCaptures(bool captures) {
-    SendMsg(2384, captures, 0);
-}
-
-// Get whether mouse gets captured.
-bool wxStyledTextCtrl::GetMouseDownCaptures() {
-    return SendMsg(2385, 0, 0) != 0;
-}
-
-// Sets the cursor to one of the SC_CURSOR* values.
-void wxStyledTextCtrl::SetSTCCursor(int cursorType) {
-    SendMsg(2386, cursorType, 0);
-}
-
-// Get cursor type.
-int wxStyledTextCtrl::GetSTCCursor() {
-    return SendMsg(2387, 0, 0);
-}
-
-// Change the way control characters are displayed:
-// If symbol is < 32, keep the drawn way, else, use the given character.
-void wxStyledTextCtrl::SetControlCharSymbol(int symbol) {
-    SendMsg(2388, symbol, 0);
-}
-
-// Get the way control characters are displayed.
-int wxStyledTextCtrl::GetControlCharSymbol() {
-    return SendMsg(2389, 0, 0);
-}
-
-// Move to the previous change in capitalisation.
-void wxStyledTextCtrl::WordPartLeft() {
-    SendMsg(2390, 0, 0);
-}
-
-// Move to the previous change in capitalisation extending selection
-// to new caret position.
-void wxStyledTextCtrl::WordPartLeftExtend() {
-    SendMsg(2391, 0, 0);
-}
-
-// Move to the change next in capitalisation.
-void wxStyledTextCtrl::WordPartRight() {
-    SendMsg(2392, 0, 0);
-}
-
-// Move to the next change in capitalisation extending selection
-// to new caret position.
-void wxStyledTextCtrl::WordPartRightExtend() {
-    SendMsg(2393, 0, 0);
-}
-
-// Set the way the display area is determined when a particular line
-// is to be moved to by Find, FindNext, GotoLine, etc.
-void wxStyledTextCtrl::SetVisiblePolicy(int visiblePolicy, int visibleSlop) {
-    SendMsg(2394, visiblePolicy, visibleSlop);
-}
-
-// Delete back from the current position to the start of the line.
-void wxStyledTextCtrl::DelLineLeft() {
-    SendMsg(2395, 0, 0);
-}
-
-// Delete forwards from the current position to the end of the line.
-void wxStyledTextCtrl::DelLineRight() {
-    SendMsg(2396, 0, 0);
-}
-
-// Get and Set the xOffset (ie, horizonal scroll position).
-void wxStyledTextCtrl::SetXOffset(int newOffset) {
-    SendMsg(2397, newOffset, 0);
-}
-int wxStyledTextCtrl::GetXOffset() {
-    return SendMsg(2398, 0, 0);
-}
-
-// Set the last x chosen value to be the caret x position.
-void wxStyledTextCtrl::ChooseCaretX() {
-    SendMsg(2399, 0, 0);
-}
-
-// Set the way the caret is kept visible when going sideway.
-// The exclusion zone is given in pixels.
-void wxStyledTextCtrl::SetXCaretPolicy(int caretPolicy, int caretSlop) {
-    SendMsg(2402, caretPolicy, caretSlop);
-}
-
-// Set the way the line the caret is on is kept visible.
-// The exclusion zone is given in lines.
-void wxStyledTextCtrl::SetYCaretPolicy(int caretPolicy, int caretSlop) {
-    SendMsg(2403, caretPolicy, caretSlop);
-}
-
-// Set printing to line wrapped (SC_WRAP_WORD) or not line wrapped (SC_WRAP_NONE).
-void wxStyledTextCtrl::SetPrintWrapMode(int mode) {
-    SendMsg(2406, mode, 0);
-}
-
-// Is printing line wrapped?
-int wxStyledTextCtrl::GetPrintWrapMode() {
-    return SendMsg(2407, 0, 0);
-}
-
-// Set a fore colour for active hotspots.
-void wxStyledTextCtrl::SetHotspotActiveForeground(bool useSetting, const wxColour& fore) {
-    SendMsg(2410, useSetting, wxColourAsLong(fore));
-}
-
-// Set a back colour for active hotspots.
-void wxStyledTextCtrl::SetHotspotActiveBackground(bool useSetting, const wxColour& back) {
-    SendMsg(2411, useSetting, wxColourAsLong(back));
-}
-
-// Enable / Disable underlining active hotspots.
-void wxStyledTextCtrl::SetHotspotActiveUnderline(bool underline) {
-    SendMsg(2412, underline, 0);
-}
-
-// Limit hotspots to single line so hotspots on two lines don't merge.
-void wxStyledTextCtrl::SetHotspotSingleLine(bool singleLine) {
-    SendMsg(2421, singleLine, 0);
-}
-
-// Move caret between paragraphs (delimited by empty lines).
-void wxStyledTextCtrl::ParaDown() {
-    SendMsg(2413, 0, 0);
-}
-void wxStyledTextCtrl::ParaDownExtend() {
-    SendMsg(2414, 0, 0);
-}
-void wxStyledTextCtrl::ParaUp() {
-    SendMsg(2415, 0, 0);
-}
-void wxStyledTextCtrl::ParaUpExtend() {
-    SendMsg(2416, 0, 0);
-}
-
-// Given a valid document position, return the previous position taking code
-// page into account. Returns 0 if passed 0.
-int wxStyledTextCtrl::PositionBefore(int pos) {
-    return SendMsg(2417, pos, 0);
-}
-
-// Given a valid document position, return the next position taking code
-// page into account. Maximum value returned is the last position in the document.
-int wxStyledTextCtrl::PositionAfter(int pos) {
-    return SendMsg(2418, pos, 0);
-}
-
-// Copy a range of text to the clipboard. Positions are clipped into the document.
-void wxStyledTextCtrl::CopyRange(int start, int end) {
-    SendMsg(2419, start, end);
-}
-
-// Copy argument text to the clipboard.
-void wxStyledTextCtrl::CopyText(int length, const wxString& text) {
-    SendMsg(2420, length, (long)(const char*)wx2stc(text));
-}
-
-// Set the selection mode to stream (SC_SEL_STREAM) or rectangular (SC_SEL_RECTANGLE) or
-// by lines (SC_SEL_LINES).
-void wxStyledTextCtrl::SetSelectionMode(int mode) {
-    SendMsg(2422, mode, 0);
-}
-
-// Get the mode of the current selection.
-int wxStyledTextCtrl::GetSelectionMode() {
-    return SendMsg(2423, 0, 0);
-}
-
-// Retrieve the position of the start of the selection at the given line (INVALID_POSITION if no selection on this line).
-int wxStyledTextCtrl::GetLineSelStartPosition(int line) {
-    return SendMsg(2424, line, 0);
-}
-
-// Retrieve the position of the end of the selection at the given line (INVALID_POSITION if no selection on this line).
-int wxStyledTextCtrl::GetLineSelEndPosition(int line) {
-    return SendMsg(2425, line, 0);
-}
-
-// Move caret down one line, extending rectangular selection to new caret position.
-void wxStyledTextCtrl::LineDownRectExtend() {
-    SendMsg(2426, 0, 0);
-}
-
-// Move caret up one line, extending rectangular selection to new caret position.
-void wxStyledTextCtrl::LineUpRectExtend() {
-    SendMsg(2427, 0, 0);
-}
-
-// Move caret left one character, extending rectangular selection to new caret position.
-void wxStyledTextCtrl::CharLeftRectExtend() {
-    SendMsg(2428, 0, 0);
-}
-
-// Move caret right one character, extending rectangular selection to new caret position.
-void wxStyledTextCtrl::CharRightRectExtend() {
-    SendMsg(2429, 0, 0);
-}
-
-// Move caret to first position on line, extending rectangular selection to new caret position.
-void wxStyledTextCtrl::HomeRectExtend() {
-    SendMsg(2430, 0, 0);
-}
-
-// Move caret to before first visible character on line.
-// If already there move to first character on line.
-// In either case, extend rectangular selection to new caret position.
-void wxStyledTextCtrl::VCHomeRectExtend() {
-    SendMsg(2431, 0, 0);
-}
-
-// Move caret to last position on line, extending rectangular selection to new caret position.
-void wxStyledTextCtrl::LineEndRectExtend() {
-    SendMsg(2432, 0, 0);
-}
-
-// Move caret one page up, extending rectangular selection to new caret position.
-void wxStyledTextCtrl::PageUpRectExtend() {
-    SendMsg(2433, 0, 0);
-}
-
-// Move caret one page down, extending rectangular selection to new caret position.
-void wxStyledTextCtrl::PageDownRectExtend() {
-    SendMsg(2434, 0, 0);
-}
-
-// Move caret to top of page, or one page up if already at top of page.
-void wxStyledTextCtrl::StutteredPageUp() {
-    SendMsg(2435, 0, 0);
-}
-
-// Move caret to top of page, or one page up if already at top of page, extending selection to new caret position.
-void wxStyledTextCtrl::StutteredPageUpExtend() {
-    SendMsg(2436, 0, 0);
-}
-
-// Move caret to bottom of page, or one page down if already at bottom of page.
-void wxStyledTextCtrl::StutteredPageDown() {
-    SendMsg(2437, 0, 0);
-}
-
-// Move caret to bottom of page, or one page down if already at bottom of page, extending selection to new caret position.
-void wxStyledTextCtrl::StutteredPageDownExtend() {
-    SendMsg(2438, 0, 0);
-}
-
-// Move caret left one word, position cursor at end of word.
-void wxStyledTextCtrl::WordLeftEnd() {
-    SendMsg(2439, 0, 0);
-}
-
-// Move caret left one word, position cursor at end of word, extending selection to new caret position.
-void wxStyledTextCtrl::WordLeftEndExtend() {
-    SendMsg(2440, 0, 0);
-}
-
-// Move caret right one word, position cursor at end of word.
-void wxStyledTextCtrl::WordRightEnd() {
-    SendMsg(2441, 0, 0);
-}
-
-// Move caret right one word, position cursor at end of word, extending selection to new caret position.
-void wxStyledTextCtrl::WordRightEndExtend() {
-    SendMsg(2442, 0, 0);
-}
-
-// Set the set of characters making up whitespace for when moving or selecting by word.
-// Should be called after SetWordChars.
-void wxStyledTextCtrl::SetWhitespaceChars(const wxString& characters) {
-    SendMsg(2443, 0, (long)(const char*)wx2stc(characters));
-}
-
-// Reset the set of characters for whitespace and word characters to the defaults.
-void wxStyledTextCtrl::SetCharsDefault() {
-    SendMsg(2444, 0, 0);
-}
-
-// Get currently selected item position in the auto-completion list
-int wxStyledTextCtrl::AutoCompGetCurrent() {
-    return SendMsg(2445, 0, 0);
-}
-
-// Enlarge the document to a particular size of text bytes.
-void wxStyledTextCtrl::Allocate(int bytes) {
-    SendMsg(2446, bytes, 0);
-}
-
-// Find the position of a column on a line taking into account tabs and
-// multi-byte characters. If beyond end of line, return line end position.
-int wxStyledTextCtrl::FindColumn(int line, int column) {
-    return SendMsg(2456, line, column);
-}
-
-// Can the caret preferred x position only be changed by explicit movement commands?
-bool wxStyledTextCtrl::GetCaretSticky() {
-    return SendMsg(2457, 0, 0) != 0;
-}
-
-// Stop the caret preferred x position changing when the user types.
-void wxStyledTextCtrl::SetCaretSticky(bool useCaretStickyBehaviour) {
-    SendMsg(2458, useCaretStickyBehaviour, 0);
-}
-
-// Switch between sticky and non-sticky: meant to be bound to a key.
-void wxStyledTextCtrl::ToggleCaretSticky() {
-    SendMsg(2459, 0, 0);
-}
-
-// Enable/Disable convert-on-paste for line endings
-void wxStyledTextCtrl::SetPasteConvertEndings(bool convert) {
-    SendMsg(2467, convert, 0);
-}
-
-// Get convert-on-paste setting
-bool wxStyledTextCtrl::GetPasteConvertEndings() {
-    return SendMsg(2468, 0, 0) != 0;
-}
-
-// Duplicate the selection. If selection empty duplicate the line containing the caret.
-void wxStyledTextCtrl::SelectionDuplicate() {
-    SendMsg(2469, 0, 0);
-}
-
-// Set background alpha of the caret line.
-void wxStyledTextCtrl::SetCaretLineBackAlpha(int alpha) {
-    SendMsg(2470, alpha, 0);
-}
-
-// Get the background alpha of the caret line.
-int wxStyledTextCtrl::GetCaretLineBackAlpha() {
-    return SendMsg(2471, 0, 0);
-}
-
-// Start notifying the container of all key presses and commands.
-void wxStyledTextCtrl::StartRecord() {
-    SendMsg(3001, 0, 0);
-}
-
-// Stop notifying the container of all key presses and commands.
-void wxStyledTextCtrl::StopRecord() {
-    SendMsg(3002, 0, 0);
-}
-
-// Set the lexing language of the document.
-void wxStyledTextCtrl::SetLexer(int lexer) {
-    SendMsg(4001, lexer, 0);
-}
-
-// Retrieve the lexing language of the document.
-int wxStyledTextCtrl::GetLexer() {
-    return SendMsg(4002, 0, 0);
-}
-
-// Colourise a segment of the document using the current lexing language.
-void wxStyledTextCtrl::Colourise(int start, int end) {
-    SendMsg(4003, start, end);
-}
-
-// Set up a value that may be used by a lexer for some optional feature.
-void wxStyledTextCtrl::SetProperty(const wxString& key, const wxString& value) {
-    SendMsg(4004, (long)(const char*)wx2stc(key), (long)(const char*)wx2stc(value));
-}
-
-// Set up the key words used by the lexer.
-void wxStyledTextCtrl::SetKeyWords(int keywordSet, const wxString& keyWords) {
-    SendMsg(4005, keywordSet, (long)(const char*)wx2stc(keyWords));
-}
-
-// Set the lexing language of the document based on string name.
-void wxStyledTextCtrl::SetLexerLanguage(const wxString& language) {
-    SendMsg(4006, 0, (long)(const char*)wx2stc(language));
-}
-
-// Retrieve a 'property' value previously set with SetProperty.
-wxString wxStyledTextCtrl::GetProperty(const wxString& key) {
-         int len = SendMsg(SCI_GETPROPERTY, (long)(const char*)wx2stc(key), (long)NULL);
-         if (!len) return wxEmptyString;
-
-         wxMemoryBuffer mbuf(len+1);
-         char* buf = (char*)mbuf.GetWriteBuf(len+1);
-         SendMsg(4008, (long)(const char*)wx2stc(key), (long)buf);
-         mbuf.UngetWriteBuf(len);
-         mbuf.AppendByte(0);
-         return stc2wx(buf);
-}
-
-// Retrieve a 'property' value previously set with SetProperty,
-// with '$()' variable replacement on returned buffer.
-wxString wxStyledTextCtrl::GetPropertyExpanded(const wxString& key) {
-         int len = SendMsg(SCI_GETPROPERTYEXPANDED, (long)(const char*)wx2stc(key), (long)NULL);
-         if (!len) return wxEmptyString;
-
-         wxMemoryBuffer mbuf(len+1);
-         char* buf = (char*)mbuf.GetWriteBuf(len+1);
-         SendMsg(4009, (long)(const char*)wx2stc(key), (long)buf);
-         mbuf.UngetWriteBuf(len);
-         mbuf.AppendByte(0);
-         return stc2wx(buf);
-}
-
-// Retrieve a 'property' value previously set with SetProperty,
-// interpreted as an int AFTER any '$()' variable replacement.
-int wxStyledTextCtrl::GetPropertyInt(const wxString& key) {
-    return SendMsg(4010, (long)(const char*)wx2stc(key), 0);
-}
-
-// Retrieve the number of bits the current lexer needs for styling.
-int wxStyledTextCtrl::GetStyleBitsNeeded() {
-    return SendMsg(4011, 0, 0);
-}
-
-// 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:[name or #RRGGBB]  sets the foreground colour
-//      back:[name or #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, wxT(","));
-    while (tkz.HasMoreTokens()) {
-        wxString token = tkz.GetNextToken();
-
-        wxString option = token.BeforeFirst(':');
-        wxString val = token.AfterFirst(':');
-
-        if (option == wxT("bold"))
-            StyleSetBold(styleNum, true);
-
-        else if (option == wxT("italic"))
-            StyleSetItalic(styleNum, true);
-
-        else if (option == wxT("underline"))
-            StyleSetUnderline(styleNum, true);
-
-        else if (option == wxT("eol"))
-            StyleSetEOLFilled(styleNum, true);
-
-        else if (option == wxT("size")) {
-            long points;
-            if (val.ToLong(&points))
-                StyleSetSize(styleNum, points);
-        }
-
-        else if (option == wxT("face"))
-            StyleSetFaceName(styleNum, val);
-
-        else if (option == wxT("fore"))
-            StyleSetForeground(styleNum, wxColourFromSpec(val));
-
-        else if (option == wxT("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) {
-#ifdef __WXGTK__
-    // Ensure that the native font is initialized
-    int x, y;
-    GetTextExtent(wxT("X"), &x, &y, NULL, NULL, &font);
-#endif
-    int            size     = font.GetPointSize();
-    wxString       faceName = font.GetFaceName();
-    bool           bold     = font.GetWeight() == wxBOLD;
-    bool           italic   = font.GetStyle() != wxNORMAL;
-    bool           under    = font.GetUnderlined();
-    wxFontEncoding encoding = font.GetEncoding();
-    
-    StyleSetFontAttr(styleNum, size, faceName, bold, italic, under, encoding);
-}
-
-// Set all font style attributes at once.
-void wxStyledTextCtrl::StyleSetFontAttr(int styleNum, int size,
-                                        const wxString& faceName,
-                                        bool bold, bool italic,
-                                        bool underline,
-                                        wxFontEncoding encoding) {
-    StyleSetSize(styleNum, size);
-    StyleSetFaceName(styleNum, faceName);
-    StyleSetBold(styleNum, bold);
-    StyleSetItalic(styleNum, italic);
-    StyleSetUnderline(styleNum, underline);
-    StyleSetFontEncoding(styleNum, encoding);
-}
-
-
-// Set the character set of the font in a style.  Converts the Scintilla
-// character set values to a wxFontEncoding.
-void wxStyledTextCtrl::StyleSetCharacterSet(int style, int characterSet)
-{
-    wxFontEncoding encoding;
-
-    // Translate the Scintilla characterSet to a wxFontEncoding
-    switch (characterSet) {
-        default:
-        case wxSTC_CHARSET_ANSI:
-        case wxSTC_CHARSET_DEFAULT:
-            encoding = wxFONTENCODING_DEFAULT;
-            break;
-
-        case wxSTC_CHARSET_BALTIC:
-            encoding = wxFONTENCODING_ISO8859_13;
-            break;
-
-        case wxSTC_CHARSET_CHINESEBIG5:
-            encoding = wxFONTENCODING_CP950;
-            break;
-
-        case wxSTC_CHARSET_EASTEUROPE:
-            encoding = wxFONTENCODING_ISO8859_2;
-            break;
-
-        case wxSTC_CHARSET_GB2312:
-            encoding = wxFONTENCODING_CP936;
-            break;
-
-        case wxSTC_CHARSET_GREEK:
-            encoding = wxFONTENCODING_ISO8859_7;
-            break;
-
-        case wxSTC_CHARSET_HANGUL:
-            encoding = wxFONTENCODING_CP949;
-            break;
-
-        case wxSTC_CHARSET_MAC:
-            encoding = wxFONTENCODING_DEFAULT;
-            break;
-
-        case wxSTC_CHARSET_OEM:
-            encoding = wxFONTENCODING_DEFAULT;
-            break;
-
-        case wxSTC_CHARSET_RUSSIAN:
-            encoding = wxFONTENCODING_KOI8;
-            break;
-
-        case wxSTC_CHARSET_SHIFTJIS:
-            encoding = wxFONTENCODING_CP932;
-            break;
-
-        case wxSTC_CHARSET_SYMBOL:
-            encoding = wxFONTENCODING_DEFAULT;
-            break;
-
-        case wxSTC_CHARSET_TURKISH:
-            encoding = wxFONTENCODING_ISO8859_9;
-            break;
-
-        case wxSTC_CHARSET_JOHAB:
-            encoding = wxFONTENCODING_DEFAULT;
-            break;
-
-        case wxSTC_CHARSET_HEBREW:
-            encoding = wxFONTENCODING_ISO8859_8;
-            break;
-
-        case wxSTC_CHARSET_ARABIC:
-            encoding = wxFONTENCODING_ISO8859_6;
-            break;
-
-        case wxSTC_CHARSET_VIETNAMESE:
-            encoding = wxFONTENCODING_DEFAULT;
-            break;
-
-        case wxSTC_CHARSET_THAI:
-            encoding = wxFONTENCODING_ISO8859_11;
-            break;
-
-        case wxSTC_CHARSET_CYRILLIC:
-            encoding = wxFONTENCODING_ISO8859_5;
-            break;
-                
-        case wxSTC_CHARSET_8859_15:
-            encoding = wxFONTENCODING_ISO8859_15;;
-            break;
-    }
-
-    // We just have Scintilla track the wxFontEncoding for us.  It gets used
-    // in Font::Create in PlatWX.cpp.  We add one to the value so that the
-    // effective wxFONENCODING_DEFAULT == SC_SHARSET_DEFAULT and so when
-    // Scintilla internally uses SC_CHARSET_DEFAULT we will translate it back
-    // to wxFONENCODING_DEFAULT in Font::Create.
-    SendMsg(SCI_STYLESETCHARACTERSET, style, encoding+1);
-}
-
-
-// Set the font encoding to be used by a style.
-void wxStyledTextCtrl::StyleSetFontEncoding(int style, wxFontEncoding encoding)
-{
-    SendMsg(SCI_STYLESETCHARACTERSET, style, encoding+1);
-}
-
-
-// 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);
-}
-
-
-bool wxStyledTextCtrl::SaveFile(const wxString& filename)
-{
-    wxFile file(filename, wxFile::write);
-
-    if (!file.IsOpened())
-        return false;
-
-    bool success = file.Write(GetText(), *wxConvCurrent);
-
-    if (success)
-        SetSavePoint();
-
-    return success;
-}
-
-bool wxStyledTextCtrl::LoadFile(const wxString& filename)
-{
-    bool success = false;
-    wxFile file(filename, wxFile::read);
-
-    if (file.IsOpened())
-    {
-        wxString contents;
-        // get the file size (assume it is not huge file...)
-        ssize_t len = (ssize_t)file.Length();
-
-        if (len > 0)
-        {
-#if wxUSE_UNICODE
-            wxMemoryBuffer buffer(len+1);
-            success = (file.Read(buffer.GetData(), len) == len);
-            if (success) {
-                ((char*)buffer.GetData())[len] = 0;
-                contents = wxString(buffer, *wxConvCurrent, len);
-            }
-#else
-            wxString buffer;
-            success = (file.Read(wxStringBuffer(buffer, len), len) == len);
-            contents = buffer;
-#endif
-        }
-        else
-        {
-            if (len == 0)
-                success = true;  // empty file is ok
-            else
-                success = false; // len == wxInvalidOffset
-        }
-
-        if (success)
-        {
-            SetText(contents);
-            EmptyUndoBuffer();
-            SetSavePoint();
-        }
-    }
-
-    return success;
-}
-
-
-#if wxUSE_DRAG_AND_DROP
-wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) {
-        return m_swx->DoDragOver(x, y, def);
-}
-
-
-bool wxStyledTextCtrl::DoDropText(long x, long y, const wxString& data) {
-    return m_swx->DoDropText(x, y, data);
-}
-#endif
-
-
-void wxStyledTextCtrl::SetUseAntiAliasing(bool useAA) {
-    m_swx->SetUseAntiAliasing(useAA);
-}
-
-bool wxStyledTextCtrl::GetUseAntiAliasing() {
-    return m_swx->GetUseAntiAliasing();
-}
-
-
-
-
-
-void wxStyledTextCtrl::AddTextRaw(const char* text)
-{
-    SendMsg(SCI_ADDTEXT, strlen(text), (long)text);
-}
-
-void wxStyledTextCtrl::InsertTextRaw(int pos, const char* text)
-{
-    SendMsg(SCI_INSERTTEXT, pos, (long)text);
-}
-
-wxCharBuffer wxStyledTextCtrl::GetCurLineRaw(int* linePos)
-{
-    int len = LineLength(GetCurrentLine());
-    if (!len) {
-        if (linePos)  *linePos = 0;
-        wxCharBuffer empty;
-        return empty;
-    }
-
-    wxCharBuffer buf(len);
-    int pos = SendMsg(SCI_GETCURLINE, len, (long)buf.data());
-    if (linePos)  *linePos = pos;
-    return buf;
-}
-
-wxCharBuffer wxStyledTextCtrl::GetLineRaw(int line)
-{
-    int len = LineLength(line);
-    if (!len) {
-        wxCharBuffer empty;
-        return empty;
-    }
-
-    wxCharBuffer buf(len);
-    SendMsg(SCI_GETLINE, line, (long)buf.data());
-    return buf;
-}
-
-wxCharBuffer wxStyledTextCtrl::GetSelectedTextRaw()
-{
-    int   start;
-    int   end;
-
-    GetSelection(&start, &end);
-    int   len  = end - start;
-    if (!len) {
-        wxCharBuffer empty;
-        return empty;
-    }        
-
-    wxCharBuffer buf(len);
-    SendMsg(SCI_GETSELTEXT, 0, (long)buf.data());
-    return buf;
-}
-
-wxCharBuffer wxStyledTextCtrl::GetTextRangeRaw(int startPos, int endPos)
-{
-    if (endPos < startPos) {
-        int temp = startPos;
-        startPos = endPos;
-        endPos = temp;
-    }
-    int len  = endPos - startPos;
-    if (!len) {
-        wxCharBuffer empty;
-        return empty;
-    }        
-
-    wxCharBuffer buf(len);
-    TextRange tr;
-    tr.lpstrText = buf.data();
-    tr.chrg.cpMin = startPos;
-    tr.chrg.cpMax = endPos;
-    SendMsg(SCI_GETTEXTRANGE, 0, (long)&tr);
-    return buf;
-}
-
-void wxStyledTextCtrl::SetTextRaw(const char* text)
-{
-    SendMsg(SCI_SETTEXT, 0, (long)text);
-}
-
-wxCharBuffer wxStyledTextCtrl::GetTextRaw()
-{
-    int len  = GetTextLength();
-    wxCharBuffer buf(len);
-    SendMsg(SCI_GETTEXT, len, (long)buf.data());
-    return buf;
-}
-
-void wxStyledTextCtrl::AppendTextRaw(const char* text)
-{
-    SendMsg(SCI_APPENDTEXT, strlen(text), (long)text);
-}
-
-
-
-
-
-//----------------------------------------------------------------------
-// Event handlers
-
-void wxStyledTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(evt)) {
-    wxPaintDC dc(this);
-    m_swx->DoPaint(&dc, GetUpdateRegion().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::OnScroll(wxScrollEvent& evt) {
-    wxScrollBar* sb = wxDynamicCast(evt.GetEventObject(), wxScrollBar);
-    if (sb) {
-        if (sb->IsVertical())
-            m_swx->DoVScroll(evt.GetEventType(), evt.GetPosition());
-        else
-            m_swx->DoHScroll(evt.GetEventType(), evt.GetPosition());
-    }
-}
-
-void wxStyledTextCtrl::OnSize(wxSizeEvent& WXUNUSED(evt)) {
-    if (m_swx) {
-        wxSize sz = GetClientSize();
-        m_swx->DoSize(sz.x, sz.y);
-    }
-}
-
-void wxStyledTextCtrl::OnMouseLeftDown(wxMouseEvent& evt) {
-    SetFocus();
-    wxPoint pt = evt.GetPosition();
-    m_swx->DoLeftButtonDown(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->DoLeftButtonMove(Point(pt.x, pt.y));
-}
-
-void wxStyledTextCtrl::OnMouseLeftUp(wxMouseEvent& evt) {
-    wxPoint pt = evt.GetPosition();
-    m_swx->DoLeftButtonUp(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::OnMouseMiddleUp(wxMouseEvent& evt) {
-    wxPoint pt = evt.GetPosition();
-    m_swx->DoMiddleButtonUp(Point(pt.x, pt.y));
-}
-
-void wxStyledTextCtrl::OnContextMenu(wxContextMenuEvent& evt) {
-    wxPoint pt = evt.GetPosition();
-    ScreenToClient(&pt.x, &pt.y);
-    /*
-      Show context menu at event point if it's within the window,
-      or at caret location if not
-    */
-    wxHitTest ht = this->HitTest(pt);
-    if (ht != wxHT_WINDOW_INSIDE) {
-        pt = this->PointFromPosition(this->GetCurrentPos());
-    }
-    m_swx->DoContextMenu(Point(pt.x, pt.y));
-}
-
-
-void wxStyledTextCtrl::OnMouseWheel(wxMouseEvent& evt) {
-    m_swx->DoMouseWheel(evt.GetWheelRotation(),
-                        evt.GetWheelDelta(),
-                        evt.GetLinesPerAction(),
-                        evt.ControlDown(),
-                        evt.IsPageScroll());
-}
-
-
-void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
-    // On (some?) non-US PC keyboards the AltGr key is required to enter some
-    // common characters.  It comes to us as both Alt and Ctrl down so we need
-    // to let the char through in that case, otherwise if only ctrl or only
-    // alt let's skip it.
-    bool ctrl = evt.ControlDown();
-#ifdef __WXMAC__
-    // On the Mac the Alt key is just a modifier key (like Shift) so we need
-    // to allow the char events to be processed when Alt is pressed.
-    // TODO:  Should we check MetaDown instead in this case?
-    bool alt = false;
-#else
-    bool alt  = evt.AltDown();
-#endif
-    bool skip = ((ctrl || alt) && ! (ctrl && alt));
-
-    if (!m_lastKeyDownConsumed && !skip) {
-#if wxUSE_UNICODE
-        int key = evt.GetUnicodeKey();
-        bool keyOk = true;
-
-        // if the unicode key code is not really a unicode character (it may
-        // be a function key or etc., the platforms appear to always give us a
-        // small value in this case) then fallback to the ascii key code but
-        // don't do anything for function keys or etc.
-        if (key <= 127) {
-            key = evt.GetKeyCode();
-            keyOk = (key <= 127);
-        }
-        if (keyOk) {
-            m_swx->DoAddChar(key);
-            return;
-        }
-#else
-        int key = evt.GetKeyCode();
-        if (key <= WXK_START || key > WXK_COMMAND) {
-            m_swx->DoAddChar(key);
-            return;
-        }
-#endif
-    }
-    
-    evt.Skip();
-}
-
-
-void wxStyledTextCtrl::OnKeyDown(wxKeyEvent& evt) {
-    int processed = m_swx->DoKeyDown(evt, &m_lastKeyDownConsumed);
-    if (!processed && !m_lastKeyDownConsumed)
-        evt.Skip();
-}
-
-
-void wxStyledTextCtrl::OnLoseFocus(wxFocusEvent& evt) {
-    m_swx->DoLoseFocus();
-    evt.Skip();
-}
-
-
-void wxStyledTextCtrl::OnGainFocus(wxFocusEvent& evt) {
-    m_swx->DoGainFocus();
-    evt.Skip();
-}
-
-
-void wxStyledTextCtrl::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(evt)) {
-    m_swx->DoSysColourChange();
-}
-
-
-void wxStyledTextCtrl::OnEraseBackground(wxEraseEvent& WXUNUSED(evt)) {
-    // do nothing to help avoid flashing
-}
-
-
-
-void wxStyledTextCtrl::OnMenu(wxCommandEvent& evt) {
-    m_swx->DoCommand(evt.GetId());
-}
-
-
-void wxStyledTextCtrl::OnListBox(wxCommandEvent& WXUNUSED(evt)) {
-    m_swx->DoOnListBox();
-}
-
-
-void wxStyledTextCtrl::OnIdle(wxIdleEvent& evt) {
-    m_swx->DoOnIdle(evt);
-}
-
-
-wxSize wxStyledTextCtrl::DoGetBestSize() const
-{
-    // What would be the best size for a wxSTC?
-    // Just give a reasonable minimum until something else can be figured out.
-    return wxSize(200,100);
-}
-
-
-//----------------------------------------------------------------------
-// Turn notifications from Scintilla into events
-
-
-void wxStyledTextCtrl::NotifyChange() {
-    wxStyledTextEvent evt(wxEVT_STC_CHANGE, GetId());
-    evt.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(evt);
-}
-
-
-static void SetEventText(wxStyledTextEvent& evt, const char* text,
-                         size_t length) {
-    if(!text) return;
-
-    evt.SetText(stc2wx(text, length));
-}
-
-
-void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
-    SCNotification& scn = *_scn;
-    wxStyledTextEvent evt(0, GetId());
-
-    evt.SetEventObject(this);
-    evt.SetPosition(scn.position);
-    evt.SetKey(scn.ch);
-    evt.SetModifiers(scn.modifiers);
-
-    switch (scn.nmhdr.code) {
-    case SCN_STYLENEEDED:
-        evt.SetEventType(wxEVT_STC_STYLENEEDED);
-        break;
-
-    case SCN_CHARADDED:
-        evt.SetEventType(wxEVT_STC_CHARADDED);
-        break;
-
-    case SCN_SAVEPOINTREACHED:
-        evt.SetEventType(wxEVT_STC_SAVEPOINTREACHED);
-        break;
-
-    case SCN_SAVEPOINTLEFT:
-        evt.SetEventType(wxEVT_STC_SAVEPOINTLEFT);
-        break;
-
-    case SCN_MODIFYATTEMPTRO:
-        evt.SetEventType(wxEVT_STC_ROMODIFYATTEMPT);
-        break;
-
-    case SCN_KEY:
-        evt.SetEventType(wxEVT_STC_KEY);
-        break;
-
-    case SCN_DOUBLECLICK:
-        evt.SetEventType(wxEVT_STC_DOUBLECLICK);
-        break;
-
-    case SCN_UPDATEUI:
-        evt.SetEventType(wxEVT_STC_UPDATEUI);
-        break;
-
-    case SCN_MODIFIED:
-        evt.SetEventType(wxEVT_STC_MODIFIED);
-        evt.SetModificationType(scn.modificationType);
-        SetEventText(evt, scn.text, scn.length);
-        evt.SetLength(scn.length);
-        evt.SetLinesAdded(scn.linesAdded);
-        evt.SetLine(scn.line);
-        evt.SetFoldLevelNow(scn.foldLevelNow);
-        evt.SetFoldLevelPrev(scn.foldLevelPrev);
-        break;
-
-    case SCN_MACRORECORD:
-        evt.SetEventType(wxEVT_STC_MACRORECORD);
-        evt.SetMessage(scn.message);
-        evt.SetWParam(scn.wParam);
-        evt.SetLParam(scn.lParam);
-        break;
-
-    case SCN_MARGINCLICK:
-        evt.SetEventType(wxEVT_STC_MARGINCLICK);
-        evt.SetMargin(scn.margin);
-        break;
-
-    case SCN_NEEDSHOWN:
-        evt.SetEventType(wxEVT_STC_NEEDSHOWN);
-        evt.SetLength(scn.length);
-        break;
-
-    case SCN_PAINTED:
-        evt.SetEventType(wxEVT_STC_PAINTED);
-        break;
-
-    case SCN_USERLISTSELECTION:
-        evt.SetEventType(wxEVT_STC_USERLISTSELECTION);
-        evt.SetListType(scn.listType);
-        SetEventText(evt, scn.text, strlen(scn.text));
-        break;
-
-    case SCN_URIDROPPED:
-        evt.SetEventType(wxEVT_STC_URIDROPPED);
-        SetEventText(evt, scn.text, strlen(scn.text));
-        break;
-
-    case SCN_DWELLSTART:
-        evt.SetEventType(wxEVT_STC_DWELLSTART);
-        evt.SetX(scn.x);
-        evt.SetY(scn.y);
-        break;
-
-    case SCN_DWELLEND:
-        evt.SetEventType(wxEVT_STC_DWELLEND);
-        evt.SetX(scn.x);
-        evt.SetY(scn.y);
-        break;
-
-    case SCN_ZOOM:
-        evt.SetEventType(wxEVT_STC_ZOOM);
-        break;
-
-    case SCN_HOTSPOTCLICK:
-        evt.SetEventType(wxEVT_STC_HOTSPOT_CLICK);
-        break;
-
-    case SCN_HOTSPOTDOUBLECLICK:
-        evt.SetEventType(wxEVT_STC_HOTSPOT_DCLICK);
-        break;
-
-    case SCN_CALLTIPCLICK:
-        evt.SetEventType(wxEVT_STC_CALLTIP_CLICK);
-        break;
-
-    case SCN_AUTOCSELECTION:
-        evt.SetEventType(wxEVT_STC_AUTOCOMP_SELECTION);
-        break;
-        
-    default:
-        return;
-    }
-
-    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;
-    m_listType = 0;
-    m_x = 0;
-    m_y = 0;
-    m_dragAllowMove = false;
-#if wxUSE_DRAG_AND_DROP
-    m_dragResult = wxDragNone;
-#endif
-}
-
-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; }
-
-
-wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
-  wxCommandEvent(event)
-{
-    m_position =      event.m_position;
-    m_key =           event.m_key;
-    m_modifiers =     event.m_modifiers;
-    m_modificationType = event.m_modificationType;
-    m_text =          event.m_text;
-    m_length =        event.m_length;
-    m_linesAdded =    event.m_linesAdded;
-    m_line =          event.m_line;
-    m_foldLevelNow =  event.m_foldLevelNow;
-    m_foldLevelPrev = event.m_foldLevelPrev;
-
-    m_margin =        event.m_margin;
-
-    m_message =       event.m_message;
-    m_wParam =        event.m_wParam;
-    m_lParam =        event.m_lParam;
-
-    m_listType =     event.m_listType;
-    m_x =            event.m_x;
-    m_y =            event.m_y;
-
-    m_dragText =     event.m_dragText;
-    m_dragAllowMove =event.m_dragAllowMove;
-#if wxUSE_DRAG_AND_DROP
-    m_dragResult =   event.m_dragResult;
-#endif
-}
-
-//----------------------------------------------------------------------
-//----------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
deleted file mode 100644
index d1a1701a53..0000000000
--- a/src/stc/stc.cpp.in
+++ /dev/null
@@ -1,1061 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Name:        stc.cpp
-// Purpose:     A wxWidgets 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/wx.h"
-#include "wx/tokenzr.h"
-#include "wx/mstream.h"
-#include "wx/image.h"
-#include "wx/file.h"
-
-#include "wx/stc/stc.h"
-#include "ScintillaWX.h"
-
-//----------------------------------------------------------------------
-
-const wxChar* wxSTCNameStr = wxT("stcwindow");
-
-#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((unsigned char)(c & 0xff),
-            (unsigned char)((c >> 8) & 0xff),
-            (unsigned char)((c >> 16) & 0xff));
-    return clr;
-}
-
-
-static wxColour wxColourFromSpec(const wxString& spec) {
-    // spec should be a colour name or "#RRGGBB"
-    if (spec.GetChar(0) == wxT('#')) {
-
-        long red, green, blue;
-        red = green = blue = 0;
-        spec.Mid(1,2).ToLong(&red,   16);
-        spec.Mid(3,2).ToLong(&green, 16);
-        spec.Mid(5,2).ToLong(&blue,  16);
-        return wxColour((unsigned char)red,
-                        (unsigned char)green,
-                        (unsigned char)blue);
-    }
-    else
-        return wxColour(spec);
-}
-
-//----------------------------------------------------------------------
-
-DEFINE_EVENT_TYPE( wxEVT_STC_CHANGE )
-DEFINE_EVENT_TYPE( wxEVT_STC_STYLENEEDED )
-DEFINE_EVENT_TYPE( wxEVT_STC_CHARADDED )
-DEFINE_EVENT_TYPE( wxEVT_STC_SAVEPOINTREACHED )
-DEFINE_EVENT_TYPE( wxEVT_STC_SAVEPOINTLEFT )
-DEFINE_EVENT_TYPE( wxEVT_STC_ROMODIFYATTEMPT )
-DEFINE_EVENT_TYPE( wxEVT_STC_KEY )
-DEFINE_EVENT_TYPE( wxEVT_STC_DOUBLECLICK )
-DEFINE_EVENT_TYPE( wxEVT_STC_UPDATEUI )
-DEFINE_EVENT_TYPE( wxEVT_STC_MODIFIED )
-DEFINE_EVENT_TYPE( wxEVT_STC_MACRORECORD )
-DEFINE_EVENT_TYPE( wxEVT_STC_MARGINCLICK )
-DEFINE_EVENT_TYPE( wxEVT_STC_NEEDSHOWN )
-DEFINE_EVENT_TYPE( wxEVT_STC_PAINTED )
-DEFINE_EVENT_TYPE( wxEVT_STC_USERLISTSELECTION )
-DEFINE_EVENT_TYPE( wxEVT_STC_URIDROPPED )
-DEFINE_EVENT_TYPE( wxEVT_STC_DWELLSTART )
-DEFINE_EVENT_TYPE( wxEVT_STC_DWELLEND )
-DEFINE_EVENT_TYPE( wxEVT_STC_START_DRAG )
-DEFINE_EVENT_TYPE( wxEVT_STC_DRAG_OVER )
-DEFINE_EVENT_TYPE( wxEVT_STC_DO_DROP )
-DEFINE_EVENT_TYPE( wxEVT_STC_ZOOM )
-DEFINE_EVENT_TYPE( wxEVT_STC_HOTSPOT_CLICK )
-DEFINE_EVENT_TYPE( wxEVT_STC_HOTSPOT_DCLICK )
-DEFINE_EVENT_TYPE( wxEVT_STC_CALLTIP_CLICK )
-DEFINE_EVENT_TYPE( wxEVT_STC_AUTOCOMP_SELECTION )    
-
-
-
-BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
-    EVT_PAINT                   (wxStyledTextCtrl::OnPaint)
-    EVT_SCROLLWIN               (wxStyledTextCtrl::OnScrollWin)
-    EVT_SCROLL                  (wxStyledTextCtrl::OnScroll)
-    EVT_SIZE                    (wxStyledTextCtrl::OnSize)
-    EVT_LEFT_DOWN               (wxStyledTextCtrl::OnMouseLeftDown)
-    // Let Scintilla see the double click as a second click
-    EVT_LEFT_DCLICK             (wxStyledTextCtrl::OnMouseLeftDown)
-    EVT_MOTION                  (wxStyledTextCtrl::OnMouseMove)
-    EVT_LEFT_UP                 (wxStyledTextCtrl::OnMouseLeftUp)
-#if defined(__WXGTK__) || defined(__WXMAC__)
-    EVT_RIGHT_UP                (wxStyledTextCtrl::OnMouseRightUp)
-#else
-    EVT_CONTEXT_MENU            (wxStyledTextCtrl::OnContextMenu)
-#endif
-    EVT_MOUSEWHEEL              (wxStyledTextCtrl::OnMouseWheel)
-    EVT_MIDDLE_UP               (wxStyledTextCtrl::OnMouseMiddleUp)
-    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              (10, 16, wxStyledTextCtrl::OnMenu)
-    EVT_LISTBOX_DCLICK          (wxID_ANY, wxStyledTextCtrl::OnListBox)
-END_EVENT_TABLE()
-
-
-IMPLEMENT_CLASS(wxStyledTextCtrl, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxStyledTextEvent, wxCommandEvent)
-
-#ifdef LINK_LEXERS
-// forces the linking of the lexer modules
-int Scintilla_LinkLexers();
-#endif
-
-//----------------------------------------------------------------------
-// Constructor and Destructor
-
-wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
-                                   wxWindowID id,
-                                   const wxPoint& pos,
-                                   const wxSize& size,
-                                   long style,
-                                   const wxString& name)
-{
-    m_swx = NULL;
-    Create(parent, id, pos, size, style, name);
-}
-
-
-bool wxStyledTextCtrl::Create(wxWindow *parent,
-                              wxWindowID id,
-                              const wxPoint& pos,
-                              const wxSize& size,
-                              long style,
-                              const wxString& name)
-{
-#ifdef __WXMAC__
-    style |= wxVSCROLL | wxHSCROLL;
-#endif
-    if (!wxControl::Create(parent, id, pos, size,
-                           style | wxWANTS_CHARS | wxCLIP_CHILDREN,
-                           wxDefaultValidator, name))
-        return false;
-
-#ifdef LINK_LEXERS
-    Scintilla_LinkLexers();
-#endif
-    m_swx = new ScintillaWX(this);
-    m_stopWatch.Start();
-    m_lastKeyDownConsumed = false;
-    m_vScrollBar = NULL;
-    m_hScrollBar = NULL;
-#if wxUSE_UNICODE
-    // Put Scintilla into unicode (UTF-8) mode
-    SetCodePage(wxSTC_CP_UTF8);
-#endif
-
-    SetInitialSize(size);
-
-    // Reduces flicker on GTK+/X11
-    SetBackgroundStyle(wxBG_STYLE_CUSTOM);
-    return true;
-}
-
-
-wxStyledTextCtrl::~wxStyledTextCtrl() {
-    delete m_swx;
-}
-
-
-//----------------------------------------------------------------------
-
-long wxStyledTextCtrl::SendMsg(int msg, long wp, long lp) {
-
-    return m_swx->WndProc(msg, wp, lp);
-}
-
-//----------------------------------------------------------------------
-
-// Set the vertical scrollbar to use instead of the ont that's built-in.
-void wxStyledTextCtrl::SetVScrollBar(wxScrollBar* bar)  {
-    m_vScrollBar = bar;
-    if (bar != NULL) {
-        // ensure that the built-in scrollbar is not visible
-        SetScrollbar(wxVERTICAL, 0, 0, 0);
-    }
-}
-
-
-// Set the horizontal scrollbar to use instead of the ont that's built-in.
-void wxStyledTextCtrl::SetHScrollBar(wxScrollBar* bar)  {
-    m_hScrollBar = bar;
-    if (bar != NULL) {
-        // ensure that the built-in scrollbar is not visible
-        SetScrollbar(wxHORIZONTAL, 0, 0, 0);
-    }
-}
-
-//----------------------------------------------------------------------
-// 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:[name or #RRGGBB]  sets the foreground colour
-//      back:[name or #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, wxT(","));
-    while (tkz.HasMoreTokens()) {
-        wxString token = tkz.GetNextToken();
-
-        wxString option = token.BeforeFirst(':');
-        wxString val = token.AfterFirst(':');
-
-        if (option == wxT("bold"))
-            StyleSetBold(styleNum, true);
-
-        else if (option == wxT("italic"))
-            StyleSetItalic(styleNum, true);
-
-        else if (option == wxT("underline"))
-            StyleSetUnderline(styleNum, true);
-
-        else if (option == wxT("eol"))
-            StyleSetEOLFilled(styleNum, true);
-
-        else if (option == wxT("size")) {
-            long points;
-            if (val.ToLong(&points))
-                StyleSetSize(styleNum, points);
-        }
-
-        else if (option == wxT("face"))
-            StyleSetFaceName(styleNum, val);
-
-        else if (option == wxT("fore"))
-            StyleSetForeground(styleNum, wxColourFromSpec(val));
-
-        else if (option == wxT("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) {
-#ifdef __WXGTK__
-    // Ensure that the native font is initialized
-    int x, y;
-    GetTextExtent(wxT("X"), &x, &y, NULL, NULL, &font);
-#endif
-    int            size     = font.GetPointSize();
-    wxString       faceName = font.GetFaceName();
-    bool           bold     = font.GetWeight() == wxBOLD;
-    bool           italic   = font.GetStyle() != wxNORMAL;
-    bool           under    = font.GetUnderlined();
-    wxFontEncoding encoding = font.GetEncoding();
-    
-    StyleSetFontAttr(styleNum, size, faceName, bold, italic, under, encoding);
-}
-
-// Set all font style attributes at once.
-void wxStyledTextCtrl::StyleSetFontAttr(int styleNum, int size,
-                                        const wxString& faceName,
-                                        bool bold, bool italic,
-                                        bool underline,
-                                        wxFontEncoding encoding) {
-    StyleSetSize(styleNum, size);
-    StyleSetFaceName(styleNum, faceName);
-    StyleSetBold(styleNum, bold);
-    StyleSetItalic(styleNum, italic);
-    StyleSetUnderline(styleNum, underline);
-    StyleSetFontEncoding(styleNum, encoding);
-}
-
-
-// Set the character set of the font in a style.  Converts the Scintilla
-// character set values to a wxFontEncoding.
-void wxStyledTextCtrl::StyleSetCharacterSet(int style, int characterSet)
-{
-    wxFontEncoding encoding;
-
-    // Translate the Scintilla characterSet to a wxFontEncoding
-    switch (characterSet) {
-        default:
-        case wxSTC_CHARSET_ANSI:
-        case wxSTC_CHARSET_DEFAULT:
-            encoding = wxFONTENCODING_DEFAULT;
-            break;
-
-        case wxSTC_CHARSET_BALTIC:
-            encoding = wxFONTENCODING_ISO8859_13;
-            break;
-
-        case wxSTC_CHARSET_CHINESEBIG5:
-            encoding = wxFONTENCODING_CP950;
-            break;
-
-        case wxSTC_CHARSET_EASTEUROPE:
-            encoding = wxFONTENCODING_ISO8859_2;
-            break;
-
-        case wxSTC_CHARSET_GB2312:
-            encoding = wxFONTENCODING_CP936;
-            break;
-
-        case wxSTC_CHARSET_GREEK:
-            encoding = wxFONTENCODING_ISO8859_7;
-            break;
-
-        case wxSTC_CHARSET_HANGUL:
-            encoding = wxFONTENCODING_CP949;
-            break;
-
-        case wxSTC_CHARSET_MAC:
-            encoding = wxFONTENCODING_DEFAULT;
-            break;
-
-        case wxSTC_CHARSET_OEM:
-            encoding = wxFONTENCODING_DEFAULT;
-            break;
-
-        case wxSTC_CHARSET_RUSSIAN:
-            encoding = wxFONTENCODING_KOI8;
-            break;
-
-        case wxSTC_CHARSET_SHIFTJIS:
-            encoding = wxFONTENCODING_CP932;
-            break;
-
-        case wxSTC_CHARSET_SYMBOL:
-            encoding = wxFONTENCODING_DEFAULT;
-            break;
-
-        case wxSTC_CHARSET_TURKISH:
-            encoding = wxFONTENCODING_ISO8859_9;
-            break;
-
-        case wxSTC_CHARSET_JOHAB:
-            encoding = wxFONTENCODING_DEFAULT;
-            break;
-
-        case wxSTC_CHARSET_HEBREW:
-            encoding = wxFONTENCODING_ISO8859_8;
-            break;
-
-        case wxSTC_CHARSET_ARABIC:
-            encoding = wxFONTENCODING_ISO8859_6;
-            break;
-
-        case wxSTC_CHARSET_VIETNAMESE:
-            encoding = wxFONTENCODING_DEFAULT;
-            break;
-
-        case wxSTC_CHARSET_THAI:
-            encoding = wxFONTENCODING_ISO8859_11;
-            break;
-
-        case wxSTC_CHARSET_CYRILLIC:
-            encoding = wxFONTENCODING_ISO8859_5;
-            break;
-                
-        case wxSTC_CHARSET_8859_15:
-            encoding = wxFONTENCODING_ISO8859_15;;
-            break;
-    }
-
-    // We just have Scintilla track the wxFontEncoding for us.  It gets used
-    // in Font::Create in PlatWX.cpp.  We add one to the value so that the
-    // effective wxFONENCODING_DEFAULT == SC_SHARSET_DEFAULT and so when
-    // Scintilla internally uses SC_CHARSET_DEFAULT we will translate it back
-    // to wxFONENCODING_DEFAULT in Font::Create.
-    SendMsg(SCI_STYLESETCHARACTERSET, style, encoding+1);
-}
-
-
-// Set the font encoding to be used by a style.
-void wxStyledTextCtrl::StyleSetFontEncoding(int style, wxFontEncoding encoding)
-{
-    SendMsg(SCI_STYLESETCHARACTERSET, style, encoding+1);
-}
-
-
-// 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);
-}
-
-
-bool wxStyledTextCtrl::SaveFile(const wxString& filename)
-{
-    wxFile file(filename, wxFile::write);
-
-    if (!file.IsOpened())
-        return false;
-
-    bool success = file.Write(GetText(), *wxConvCurrent);
-
-    if (success)
-        SetSavePoint();
-
-    return success;
-}
-
-bool wxStyledTextCtrl::LoadFile(const wxString& filename)
-{
-    bool success = false;
-    wxFile file(filename, wxFile::read);
-
-    if (file.IsOpened())
-    {
-        wxString contents;
-        // get the file size (assume it is not huge file...)
-        ssize_t len = (ssize_t)file.Length();
-
-        if (len > 0)
-        {
-#if wxUSE_UNICODE
-            wxMemoryBuffer buffer(len+1);
-            success = (file.Read(buffer.GetData(), len) == len);
-            if (success) {
-                ((char*)buffer.GetData())[len] = 0;
-                contents = wxString(buffer, *wxConvCurrent, len);
-            }
-#else
-            wxString buffer;
-            success = (file.Read(wxStringBuffer(buffer, len), len) == len);
-            contents = buffer;
-#endif
-        }
-        else
-        {
-            if (len == 0)
-                success = true;  // empty file is ok
-            else
-                success = false; // len == wxInvalidOffset
-        }
-
-        if (success)
-        {
-            SetText(contents);
-            EmptyUndoBuffer();
-            SetSavePoint();
-        }
-    }
-
-    return success;
-}
-
-
-#if wxUSE_DRAG_AND_DROP
-wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) {
-        return m_swx->DoDragOver(x, y, def);
-}
-
-
-bool wxStyledTextCtrl::DoDropText(long x, long y, const wxString& data) {
-    return m_swx->DoDropText(x, y, data);
-}
-#endif
-
-
-void wxStyledTextCtrl::SetUseAntiAliasing(bool useAA) {
-    m_swx->SetUseAntiAliasing(useAA);
-}
-
-bool wxStyledTextCtrl::GetUseAntiAliasing() {
-    return m_swx->GetUseAntiAliasing();
-}
-
-
-
-
-
-void wxStyledTextCtrl::AddTextRaw(const char* text)
-{
-    SendMsg(SCI_ADDTEXT, strlen(text), (long)text);
-}
-
-void wxStyledTextCtrl::InsertTextRaw(int pos, const char* text)
-{
-    SendMsg(SCI_INSERTTEXT, pos, (long)text);
-}
-
-wxCharBuffer wxStyledTextCtrl::GetCurLineRaw(int* linePos)
-{
-    int len = LineLength(GetCurrentLine());
-    if (!len) {
-        if (linePos)  *linePos = 0;
-        wxCharBuffer empty;
-        return empty;
-    }
-
-    wxCharBuffer buf(len);
-    int pos = SendMsg(SCI_GETCURLINE, len, (long)buf.data());
-    if (linePos)  *linePos = pos;
-    return buf;
-}
-
-wxCharBuffer wxStyledTextCtrl::GetLineRaw(int line)
-{
-    int len = LineLength(line);
-    if (!len) {
-        wxCharBuffer empty;
-        return empty;
-    }
-
-    wxCharBuffer buf(len);
-    SendMsg(SCI_GETLINE, line, (long)buf.data());
-    return buf;
-}
-
-wxCharBuffer wxStyledTextCtrl::GetSelectedTextRaw()
-{
-    int   start;
-    int   end;
-
-    GetSelection(&start, &end);
-    int   len  = end - start;
-    if (!len) {
-        wxCharBuffer empty;
-        return empty;
-    }        
-
-    wxCharBuffer buf(len);
-    SendMsg(SCI_GETSELTEXT, 0, (long)buf.data());
-    return buf;
-}
-
-wxCharBuffer wxStyledTextCtrl::GetTextRangeRaw(int startPos, int endPos)
-{
-    if (endPos < startPos) {
-        int temp = startPos;
-        startPos = endPos;
-        endPos = temp;
-    }
-    int len  = endPos - startPos;
-    if (!len) {
-        wxCharBuffer empty;
-        return empty;
-    }        
-
-    wxCharBuffer buf(len);
-    TextRange tr;
-    tr.lpstrText = buf.data();
-    tr.chrg.cpMin = startPos;
-    tr.chrg.cpMax = endPos;
-    SendMsg(SCI_GETTEXTRANGE, 0, (long)&tr);
-    return buf;
-}
-
-void wxStyledTextCtrl::SetTextRaw(const char* text)
-{
-    SendMsg(SCI_SETTEXT, 0, (long)text);
-}
-
-wxCharBuffer wxStyledTextCtrl::GetTextRaw()
-{
-    int len  = GetTextLength();
-    wxCharBuffer buf(len);
-    SendMsg(SCI_GETTEXT, len, (long)buf.data());
-    return buf;
-}
-
-void wxStyledTextCtrl::AppendTextRaw(const char* text)
-{
-    SendMsg(SCI_APPENDTEXT, strlen(text), (long)text);
-}
-
-
-
-
-
-//----------------------------------------------------------------------
-// Event handlers
-
-void wxStyledTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(evt)) {
-    wxPaintDC dc(this);
-    m_swx->DoPaint(&dc, GetUpdateRegion().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::OnScroll(wxScrollEvent& evt) {
-    wxScrollBar* sb = wxDynamicCast(evt.GetEventObject(), wxScrollBar);
-    if (sb) {
-        if (sb->IsVertical())
-            m_swx->DoVScroll(evt.GetEventType(), evt.GetPosition());
-        else
-            m_swx->DoHScroll(evt.GetEventType(), evt.GetPosition());
-    }
-}
-
-void wxStyledTextCtrl::OnSize(wxSizeEvent& WXUNUSED(evt)) {
-    if (m_swx) {
-        wxSize sz = GetClientSize();
-        m_swx->DoSize(sz.x, sz.y);
-    }
-}
-
-void wxStyledTextCtrl::OnMouseLeftDown(wxMouseEvent& evt) {
-    SetFocus();
-    wxPoint pt = evt.GetPosition();
-    m_swx->DoLeftButtonDown(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->DoLeftButtonMove(Point(pt.x, pt.y));
-}
-
-void wxStyledTextCtrl::OnMouseLeftUp(wxMouseEvent& evt) {
-    wxPoint pt = evt.GetPosition();
-    m_swx->DoLeftButtonUp(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::OnMouseMiddleUp(wxMouseEvent& evt) {
-    wxPoint pt = evt.GetPosition();
-    m_swx->DoMiddleButtonUp(Point(pt.x, pt.y));
-}
-
-void wxStyledTextCtrl::OnContextMenu(wxContextMenuEvent& evt) {
-    wxPoint pt = evt.GetPosition();
-    ScreenToClient(&pt.x, &pt.y);
-    /*
-      Show context menu at event point if it's within the window,
-      or at caret location if not
-    */
-    wxHitTest ht = this->HitTest(pt);
-    if (ht != wxHT_WINDOW_INSIDE) {
-        pt = this->PointFromPosition(this->GetCurrentPos());
-    }
-    m_swx->DoContextMenu(Point(pt.x, pt.y));
-}
-
-
-void wxStyledTextCtrl::OnMouseWheel(wxMouseEvent& evt) {
-    m_swx->DoMouseWheel(evt.GetWheelRotation(),
-                        evt.GetWheelDelta(),
-                        evt.GetLinesPerAction(),
-                        evt.ControlDown(),
-                        evt.IsPageScroll());
-}
-
-
-void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
-    // On (some?) non-US PC keyboards the AltGr key is required to enter some
-    // common characters.  It comes to us as both Alt and Ctrl down so we need
-    // to let the char through in that case, otherwise if only ctrl or only
-    // alt let's skip it.
-    bool ctrl = evt.ControlDown();
-#ifdef __WXMAC__
-    // On the Mac the Alt key is just a modifier key (like Shift) so we need
-    // to allow the char events to be processed when Alt is pressed.
-    // TODO:  Should we check MetaDown instead in this case?
-    bool alt = false;
-#else
-    bool alt  = evt.AltDown();
-#endif
-    bool skip = ((ctrl || alt) && ! (ctrl && alt));
-
-    if (!m_lastKeyDownConsumed && !skip) {
-#if wxUSE_UNICODE
-        int key = evt.GetUnicodeKey();
-        bool keyOk = true;
-
-        // if the unicode key code is not really a unicode character (it may
-        // be a function key or etc., the platforms appear to always give us a
-        // small value in this case) then fallback to the ascii key code but
-        // don't do anything for function keys or etc.
-        if (key <= 127) {
-            key = evt.GetKeyCode();
-            keyOk = (key <= 127);
-        }
-        if (keyOk) {
-            m_swx->DoAddChar(key);
-            return;
-        }
-#else
-        int key = evt.GetKeyCode();
-        if (key <= WXK_START || key > WXK_COMMAND) {
-            m_swx->DoAddChar(key);
-            return;
-        }
-#endif
-    }
-    
-    evt.Skip();
-}
-
-
-void wxStyledTextCtrl::OnKeyDown(wxKeyEvent& evt) {
-    int processed = m_swx->DoKeyDown(evt, &m_lastKeyDownConsumed);
-    if (!processed && !m_lastKeyDownConsumed)
-        evt.Skip();
-}
-
-
-void wxStyledTextCtrl::OnLoseFocus(wxFocusEvent& evt) {
-    m_swx->DoLoseFocus();
-    evt.Skip();
-}
-
-
-void wxStyledTextCtrl::OnGainFocus(wxFocusEvent& evt) {
-    m_swx->DoGainFocus();
-    evt.Skip();
-}
-
-
-void wxStyledTextCtrl::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(evt)) {
-    m_swx->DoSysColourChange();
-}
-
-
-void wxStyledTextCtrl::OnEraseBackground(wxEraseEvent& WXUNUSED(evt)) {
-    // do nothing to help avoid flashing
-}
-
-
-
-void wxStyledTextCtrl::OnMenu(wxCommandEvent& evt) {
-    m_swx->DoCommand(evt.GetId());
-}
-
-
-void wxStyledTextCtrl::OnListBox(wxCommandEvent& WXUNUSED(evt)) {
-    m_swx->DoOnListBox();
-}
-
-
-void wxStyledTextCtrl::OnIdle(wxIdleEvent& evt) {
-    m_swx->DoOnIdle(evt);
-}
-
-
-wxSize wxStyledTextCtrl::DoGetBestSize() const
-{
-    // What would be the best size for a wxSTC?
-    // Just give a reasonable minimum until something else can be figured out.
-    return wxSize(200,100);
-}
-
-
-//----------------------------------------------------------------------
-// Turn notifications from Scintilla into events
-
-
-void wxStyledTextCtrl::NotifyChange() {
-    wxStyledTextEvent evt(wxEVT_STC_CHANGE, GetId());
-    evt.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(evt);
-}
-
-
-static void SetEventText(wxStyledTextEvent& evt, const char* text,
-                         size_t length) {
-    if(!text) return;
-
-    evt.SetText(stc2wx(text, length));
-}
-
-
-void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
-    SCNotification& scn = *_scn;
-    wxStyledTextEvent evt(0, GetId());
-
-    evt.SetEventObject(this);
-    evt.SetPosition(scn.position);
-    evt.SetKey(scn.ch);
-    evt.SetModifiers(scn.modifiers);
-
-    switch (scn.nmhdr.code) {
-    case SCN_STYLENEEDED:
-        evt.SetEventType(wxEVT_STC_STYLENEEDED);
-        break;
-
-    case SCN_CHARADDED:
-        evt.SetEventType(wxEVT_STC_CHARADDED);
-        break;
-
-    case SCN_SAVEPOINTREACHED:
-        evt.SetEventType(wxEVT_STC_SAVEPOINTREACHED);
-        break;
-
-    case SCN_SAVEPOINTLEFT:
-        evt.SetEventType(wxEVT_STC_SAVEPOINTLEFT);
-        break;
-
-    case SCN_MODIFYATTEMPTRO:
-        evt.SetEventType(wxEVT_STC_ROMODIFYATTEMPT);
-        break;
-
-    case SCN_KEY:
-        evt.SetEventType(wxEVT_STC_KEY);
-        break;
-
-    case SCN_DOUBLECLICK:
-        evt.SetEventType(wxEVT_STC_DOUBLECLICK);
-        break;
-
-    case SCN_UPDATEUI:
-        evt.SetEventType(wxEVT_STC_UPDATEUI);
-        break;
-
-    case SCN_MODIFIED:
-        evt.SetEventType(wxEVT_STC_MODIFIED);
-        evt.SetModificationType(scn.modificationType);
-        SetEventText(evt, scn.text, scn.length);
-        evt.SetLength(scn.length);
-        evt.SetLinesAdded(scn.linesAdded);
-        evt.SetLine(scn.line);
-        evt.SetFoldLevelNow(scn.foldLevelNow);
-        evt.SetFoldLevelPrev(scn.foldLevelPrev);
-        break;
-
-    case SCN_MACRORECORD:
-        evt.SetEventType(wxEVT_STC_MACRORECORD);
-        evt.SetMessage(scn.message);
-        evt.SetWParam(scn.wParam);
-        evt.SetLParam(scn.lParam);
-        break;
-
-    case SCN_MARGINCLICK:
-        evt.SetEventType(wxEVT_STC_MARGINCLICK);
-        evt.SetMargin(scn.margin);
-        break;
-
-    case SCN_NEEDSHOWN:
-        evt.SetEventType(wxEVT_STC_NEEDSHOWN);
-        evt.SetLength(scn.length);
-        break;
-
-    case SCN_PAINTED:
-        evt.SetEventType(wxEVT_STC_PAINTED);
-        break;
-
-    case SCN_USERLISTSELECTION:
-        evt.SetEventType(wxEVT_STC_USERLISTSELECTION);
-        evt.SetListType(scn.listType);
-        SetEventText(evt, scn.text, strlen(scn.text));
-        break;
-
-    case SCN_URIDROPPED:
-        evt.SetEventType(wxEVT_STC_URIDROPPED);
-        SetEventText(evt, scn.text, strlen(scn.text));
-        break;
-
-    case SCN_DWELLSTART:
-        evt.SetEventType(wxEVT_STC_DWELLSTART);
-        evt.SetX(scn.x);
-        evt.SetY(scn.y);
-        break;
-
-    case SCN_DWELLEND:
-        evt.SetEventType(wxEVT_STC_DWELLEND);
-        evt.SetX(scn.x);
-        evt.SetY(scn.y);
-        break;
-
-    case SCN_ZOOM:
-        evt.SetEventType(wxEVT_STC_ZOOM);
-        break;
-
-    case SCN_HOTSPOTCLICK:
-        evt.SetEventType(wxEVT_STC_HOTSPOT_CLICK);
-        break;
-
-    case SCN_HOTSPOTDOUBLECLICK:
-        evt.SetEventType(wxEVT_STC_HOTSPOT_DCLICK);
-        break;
-
-    case SCN_CALLTIPCLICK:
-        evt.SetEventType(wxEVT_STC_CALLTIP_CLICK);
-        break;
-
-    case SCN_AUTOCSELECTION:
-        evt.SetEventType(wxEVT_STC_AUTOCOMP_SELECTION);
-        break;
-        
-    default:
-        return;
-    }
-
-    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;
-    m_listType = 0;
-    m_x = 0;
-    m_y = 0;
-    m_dragAllowMove = false;
-#if wxUSE_DRAG_AND_DROP
-    m_dragResult = wxDragNone;
-#endif
-}
-
-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; }
-
-
-wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
-  wxCommandEvent(event)
-{
-    m_position =      event.m_position;
-    m_key =           event.m_key;
-    m_modifiers =     event.m_modifiers;
-    m_modificationType = event.m_modificationType;
-    m_text =          event.m_text;
-    m_length =        event.m_length;
-    m_linesAdded =    event.m_linesAdded;
-    m_line =          event.m_line;
-    m_foldLevelNow =  event.m_foldLevelNow;
-    m_foldLevelPrev = event.m_foldLevelPrev;
-
-    m_margin =        event.m_margin;
-
-    m_message =       event.m_message;
-    m_wParam =        event.m_wParam;
-    m_lParam =        event.m_lParam;
-
-    m_listType =     event.m_listType;
-    m_x =            event.m_x;
-    m_y =            event.m_y;
-
-    m_dragText =     event.m_dragText;
-    m_dragAllowMove =event.m_dragAllowMove;
-#if wxUSE_DRAG_AND_DROP
-    m_dragResult =   event.m_dragResult;
-#endif
-}
-
-//----------------------------------------------------------------------
-//----------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in
deleted file mode 100644
index 9dd1d5dfbd..0000000000
--- a/src/stc/stc.h.in
+++ /dev/null
@@ -1,542 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Name:        stc.h
-// Purpose:     A wxWidgets 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"
-#include "wx/dnd.h"
-
-
-#ifdef WXMAKINGDLL_STC
-    #define WXDLLIMPEXP_STC WXEXPORT
-#elif defined(WXUSINGDLL)
-    #define WXDLLIMPEXP_STC WXIMPORT
-#else // not making nor using DLL
-    #define WXDLLIMPEXP_STC
-#endif
-
-
-// SWIG can't handle "#if" type of conditionals, only "#ifdef"
-#ifdef SWIG
-#define STC_USE_DND 1
-#else
-#if wxUSE_DRAG_AND_DROP
-#define STC_USE_DND 1
-#endif
-#endif
-
-//----------------------------------------------------------------------
-
-// Should a wxPopupWindow be used for the call tips and autocomplete windows?
-#ifndef wxSTC_USE_POPUP
-#define wxSTC_USE_POPUP 1
-#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
-
-%(VALUES)s
-
-
-//-----------------------------------------
-// Commands that can be bound to keystrokes
-
-%(CMDS)s
-
-
-// END of generated section
-//----------------------------------------------------------------------
-
-class  ScintillaWX;                      // forward declare
-class  WordList;
-struct SCNotification;
-
-#ifndef SWIG
-extern WXDLLIMPEXP_STC const wxChar* wxSTCNameStr;
-class  WXDLLIMPEXP_STC wxStyledTextCtrl;
-class  WXDLLIMPEXP_STC wxStyledTextEvent;
-#endif
-
-//----------------------------------------------------------------------
-
-class WXDLLIMPEXP_STC wxStyledTextCtrl : public wxControl {
-public:
-
-#ifdef SWIG
-    %%pythonAppend wxStyledTextCtrl   "self._setOORInfo(self)"
-    %%pythonAppend wxStyledTextCtrl() ""
-
-    wxStyledTextCtrl(wxWindow *parent, wxWindowID id=wxID_ANY,
-                     const wxPoint& pos = wxDefaultPosition,
-                     const wxSize& size = wxDefaultSize, long style = 0,
-                     const wxString& name = wxPySTCNameStr);
-    %%RenameCtor(PreStyledTextCtrl,  wxStyledTextCtrl());
-
-#else
-    wxStyledTextCtrl(wxWindow *parent, wxWindowID id=wxID_ANY,
-                     const wxPoint& pos = wxDefaultPosition,
-                     const wxSize& size = wxDefaultSize, long style = 0,
-                     const wxString& name = wxSTCNameStr);
-    wxStyledTextCtrl() { m_swx = NULL; }
-    ~wxStyledTextCtrl();
-
-#endif
-
-    bool Create(wxWindow *parent, wxWindowID id=wxID_ANY,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize, long style = 0,
-                const wxString& name = wxSTCNameStr);
-
-
-//----------------------------------------------------------------------
-// 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:[name or #RRGGBB]  sets the foreground colour
-    //      back:[name or #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,
-                          wxFontEncoding encoding=wxFONTENCODING_DEFAULT);
-
-
-    // Set the character set of the font in a style.  Converts the Scintilla
-    // character set values to a wxFontEncoding.
-    void StyleSetCharacterSet(int style, int characterSet);
-
-    // Set the font encoding to be used by a style.
-    void StyleSetFontEncoding(int style, wxFontEncoding encoding);
-    
-
-    // 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);
-
-
-    // Send a message to Scintilla
-    long SendMsg(int msg, long wp=0, long lp=0);
-
-
-    // Set the vertical scrollbar to use instead of the ont that's built-in.
-    void SetVScrollBar(wxScrollBar* bar);
-
-
-    // Set the horizontal scrollbar to use instead of the ont that's built-in.
-    void SetHScrollBar(wxScrollBar* bar);
-
-    // Can be used to prevent the EVT_CHAR handler from adding the char
-    bool GetLastKeydownProcessed() { return m_lastKeyDownConsumed; }
-    void SetLastKeydownProcessed(bool val) { m_lastKeyDownConsumed = val; }
-
-    // Write the contents of the editor to filename
-    bool SaveFile(const wxString& filename);
-
-    // Load the contents of filename into the editor
-    bool LoadFile(const wxString& filename);
-
-#ifdef STC_USE_DND
-    // Allow for simulating a DnD DragOver
-    wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def);
-
-    // Allow for simulating a DnD DropText
-    bool DoDropText(long x, long y, const wxString& data);
-#endif
-
-    // Specify whether anti-aliased fonts should be used.  Will have no effect
-    // on some platforms, but on some (wxMac for example) can greatly improve
-    // performance.
-    void SetUseAntiAliasing(bool useAA);
-
-    // Returns the current UseAntiAliasing setting.
-    bool GetUseAntiAliasing();
-
-
-    
-    // The following methods are nearly equivallent to their similarly named
-    // cousins above.  The difference is that these methods bypass wxString
-    // and always use a char* even if used in a unicode build of wxWidgets.
-    // In that case the character data will be utf-8 encoded since that is
-    // what is used internally by Scintilla in unicode builds.
-    
-    // Add text to the document at current position.
-    void AddTextRaw(const char* text);
-
-    // Insert string at a position.
-    void InsertTextRaw(int pos, const char* text);
-
-    // Retrieve the text of the line containing the caret.
-    // Returns the index of the caret on the line.
-#ifdef SWIG
-    wxCharBuffer GetCurLineRaw(int* OUTPUT);
-#else
-    wxCharBuffer GetCurLineRaw(int* linePos=NULL);
-#endif
-
-    // Retrieve the contents of a line.
-    wxCharBuffer GetLineRaw(int line);
-
-    // Retrieve the selected text.
-    wxCharBuffer GetSelectedTextRaw();
-
-    // Retrieve a range of text.
-    wxCharBuffer GetTextRangeRaw(int startPos, int endPos);
-
-    // Replace the contents of the document with the argument text.
-    void SetTextRaw(const char* text);
-
-    // Retrieve all the text in the document.
-    wxCharBuffer GetTextRaw();
-
-    // Append a string to the end of the document without changing the selection.
-    void AppendTextRaw(const char* text);
-
-#ifdef SWIG
-    %%pythoncode "_stc_utf8_methods.py"
-#endif
-//----------------------------------------------------------------------
-
-
-#ifndef SWIG
-protected:
-    // Event handlers
-    void OnPaint(wxPaintEvent& evt);
-    void OnScrollWin(wxScrollWinEvent& evt);
-    void OnScroll(wxScrollEvent& evt);
-    void OnSize(wxSizeEvent& evt);
-    void OnMouseLeftDown(wxMouseEvent& evt);
-    void OnMouseMove(wxMouseEvent& evt);
-    void OnMouseLeftUp(wxMouseEvent& evt);
-    void OnMouseRightUp(wxMouseEvent& evt);
-    void OnMouseMiddleUp(wxMouseEvent& evt);
-    void OnContextMenu(wxContextMenuEvent& evt);
-    void OnMouseWheel(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);
-    void OnIdle(wxIdleEvent& evt);
-
-    virtual wxSize DoGetBestSize() const;
-
-    // Turn notifications from Scintilla into events
-    void NotifyChange();
-    void NotifyParent(SCNotification* scn);
-
-private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxStyledTextCtrl)
-
-protected:
-
-    ScintillaWX*        m_swx;
-    wxStopWatch         m_stopWatch;
-    wxScrollBar*        m_vScrollBar;
-    wxScrollBar*        m_hScrollBar;
-
-    bool                m_lastKeyDownConsumed;
-
-    friend class ScintillaWX;
-    friend class Platform;
-#endif
-};
-
-//----------------------------------------------------------------------
-
-class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
-public:
-    wxStyledTextEvent(wxEventType commandType=0, int id=0);
-#ifndef SWIG
-    wxStyledTextEvent(const wxStyledTextEvent& event);
-#endif
-    ~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 wxString& 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; }
-    void SetListType(int val)             { m_listType = val; }
-    void SetX(int val)                    { m_x = val; }
-    void SetY(int val)                    { m_y = val; }
-    void SetDragText(const wxString& val) { m_dragText = val; }
-    void SetDragAllowMove(bool val)       { m_dragAllowMove = val; }
-#ifdef  STC_USE_DND
-    void SetDragResult(wxDragResult val)  { m_dragResult = val; }
-#endif
-
-    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; }
-    int  GetListType() const         { return m_listType; }
-    int  GetX() const                { return m_x; }
-    int  GetY() const                { return m_y; }
-    wxString GetDragText()           { return m_dragText; }
-    bool GetDragAllowMove()          { return m_dragAllowMove; }
-#ifdef STC_USE_DND
-    wxDragResult GetDragResult()     { return m_dragResult; }
-#endif
-
-    bool GetShift() const;
-    bool GetControl() const;
-    bool GetAlt() const;
-
-    virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); }
-
-#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;
-
-    int m_listType;
-    int m_x;
-    int m_y;
-
-    wxString m_dragText;        // wxEVT_STC_START_DRAG, wxEVT_STC_DO_DROP
-    bool     m_dragAllowMove;   // wxEVT_STC_START_DRAG
-
-#if wxUSE_DRAG_AND_DROP
-    wxDragResult m_dragResult; // wxEVT_STC_DRAG_OVER,wxEVT_STC_DO_DROP
-#endif
-#endif
-};
-
-
-
-#ifndef SWIG
-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_CHANGE,             1650)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_STYLENEEDED,        1651)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_CHARADDED,          1652)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_SAVEPOINTREACHED,   1653)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_SAVEPOINTLEFT,      1654)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_ROMODIFYATTEMPT,    1655)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_KEY,                1656)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_DOUBLECLICK,        1657)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_UPDATEUI,           1658)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_MODIFIED,           1659)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_MACRORECORD,        1660)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_MARGINCLICK,        1661)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_NEEDSHOWN,          1662)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_PAINTED,            1664)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_USERLISTSELECTION,  1665)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_URIDROPPED,         1666)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_DWELLSTART,         1667)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_DWELLEND,           1668)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_START_DRAG,         1669)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_DRAG_OVER,          1670)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_DO_DROP,            1671)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_ZOOM,               1672)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_HOTSPOT_CLICK,      1673)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_HOTSPOT_DCLICK,     1674)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_CALLTIP_CLICK,      1675)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_AUTOCOMP_SELECTION, 1676)
-END_DECLARE_EVENT_TYPES()
-#else
-    enum {
-        wxEVT_STC_CHANGE,
-        wxEVT_STC_STYLENEEDED,
-        wxEVT_STC_CHARADDED,
-        wxEVT_STC_SAVEPOINTREACHED,
-        wxEVT_STC_SAVEPOINTLEFT,
-        wxEVT_STC_ROMODIFYATTEMPT,
-        wxEVT_STC_KEY,
-        wxEVT_STC_DOUBLECLICK,
-        wxEVT_STC_UPDATEUI,
-        wxEVT_STC_MODIFIED,
-        wxEVT_STC_MACRORECORD,
-        wxEVT_STC_MARGINCLICK,
-        wxEVT_STC_NEEDSHOWN,
-        wxEVT_STC_PAINTED,
-        wxEVT_STC_USERLISTSELECTION,
-        wxEVT_STC_URIDROPPED,
-        wxEVT_STC_DWELLSTART,
-        wxEVT_STC_DWELLEND,
-        wxEVT_STC_START_DRAG,
-        wxEVT_STC_DRAG_OVER,
-        wxEVT_STC_DO_DROP,
-        wxEVT_STC_ZOOM,
-        wxEVT_STC_HOTSPOT_CLICK,
-        wxEVT_STC_HOTSPOT_DCLICK,
-        wxEVT_STC_CALLTIP_CLICK,
-        wxEVT_STC_AUTOCOMP_SELECTION
-    };
-#endif
-
-
-
-#ifndef SWIG
-typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
-
-#define EVT_STC_CHANGE(id, fn)             DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CHANGE,                id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_STYLENEEDED(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_STYLENEEDED,           id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_CHARADDED(id, fn)          DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CHARADDED,             id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_SAVEPOINTREACHED(id, fn)   DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_SAVEPOINTREACHED,      id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_SAVEPOINTLEFT(id, fn)      DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_SAVEPOINTLEFT,         id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_ROMODIFYATTEMPT(id, fn)    DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_ROMODIFYATTEMPT,       id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_KEY(id, fn)                DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_KEY,                   id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_DOUBLECLICK(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DOUBLECLICK,           id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_UPDATEUI(id, fn)           DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_UPDATEUI,              id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_MODIFIED(id, fn)           DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MODIFIED,              id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_MACRORECORD(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MACRORECORD,           id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_MARGINCLICK(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MARGINCLICK,           id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_NEEDSHOWN(id, fn)          DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_NEEDSHOWN,             id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_PAINTED(id, fn)            DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_PAINTED,               id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_USERLISTSELECTION(id, fn)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_USERLISTSELECTION,     id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_URIDROPPED(id, fn)         DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_URIDROPPED,            id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_DWELLSTART(id, fn)         DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLSTART,            id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_DWELLEND(id, fn)           DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLEND,              id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_START_DRAG(id, fn)         DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_START_DRAG,            id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_DRAG_OVER(id, fn)          DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DRAG_OVER,             id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_DO_DROP(id, fn)            DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DO_DROP,               id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_ZOOM(id, fn)               DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_ZOOM,                  id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_HOTSPOT_CLICK(id, fn)      DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_CLICK,         id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_HOTSPOT_DCLICK(id, fn)     DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_DCLICK,        id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_CALLTIP_CLICK(id, fn))     DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CALLTIP_CLICK          id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_AUTOCOMP_SELECTION(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_AUTOCOMP_SELECTION     id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#endif
-
-//----------------------------------------------------------------------
-// Utility functions used within wxSTC
-
-#ifndef SWIG
-#if wxUSE_UNICODE
-
-WXDLLIMPEXP_STC wxString stc2wx(const char* str);
-WXDLLIMPEXP_STC wxString stc2wx(const char* str, size_t len);
-WXDLLIMPEXP_STC const wxWX2MBbuf wx2stc(const wxString& str);
-
-#else // not UNICODE
-
-inline wxString stc2wx(const char* str) {
-    return wxString(str);
-}
-inline wxString stc2wx(const char* str, size_t len) {
-    return wxString(str, len);
-}
-inline const wxWX2MBbuf wx2stc(const wxString& str) {
-    return str.mbc_str();
-}
-
-#endif // UNICODE
-#endif // SWIG
-
-//----------------------------------------------------------------------
-#endif
-
-
diff --git a/src/stc/stcM8.xml b/src/stc/stcM8.xml
deleted file mode 100644
index 5e7ee5fea1..0000000000
--- a/src/stc/stcM8.xml
+++ /dev/null
@@ -1,7164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<?codewarrior exportversion="1.0.1" ideversion="5.0" ?>
-
-<!DOCTYPE PROJECT [
-<!ELEMENT PROJECT (TARGETLIST, TARGETORDER, GROUPLIST, DESIGNLIST?)>
-<!ELEMENT TARGETLIST (TARGET+)>
-<!ELEMENT TARGET (NAME, SETTINGLIST, FILELIST?, LINKORDER?, SEGMENTLIST?, OVERLAYGROUPLIST?, SUBTARGETLIST?, SUBPROJECTLIST?, FRAMEWORKLIST?)>
-<!ELEMENT NAME (#PCDATA)>
-<!ELEMENT USERSOURCETREETYPE (#PCDATA)>
-<!ELEMENT PATH (#PCDATA)>
-<!ELEMENT FILELIST (FILE*)>
-<!ELEMENT FILE (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?, ROOTFILEREF?, FILEKIND?, FILEFLAGS?)>
-<!ELEMENT PATHTYPE (#PCDATA)>
-<!ELEMENT PATHROOT (#PCDATA)>
-<!ELEMENT ACCESSPATH (#PCDATA)>
-<!ELEMENT PATHFORMAT (#PCDATA)>
-<!ELEMENT ROOTFILEREF (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)>
-<!ELEMENT FILEKIND (#PCDATA)>
-<!ELEMENT FILEFLAGS (#PCDATA)>
-<!ELEMENT FILEREF (TARGETNAME?, PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)>
-<!ELEMENT TARGETNAME (#PCDATA)>
-<!ELEMENT SETTINGLIST ((SETTING|PANELDATA)+)>
-<!ELEMENT SETTING (NAME?, (VALUE|(SETTING+)))>
-<!ELEMENT PANELDATA (NAME, VALUE)>
-<!ELEMENT VALUE (#PCDATA)>
-<!ELEMENT LINKORDER (FILEREF*)>
-<!ELEMENT SEGMENTLIST (SEGMENT+)>
-<!ELEMENT SEGMENT (NAME, ATTRIBUTES?, FILEREF*)>
-<!ELEMENT ATTRIBUTES (#PCDATA)>
-<!ELEMENT OVERLAYGROUPLIST (OVERLAYGROUP+)>
-<!ELEMENT OVERLAYGROUP (NAME, BASEADDRESS, OVERLAY*)>
-<!ELEMENT BASEADDRESS (#PCDATA)>
-<!ELEMENT OVERLAY (NAME, FILEREF*)>
-<!ELEMENT SUBTARGETLIST (SUBTARGET+)>
-<!ELEMENT SUBTARGET (TARGETNAME, ATTRIBUTES?, FILEREF?)>
-<!ELEMENT SUBPROJECTLIST (SUBPROJECT+)>
-<!ELEMENT SUBPROJECT (FILEREF, SUBPROJECTTARGETLIST)>
-<!ELEMENT SUBPROJECTTARGETLIST (SUBPROJECTTARGET*)>
-<!ELEMENT SUBPROJECTTARGET (TARGETNAME, ATTRIBUTES?, FILEREF?)>
-<!ELEMENT FRAMEWORKLIST (FRAMEWORK+)>
-<!ELEMENT FRAMEWORK (FILEREF, LIBRARYFILE?, VERSION?)>
-<!ELEMENT LIBRARYFILE (FILEREF)>
-<!ELEMENT VERSION (#PCDATA)>
-<!ELEMENT TARGETORDER (ORDEREDTARGET|ORDEREDDESIGN)*>
-<!ELEMENT ORDEREDTARGET (NAME)>
-<!ELEMENT ORDEREDDESIGN (NAME, ORDEREDTARGET+)>
-<!ELEMENT GROUPLIST (GROUP|FILEREF)*>
-<!ELEMENT GROUP (NAME, (GROUP|FILEREF)*)>
-<!ELEMENT DESIGNLIST (DESIGN+)>
-<!ELEMENT DESIGN (NAME, DESIGNDATA)>
-<!ELEMENT DESIGNDATA (#PCDATA)>
-]>
-
-<PROJECT>
-    <TARGETLIST>
-        <TARGET>
-            <NAME>PPC</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>RequireFrameworkStyleIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:::include:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>::::include:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>MSL</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:MacOS Support:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Debugger Runtime" panel -->
-                <SETTING><NAME>MWRuntimeSettings_WorkingDirectory</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_CommandLine</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_HostApplication</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>MacOS PPC Linker</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>::::lib:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>APPL</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>Appl</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MMLB</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MPLF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MWCD</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>RSRC</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.bh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Balloon Help</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>Balloon Help</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cxx</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.exp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.p</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW Pascal PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pas</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW Pascal PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ppu</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW Pascal PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.r</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Rez</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>Rez</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.s</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PPCAsm</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>Balloon Help</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>XCOF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>docu</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>rsrc</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>shlb</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>stub</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.doc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ppob</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsrc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>BrowserGenerator</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>DebuggerAppPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>DebuggerWorkingDir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CodeCompletionPrefixFileName</NAME><VALUE>MacHeaders.c</VALUE></SETTING>
-                <SETTING><NAME>CodeCompletionMacroFileName</NAME><VALUE>MacOS_Carbon_C++_Macros.h</VALUE></SETTING>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>ConsoleEncoding</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Remote Debug" panel -->
-                <SETTING><NAME>Enabled</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ConnectionName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>DownloadPath</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>LaunchRemoteApp</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RemoteAppPath</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>CoreID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>JTAGClockSpeed</NAME><VALUE>8000</VALUE></SETTING>
-                <SETTING><NAME>IsMultiCore</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UseGlobalOSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownloadConnectionName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>OSDownloadPath</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>AltDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>AltDownloadConnectionName</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Auto-target" panel -->
-                <SETTING><NAME>OtherExecutables</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "C/C++ Compiler" panel -->
-                <SETTING><NAME>MWFrontEnd_C_cplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_checkprotos</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_arm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_trigraphs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>stc_cw.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enableexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontreusestrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_poolstrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_useRTTI</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_multibyteaware</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_unsignedchars</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_autoinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_booltruefalse</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_inlinelevel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ecplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_objective_c</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_defer_codegen</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_templateparser</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_c99</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_bottomupinline</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "C/C++ Warnings" panel -->
-                <SETTING><NAME>MWWarning_C_warn_illpragma</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_emptydecl</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_possunwant</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedvar</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedarg</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_extracomma</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_pedantic</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warningerrors</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_hidevirtual</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_implicitconv</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_notinlined</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_structclass</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "FTP Panel" panel -->
-                <SETTING><NAME>MWFTP_Post_hostName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_username</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_password</NAME><VALUE>0&#255;&#196;@
&#168;&#224;&#152;&#144;"&#168;T</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_remoteDir</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_PathVersion</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_PathType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_PathFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_tree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_uploadDir</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_port</NAME><VALUE>21</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_SendBin</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ShouldLog</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "Java Command Line" panel -->
-                <SETTING><NAME>MWCommandLine_Java_clsName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWCommandLine_Java_args</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "PJavaDebugging" panel -->
-                <SETTING><NAME>MWVJavaDebugging_Protocol</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_JDKVersion</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_TimeOut</NAME><VALUE>25</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_SupportSlowDevices</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_UseRemoteLaunchAgent</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_LaunchVMasServer</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Java Language" panel -->
-                <SETTING><NAME>MWJava_Language_optimize</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_warnDeprecated</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_emitMap</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_strictFileNames</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_strictFileHierarchy</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_1_1_Compatible</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_emitHeaders</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_headerType</NAME><VALUE>JNINativeHeaders</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_packageFilter</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_genComments</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_genHeaders</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_enableAsserts</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_targetVM</NAME><VALUE>1.1</VALUE></SETTING>
-
-                <!-- Settings for "Java Manifest-JAD Setting Info" panel -->
-                <SETTING><NAME>Manifest-JAD Attributes</NAME>
-                    <SETTING>
-                        <SETTING><NAME>Attribute</NAME><VALUE>Main-Class</VALUE></SETTING>
-                        <SETTING><NAME>Value</NAME><VALUE>Auto-Generated</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Java MRJAppBuilder" panel -->
-                <SETTING><NAME>MWJava_MRJAppBuilder_outFile</NAME><VALUE>MRJApplication</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_merge</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_quitMenu</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_grow</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutType</NAME><VALUE>Console</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrType</NAME><VALUE>Console</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinType</NAME><VALUE>Console</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconPVersion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconFile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPVersion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPICTFile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_aboutName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutPVersion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutFile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutAppend</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrFile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrAppend</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinFile</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Java Output" panel -->
-                <SETTING><NAME>MWJava_Output_outputtype</NAME><VALUE>JarFile</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_outfile</NAME><VALUE>JavaClasses.jar</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_ftype</NAME><VALUE>1514754080</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_fcreator</NAME><VALUE>1297570384</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_compress</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_genManifest</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_trunctype</NAME><VALUE>Front</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_deleteClasses</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_consoleApp</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_preverify</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_genJad</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_obfuscate</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Java Project" panel -->
-                <SETTING><NAME>MWJava_Proj_projtype</NAME><VALUE>Applet</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_mainClassName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_HTMLAppCreator</NAME><VALUE>1145457748</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_HTMLAppName</NAME><VALUE>Metrowerks Java</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_PathVersion</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_PathType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_PathFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_tree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_HTMLAppWin32Name</NAME><VALUE>Internet Explorer</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_compress</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_simulator</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_useVM</NAME><VALUE>\000\000mrj225</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_vmarguments</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_vmName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_simPropFile</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "JavaDoc Project" panel -->
-                <SETTING><NAME>MWJavaDoc_Proj_Version</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Deprecated</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Author</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Index</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Tree</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_SunResolveToSame</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Shortnames</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Folder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_GenerateAPILinks</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_scope</NAME><VALUE>Public</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_fcreator</NAME><VALUE>1229278547</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_encodingName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_decodingName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_javaPackagePath</NAME><VALUE>http://java.sun.com/products/jdk/1.1/docs/api/</VALUE></SETTING>
-
-                <!-- Settings for "MacOS Merge Panel" panel -->
-                <SETTING><NAME>MWMerge_MacOS_projectType</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputName</NAME><VALUE>Merge Out</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputCreator</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>APPL</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_suppressWarning</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyFragments</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_flattenResource</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_flatFileName</NAME><VALUE>a.rsrc</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_flatFileOutputPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
-                    <SETTING><VALUE>DLGX</VALUE></SETTING>
-                    <SETTING><VALUE>ckid</VALUE></SETTING>
-                    <SETTING><VALUE>Proj</VALUE></SETTING>
-                    <SETTING><VALUE>WSPC</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "OmnisRC Panel" panel -->
-                <SETTING><NAME>Defines</NAME><VALUE>ismac,isMacRCC</VALUE></SETTING>
-                <SETTING><NAME>Compatible</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Output Flags" panel -->
-                <SETTING><NAME>FileLocked</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ResourcesMapIsReadOnly</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PrinterDriverIsMultiFinderCompatible</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Invisible</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>HasBundle</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>NameLocked</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Stationery</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>HasCustomIcon</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Shared</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>HasBeenInited</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Label</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>Comments</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Packager Panel" panel -->
-                <SETTING><NAME>MWMacOSPackager_UsePackager</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_FolderToPackage</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWMacOSPackager_CreateClassicAlias</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_ClassicAliasMethod</NAME><VALUE>UseTargetOutput</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_ClassicAliasPath</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_CreatePkgInfo</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_PkgCreatorType</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_PkgFileType</NAME><VALUE>APPL</VALUE></SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC_mw</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tracebacktables</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_function_align</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_largetoc</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_poolconst</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_linkerpoolsstrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_volatileasm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec_move_block</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_strictIEEEfp</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_genfsel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_orderedfpcmp</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC CodeGen Mach-O" panel -->
-                <SETTING><NAME>MWCodeGen_MachO_structalignment</NAME><VALUE>PPC_mw</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_profiler_enum</NAME><VALUE>Off</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_function_align</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_common</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_linkerpoolsstrings</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_volatileasm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_vecmove</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_fp_ieee_strict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_genfsel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_fp_cmps_ordered</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Disassembler" panel -->
-                <SETTING><NAME>MWDisassembler_PPC_showcode</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_extended</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_mix</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_nohex</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showsym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_shownames</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "PPC Global Optimizer" panel -->
-                <SETTING><NAME>GlobalOptimizer_PPC_optimizationlevel</NAME><VALUE>Level2</VALUE></SETTING>
-                <SETTING><NAME>GlobalOptimizer_PPC_optfor</NAME><VALUE>Speed</VALUE></SETTING>
-
-                <!-- Settings for "PPC Linker" panel -->
-                <SETTING><NAME>MWLinker_PPC_linksym</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_symfullpath</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_nolinkwarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_dontdeadstripinitcode</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_permitmultdefs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmode</NAME><VALUE>Fast</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_initname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_mainname</NAME><VALUE>__start</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_termname</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "PPC Mac OS X Linker" panel -->
-                <SETTING><NAME>MWLinker_MacOSX_linksym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_symfullpath</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_nolinkwarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_linkmap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_dontdeadstripinitcode</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_permitmultdefs</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_use_objectivec_semantics</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_strip_debug_symbols</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_split_segs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_report_msl_overloads</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_objects_follow_linkorder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_linkmode</NAME><VALUE>Fast</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_exports</NAME><VALUE>ReferencedGlobals</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_sortcode</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_mainname</NAME><VALUE>start</VALUE></SETTING>
-
-                <!-- Settings for "PPC Mac OS X Project" panel -->
-                <SETTING><NAME>MWProject_MacOSX_type</NAME><VALUE>Library</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_outfile</NAME><VALUE>wxxrc_PPC.lib</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_filecreator</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_filetype</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_vmaddress</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_usedefaultvmaddr</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flatrsrc</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flatrsrcfilename</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flatrsrcoutputdir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWProject_MacOSX_installpath</NAME><VALUE>./</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_dont_prebind</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flat_namespace</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_frameworkversion</NAME><VALUE>A</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flat_oldimpversion</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Mach-O Linker" panel -->
-                <SETTING><NAME>MWLinker_MachO_exports</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_mainname</NAME><VALUE>start</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_compatibleversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_symfullpath</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_supresswarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_multisymerror</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_prebind</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_deadstrip</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_objectivecsemantics</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_whichfileloaded</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_whyfileloaded</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_readonlyrelocs</NAME><VALUE>Errors</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_undefinedsymbols</NAME><VALUE>Errors</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_twolevelnamespace</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_stripdebugsymbols</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Mach-O Target" panel -->
-                <SETTING><NAME>MWProject_MachO_type</NAME><VALUE>Executable</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_outfile</NAME><VALUE>a.exe</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_filecreator</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_filetype</NAME><VALUE>MEXE</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_vmaddress</NAME><VALUE>4096</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_flatrsrc</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_flatrsrcfilename</NAME><VALUE>a.rsrc</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_flatrsrcoutputdir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWProject_MachO_installpath</NAME><VALUE>./</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_frameworkversion</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "PPC PEF" panel -->
-                <SETTING><NAME>MWPEF_exports</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_libfolder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sortcode</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_expandbss</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sharedata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_olddefversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_oldimpversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_fragmentname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWPEF_collapsereloads</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Project" panel -->
-                <SETTING><NAME>MWProject_PPC_type</NAME><VALUE>Library</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_outfile</NAME><VALUE>wxstc_PPC.lib</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_stacksize</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_symfilename</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcheader</NAME><VALUE>Native</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrctype</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcflags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcstore</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcmerge</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flatrsrc</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flatrsrcoutputdir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWProject_PPC_flatrsrcfilename</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "PPCAsm Panel" panel -->
-                <SETTING><NAME>MWAssembler_PPC_auxheader</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_symmode</NAME><VALUE>Mac</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_dialect</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_prefixfile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_typecheck</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_warnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_casesensitive</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Property List" panel -->
-                <SETTING><NAME>PList_OutputType</NAME><VALUE>File</VALUE></SETTING>
-                <SETTING><NAME>PList_OutputEncoding</NAME><VALUE>UTF-8</VALUE></SETTING>
-                <SETTING><NAME>PList_Prefix</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>PList_FileFilename</NAME><VALUE>Info.plist</VALUE></SETTING>
-                <SETTING><NAME>PList_FileDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>PList_ResourceType</NAME><VALUE>plst</VALUE></SETTING>
-                <SETTING><NAME>PList_ResourceID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>PList_ResourceName</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Rez Compiler" panel -->
-                <SETTING><NAME>MWRez_Language_maxwidth</NAME><VALUE>80</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_script</NAME><VALUE>Roman</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_alignment</NAME><VALUE>Align1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filtermode</NAME><VALUE>FilterSkip</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_suppresswarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_escapecontrolchars</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_prefixname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filteredtypes</NAME><VALUE>'CODE' 'DATA' 'PICT'</VALUE></SETTING>
-
-                <!-- Settings for "WinRC Compiler" panel -->
-                <SETTING><NAME>MWWinRC_prefixname</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "x86 CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_X86_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_alignment</NAME><VALUE>bytes8</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_exceptions</NAME><VALUE>ZeroOverhead</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_name_mangling</NAME><VALUE>MWWin32</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_use_extinst</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_mmx</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_3dnow</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_use_mmx_3dnow_convention</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_cmov</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_sse</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_sse2</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_intrinsics</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_optimizeasm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_disableopts</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_profile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_runtime</NAME><VALUE>Custom</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "x86 COFF" panel -->
-                <SETTING><NAME>MWLinker_X86_subsysmajorid</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_subsysminorid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_opsysmajorid</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_opsysminorid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_usrmajorid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_usrminorid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_maxstacksize</NAME><VALUE>1024</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_minstacksize</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_size</NAME><VALUE>1024</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_minsize</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_coff_flags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_dll_flags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_baseaddress</NAME><VALUE>4194304</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_filealign</NAME><VALUE>512</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_sectionalign</NAME><VALUE>4096</VALUE></SETTING>
-
-                <!-- Settings for "x86 Disassembler" panel -->
-                <SETTING><NAME>PDisasmX86_showHeaders</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showSectHeaders</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showSymTab</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showCode</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showData</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showDebug</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showExceptions</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showRaw</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showAllRaw</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showSource</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showRelocation</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showHex</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showComments</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showSymDefs</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_unmangle</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_verbose</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_resolveRelocs</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_resolveLocals</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "x86 Exceptions Panel" panel -->
-                <SETTING><NAME>MWDebugger_X86_Exceptions</NAME>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "x86 Global Optimizer" panel -->
-                <SETTING><NAME>GlobalOptimizer_X86_optimizationlevel</NAME><VALUE>Level0</VALUE></SETTING>
-                <SETTING><NAME>GlobalOptimizer_X86_optfor</NAME><VALUE>Speed</VALUE></SETTING>
-
-                <!-- Settings for "x86 Linker" panel -->
-                <SETTING><NAME>MWLinker_X86_entrypointusage</NAME><VALUE>Default</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_entrypoint</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_subsystem</NAME><VALUE>WinGUI</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_commandfile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_generatemap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_linksym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_linkCV</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_symfullpath</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_linkdebug</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_checksum</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_zero_init_bss</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_mergedata</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_usedefaultlibs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_adddefaultlibs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_nowarnings</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_verbose</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "x86 Project" panel -->
-                <SETTING><NAME>MWProject_X86_type</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_outfile</NAME><VALUE>NONAME.EXE</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_importlib</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_setimportlibdir</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_dontgenerateimportlib</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_oldformatlib</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_replaceobjextension</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_copyallfiles</NAME><VALUE>false</VALUE></SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PlatWX.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ScintillaWX.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>stc.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AutoComplete.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CallTip.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CellBuffer.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ContractionState.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Document.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DocumentAccessor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Editor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Indicator.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>KeyMap.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>KeyWords.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexAda.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexAVE.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexBaan.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexBullant.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexConf.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexCPP.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexCrontab.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexEiffel.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexHTML.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexLisp.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexLua.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexMatlab.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexOthers.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPascal.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPerl.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPython.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexRuby.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexSQL.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexVB.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LineMarker.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PropSet.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>RESearch.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ScintillaBase.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Style.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>StyleContext.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UniConversion.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ViewStyle.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowAccessor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PlatWX.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ScintillaWX.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>stc.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AutoComplete.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CallTip.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CellBuffer.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ContractionState.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Document.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DocumentAccessor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Editor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Indicator.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>KeyMap.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>KeyWords.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexAda.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexAVE.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexBaan.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexBullant.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexConf.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexCPP.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexCrontab.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexEiffel.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexHTML.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexLisp.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexLua.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexMatlab.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexOthers.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPascal.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPerl.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPython.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexRuby.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexSQL.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexVB.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LineMarker.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PropSet.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>RESearch.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ScintillaBase.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Style.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>StyleContext.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UniConversion.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ViewStyle.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowAccessor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </LINKORDER>
-        </TARGET>
-        <TARGET>
-            <NAME>All</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RequireFrameworkStyleIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Debugger Runtime" panel -->
-                <SETTING><NAME>MWRuntimeSettings_WorkingDirectory</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_CommandLine</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_HostApplication</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>All</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MMPr</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>BrowserGenerator</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>DebuggerAppPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>DebuggerWorkingDir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CodeCompletionPrefixFileName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>CodeCompletionMacroFileName</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>ConsoleEncoding</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Remote Debug" panel -->
-                <SETTING><NAME>Enabled</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ConnectionName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>DownloadPath</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>LaunchRemoteApp</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RemoteAppPath</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>CoreID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>JTAGClockSpeed</NAME><VALUE>8000</VALUE></SETTING>
-                <SETTING><NAME>IsMultiCore</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UseGlobalOSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownloadConnectionName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>OSDownloadPath</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>AltDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>AltDownloadConnectionName</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Auto-target" panel -->
-                <SETTING><NAME>OtherExecutables</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "C/C++ Compiler" panel -->
-                <SETTING><NAME>MWFrontEnd_C_cplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_checkprotos</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_arm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_trigraphs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enableexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontreusestrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_poolstrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_useRTTI</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_multibyteaware</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_unsignedchars</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_autoinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_booltruefalse</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_inlinelevel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ecplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_objective_c</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_defer_codegen</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_templateparser</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_c99</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_bottomupinline</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "C/C++ Warnings" panel -->
-                <SETTING><NAME>MWWarning_C_warn_illpragma</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_emptydecl</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_possunwant</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedvar</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedarg</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_extracomma</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_pedantic</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warningerrors</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_hidevirtual</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_implicitconv</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_notinlined</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_structclass</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "FTP Panel" panel -->
-                <SETTING><NAME>MWFTP_Post_hostName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_username</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_password</NAME><VALUE>0&#255;&#196;@
&#168;&#224;&#152;&#144;"&#168;T</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_remoteDir</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_PathVersion</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_PathType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_PathFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_tree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_uploadDir</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_port</NAME><VALUE>21</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_SendBin</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ShouldLog</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "Java Command Line" panel -->
-                <SETTING><NAME>MWCommandLine_Java_clsName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWCommandLine_Java_args</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "PJavaDebugging" panel -->
-                <SETTING><NAME>MWVJavaDebugging_Protocol</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_JDKVersion</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_TimeOut</NAME><VALUE>25</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_SupportSlowDevices</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_UseRemoteLaunchAgent</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_LaunchVMasServer</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Java Language" panel -->
-                <SETTING><NAME>MWJava_Language_optimize</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_warnDeprecated</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_emitMap</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_strictFileNames</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_strictFileHierarchy</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_1_1_Compatible</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_emitHeaders</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_headerType</NAME><VALUE>JNINativeHeaders</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_packageFilter</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_genComments</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_genHeaders</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_enableAsserts</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_targetVM</NAME><VALUE>1.1</VALUE></SETTING>
-
-                <!-- Settings for "Java Manifest-JAD Setting Info" panel -->
-                <SETTING><NAME>Manifest-JAD Attributes</NAME>
-                    <SETTING>
-                        <SETTING><NAME>Attribute</NAME><VALUE>Main-Class</VALUE></SETTING>
-                        <SETTING><NAME>Value</NAME><VALUE>Auto-Generated</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Java MRJAppBuilder" panel -->
-                <SETTING><NAME>MWJava_MRJAppBuilder_outFile</NAME><VALUE>MRJApplication</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_merge</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_quitMenu</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_grow</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutType</NAME><VALUE>Console</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrType</NAME><VALUE>Console</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinType</NAME><VALUE>Console</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconPVersion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconFile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPVersion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPICTFile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_aboutName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutPVersion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutFile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutAppend</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrFile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrAppend</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinFile</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Java Output" panel -->
-                <SETTING><NAME>MWJava_Output_outputtype</NAME><VALUE>JarFile</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_outfile</NAME><VALUE>JavaClasses.jar</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_ftype</NAME><VALUE>1514754080</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_fcreator</NAME><VALUE>1297570384</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_compress</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_genManifest</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_trunctype</NAME><VALUE>Front</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_deleteClasses</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_consoleApp</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_preverify</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_genJad</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_obfuscate</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Java Project" panel -->
-                <SETTING><NAME>MWJava_Proj_projtype</NAME><VALUE>Applet</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_mainClassName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_HTMLAppCreator</NAME><VALUE>1145457748</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_HTMLAppName</NAME><VALUE>Metrowerks Java</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_PathVersion</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_PathType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_PathFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_tree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_HTMLAppWin32Name</NAME><VALUE>Internet Explorer</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_compress</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_simulator</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_useVM</NAME><VALUE>\000\000mrj225</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_vmarguments</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_vmName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_simPropFile</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "JavaDoc Project" panel -->
-                <SETTING><NAME>MWJavaDoc_Proj_Version</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Deprecated</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Author</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Index</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Tree</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_SunResolveToSame</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Shortnames</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Folder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_GenerateAPILinks</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_scope</NAME><VALUE>Public</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_fcreator</NAME><VALUE>1229278547</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_encodingName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_decodingName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_javaPackagePath</NAME><VALUE>http://java.sun.com/products/jdk/1.1/docs/api/</VALUE></SETTING>
-
-                <!-- Settings for "MacOS Merge Panel" panel -->
-                <SETTING><NAME>MWMerge_MacOS_projectType</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputName</NAME><VALUE>Merge Out</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputCreator</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>APPL</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_suppressWarning</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyFragments</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_flattenResource</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_flatFileName</NAME><VALUE>a.rsrc</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_flatFileOutputPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
-                    <SETTING><VALUE>DLGX</VALUE></SETTING>
-                    <SETTING><VALUE>ckid</VALUE></SETTING>
-                    <SETTING><VALUE>Proj</VALUE></SETTING>
-                    <SETTING><VALUE>WSPC</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "OmnisRC Panel" panel -->
-                <SETTING><NAME>Defines</NAME><VALUE>ismac,isMacRCC</VALUE></SETTING>
-                <SETTING><NAME>Compatible</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Output Flags" panel -->
-                <SETTING><NAME>FileLocked</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ResourcesMapIsReadOnly</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PrinterDriverIsMultiFinderCompatible</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Invisible</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>HasBundle</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>NameLocked</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Stationery</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>HasCustomIcon</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Shared</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>HasBeenInited</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Label</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>Comments</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Packager Panel" panel -->
-                <SETTING><NAME>MWMacOSPackager_UsePackager</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_FolderToPackage</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWMacOSPackager_CreateClassicAlias</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_ClassicAliasMethod</NAME><VALUE>UseTargetOutput</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_ClassicAliasPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWMacOSPackager_CreatePkgInfo</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_PkgCreatorType</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_PkgFileType</NAME><VALUE>APPL</VALUE></SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>MC68K</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tracebacktables</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_function_align</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_largetoc</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_poolconst</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_linkerpoolsstrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_volatileasm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec_move_block</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_strictIEEEfp</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_genfsel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_orderedfpcmp</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC CodeGen Mach-O" panel -->
-                <SETTING><NAME>MWCodeGen_MachO_structalignment</NAME><VALUE>PPC_mw</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_profiler_enum</NAME><VALUE>Off</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_function_align</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_common</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_linkerpoolsstrings</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_volatileasm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_vecmove</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_fp_ieee_strict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_genfsel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_fp_cmps_ordered</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Disassembler" panel -->
-                <SETTING><NAME>MWDisassembler_PPC_showcode</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_extended</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_mix</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_nohex</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showsym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_shownames</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "PPC Global Optimizer" panel -->
-                <SETTING><NAME>GlobalOptimizer_PPC_optimizationlevel</NAME><VALUE>Level0</VALUE></SETTING>
-                <SETTING><NAME>GlobalOptimizer_PPC_optfor</NAME><VALUE>Speed</VALUE></SETTING>
-
-                <!-- Settings for "PPC Linker" panel -->
-                <SETTING><NAME>MWLinker_PPC_linksym</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_symfullpath</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_nolinkwarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_dontdeadstripinitcode</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_permitmultdefs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmode</NAME><VALUE>Fast</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_initname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_mainname</NAME><VALUE>__start</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_termname</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "PPC Mac OS X Linker" panel -->
-                <SETTING><NAME>MWLinker_MacOSX_linksym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_symfullpath</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_nolinkwarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_linkmap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_dontdeadstripinitcode</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_permitmultdefs</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_use_objectivec_semantics</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_strip_debug_symbols</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_split_segs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_report_msl_overloads</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_objects_follow_linkorder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_linkmode</NAME><VALUE>Fast</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_exports</NAME><VALUE>ReferencedGlobals</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_sortcode</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_mainname</NAME><VALUE>start</VALUE></SETTING>
-
-                <!-- Settings for "PPC Mac OS X Project" panel -->
-                <SETTING><NAME>MWProject_MacOSX_type</NAME><VALUE>Executable</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_outfile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_filecreator</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_filetype</NAME><VALUE>MEXE</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_vmaddress</NAME><VALUE>4096</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_usedefaultvmaddr</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flatrsrc</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flatrsrcfilename</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flatrsrcoutputdir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWProject_MacOSX_installpath</NAME><VALUE>./</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_dont_prebind</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flat_namespace</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_frameworkversion</NAME><VALUE>A</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flat_oldimpversion</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Mach-O Linker" panel -->
-                <SETTING><NAME>MWLinker_MachO_exports</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_mainname</NAME><VALUE>start</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_compatibleversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_symfullpath</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_supresswarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_multisymerror</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_prebind</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_deadstrip</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_objectivecsemantics</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_whichfileloaded</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_whyfileloaded</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_readonlyrelocs</NAME><VALUE>Errors</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_undefinedsymbols</NAME><VALUE>Errors</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_twolevelnamespace</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_stripdebugsymbols</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Mach-O Target" panel -->
-                <SETTING><NAME>MWProject_MachO_type</NAME><VALUE>Executable</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_outfile</NAME><VALUE>a.exe</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_filecreator</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_filetype</NAME><VALUE>MEXE</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_vmaddress</NAME><VALUE>4096</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_flatrsrc</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_flatrsrcfilename</NAME><VALUE>a.rsrc</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_flatrsrcoutputdir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWProject_MachO_installpath</NAME><VALUE>./</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_frameworkversion</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "PPC PEF" panel -->
-                <SETTING><NAME>MWPEF_exports</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_libfolder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sortcode</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_expandbss</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sharedata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_olddefversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_oldimpversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_fragmentname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWPEF_collapsereloads</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Project" panel -->
-                <SETTING><NAME>MWProject_PPC_type</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_outfile</NAME><VALUE>a.out</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>APPL</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>384</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>384</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_stacksize</NAME><VALUE>64</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flags</NAME><VALUE>22720</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_symfilename</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcheader</NAME><VALUE>Native</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrctype</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcflags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcstore</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcmerge</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flatrsrc</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flatrsrcoutputdir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWProject_PPC_flatrsrcfilename</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "PPCAsm Panel" panel -->
-                <SETTING><NAME>MWAssembler_PPC_auxheader</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_symmode</NAME><VALUE>Mac</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_dialect</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_prefixfile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_typecheck</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_warnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_casesensitive</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Property List" panel -->
-                <SETTING><NAME>PList_OutputType</NAME><VALUE>File</VALUE></SETTING>
-                <SETTING><NAME>PList_OutputEncoding</NAME><VALUE>UTF-8</VALUE></SETTING>
-                <SETTING><NAME>PList_Prefix</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>PList_FileFilename</NAME><VALUE>Info.plist</VALUE></SETTING>
-                <SETTING><NAME>PList_FileDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>PList_ResourceType</NAME><VALUE>plst</VALUE></SETTING>
-                <SETTING><NAME>PList_ResourceID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>PList_ResourceName</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Rez Compiler" panel -->
-                <SETTING><NAME>MWRez_Language_maxwidth</NAME><VALUE>80</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_script</NAME><VALUE>Roman</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_alignment</NAME><VALUE>Align1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filtermode</NAME><VALUE>FilterSkip</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_suppresswarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_escapecontrolchars</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_prefixname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filteredtypes</NAME><VALUE>'CODE' 'DATA' 'PICT'</VALUE></SETTING>
-
-                <!-- Settings for "WinRC Compiler" panel -->
-                <SETTING><NAME>MWWinRC_prefixname</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "x86 CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_X86_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_alignment</NAME><VALUE>bytes8</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_exceptions</NAME><VALUE>ZeroOverhead</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_name_mangling</NAME><VALUE>MWWin32</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_use_extinst</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_mmx</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_3dnow</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_use_mmx_3dnow_convention</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_cmov</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_sse</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_sse2</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_intrinsics</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_optimizeasm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_disableopts</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_profile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_runtime</NAME><VALUE>Custom</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "x86 COFF" panel -->
-                <SETTING><NAME>MWLinker_X86_subsysmajorid</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_subsysminorid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_opsysmajorid</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_opsysminorid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_usrmajorid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_usrminorid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_maxstacksize</NAME><VALUE>1024</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_minstacksize</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_size</NAME><VALUE>1024</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_minsize</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_coff_flags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_dll_flags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_baseaddress</NAME><VALUE>4194304</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_filealign</NAME><VALUE>512</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_sectionalign</NAME><VALUE>4096</VALUE></SETTING>
-
-                <!-- Settings for "x86 Disassembler" panel -->
-                <SETTING><NAME>PDisasmX86_showHeaders</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showSectHeaders</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showSymTab</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showCode</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showData</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showDebug</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showExceptions</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showRaw</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showAllRaw</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showSource</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showRelocation</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showHex</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showComments</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showSymDefs</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_unmangle</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_verbose</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_resolveRelocs</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_resolveLocals</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "x86 Exceptions Panel" panel -->
-                <SETTING><NAME>MWDebugger_X86_Exceptions</NAME>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "x86 Global Optimizer" panel -->
-                <SETTING><NAME>GlobalOptimizer_X86_optimizationlevel</NAME><VALUE>Level0</VALUE></SETTING>
-                <SETTING><NAME>GlobalOptimizer_X86_optfor</NAME><VALUE>Speed</VALUE></SETTING>
-
-                <!-- Settings for "x86 Linker" panel -->
-                <SETTING><NAME>MWLinker_X86_entrypointusage</NAME><VALUE>Default</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_entrypoint</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_subsystem</NAME><VALUE>WinGUI</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_commandfile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_generatemap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_linksym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_linkCV</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_symfullpath</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_linkdebug</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_checksum</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_zero_init_bss</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_mergedata</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_usedefaultlibs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_adddefaultlibs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_nowarnings</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_verbose</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "x86 Project" panel -->
-                <SETTING><NAME>MWProject_X86_type</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_outfile</NAME><VALUE>NONAME.EXE</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_importlib</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_setimportlibdir</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_dontgenerateimportlib</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_oldformatlib</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_replaceobjextension</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_copyallfiles</NAME><VALUE>false</VALUE></SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-            </FILELIST>
-            <LINKORDER>
-            </LINKORDER>
-            <SUBTARGETLIST>
-                <SUBTARGET>
-                    <TARGETNAME>CARBON</TARGETNAME>
-                </SUBTARGET>
-                <SUBTARGET>
-                    <TARGETNAME>CARBON Debug</TARGETNAME>
-                </SUBTARGET>
-                <SUBTARGET>
-                    <TARGETNAME>PPC</TARGETNAME>
-                </SUBTARGET>
-                <SUBTARGET>
-                    <TARGETNAME>PPC Debug</TARGETNAME>
-                </SUBTARGET>
-            </SUBTARGETLIST>
-        </TARGET>
-        <TARGET>
-            <NAME>PPC Debug</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>RequireFrameworkStyleIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:::include:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>::::include:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>MSL</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:MacOS Support:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Debugger Runtime" panel -->
-                <SETTING><NAME>MWRuntimeSettings_WorkingDirectory</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_CommandLine</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_HostApplication</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>MacOS PPC Linker</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>PPC Debug</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>::::lib:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>APPL</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>Appl</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MMLB</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MPLF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MWCD</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>RSRC</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.bh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Balloon Help</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>Balloon Help</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cxx</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.exp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.p</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW Pascal PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pas</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW Pascal PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ppu</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW Pascal PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.r</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Rez</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>Rez</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.s</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PPCAsm</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>Balloon Help</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>XCOF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>docu</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>rsrc</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>shlb</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>stub</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.doc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ppob</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsrc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>BrowserGenerator</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>DebuggerAppPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>DebuggerWorkingDir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CodeCompletionPrefixFileName</NAME><VALUE>MacHeaders.c</VALUE></SETTING>
-                <SETTING><NAME>CodeCompletionMacroFileName</NAME><VALUE>MacOS_Carbon_C++_Macros.h</VALUE></SETTING>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>ConsoleEncoding</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Remote Debug" panel -->
-                <SETTING><NAME>Enabled</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ConnectionName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>DownloadPath</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>LaunchRemoteApp</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RemoteAppPath</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>CoreID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>JTAGClockSpeed</NAME><VALUE>8000</VALUE></SETTING>
-                <SETTING><NAME>IsMultiCore</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UseGlobalOSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownloadConnectionName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>OSDownloadPath</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>AltDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>AltDownloadConnectionName</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Auto-target" panel -->
-                <SETTING><NAME>OtherExecutables</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "C/C++ Compiler" panel -->
-                <SETTING><NAME>MWFrontEnd_C_cplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_checkprotos</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_arm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_trigraphs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>stc_cw_d.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enableexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontreusestrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_poolstrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_useRTTI</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_multibyteaware</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_unsignedchars</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_autoinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_booltruefalse</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_inlinelevel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ecplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_objective_c</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_defer_codegen</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_templateparser</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_c99</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_bottomupinline</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "C/C++ Warnings" panel -->
-                <SETTING><NAME>MWWarning_C_warn_illpragma</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_emptydecl</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_possunwant</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedvar</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedarg</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_extracomma</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_pedantic</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warningerrors</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_hidevirtual</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_implicitconv</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_notinlined</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_structclass</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "FTP Panel" panel -->
-                <SETTING><NAME>MWFTP_Post_hostName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_username</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_password</NAME><VALUE>0&#255;&#196;@
&#168;&#224;&#152;&#144;"&#168;T</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_remoteDir</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_PathVersion</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_PathType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_PathFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_tree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_uploadDir</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_port</NAME><VALUE>21</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_SendBin</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ShouldLog</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "Java Command Line" panel -->
-                <SETTING><NAME>MWCommandLine_Java_clsName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWCommandLine_Java_args</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "PJavaDebugging" panel -->
-                <SETTING><NAME>MWVJavaDebugging_Protocol</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_JDKVersion</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_TimeOut</NAME><VALUE>25</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_SupportSlowDevices</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_UseRemoteLaunchAgent</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_LaunchVMasServer</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Java Language" panel -->
-                <SETTING><NAME>MWJava_Language_optimize</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_warnDeprecated</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_emitMap</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_strictFileNames</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_strictFileHierarchy</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_1_1_Compatible</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_emitHeaders</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_headerType</NAME><VALUE>JNINativeHeaders</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_packageFilter</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_genComments</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_genHeaders</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_enableAsserts</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_targetVM</NAME><VALUE>1.1</VALUE></SETTING>
-
-                <!-- Settings for "Java Manifest-JAD Setting Info" panel -->
-                <SETTING><NAME>Manifest-JAD Attributes</NAME>
-                    <SETTING>
-                        <SETTING><NAME>Attribute</NAME><VALUE>Main-Class</VALUE></SETTING>
-                        <SETTING><NAME>Value</NAME><VALUE>Auto-Generated</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Java MRJAppBuilder" panel -->
-                <SETTING><NAME>MWJava_MRJAppBuilder_outFile</NAME><VALUE>MRJApplication</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_merge</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_quitMenu</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_grow</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutType</NAME><VALUE>Console</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrType</NAME><VALUE>Console</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinType</NAME><VALUE>Console</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconPVersion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconFile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPVersion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPICTFile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_aboutName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutPVersion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutFile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutAppend</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrFile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrAppend</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinFile</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Java Output" panel -->
-                <SETTING><NAME>MWJava_Output_outputtype</NAME><VALUE>JarFile</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_outfile</NAME><VALUE>JavaClasses.jar</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_ftype</NAME><VALUE>1514754080</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_fcreator</NAME><VALUE>1297570384</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_compress</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_genManifest</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_trunctype</NAME><VALUE>Front</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_deleteClasses</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_consoleApp</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_preverify</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_genJad</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_obfuscate</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Java Project" panel -->
-                <SETTING><NAME>MWJava_Proj_projtype</NAME><VALUE>Applet</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_mainClassName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_HTMLAppCreator</NAME><VALUE>1145457748</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_HTMLAppName</NAME><VALUE>Metrowerks Java</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_PathVersion</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_PathType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_PathFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_tree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_HTMLAppWin32Name</NAME><VALUE>Internet Explorer</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_compress</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_simulator</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_useVM</NAME><VALUE>\000\000mrj225</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_vmarguments</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_vmName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_simPropFile</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "JavaDoc Project" panel -->
-                <SETTING><NAME>MWJavaDoc_Proj_Version</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Deprecated</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Author</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Index</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Tree</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_SunResolveToSame</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Shortnames</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Folder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_GenerateAPILinks</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_scope</NAME><VALUE>Public</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_fcreator</NAME><VALUE>1229278547</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_encodingName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_decodingName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_javaPackagePath</NAME><VALUE>http://java.sun.com/products/jdk/1.1/docs/api/</VALUE></SETTING>
-
-                <!-- Settings for "MacOS Merge Panel" panel -->
-                <SETTING><NAME>MWMerge_MacOS_projectType</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputName</NAME><VALUE>Merge Out</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputCreator</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>APPL</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_suppressWarning</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyFragments</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_flattenResource</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_flatFileName</NAME><VALUE>a.rsrc</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_flatFileOutputPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
-                    <SETTING><VALUE>DLGX</VALUE></SETTING>
-                    <SETTING><VALUE>ckid</VALUE></SETTING>
-                    <SETTING><VALUE>Proj</VALUE></SETTING>
-                    <SETTING><VALUE>WSPC</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "OmnisRC Panel" panel -->
-                <SETTING><NAME>Defines</NAME><VALUE>ismac,isMacRCC</VALUE></SETTING>
-                <SETTING><NAME>Compatible</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Output Flags" panel -->
-                <SETTING><NAME>FileLocked</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ResourcesMapIsReadOnly</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PrinterDriverIsMultiFinderCompatible</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Invisible</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>HasBundle</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>NameLocked</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Stationery</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>HasCustomIcon</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Shared</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>HasBeenInited</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Label</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>Comments</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Packager Panel" panel -->
-                <SETTING><NAME>MWMacOSPackager_UsePackager</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_FolderToPackage</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWMacOSPackager_CreateClassicAlias</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_ClassicAliasMethod</NAME><VALUE>UseTargetOutput</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_ClassicAliasPath</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_CreatePkgInfo</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_PkgCreatorType</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_PkgFileType</NAME><VALUE>APPL</VALUE></SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC_mw</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tracebacktables</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_function_align</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_largetoc</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_poolconst</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_linkerpoolsstrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_volatileasm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec_move_block</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_strictIEEEfp</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_genfsel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_orderedfpcmp</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC CodeGen Mach-O" panel -->
-                <SETTING><NAME>MWCodeGen_MachO_structalignment</NAME><VALUE>PPC_mw</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_profiler_enum</NAME><VALUE>Off</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_function_align</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_common</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_linkerpoolsstrings</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_volatileasm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_vecmove</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_fp_ieee_strict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_genfsel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_fp_cmps_ordered</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Disassembler" panel -->
-                <SETTING><NAME>MWDisassembler_PPC_showcode</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_extended</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_mix</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_nohex</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showsym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_shownames</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "PPC Global Optimizer" panel -->
-                <SETTING><NAME>GlobalOptimizer_PPC_optimizationlevel</NAME><VALUE>Level2</VALUE></SETTING>
-                <SETTING><NAME>GlobalOptimizer_PPC_optfor</NAME><VALUE>Speed</VALUE></SETTING>
-
-                <!-- Settings for "PPC Linker" panel -->
-                <SETTING><NAME>MWLinker_PPC_linksym</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_symfullpath</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_nolinkwarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_dontdeadstripinitcode</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_permitmultdefs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmode</NAME><VALUE>Fast</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_initname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_mainname</NAME><VALUE>__start</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_termname</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "PPC Mac OS X Linker" panel -->
-                <SETTING><NAME>MWLinker_MacOSX_linksym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_symfullpath</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_nolinkwarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_linkmap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_dontdeadstripinitcode</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_permitmultdefs</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_use_objectivec_semantics</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_strip_debug_symbols</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_split_segs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_report_msl_overloads</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_objects_follow_linkorder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_linkmode</NAME><VALUE>Fast</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_exports</NAME><VALUE>ReferencedGlobals</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_sortcode</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_mainname</NAME><VALUE>start</VALUE></SETTING>
-
-                <!-- Settings for "PPC Mac OS X Project" panel -->
-                <SETTING><NAME>MWProject_MacOSX_type</NAME><VALUE>Library</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_outfile</NAME><VALUE>wxstc_PPC_d.lib</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_filecreator</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_filetype</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_vmaddress</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_usedefaultvmaddr</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flatrsrc</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flatrsrcfilename</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flatrsrcoutputdir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWProject_MacOSX_installpath</NAME><VALUE>./</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_dont_prebind</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flat_namespace</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_frameworkversion</NAME><VALUE>A</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flat_oldimpversion</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Mach-O Linker" panel -->
-                <SETTING><NAME>MWLinker_MachO_exports</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_mainname</NAME><VALUE>start</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_compatibleversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_symfullpath</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_supresswarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_multisymerror</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_prebind</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_deadstrip</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_objectivecsemantics</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_whichfileloaded</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_whyfileloaded</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_readonlyrelocs</NAME><VALUE>Errors</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_undefinedsymbols</NAME><VALUE>Errors</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_twolevelnamespace</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_stripdebugsymbols</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Mach-O Target" panel -->
-                <SETTING><NAME>MWProject_MachO_type</NAME><VALUE>Executable</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_outfile</NAME><VALUE>a.exe</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_filecreator</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_filetype</NAME><VALUE>MEXE</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_vmaddress</NAME><VALUE>4096</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_flatrsrc</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_flatrsrcfilename</NAME><VALUE>a.rsrc</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_flatrsrcoutputdir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWProject_MachO_installpath</NAME><VALUE>./</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_frameworkversion</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "PPC PEF" panel -->
-                <SETTING><NAME>MWPEF_exports</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_libfolder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sortcode</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_expandbss</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sharedata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_olddefversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_oldimpversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_fragmentname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWPEF_collapsereloads</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Project" panel -->
-                <SETTING><NAME>MWProject_PPC_type</NAME><VALUE>Library</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_outfile</NAME><VALUE>wxstc_PPC_d.lib</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_stacksize</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_symfilename</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcheader</NAME><VALUE>Native</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrctype</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcflags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcstore</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcmerge</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flatrsrc</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flatrsrcoutputdir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWProject_PPC_flatrsrcfilename</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "PPCAsm Panel" panel -->
-                <SETTING><NAME>MWAssembler_PPC_auxheader</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_symmode</NAME><VALUE>Mac</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_dialect</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_prefixfile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_typecheck</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_warnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_casesensitive</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Property List" panel -->
-                <SETTING><NAME>PList_OutputType</NAME><VALUE>File</VALUE></SETTING>
-                <SETTING><NAME>PList_OutputEncoding</NAME><VALUE>UTF-8</VALUE></SETTING>
-                <SETTING><NAME>PList_Prefix</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>PList_FileFilename</NAME><VALUE>Info.plist</VALUE></SETTING>
-                <SETTING><NAME>PList_FileDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>PList_ResourceType</NAME><VALUE>plst</VALUE></SETTING>
-                <SETTING><NAME>PList_ResourceID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>PList_ResourceName</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Rez Compiler" panel -->
-                <SETTING><NAME>MWRez_Language_maxwidth</NAME><VALUE>80</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_script</NAME><VALUE>Roman</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_alignment</NAME><VALUE>Align1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filtermode</NAME><VALUE>FilterSkip</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_suppresswarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_escapecontrolchars</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_prefixname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filteredtypes</NAME><VALUE>'CODE' 'DATA' 'PICT'</VALUE></SETTING>
-
-                <!-- Settings for "WinRC Compiler" panel -->
-                <SETTING><NAME>MWWinRC_prefixname</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "x86 CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_X86_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_alignment</NAME><VALUE>bytes8</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_exceptions</NAME><VALUE>ZeroOverhead</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_name_mangling</NAME><VALUE>MWWin32</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_use_extinst</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_mmx</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_3dnow</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_use_mmx_3dnow_convention</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_cmov</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_sse</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_sse2</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_intrinsics</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_optimizeasm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_disableopts</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_profile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_runtime</NAME><VALUE>Custom</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "x86 COFF" panel -->
-                <SETTING><NAME>MWLinker_X86_subsysmajorid</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_subsysminorid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_opsysmajorid</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_opsysminorid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_usrmajorid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_usrminorid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_maxstacksize</NAME><VALUE>1024</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_minstacksize</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_size</NAME><VALUE>1024</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_minsize</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_coff_flags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_dll_flags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_baseaddress</NAME><VALUE>4194304</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_filealign</NAME><VALUE>512</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_sectionalign</NAME><VALUE>4096</VALUE></SETTING>
-
-                <!-- Settings for "x86 Disassembler" panel -->
-                <SETTING><NAME>PDisasmX86_showHeaders</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showSectHeaders</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showSymTab</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showCode</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showData</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showDebug</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showExceptions</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showRaw</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showAllRaw</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showSource</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showRelocation</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showHex</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showComments</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showSymDefs</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_unmangle</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_verbose</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_resolveRelocs</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_resolveLocals</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "x86 Exceptions Panel" panel -->
-                <SETTING><NAME>MWDebugger_X86_Exceptions</NAME>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "x86 Global Optimizer" panel -->
-                <SETTING><NAME>GlobalOptimizer_X86_optimizationlevel</NAME><VALUE>Level0</VALUE></SETTING>
-                <SETTING><NAME>GlobalOptimizer_X86_optfor</NAME><VALUE>Speed</VALUE></SETTING>
-
-                <!-- Settings for "x86 Linker" panel -->
-                <SETTING><NAME>MWLinker_X86_entrypointusage</NAME><VALUE>Default</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_entrypoint</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_subsystem</NAME><VALUE>WinGUI</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_commandfile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_generatemap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_linksym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_linkCV</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_symfullpath</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_linkdebug</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_checksum</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_zero_init_bss</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_mergedata</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_usedefaultlibs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_adddefaultlibs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_nowarnings</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_verbose</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "x86 Project" panel -->
-                <SETTING><NAME>MWProject_X86_type</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_outfile</NAME><VALUE>NONAME.EXE</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_importlib</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_setimportlibdir</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_dontgenerateimportlib</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_oldformatlib</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_replaceobjextension</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_copyallfiles</NAME><VALUE>false</VALUE></SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PlatWX.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ScintillaWX.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>stc.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AutoComplete.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CallTip.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CellBuffer.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ContractionState.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Document.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DocumentAccessor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Editor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Indicator.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>KeyMap.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>KeyWords.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexAda.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexAVE.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexBaan.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexBullant.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexConf.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexCPP.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexCrontab.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexEiffel.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexHTML.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexLisp.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexLua.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexMatlab.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexOthers.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPascal.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPerl.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPython.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexRuby.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexSQL.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexVB.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LineMarker.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PropSet.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>RESearch.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ScintillaBase.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Style.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>StyleContext.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UniConversion.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ViewStyle.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowAccessor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PlatWX.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ScintillaWX.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>stc.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AutoComplete.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CallTip.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CellBuffer.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ContractionState.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Document.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DocumentAccessor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Editor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Indicator.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>KeyMap.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>KeyWords.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexAda.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexAVE.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexBaan.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexBullant.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexConf.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexCPP.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexCrontab.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexEiffel.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexHTML.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexLisp.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexLua.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexMatlab.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexOthers.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPascal.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPerl.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPython.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexRuby.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexSQL.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexVB.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LineMarker.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PropSet.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>RESearch.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ScintillaBase.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Style.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>StyleContext.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UniConversion.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ViewStyle.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowAccessor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </LINKORDER>
-        </TARGET>
-        <TARGET>
-            <NAME>CARBON</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>RequireFrameworkStyleIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:::include:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>::::include:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>MSL</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:MacOS Support:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Debugger Runtime" panel -->
-                <SETTING><NAME>MWRuntimeSettings_WorkingDirectory</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_CommandLine</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_HostApplication</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>MacOS PPC Linker</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>CARBON</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>::::lib:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>APPL</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>Appl</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MMLB</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MPLF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MWCD</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>RSRC</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.bh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Balloon Help</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>Balloon Help</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cxx</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.exp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.p</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW Pascal PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pas</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW Pascal PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ppu</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW Pascal PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.r</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Rez</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>Rez</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.s</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PPCAsm</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>Balloon Help</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>XCOF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>docu</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>rsrc</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>shlb</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>stub</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.doc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ppob</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsrc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>BrowserGenerator</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>DebuggerAppPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>DebuggerWorkingDir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CodeCompletionPrefixFileName</NAME><VALUE>MacHeaders.c</VALUE></SETTING>
-                <SETTING><NAME>CodeCompletionMacroFileName</NAME><VALUE>MacOS_Carbon_C++_Macros.h</VALUE></SETTING>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>ConsoleEncoding</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Remote Debug" panel -->
-                <SETTING><NAME>Enabled</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ConnectionName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>DownloadPath</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>LaunchRemoteApp</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RemoteAppPath</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>CoreID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>JTAGClockSpeed</NAME><VALUE>8000</VALUE></SETTING>
-                <SETTING><NAME>IsMultiCore</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UseGlobalOSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownloadConnectionName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>OSDownloadPath</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>AltDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>AltDownloadConnectionName</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Auto-target" panel -->
-                <SETTING><NAME>OtherExecutables</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "C/C++ Compiler" panel -->
-                <SETTING><NAME>MWFrontEnd_C_cplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_checkprotos</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_arm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_trigraphs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>stc_cwc.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enableexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontreusestrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_poolstrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_useRTTI</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_multibyteaware</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_unsignedchars</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_autoinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_booltruefalse</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_inlinelevel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ecplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_objective_c</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_defer_codegen</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_templateparser</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_c99</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_bottomupinline</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "C/C++ Warnings" panel -->
-                <SETTING><NAME>MWWarning_C_warn_illpragma</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_emptydecl</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_possunwant</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedvar</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedarg</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_extracomma</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_pedantic</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warningerrors</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_hidevirtual</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_implicitconv</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_notinlined</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_structclass</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "FTP Panel" panel -->
-                <SETTING><NAME>MWFTP_Post_hostName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_username</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_password</NAME><VALUE>0&#255;&#196;@
&#168;&#224;&#152;&#144;"&#168;T</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_remoteDir</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_PathVersion</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_PathType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_PathFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_tree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_uploadDir</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_port</NAME><VALUE>21</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_SendBin</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ShouldLog</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "Java Command Line" panel -->
-                <SETTING><NAME>MWCommandLine_Java_clsName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWCommandLine_Java_args</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "PJavaDebugging" panel -->
-                <SETTING><NAME>MWVJavaDebugging_Protocol</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_JDKVersion</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_TimeOut</NAME><VALUE>25</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_SupportSlowDevices</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_UseRemoteLaunchAgent</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_LaunchVMasServer</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Java Language" panel -->
-                <SETTING><NAME>MWJava_Language_optimize</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_warnDeprecated</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_emitMap</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_strictFileNames</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_strictFileHierarchy</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_1_1_Compatible</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_emitHeaders</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_headerType</NAME><VALUE>JNINativeHeaders</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_packageFilter</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_genComments</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_genHeaders</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_enableAsserts</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_targetVM</NAME><VALUE>1.1</VALUE></SETTING>
-
-                <!-- Settings for "Java Manifest-JAD Setting Info" panel -->
-                <SETTING><NAME>Manifest-JAD Attributes</NAME>
-                    <SETTING>
-                        <SETTING><NAME>Attribute</NAME><VALUE>Main-Class</VALUE></SETTING>
-                        <SETTING><NAME>Value</NAME><VALUE>Auto-Generated</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Java MRJAppBuilder" panel -->
-                <SETTING><NAME>MWJava_MRJAppBuilder_outFile</NAME><VALUE>MRJApplication</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_merge</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_quitMenu</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_grow</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutType</NAME><VALUE>Console</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrType</NAME><VALUE>Console</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinType</NAME><VALUE>Console</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconPVersion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconFile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPVersion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPICTFile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_aboutName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutPVersion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutFile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutAppend</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrFile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrAppend</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinFile</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Java Output" panel -->
-                <SETTING><NAME>MWJava_Output_outputtype</NAME><VALUE>JarFile</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_outfile</NAME><VALUE>JavaClasses.jar</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_ftype</NAME><VALUE>1514754080</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_fcreator</NAME><VALUE>1297570384</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_compress</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_genManifest</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_trunctype</NAME><VALUE>Front</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_deleteClasses</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_consoleApp</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_preverify</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_genJad</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_obfuscate</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Java Project" panel -->
-                <SETTING><NAME>MWJava_Proj_projtype</NAME><VALUE>Applet</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_mainClassName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_HTMLAppCreator</NAME><VALUE>1145457748</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_HTMLAppName</NAME><VALUE>Metrowerks Java</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_PathVersion</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_PathType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_PathFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_tree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_HTMLAppWin32Name</NAME><VALUE>Internet Explorer</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_compress</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_simulator</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_useVM</NAME><VALUE>\000\000mrj225</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_vmarguments</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_vmName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_simPropFile</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "JavaDoc Project" panel -->
-                <SETTING><NAME>MWJavaDoc_Proj_Version</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Deprecated</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Author</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Index</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Tree</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_SunResolveToSame</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Shortnames</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Folder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_GenerateAPILinks</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_scope</NAME><VALUE>Public</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_fcreator</NAME><VALUE>1229278547</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_encodingName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_decodingName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_javaPackagePath</NAME><VALUE>http://java.sun.com/products/jdk/1.1/docs/api/</VALUE></SETTING>
-
-                <!-- Settings for "MacOS Merge Panel" panel -->
-                <SETTING><NAME>MWMerge_MacOS_projectType</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputName</NAME><VALUE>Merge Out</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputCreator</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>APPL</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_suppressWarning</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyFragments</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_flattenResource</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_flatFileName</NAME><VALUE>a.rsrc</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_flatFileOutputPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
-                    <SETTING><VALUE>DLGX</VALUE></SETTING>
-                    <SETTING><VALUE>ckid</VALUE></SETTING>
-                    <SETTING><VALUE>Proj</VALUE></SETTING>
-                    <SETTING><VALUE>WSPC</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "OmnisRC Panel" panel -->
-                <SETTING><NAME>Defines</NAME><VALUE>ismac,isMacRCC</VALUE></SETTING>
-                <SETTING><NAME>Compatible</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Output Flags" panel -->
-                <SETTING><NAME>FileLocked</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ResourcesMapIsReadOnly</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PrinterDriverIsMultiFinderCompatible</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Invisible</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>HasBundle</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>NameLocked</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Stationery</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>HasCustomIcon</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Shared</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>HasBeenInited</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Label</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>Comments</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Packager Panel" panel -->
-                <SETTING><NAME>MWMacOSPackager_UsePackager</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_FolderToPackage</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWMacOSPackager_CreateClassicAlias</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_ClassicAliasMethod</NAME><VALUE>UseTargetOutput</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_ClassicAliasPath</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_CreatePkgInfo</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_PkgCreatorType</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_PkgFileType</NAME><VALUE>APPL</VALUE></SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC_mw</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tracebacktables</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_function_align</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_largetoc</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_poolconst</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_linkerpoolsstrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_volatileasm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec_move_block</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_strictIEEEfp</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_genfsel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_orderedfpcmp</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC CodeGen Mach-O" panel -->
-                <SETTING><NAME>MWCodeGen_MachO_structalignment</NAME><VALUE>PPC_mw</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_profiler_enum</NAME><VALUE>Off</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_function_align</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_common</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_linkerpoolsstrings</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_volatileasm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_vecmove</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_fp_ieee_strict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_genfsel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_fp_cmps_ordered</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Disassembler" panel -->
-                <SETTING><NAME>MWDisassembler_PPC_showcode</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_extended</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_mix</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_nohex</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showsym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_shownames</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "PPC Global Optimizer" panel -->
-                <SETTING><NAME>GlobalOptimizer_PPC_optimizationlevel</NAME><VALUE>Level2</VALUE></SETTING>
-                <SETTING><NAME>GlobalOptimizer_PPC_optfor</NAME><VALUE>Speed</VALUE></SETTING>
-
-                <!-- Settings for "PPC Linker" panel -->
-                <SETTING><NAME>MWLinker_PPC_linksym</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_symfullpath</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_nolinkwarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_dontdeadstripinitcode</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_permitmultdefs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmode</NAME><VALUE>Fast</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_initname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_mainname</NAME><VALUE>__start</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_termname</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "PPC Mac OS X Linker" panel -->
-                <SETTING><NAME>MWLinker_MacOSX_linksym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_symfullpath</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_nolinkwarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_linkmap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_dontdeadstripinitcode</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_permitmultdefs</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_use_objectivec_semantics</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_strip_debug_symbols</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_split_segs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_report_msl_overloads</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_objects_follow_linkorder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_linkmode</NAME><VALUE>Fast</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_exports</NAME><VALUE>ReferencedGlobals</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_sortcode</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_mainname</NAME><VALUE>start</VALUE></SETTING>
-
-                <!-- Settings for "PPC Mac OS X Project" panel -->
-                <SETTING><NAME>MWProject_MacOSX_type</NAME><VALUE>Library</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_outfile</NAME><VALUE>wxxrc_CARBON.lib</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_filecreator</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_filetype</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_vmaddress</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_usedefaultvmaddr</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flatrsrc</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flatrsrcfilename</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flatrsrcoutputdir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWProject_MacOSX_installpath</NAME><VALUE>./</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_dont_prebind</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flat_namespace</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_frameworkversion</NAME><VALUE>A</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flat_oldimpversion</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Mach-O Linker" panel -->
-                <SETTING><NAME>MWLinker_MachO_exports</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_mainname</NAME><VALUE>start</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_compatibleversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_symfullpath</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_supresswarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_multisymerror</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_prebind</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_deadstrip</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_objectivecsemantics</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_whichfileloaded</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_whyfileloaded</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_readonlyrelocs</NAME><VALUE>Errors</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_undefinedsymbols</NAME><VALUE>Errors</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_twolevelnamespace</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_stripdebugsymbols</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Mach-O Target" panel -->
-                <SETTING><NAME>MWProject_MachO_type</NAME><VALUE>Executable</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_outfile</NAME><VALUE>a.exe</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_filecreator</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_filetype</NAME><VALUE>MEXE</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_vmaddress</NAME><VALUE>4096</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_flatrsrc</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_flatrsrcfilename</NAME><VALUE>a.rsrc</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_flatrsrcoutputdir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWProject_MachO_installpath</NAME><VALUE>./</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_frameworkversion</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "PPC PEF" panel -->
-                <SETTING><NAME>MWPEF_exports</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_libfolder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sortcode</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_expandbss</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sharedata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_olddefversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_oldimpversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_fragmentname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWPEF_collapsereloads</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Project" panel -->
-                <SETTING><NAME>MWProject_PPC_type</NAME><VALUE>Library</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_outfile</NAME><VALUE>wxstc_CARBON.lib</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_stacksize</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_symfilename</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcheader</NAME><VALUE>Native</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrctype</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcflags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcstore</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcmerge</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flatrsrc</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flatrsrcoutputdir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWProject_PPC_flatrsrcfilename</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "PPCAsm Panel" panel -->
-                <SETTING><NAME>MWAssembler_PPC_auxheader</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_symmode</NAME><VALUE>Mac</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_dialect</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_prefixfile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_typecheck</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_warnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_casesensitive</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Property List" panel -->
-                <SETTING><NAME>PList_OutputType</NAME><VALUE>File</VALUE></SETTING>
-                <SETTING><NAME>PList_OutputEncoding</NAME><VALUE>UTF-8</VALUE></SETTING>
-                <SETTING><NAME>PList_Prefix</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>PList_FileFilename</NAME><VALUE>Info.plist</VALUE></SETTING>
-                <SETTING><NAME>PList_FileDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>PList_ResourceType</NAME><VALUE>plst</VALUE></SETTING>
-                <SETTING><NAME>PList_ResourceID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>PList_ResourceName</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Rez Compiler" panel -->
-                <SETTING><NAME>MWRez_Language_maxwidth</NAME><VALUE>80</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_script</NAME><VALUE>Roman</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_alignment</NAME><VALUE>Align1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filtermode</NAME><VALUE>FilterSkip</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_suppresswarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_escapecontrolchars</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_prefixname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filteredtypes</NAME><VALUE>'CODE' 'DATA' 'PICT'</VALUE></SETTING>
-
-                <!-- Settings for "WinRC Compiler" panel -->
-                <SETTING><NAME>MWWinRC_prefixname</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "x86 CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_X86_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_alignment</NAME><VALUE>bytes8</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_exceptions</NAME><VALUE>ZeroOverhead</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_name_mangling</NAME><VALUE>MWWin32</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_use_extinst</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_mmx</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_3dnow</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_use_mmx_3dnow_convention</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_cmov</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_sse</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_sse2</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_intrinsics</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_optimizeasm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_disableopts</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_profile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_runtime</NAME><VALUE>Custom</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "x86 COFF" panel -->
-                <SETTING><NAME>MWLinker_X86_subsysmajorid</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_subsysminorid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_opsysmajorid</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_opsysminorid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_usrmajorid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_usrminorid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_maxstacksize</NAME><VALUE>1024</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_minstacksize</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_size</NAME><VALUE>1024</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_minsize</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_coff_flags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_dll_flags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_baseaddress</NAME><VALUE>4194304</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_filealign</NAME><VALUE>512</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_sectionalign</NAME><VALUE>4096</VALUE></SETTING>
-
-                <!-- Settings for "x86 Disassembler" panel -->
-                <SETTING><NAME>PDisasmX86_showHeaders</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showSectHeaders</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showSymTab</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showCode</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showData</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showDebug</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showExceptions</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showRaw</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showAllRaw</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showSource</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showRelocation</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showHex</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showComments</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showSymDefs</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_unmangle</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_verbose</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_resolveRelocs</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_resolveLocals</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "x86 Exceptions Panel" panel -->
-                <SETTING><NAME>MWDebugger_X86_Exceptions</NAME>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "x86 Global Optimizer" panel -->
-                <SETTING><NAME>GlobalOptimizer_X86_optimizationlevel</NAME><VALUE>Level0</VALUE></SETTING>
-                <SETTING><NAME>GlobalOptimizer_X86_optfor</NAME><VALUE>Speed</VALUE></SETTING>
-
-                <!-- Settings for "x86 Linker" panel -->
-                <SETTING><NAME>MWLinker_X86_entrypointusage</NAME><VALUE>Default</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_entrypoint</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_subsystem</NAME><VALUE>WinGUI</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_commandfile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_generatemap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_linksym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_linkCV</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_symfullpath</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_linkdebug</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_checksum</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_zero_init_bss</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_mergedata</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_usedefaultlibs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_adddefaultlibs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_nowarnings</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_verbose</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "x86 Project" panel -->
-                <SETTING><NAME>MWProject_X86_type</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_outfile</NAME><VALUE>NONAME.EXE</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_importlib</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_setimportlibdir</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_dontgenerateimportlib</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_oldformatlib</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_replaceobjextension</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_copyallfiles</NAME><VALUE>false</VALUE></SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PlatWX.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ScintillaWX.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>stc.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AutoComplete.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CallTip.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CellBuffer.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ContractionState.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Document.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DocumentAccessor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Editor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Indicator.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>KeyMap.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>KeyWords.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexAda.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexAVE.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexBaan.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexBullant.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexConf.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexCPP.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexCrontab.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexEiffel.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexHTML.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexLisp.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexLua.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexMatlab.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexOthers.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPascal.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPerl.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPython.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexRuby.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexSQL.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexVB.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LineMarker.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PropSet.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>RESearch.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ScintillaBase.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Style.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>StyleContext.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UniConversion.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ViewStyle.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowAccessor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PlatWX.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ScintillaWX.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>stc.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AutoComplete.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CallTip.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CellBuffer.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ContractionState.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Document.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DocumentAccessor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Editor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Indicator.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>KeyMap.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>KeyWords.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexAda.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexAVE.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexBaan.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexBullant.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexConf.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexCPP.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexCrontab.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexEiffel.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexHTML.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexLisp.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexLua.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexMatlab.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexOthers.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPascal.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPerl.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPython.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexRuby.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexSQL.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexVB.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LineMarker.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PropSet.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>RESearch.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ScintillaBase.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Style.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>StyleContext.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UniConversion.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ViewStyle.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowAccessor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </LINKORDER>
-        </TARGET>
-        <TARGET>
-            <NAME>CARBON Debug</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>RequireFrameworkStyleIncludes</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:::include:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>::::include:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>MSL</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:MacOS Support:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Debugger Runtime" panel -->
-                <SETTING><NAME>MWRuntimeSettings_WorkingDirectory</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_CommandLine</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRuntimeSettings_HostApplication</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>MacOS PPC Linker</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>CARBON Debug</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>::::lib:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>APPL</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>Appl</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MMLB</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MPLF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MWCD</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>RSRC</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.bh</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Balloon Help</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>Balloon Help</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cxx</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.exp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.p</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW Pascal PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pas</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW Pascal PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ppu</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW Pascal PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.r</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Rez</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>Rez</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.s</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PPCAsm</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE>Balloon Help</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>XCOF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>docu</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>rsrc</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>shlb</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>stub</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.doc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ppob</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsrc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>BrowserGenerator</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>DebuggerAppPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>DebuggerCmdLineArgs</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>DebuggerWorkingDir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CodeCompletionPrefixFileName</NAME><VALUE>MacHeaders.c</VALUE></SETTING>
-                <SETTING><NAME>CodeCompletionMacroFileName</NAME><VALUE>MacOS_Carbon_C++_Macros.h</VALUE></SETTING>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>ConsoleEncoding</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Remote Debug" panel -->
-                <SETTING><NAME>Enabled</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ConnectionName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>DownloadPath</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>LaunchRemoteApp</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>RemoteAppPath</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>CoreID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>JTAGClockSpeed</NAME><VALUE>8000</VALUE></SETTING>
-                <SETTING><NAME>IsMultiCore</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>UseGlobalOSDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>OSDownloadConnectionName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>OSDownloadPath</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>AltDownload</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>AltDownloadConnectionName</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Auto-target" panel -->
-                <SETTING><NAME>OtherExecutables</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "C/C++ Compiler" panel -->
-                <SETTING><NAME>MWFrontEnd_C_cplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_checkprotos</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_arm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_trigraphs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>stc_cwc_d.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enableexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontreusestrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_poolstrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_useRTTI</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_multibyteaware</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_unsignedchars</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_autoinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_booltruefalse</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_inlinelevel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ecplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_objective_c</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_defer_codegen</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_templateparser</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_c99</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_bottomupinline</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "C/C++ Warnings" panel -->
-                <SETTING><NAME>MWWarning_C_warn_illpragma</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_emptydecl</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_possunwant</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedvar</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedarg</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_extracomma</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_pedantic</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warningerrors</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_hidevirtual</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_implicitconv</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_notinlined</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_structclass</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "FTP Panel" panel -->
-                <SETTING><NAME>MWFTP_Post_hostName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_username</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_password</NAME><VALUE>0&#255;&#196;@
&#168;&#224;&#152;&#144;"&#168;T</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_remoteDir</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_PathVersion</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_PathType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_PathFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_tree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_uploadDir</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ftp_port</NAME><VALUE>21</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_SendBin</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFTP_Post_ShouldLog</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "Java Command Line" panel -->
-                <SETTING><NAME>MWCommandLine_Java_clsName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWCommandLine_Java_args</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "PJavaDebugging" panel -->
-                <SETTING><NAME>MWVJavaDebugging_Protocol</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_JDKVersion</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_TimeOut</NAME><VALUE>25</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_SupportSlowDevices</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_UseRemoteLaunchAgent</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWVJavaDebugging_LaunchVMasServer</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Java Language" panel -->
-                <SETTING><NAME>MWJava_Language_optimize</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_warnDeprecated</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_emitMap</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_strictFileNames</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_strictFileHierarchy</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_1_1_Compatible</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_emitHeaders</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_headerType</NAME><VALUE>JNINativeHeaders</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_packageFilter</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_genComments</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_genHeaders</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_enableAsserts</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Language_targetVM</NAME><VALUE>1.1</VALUE></SETTING>
-
-                <!-- Settings for "Java Manifest-JAD Setting Info" panel -->
-                <SETTING><NAME>Manifest-JAD Attributes</NAME>
-                    <SETTING>
-                        <SETTING><NAME>Attribute</NAME><VALUE>Main-Class</VALUE></SETTING>
-                        <SETTING><NAME>Value</NAME><VALUE>Auto-Generated</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Java MRJAppBuilder" panel -->
-                <SETTING><NAME>MWJava_MRJAppBuilder_outFile</NAME><VALUE>MRJApplication</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_merge</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_quitMenu</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_grow</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutType</NAME><VALUE>Console</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrType</NAME><VALUE>Console</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinType</NAME><VALUE>Console</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconPVersion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_appIconFile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPVersion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_splashScreenPICTFile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_aboutName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutPVersion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutFile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdoutAppend</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrFile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stderrAppend</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinPType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinPFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinPTree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_MRJAppBuilder_stdinFile</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Java Output" panel -->
-                <SETTING><NAME>MWJava_Output_outputtype</NAME><VALUE>JarFile</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_outfile</NAME><VALUE>JavaClasses.jar</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_ftype</NAME><VALUE>1514754080</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_fcreator</NAME><VALUE>1297570384</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_compress</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_genManifest</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_trunctype</NAME><VALUE>Front</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_deleteClasses</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_consoleApp</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_preverify</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_genJad</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Output_obfuscate</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Java Project" panel -->
-                <SETTING><NAME>MWJava_Proj_projtype</NAME><VALUE>Applet</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_mainClassName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_HTMLAppCreator</NAME><VALUE>1145457748</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_HTMLAppName</NAME><VALUE>Metrowerks Java</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_PathVersion</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_PathType</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_PathFormat</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_tree</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_HTMLAppWin32Name</NAME><VALUE>Internet Explorer</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_compress</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_simulator</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_useVM</NAME><VALUE>\000\000mrj225</VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_vmarguments</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_vmName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJava_Proj_simPropFile</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "JavaDoc Project" panel -->
-                <SETTING><NAME>MWJavaDoc_Proj_Version</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Deprecated</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Author</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Index</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Tree</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_SunResolveToSame</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Shortnames</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_Folder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_GenerateAPILinks</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_scope</NAME><VALUE>Public</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_fcreator</NAME><VALUE>1229278547</VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_encodingName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_decodingName</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWJavaDoc_Proj_javaPackagePath</NAME><VALUE>http://java.sun.com/products/jdk/1.1/docs/api/</VALUE></SETTING>
-
-                <!-- Settings for "MacOS Merge Panel" panel -->
-                <SETTING><NAME>MWMerge_MacOS_projectType</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputName</NAME><VALUE>Merge Out</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputCreator</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>APPL</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_suppressWarning</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyFragments</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_flattenResource</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_flatFileName</NAME><VALUE>a.rsrc</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_flatFileOutputPath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
-                    <SETTING><VALUE>DLGX</VALUE></SETTING>
-                    <SETTING><VALUE>ckid</VALUE></SETTING>
-                    <SETTING><VALUE>Proj</VALUE></SETTING>
-                    <SETTING><VALUE>WSPC</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "OmnisRC Panel" panel -->
-                <SETTING><NAME>Defines</NAME><VALUE>ismac,isMacRCC</VALUE></SETTING>
-                <SETTING><NAME>Compatible</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "Output Flags" panel -->
-                <SETTING><NAME>FileLocked</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>ResourcesMapIsReadOnly</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PrinterDriverIsMultiFinderCompatible</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Invisible</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>HasBundle</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>NameLocked</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Stationery</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>HasCustomIcon</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Shared</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>HasBeenInited</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>Label</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>Comments</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Packager Panel" panel -->
-                <SETTING><NAME>MWMacOSPackager_UsePackager</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_FolderToPackage</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWMacOSPackager_CreateClassicAlias</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_ClassicAliasMethod</NAME><VALUE>UseTargetOutput</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_ClassicAliasPath</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_CreatePkgInfo</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_PkgCreatorType</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWMacOSPackager_PkgFileType</NAME><VALUE>APPL</VALUE></SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC_mw</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tracebacktables</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_function_align</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_largetoc</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_poolconst</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_linkerpoolsstrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_volatileasm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec_move_block</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_strictIEEEfp</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_genfsel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_orderedfpcmp</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC CodeGen Mach-O" panel -->
-                <SETTING><NAME>MWCodeGen_MachO_structalignment</NAME><VALUE>PPC_mw</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_profiler_enum</NAME><VALUE>Off</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_function_align</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_common</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_linkerpoolsstrings</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_volatileasm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_vecmove</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_fp_ieee_strict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_genfsel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_MachO_fp_cmps_ordered</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Disassembler" panel -->
-                <SETTING><NAME>MWDisassembler_PPC_showcode</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_extended</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_mix</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_nohex</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showsym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_shownames</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "PPC Global Optimizer" panel -->
-                <SETTING><NAME>GlobalOptimizer_PPC_optimizationlevel</NAME><VALUE>Level2</VALUE></SETTING>
-                <SETTING><NAME>GlobalOptimizer_PPC_optfor</NAME><VALUE>Speed</VALUE></SETTING>
-
-                <!-- Settings for "PPC Linker" panel -->
-                <SETTING><NAME>MWLinker_PPC_linksym</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_symfullpath</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_nolinkwarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_dontdeadstripinitcode</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_permitmultdefs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmode</NAME><VALUE>Fast</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_initname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_mainname</NAME><VALUE>__start</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_termname</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "PPC Mac OS X Linker" panel -->
-                <SETTING><NAME>MWLinker_MacOSX_linksym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_symfullpath</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_nolinkwarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_linkmap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_dontdeadstripinitcode</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_permitmultdefs</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_use_objectivec_semantics</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_strip_debug_symbols</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_split_segs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_report_msl_overloads</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_objects_follow_linkorder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_linkmode</NAME><VALUE>Fast</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_exports</NAME><VALUE>ReferencedGlobals</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_sortcode</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MacOSX_mainname</NAME><VALUE>start</VALUE></SETTING>
-
-                <!-- Settings for "PPC Mac OS X Project" panel -->
-                <SETTING><NAME>MWProject_MacOSX_type</NAME><VALUE>Library</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_outfile</NAME><VALUE>wxstc_CARBON_d.lib</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_filecreator</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_filetype</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_vmaddress</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_usedefaultvmaddr</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flatrsrc</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flatrsrcfilename</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flatrsrcoutputdir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWProject_MacOSX_installpath</NAME><VALUE>./</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_dont_prebind</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flat_namespace</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_frameworkversion</NAME><VALUE>A</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MacOSX_flat_oldimpversion</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Mach-O Linker" panel -->
-                <SETTING><NAME>MWLinker_MachO_exports</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_mainname</NAME><VALUE>start</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_compatibleversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_symfullpath</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_supresswarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_multisymerror</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_prebind</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_deadstrip</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_objectivecsemantics</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_whichfileloaded</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_whyfileloaded</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_readonlyrelocs</NAME><VALUE>Errors</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_undefinedsymbols</NAME><VALUE>Errors</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_twolevelnamespace</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_MachO_stripdebugsymbols</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Mach-O Target" panel -->
-                <SETTING><NAME>MWProject_MachO_type</NAME><VALUE>Executable</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_outfile</NAME><VALUE>a.exe</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_filecreator</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_filetype</NAME><VALUE>MEXE</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_vmaddress</NAME><VALUE>4096</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_flatrsrc</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_flatrsrcfilename</NAME><VALUE>a.rsrc</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_flatrsrcoutputdir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWProject_MachO_installpath</NAME><VALUE>./</VALUE></SETTING>
-                <SETTING><NAME>MWProject_MachO_frameworkversion</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "PPC PEF" panel -->
-                <SETTING><NAME>MWPEF_exports</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_libfolder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sortcode</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_expandbss</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sharedata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_olddefversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_oldimpversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_fragmentname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWPEF_collapsereloads</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Project" panel -->
-                <SETTING><NAME>MWProject_PPC_type</NAME><VALUE>Library</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_outfile</NAME><VALUE>wxstc_CARBON_d.lib</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_stacksize</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_symfilename</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcheader</NAME><VALUE>Native</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrctype</NAME><VALUE>????</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcflags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcstore</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcmerge</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flatrsrc</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flatrsrcoutputdir</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>MWProject_PPC_flatrsrcfilename</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "PPCAsm Panel" panel -->
-                <SETTING><NAME>MWAssembler_PPC_auxheader</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_symmode</NAME><VALUE>Mac</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_dialect</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_prefixfile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_typecheck</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_warnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_casesensitive</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Property List" panel -->
-                <SETTING><NAME>PList_OutputType</NAME><VALUE>File</VALUE></SETTING>
-                <SETTING><NAME>PList_OutputEncoding</NAME><VALUE>UTF-8</VALUE></SETTING>
-                <SETTING><NAME>PList_Prefix</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>PList_FileFilename</NAME><VALUE>Info.plist</VALUE></SETTING>
-                <SETTING><NAME>PList_FileDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>PList_ResourceType</NAME><VALUE>plst</VALUE></SETTING>
-                <SETTING><NAME>PList_ResourceID</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>PList_ResourceName</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Rez Compiler" panel -->
-                <SETTING><NAME>MWRez_Language_maxwidth</NAME><VALUE>80</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_script</NAME><VALUE>Roman</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_alignment</NAME><VALUE>Align1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filtermode</NAME><VALUE>FilterSkip</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_suppresswarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_escapecontrolchars</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_prefixname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filteredtypes</NAME><VALUE>'CODE' 'DATA' 'PICT'</VALUE></SETTING>
-
-                <!-- Settings for "WinRC Compiler" panel -->
-                <SETTING><NAME>MWWinRC_prefixname</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "x86 CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_X86_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_alignment</NAME><VALUE>bytes8</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_exceptions</NAME><VALUE>ZeroOverhead</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_name_mangling</NAME><VALUE>MWWin32</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_use_extinst</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_mmx</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_3dnow</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_use_mmx_3dnow_convention</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_cmov</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_sse</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_extinst_sse2</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_intrinsics</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_optimizeasm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_disableopts</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_profile</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_runtime</NAME><VALUE>Custom</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_X86_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "x86 COFF" panel -->
-                <SETTING><NAME>MWLinker_X86_subsysmajorid</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_subsysminorid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_opsysmajorid</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_opsysminorid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_usrmajorid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_usrminorid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_maxstacksize</NAME><VALUE>1024</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_minstacksize</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_size</NAME><VALUE>1024</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_minsize</NAME><VALUE>4</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_coff_flags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_dll_flags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_baseaddress</NAME><VALUE>4194304</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_filealign</NAME><VALUE>512</VALUE></SETTING>
-                <SETTING><NAME>MWCOFF_X86_sectionalign</NAME><VALUE>4096</VALUE></SETTING>
-
-                <!-- Settings for "x86 Disassembler" panel -->
-                <SETTING><NAME>PDisasmX86_showHeaders</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showSectHeaders</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showSymTab</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showCode</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showData</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showDebug</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showExceptions</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showRaw</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showAllRaw</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showSource</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showRelocation</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showHex</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showComments</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_showSymDefs</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_unmangle</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_verbose</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_resolveRelocs</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PDisasmX86_resolveLocals</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "x86 Exceptions Panel" panel -->
-                <SETTING><NAME>MWDebugger_X86_Exceptions</NAME>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                    <SETTING><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "x86 Global Optimizer" panel -->
-                <SETTING><NAME>GlobalOptimizer_X86_optimizationlevel</NAME><VALUE>Level0</VALUE></SETTING>
-                <SETTING><NAME>GlobalOptimizer_X86_optfor</NAME><VALUE>Speed</VALUE></SETTING>
-
-                <!-- Settings for "x86 Linker" panel -->
-                <SETTING><NAME>MWLinker_X86_entrypointusage</NAME><VALUE>Default</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_entrypoint</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_subsystem</NAME><VALUE>WinGUI</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_commandfile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_generatemap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_linksym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_linkCV</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_symfullpath</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_linkdebug</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_checksum</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_zero_init_bss</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_mergedata</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_usedefaultlibs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_adddefaultlibs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_nowarnings</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_X86_verbose</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "x86 Project" panel -->
-                <SETTING><NAME>MWProject_X86_type</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_outfile</NAME><VALUE>NONAME.EXE</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_importlib</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_setimportlibdir</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_dontgenerateimportlib</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_oldformatlib</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_replaceobjextension</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>MWProject_X86_copyallfiles</NAME><VALUE>false</VALUE></SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PlatWX.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ScintillaWX.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>stc.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AutoComplete.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CallTip.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CellBuffer.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ContractionState.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Document.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DocumentAccessor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Editor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Indicator.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>KeyMap.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>KeyWords.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexAda.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexAVE.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexBaan.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexBullant.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexConf.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexCPP.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexCrontab.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexEiffel.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexLisp.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexHTML.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexLua.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexMatlab.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexOthers.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPascal.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPerl.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPython.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexRuby.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexSQL.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexVB.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LineMarker.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PropSet.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>RESearch.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ScintillaBase.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Style.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>StyleContext.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UniConversion.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ViewStyle.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowAccessor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PlatWX.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ScintillaWX.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>stc.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AutoComplete.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CallTip.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CellBuffer.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ContractionState.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Document.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DocumentAccessor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Editor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Indicator.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>KeyMap.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>KeyWords.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexAda.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexAVE.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexBaan.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexBullant.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexConf.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexCPP.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexCrontab.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexEiffel.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexLisp.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexHTML.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexLua.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexMatlab.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexOthers.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPascal.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPerl.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPython.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexRuby.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexSQL.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexVB.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LineMarker.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PropSet.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>RESearch.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ScintillaBase.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Style.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>StyleContext.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UniConversion.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ViewStyle.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowAccessor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </LINKORDER>
-        </TARGET>
-    </TARGETLIST>
-
-    <TARGETORDER>
-        <ORDEREDTARGET><NAME>PPC</NAME></ORDEREDTARGET>
-        <ORDEREDTARGET><NAME>PPC Debug</NAME></ORDEREDTARGET>
-        <ORDEREDTARGET><NAME>CARBON</NAME></ORDEREDTARGET>
-        <ORDEREDTARGET><NAME>CARBON Debug</NAME></ORDEREDTARGET>
-        <ORDEREDTARGET><NAME>All</NAME></ORDEREDTARGET>
-    </TARGETORDER>
-
-    <GROUPLIST>
-        <FILEREF>
-            <TARGETNAME>PPC</TARGETNAME>
-            <PATHTYPE>Name</PATHTYPE>
-            <PATH>PlatWX.cpp</PATH>
-            <PATHFORMAT>MacOS</PATHFORMAT>
-        </FILEREF>
-        <FILEREF>
-            <TARGETNAME>PPC</TARGETNAME>
-            <PATHTYPE>Name</PATHTYPE>
-            <PATH>ScintillaWX.cpp</PATH>
-            <PATHFORMAT>MacOS</PATHFORMAT>
-        </FILEREF>
-        <FILEREF>
-            <TARGETNAME>PPC</TARGETNAME>
-            <PATHTYPE>Name</PATHTYPE>
-            <PATH>stc.cpp</PATH>
-            <PATHFORMAT>MacOS</PATHFORMAT>
-        </FILEREF>
-        <GROUP><NAME>scintilla</NAME>
-            <GROUP><NAME>src</NAME>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AutoComplete.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CallTip.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CellBuffer.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ContractionState.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Document.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DocumentAccessor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Editor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Indicator.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>KeyMap.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>KeyWords.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexAda.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexAVE.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexBaan.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexBullant.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexConf.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexCPP.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexCrontab.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexEiffel.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexHTML.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexLisp.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexLua.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexMatlab.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexOthers.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPascal.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPerl.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexPython.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexRuby.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexSQL.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LexVB.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>LineMarker.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PropSet.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>RESearch.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ScintillaBase.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Style.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>StyleContext.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UniConversion.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ViewStyle.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>PPC</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowAccessor.cxx</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </GROUP>
-        </GROUP>
-    </GROUPLIST>
-
-</PROJECT>
diff --git a/src/stc/stc_cw.h b/src/stc/stc_cw.h
deleted file mode 100755
index 352f7e383c..0000000000
--- a/src/stc/stc_cw.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define __WX__
-#define SCI_LEXER
-#define LINK_LEXERS
-#include "wx/wx_cw.h"
\ No newline at end of file
diff --git a/src/stc/stc_cw_d.h b/src/stc/stc_cw_d.h
deleted file mode 100755
index c865c2817a..0000000000
--- a/src/stc/stc_cw_d.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define __WX__
-#define SCI_LEXER
-#define LINK_LEXERS
-#include "wx/wx_cw_d.h"
\ No newline at end of file
diff --git a/src/stc/stc_cwc.h b/src/stc/stc_cwc.h
deleted file mode 100755
index e45ddef66a..0000000000
--- a/src/stc/stc_cwc.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define __WX__
-#define SCI_LEXER
-#define LINK_LEXERS
-#include "wx/wx_cwc.h"
\ No newline at end of file
diff --git a/src/stc/stc_cwc_d.h b/src/stc/stc_cwc_d.h
deleted file mode 100755
index bb809f5b14..0000000000
--- a/src/stc/stc_cwc_d.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define __WX__
-#define SCI_LEXER
-#define LINK_LEXERS
-#include "wx/wx_cwc_d.h"
\ No newline at end of file
diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index 89130b4e3c..f347cfe1b9 100644
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -122,8 +122,8 @@ bool wxComboListBox::Create(wxWindow* parent)
     if ( !wxListBox::Create(parent, wxID_ANY,
                             wxDefaultPosition, wxDefaultSize,
                             0, NULL,
-                            wxBORDER_SIMPLE | wxLB_INT_HEIGHT |
-                            m_combo->GetWindowStyle() & wxCB_SORT ? wxLB_SORT : 0) )
+                            wxBORDER_SIMPLE |
+                            ( m_combo->GetWindowStyle() & wxCB_SORT ? wxLB_SORT : 0 ) ) )
         return false;
 
     // we don't react to the mouse events outside the window at all
@@ -389,8 +389,12 @@ void wxComboBox::SetSelection(int n)
     wxCHECK_RET( (n == wxNOT_FOUND || IsValid(n)), _T("invalid index in wxComboBox::Select") );
 
     GetLBox()->SetSelection(n);
-    if ( GetTextCtrl() )
-        GetTextCtrl()->SetValue(GetLBox()->GetString(n));
+
+    wxString str;
+    if ( n != wxNOT_FOUND )
+        str = GetLBox()->GetString(n);
+
+    SetText(str);
 }
 
 int wxComboBox::GetSelection() const
diff --git a/src/univ/stattext.cpp b/src/univ/stattext.cpp
index 83ebf31eaf..509a5d6dde 100644
--- a/src/univ/stattext.cpp
+++ b/src/univ/stattext.cpp
@@ -88,14 +88,6 @@ wxSize wxStaticText::DoGetBestClientSize() const
 
 void wxStaticText::DoDraw(wxControlRenderer *renderer)
 {
-    if ( UseBgCol() )
-    {
-        wxDC& dc = renderer->GetDC();
-        dc.SetBrush(GetBackgroundColour());
-        dc.SetPen(*wxTRANSPARENT_PEN);
-        dc.DrawRectangle(renderer->GetRect());
-    }
-
     renderer->DrawLabel();
 }
 
diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp
index ebb49dcc83..1fbc95a389 100644
--- a/src/univ/textctrl.cpp
+++ b/src/univ/textctrl.cpp
@@ -1434,8 +1434,12 @@ wxString wxTextCtrl::GetSelectionText() const
 void wxTextCtrl::SetSelection(wxTextPos from, wxTextPos to)
 {
     // selecting till -1 is the same as selecting to the end
-    if ( to == -1 && from != -1 )
+    if ( to == -1 )
     {
+        // and selecting (-1, -1) range is the same as selecting everything, by
+        // convention
+        if ( from == -1 )
+            from = 0;
         to = GetLastPosition();
     }
 
diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index fcdda770e1..bfb8106230 100644
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -336,7 +336,7 @@ bool wxWindow::DoDrawBackground(wxDC& dc)
     rect.height = size.y;
 
     wxWindow * const parent = GetParent();
-    if ( HasTransparentBackground() && parent )
+    if ( HasTransparentBackground() && !UseBgCol() && parent )
     {
         wxASSERT( !IsTopLevel() );
 
diff --git a/src/unix/gsocket.cpp b/src/unix/gsocket.cpp
index cba3dd30f8..659f709be5 100644
--- a/src/unix/gsocket.cpp
+++ b/src/unix/gsocket.cpp
@@ -251,13 +251,13 @@ static struct hostent * deepCopyHostent(struct hostent *h,
   misalign = sizeof(char *) - pos%sizeof(char *);
   if(misalign < sizeof(char *))
     pos += misalign;
-  
+
   /* leave space for pointer list */
   p = h->h_aliases;
   char **h_aliases = (char **)(buffer + pos);
   while(*(p++) != 0)
     pos += sizeof(char *);
-  
+
   /* copy aliases and fill new pointer list */
   for (p = h->h_aliases, q = h_aliases; *p != 0; p++, q++)
   {
@@ -389,13 +389,13 @@ static struct servent * deepCopyServent(struct servent *s,
   unsigned int misalign = sizeof(char *) - pos%sizeof(char *);
   if(misalign < sizeof(char *))
     pos += misalign;
-  
+
   /* leave space for pointer list */
   char **p = s->s_aliases, **q;
   char **s_aliases = (char **)(buffer + pos);
   while(*(p++) != 0)
     pos += sizeof(char *);
-  
+
   /* copy addresses and fill new pointer list */
   for (p = s->s_aliases, q = s_aliases; *p != 0; p++, q++){
     len = strlen(*p);
@@ -587,7 +587,7 @@ void GSocket::Shutdown()
   /* If socket has been created, shutdown it */
   if (m_fd != INVALID_SOCKET)
   {
-    shutdown(m_fd, 2);
+    shutdown(m_fd, 1);
     Close();
   }
 
@@ -762,7 +762,7 @@ GSocketError GSocket::SetServer()
 
   /* FreeBSD variants can't use MSG_NOSIGNAL, and instead use a socket option */
 #ifdef SO_NOSIGPIPE
-  setsockopt(m_fd, SOL_SOCKET, SO_NOSIGPIPE, (const char*)&arg, sizeof(u_long));
+  setsockopt(m_fd, SOL_SOCKET, SO_NOSIGPIPE, (const char*)&arg, sizeof(arg));
 #endif
 
   ioctl(m_fd, FIONBIO, &arg);
@@ -773,9 +773,9 @@ GSocketError GSocket::SetServer()
    */
   if (m_reusable)
   {
-    setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(u_long));
+    setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(arg));
 #ifdef SO_REUSEPORT
-    setsockopt(m_fd, SOL_SOCKET, SO_REUSEPORT, (const char*)&arg, sizeof(u_long));
+    setsockopt(m_fd, SOL_SOCKET, SO_REUSEPORT, (const char*)&arg, sizeof(arg));
 #endif
   }
 
@@ -967,7 +967,7 @@ GSocketError GSocket::Connect(GSocketStream stream)
 
   /* FreeBSD variants can't use MSG_NOSIGNAL, and instead use a socket option */
 #ifdef SO_NOSIGPIPE
-  setsockopt(m_fd, SOL_SOCKET, SO_NOSIGPIPE, (const char*)&arg, sizeof(u_long));
+  setsockopt(m_fd, SOL_SOCKET, SO_NOSIGPIPE, (const char*)&arg, sizeof(arg));
 #endif
 
 #if defined(__EMX__) || defined(__VISAGECPP__)
@@ -979,9 +979,9 @@ GSocketError GSocket::Connect(GSocketStream stream)
   // If the reuse flag is set, use the applicable socket reuse flags(s)
   if (m_reusable)
   {
-    setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(u_long));
+    setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(arg));
 #ifdef SO_REUSEPORT
-    setsockopt(m_fd, SOL_SOCKET, SO_REUSEPORT, (const char*)&arg, sizeof(u_long));
+    setsockopt(m_fd, SOL_SOCKET, SO_REUSEPORT, (const char*)&arg, sizeof(arg));
 #endif
   }
 
@@ -1111,6 +1111,14 @@ GSocketError GSocket::SetNonOriented()
 #endif
   gs_gui_functions->Enable_Events(this);
 
+  if (m_reusable)
+  {
+    setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(arg));
+#ifdef SO_REUSEPORT
+    setsockopt(m_fd, SOL_SOCKET, SO_REUSEPORT, (const char*)&arg, sizeof(arg));
+#endif
+  }
+
   /* Bind to the local address,
    * and retrieve the actual address bound.
    */
@@ -1160,17 +1168,16 @@ int GSocket::Read(char *buffer, int size)
     else
       ret = Recv_Dgram(buffer, size);
 
-    /* If recv returned zero, then the connection is lost, and errno is not set.
+    /* If recv returned zero, then the connection has been gracefully closed.
      * Otherwise, recv has returned an error (-1), in which case we have lost the
      * socket only if errno does _not_ indicate that there may be more data to read.
      */
     if (ret == 0)
     {
-      m_error = GSOCK_IOERR;
+      /* Make sure wxSOCKET_LOST event gets sent and shut down the socket */
       m_detected = GSOCK_LOST_FLAG;
-      Close();
-      // Signal an error for return
-      return -1;
+      Detected_Read();
+      return 0;
     }
     else if (ret == -1)
     {
@@ -1319,7 +1326,7 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags)
       {
         /* This is a TCP server socket that detected a connection.
           While the INPUT_FLAG is also set, it doesn't matter on
-          this kind of  sockets, as we can only Accept() from them. */        
+          this kind of  sockets, as we can only Accept() from them. */
         result |= GSOCK_CONNECTION_FLAG;
         m_detected |= GSOCK_CONNECTION_FLAG;
       }
diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index 0d9de5f65f..9aa4adaf07 100644
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -2747,8 +2747,8 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
 
         if ( data.needsterminal )
         {
-            data.cmdOpen.Printf(wxT("xterm -e sh -c '%s'"),
-                                            data.cmdOpen.c_str());
+            data.cmdOpen.insert(0, wxT("xterm -e sh -c '"));
+            data.cmdOpen.append(wxT("'"));
         }
 
         if ( !data.cmdOpen.empty() )
diff --git a/src/unix/net.cpp b/src/unix/net.cpp
deleted file mode 100644
index 8fff0bfdd1..0000000000
--- a/src/unix/net.cpp
+++ /dev/null
@@ -1,422 +0,0 @@
-// -*- c++ -*- ///////////////////////////////////////////////////////////////
-// Name:        unix/net.cpp
-// Purpose:     Network related wxWindows classes and functions
-// Author:      Karsten Ballüder
-// Modified by:
-// Created:     03.10.99
-// RCS-ID:      $Id$
-// Copyright:   (c) Karsten Ballüder
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/setup.h"
-
-#if wxUSE_DIALUP_MANAGER
-
-#ifndef  WX_PRECOMP
-#   include "wx/defs.h"
-#endif // !PCH
-
-#include "wx/string.h"
-#include "wx/event.h"
-#include "wx/net.h"
-#include "wx/timer.h"
-#include "wx/filefn.h"
-#include "wx/utils.h"
-#include "wx/log.h"
-#include "wx/file.h"
-
-#include <stdlib.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <unistd.h>
-#define __STRICT_ANSI__
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-// ----------------------------------------------------------------------------
-// A class which groups functions dealing with connecting to the network from a
-// workstation using dial-up access to the net. There is at most one instance
-// of this class in the program accessed via GetDialUpManager().
-// ----------------------------------------------------------------------------
-
-/* TODO
- *
- * 1. more configurability for Unix: i.e. how to initiate the connection, how
- *    to check for online status, &c.
- * 2. add a "long Dial(long connectionId = -1)" function which asks the user
- *    about which connection to dial (this may be done using native dialogs
- *    under NT, need generic dialogs for all others) and returns the identifier
- *    of the selected connection (it's opaque to the application) - it may be
- *    reused later to dial the same connection later (or use strings instead of
- *    longs may be?)
- * 3. add an async version of dialing functions which notify the caller about
- *    the progress (or may be even start another thread to monitor it)
- * 4. the static creation/accessor functions are not MT-safe - but is this
- *    really crucial? I think we may suppose they're always called from the
- *    main thread?
- */
-
-class WXDLLEXPORT wxDialUpManagerImpl : public wxDialUpManager
-{
-public:
-   wxDialUpManagerImpl()
-      {
-         m_IsOnline = -1; // unknown
-         m_timer = NULL;
-         m_CanUseIfconfig = -1; // unknown
-         m_BeaconHost = WXDIALUP_MANAGER_DEFAULT_BEACONHOST;
-         m_BeaconPort = 80;
-      }
-
-   /** Could the dialup manager be initialized correctly? If this function
-       returns FALSE, no other functions will work neither, so it's a good idea
-       to call this function and check its result before calling any other
-       wxDialUpManager methods.
-   */
-   virtual bool IsOk() const
-      { return TRUE; }
-
-   /** The simplest way to initiate a dial up: this function dials the given
-       ISP (exact meaning of the parameter depends on the platform), returns
-       TRUE on success or FALSE on failure and logs the appropriate error
-       message in the latter case.
-       @param nameOfISP optional paramater for dial program
-       @param username unused
-       @param password unused
-   */
-   virtual bool Dial(const wxString& nameOfISP,
-                     const wxString& WXUNUSED(username),
-                     const wxString& WXUNUSED(password));
-
-   /// Hang up the currently active dial up connection.
-   virtual bool HangUp();
-   
-   // returns TRUE if the computer is connected to the network: under Windows,
-   // this just means that a RAS connection exists, under Unix we check that
-   // the "well-known host" (as specified by SetWellKnownHost) is reachable
-   virtual bool IsOnline() const
-      {
-         if( (! m_timer) // we are not polling, so test now:
-             || m_IsOnline == -1
-            )
-            CheckStatus();
-         return m_IsOnline != 0;
-      }
-
-   // sometimes the built-in logic for determining the online status may fail,
-   // so, in general, the user should be allowed to override it. This function
-   // allows to forcefully set the online status - whatever our internal
-   // algorithm may think about it.
-   virtual void SetOnlineStatus(bool isOnline = TRUE)
-      { m_IsOnline = isOnline; }
-
-   // set misc wxDialUpManager options
-   // --------------------------------
-
-   // enable automatical checks for the connection status and sending of
-   // wxEVT_DIALUP_CONNECTED/wxEVT_DIALUP_DISCONNECTED events. The interval
-   // parameter is only for Unix where we do the check manually: under
-   // Windows, the notification about the change of connection status is
-   // instantenous.
-   //
-   // Returns FALSE if couldn't set up automatic check for online status.
-   virtual bool EnableAutoCheckOnlineStatus(size_t nSeconds);
-
-   // disable automatic check for connection status change - notice that the
-   // wxEVT_DIALUP_XXX events won't be sent any more neither.
-   virtual void DisableAutoCheckOnlineStatus();
-
-   // under Unix, the value of well-known host is used to check whether we're
-   // connected to the internet. It's unused under Windows, but this function
-   // is always safe to call. The default value is www.yahoo.com.
-   virtual void SetWellKnownHost(const wxString& hostname,
-                                 int portno = 80);
-   /** Sets the commands to start up the network and to hang up
-       again. Used by the Unix implementations only.
-   */
-   virtual void SetConnectCommand(const wxString &command, const wxString &hupcmd)
-      { m_ConnectCommand = command; m_HangUpCommand = hupcmd; }
-
-private:
-   /// -1: don´t know, 0 = no, 1 = yes
-   int m_IsOnline;
-   
-   ///  Can we use ifconfig to list active devices?
-   int m_CanUseIfconfig;
-   /// The path to ifconfig
-   wxString m_IfconfigPath;
-
-   /// beacon host:
-   wxString m_BeaconHost;
-   /// beacon host portnumber for connect:
-   int m_BeaconPort;
-
-   /// command to connect to network
-   wxString m_ConnectCommand;
-   /// command to hang up
-   wxString m_HangUpCommand;
-   /// name of ISP
-   wxString m_ISPname;
-   /// a timer for regular testing
-   class AutoCheckTimer *m_timer;
-
-   friend class AutoCheckTimer;
-   /// determine status
-   void CheckStatus(void) const;
-
-   /// real status check
-   void CheckStatusInternal(void);
-};
-
-
-class AutoCheckTimer : public wxTimer
-{
-public:
-   AutoCheckTimer(wxDialUpManagerImpl *dupman)
-      {
-         m_dupman = dupman;
-         m_started = FALSE;
-      }
-
-   virtual bool Start( int millisecs = -1 )
-      { m_started = TRUE; return wxTimer::Start(millisecs, FALSE); }
-
-   virtual void Notify()
-      { wxLogTrace("Checking dial up network status."); m_dupman->CheckStatus(); }
-
-   virtual void Stop()
-      { if ( m_started ) wxTimer::Stop(); }
-public:
-   bool m_started;
-   wxDialUpManagerImpl *m_dupman;
-};
-
-bool
-wxDialUpManagerImpl::Dial(const wxString &isp,
-                          const wxString & WXUNUSED(username),
-                          const wxString & WXUNUSED(password))
-{
-   if(m_IsOnline == 1)
-      return FALSE;
-   m_IsOnline = -1;
-   m_ISPname = isp;
-   wxString cmd;
-   if(m_ConnectCommand.Find("%s"))
-      cmd.Printf(m_ConnectCommand,m_ISPname.c_str());
-   else
-      cmd = m_ConnectCommand;
-   return wxExecute(cmd, /* sync */ TRUE) == 0;
-}
-
-bool
-wxDialUpManagerImpl::HangUp(void)
-{
-   if(m_IsOnline == 0)
-      return FALSE;
-   m_IsOnline = -1;
-   wxString cmd;
-   if(m_HangUpCommand.Find("%s"))
-      cmd.Printf(m_HangUpCommand,m_ISPname.c_str());
-   else
-      cmd = m_HangUpCommand;
-   return wxExecute(cmd, /* sync */ TRUE) == 0;
-}
-
-
-bool
-wxDialUpManagerImpl::EnableAutoCheckOnlineStatus(size_t nSeconds)
-{
-   wxASSERT(m_timer == NULL);
-   m_timer = new AutoCheckTimer(this);
-   bool rc = m_timer->Start(nSeconds*1000);
-   if(! rc)
-   {
-      delete m_timer;
-      m_timer = NULL;
-   }
-   return rc;
-}
-
-void
-wxDialUpManagerImpl::DisableAutoCheckOnlineStatus()
-{
-   wxASSERT(m_timer != NULL);
-   m_timer->Stop();
-   delete m_timer;
-   m_timer = NULL;
-}
-
-
-void
-wxDialUpManagerImpl::SetWellKnownHost(const wxString& hostname, int portno)
-{
-   /// does hostname contain a port number?
-   wxString port = hostname.After(':');
-   if(port.Length())
-   {
-      m_BeaconHost = hostname.Before(':');
-      m_BeaconPort = atoi(port);
-   }
-   else
-   {
-      m_BeaconHost = hostname;
-      m_BeaconPort = portno;
-   }
-}
-
-
-void
-wxDialUpManagerImpl::CheckStatus(void) const
-{
-   // This function calls the CheckStatusInternal() helper function
-   // which is OS - specific and then sends the events.
-
-   int oldIsOnline = m_IsOnline;
-   ( /* non-const */ (wxDialUpManagerImpl *)this)->CheckStatusInternal();
-
-   // now send the events as appropriate:
-   if(m_IsOnline != oldIsOnline)
-   {
-      if(m_IsOnline)
-         ; // send ev
-      else
-         ; // send ev
-   }
-}
-
-/*
-  We have three methods that we can use:
-
-  1. test via /sbin/ifconfig and grep for "sl", "ppp", "pl"
-     --> should be fast enough for regular polling
-  2. test if we can reach the well known beacon host
-     --> too slow for polling
-  3. check /proc/net/dev on linux??
-     This method should be preferred, if possible. Need to do more
-     testing.
-    
-*/
-
-void
-wxDialUpManagerImpl::CheckStatusInternal(void)
-{
-   m_IsOnline = -1;
-
-   // First time check for ifconfig location. We only use the variant
-   // which does not take arguments, a la GNU.
-   if(m_CanUseIfconfig == -1) // unknown
-   {
-      if(wxFileExists("/sbin/ifconfig"))
-         m_IfconfigPath = "/sbin/ifconfig";
-      else if(wxFileExists("/usr/sbin/ifconfig"))
-         m_IfconfigPath = "/usr/sbin/ifconfig";
-   }
-
-   wxLogNull ln; // suppress all error messages
-   // Let´s try the ifconfig method first, should be fastest:
-   if(m_CanUseIfconfig != 0) // unknown or yes
-   {
-      wxASSERT(m_IfconfigPath.length());
-      
-      wxString tmpfile = wxGetTempFileName("_wxdialuptest");
-      wxString cmd = "/bin/sh -c \'";
-      cmd << m_IfconfigPath << " >" << tmpfile <<  '\'';
-      /* I tried to add an option to wxExecute() to not close stdout,
-         so we could let ifconfig write directly to the tmpfile, but
-         this does not work. That should be faster, as it doesn´t call 
-         the shell first. I have no idea why. :-(  (KB) */
-#if 0
-      // temporarily redirect stdout/stderr:
-      int
-         new_stdout = dup(STDOUT_FILENO),
-         new_stderr = dup(STDERR_FILENO);
-      close(STDOUT_FILENO);
-      close(STDERR_FILENO);
-
-      int
-         // new stdout:
-         output_fd = open(tmpfile, O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR),
-         // new stderr:
-         null_fd = open("/dev/null", O_CREAT, S_IRUSR|S_IWUSR);
-      // verify well behaved unix behaviour:
-      wxASSERT(output_fd == STDOUT_FILENO);
-      wxASSERT(null_fd == STDERR_FILENO);
-      int rc = wxExecute(m_IfconfigPath,TRUE /* sync */,NULL ,wxEXECUTE_DONT_CLOSE_FDS);
-      close(null_fd); close(output_fd);
-      // restore old stdout, stderr:
-      int test;
-      test = dup(new_stdout); close(new_stdout); wxASSERT(test == STDOUT_FILENO);
-      test = dup(new_stderr); close(new_stderr); wxASSERT(test == STDERR_FILENO);
-      if(rc == 0)
-#endif
-      if(wxExecute(cmd,TRUE /* sync */) == 0)
-      {
-         m_CanUseIfconfig = 1;
-         wxFile file;
-         if( file.Open(tmpfile) )
-         {
-            char *output = new char [file.Length()+1];
-            output[file.Length()] = '\0';
-            if(file.Read(output,file.Length()) == file.Length())
-            {
-               if(strstr(output,"ppp")   // ppp
-                  || strstr(output,"sl") // slip
-                  || strstr(output,"pl") // plip
-                  )
-                  m_IsOnline = 1;
-               else
-                  m_IsOnline = 0;
-            }
-            file.Close();
-            delete [] output;
-         }
-         // else m_IsOnline remains -1 as we don't know for sure
-      }
-      else // could not run ifconfig correctly
-         m_CanUseIfconfig = 0; // don´t try again
-      (void) wxRemoveFile(tmpfile);
-      if(m_IsOnline != -1) // we are done
-         return;
-   }
-
-   // second method: try to connect to well known host:
-   // This can be used under Win 9x, too!
-   struct hostent     *hp;
-   struct sockaddr_in  serv_addr;
-   int	sockfd;
-
-   m_IsOnline = 0; // assume false
-   if((hp = gethostbyname(m_BeaconHost)) == NULL)
-      return; // no DNS no net
-   
-   serv_addr.sin_family		= hp->h_addrtype;
-   memcpy(&serv_addr.sin_addr,hp->h_addr, hp->h_length);
-   serv_addr.sin_port		= htons(m_BeaconPort);
-   if( ( sockfd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) 
-   {	
-      //  sys_error("cannot create socket for gw");
-      return;
-   }
-   if( connect(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0)
-   {	
-      //sys_error("cannot connect to server");
-      return;
-   }
-   //connected!
-   close(sockfd);
-}
-
-
-/* static */
-wxDialUpManager *
-wxDialUpManager::wxDialUpManager::Create(void)
-{
-   return new wxDialUpManagerImpl;
-}
-
-#endif // wxUSE_DIALUP_MANAGER
diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index ff291daa3f..983ac3632a 100644
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -988,7 +988,14 @@ void wxThread::Sleep(unsigned long milliseconds)
 
 int wxThread::GetCPUCount()
 {
-#if defined(__LINUX__) && wxUSE_FFILE
+#if defined(_SC_NPROCESSORS_ONLN)
+    // this works for Solaris and Linux 2.6
+    int rc = sysconf(_SC_NPROCESSORS_ONLN);
+    if ( rc != -1 )
+    {
+        return rc;
+    }
+#elif defined(__LINUX__) && wxUSE_FFILE
     // read from proc (can't use wxTextFile here because it's a special file:
     // it has 0 size but still can be read from)
     wxLogNull nolog;
@@ -1014,13 +1021,6 @@ int wxThread::GetCPUCount()
             wxLogDebug(_T("failed to read /proc/cpuinfo"));
         }
     }
-#elif defined(_SC_NPROCESSORS_ONLN)
-    // this works for Solaris
-    int rc = sysconf(_SC_NPROCESSORS_ONLN);
-    if ( rc != -1 )
-    {
-        return rc;
-    }
 #endif // different ways to get number of CPUs
 
     // unknown
diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index c64721bafb..95dbf82091 100644
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -473,7 +473,7 @@ long wxExecute(wxChar **argv, int flags, wxProcess *process)
 
     while (argv[mb_argc])
     {
-        wxWX2MBbuf mb_arg = wxConvertWX2MB(argv[mb_argc]);
+        wxWX2MBbuf mb_arg = wxSafeConvertWX2MB(argv[mb_argc]);
         mb_argv[mb_argc] = strdup(mb_arg);
         mb_argc++;
     }
@@ -722,7 +722,7 @@ char *wxGetUserHome( const wxString &user )
         }
         if ((ptr = wxGetenv(wxT("USER"))) != NULL || (ptr = wxGetenv(wxT("LOGNAME"))) != NULL)
         {
-            who = getpwnam(wxConvertWX2MB(ptr));
+            who = getpwnam(wxSafeConvertWX2MB(ptr));
         }
 
         // We now make sure the the user exists!
@@ -736,7 +736,7 @@ char *wxGetUserHome( const wxString &user )
       who = getpwnam (user.mb_str());
     }
 
-    return wxConvertMB2WX(who ? who->pw_dir : 0);
+    return wxSafeConvertMB2WX(who ? who->pw_dir : 0);
 }
 
 // ----------------------------------------------------------------------------
@@ -787,7 +787,7 @@ static bool wxGetHostNameInternal(wxChar *buf, int sz)
     bool ok = uname(&uts) != -1;
     if ( ok )
     {
-        wxStrncpy(buf, wxConvertMB2WX(uts.nodename), sz - 1);
+        wxStrncpy(buf, wxSafeConvertMB2WX(uts.nodename), sz - 1);
         buf[sz] = wxT('\0');
     }
 #elif defined(HAVE_GETHOSTNAME)
@@ -795,7 +795,7 @@ static bool wxGetHostNameInternal(wxChar *buf, int sz)
     bool ok = gethostname(cbuf, sz) != -1;
     if ( ok )
     {
-        wxStrncpy(buf, wxConvertMB2WX(cbuf), sz - 1);
+        wxStrncpy(buf, wxSafeConvertMB2WX(cbuf), sz - 1);
         buf[sz] = wxT('\0');
     }
 #else // no uname, no gethostname
@@ -839,7 +839,7 @@ bool wxGetFullHostName(wxChar *buf, int sz)
     {
         if ( !wxStrchr(buf, wxT('.')) )
         {
-            struct hostent *host = gethostbyname(wxConvertWX2MB(buf));
+            struct hostent *host = gethostbyname(wxSafeConvertWX2MB(buf));
             if ( !host )
             {
                 wxLogSysError(_("Cannot get the official hostname"));
@@ -849,7 +849,7 @@ bool wxGetFullHostName(wxChar *buf, int sz)
             else
             {
                 // the canonical name
-                wxStrncpy(buf, wxConvertMB2WX(host->h_name), sz);
+                wxStrncpy(buf, wxSafeConvertMB2WX(host->h_name), sz);
             }
         }
         //else: it's already a FQDN (BSD behaves this way)
@@ -865,7 +865,7 @@ bool wxGetUserId(wxChar *buf, int sz)
     *buf = wxT('\0');
     if ((who = getpwuid(getuid ())) != NULL)
     {
-        wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
+        wxStrncpy (buf, wxSafeConvertMB2WX(who->pw_name), sz - 1);
         return true;
     }
 
@@ -874,24 +874,23 @@ bool wxGetUserId(wxChar *buf, int sz)
 
 bool wxGetUserName(wxChar *buf, int sz)
 {
+#ifdef HAVE_PW_GECOS
     struct passwd *who;
 
     *buf = wxT('\0');
     if ((who = getpwuid (getuid ())) != NULL)
     {
-        // pw_gecos field in struct passwd is not standard
-#ifdef HAVE_PW_GECOS
        char *comma = strchr(who->pw_gecos, ',');
        if (comma)
            *comma = '\0'; // cut off non-name comment fields
-       wxStrncpy (buf, wxConvertMB2WX(who->pw_gecos), sz - 1);
-#else // !HAVE_PW_GECOS
-       wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
-#endif // HAVE_PW_GECOS/!HAVE_PW_GECOS
+       wxStrncpy (buf, wxSafeConvertMB2WX(who->pw_gecos), sz - 1);
        return true;
     }
 
     return false;
+#else // !HAVE_PW_GECOS
+    return wxGetUserId(buf, sz);
+#endif // HAVE_PW_GECOS/!HAVE_PW_GECOS
 }
 
 bool wxIsPlatform64Bit()
diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index aa349b3efc..f6627e6e69 100644
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -811,13 +811,15 @@ bool wxGetKeyState(wxKeyCode key)
     Window       wDummy1, wDummy2;
     int          iDummy3, iDummy4, iDummy5, iDummy6;
     unsigned int iMask;
-    XModifierKeymap* map = XGetModifierMapping(pDisplay);
     KeyCode keyCode = XKeysymToKeycode(pDisplay,iKey);
     if (keyCode == NoSymbol)
         return false;
 
     if ( IsModifierKey(iKey) )  // If iKey is a modifier key, use a different method
     {
+        XModifierKeymap *map = XGetModifierMapping(pDisplay);
+        wxCHECK_MSG( map, false, _T("failed to get X11 modifiers map") );
+
         for (int i = 0; i < 8; ++i)
         {
             if ( map->modifiermap[map->max_keypermod * i] == keyCode)
@@ -833,13 +835,13 @@ bool wxGetKeyState(wxKeyCode key)
     }
 
     // From the XLib manual:
-    // The XQueryKeymap() function returns a bit vector for the logical state of the keyboard, 
-    // where each bit set to 1 indicates that the corresponding key is currently pressed down. 
-    // The vector is represented as 32 bytes. Byte N (from 0) contains the bits for keys 8N to 8N + 7 
+    // The XQueryKeymap() function returns a bit vector for the logical state of the keyboard,
+    // where each bit set to 1 indicates that the corresponding key is currently pressed down.
+    // The vector is represented as 32 bytes. Byte N (from 0) contains the bits for keys 8N to 8N + 7
     // with the least-significant bit in the byte representing key 8N.
     char key_vector[32];
     XQueryKeymap(pDisplay, key_vector);
-    return key_vector[keyCode >> 3] & (1 << (keyCode & 7)); 
+    return key_vector[keyCode >> 3] & (1 << (keyCode & 7));
 }
 
 #endif // __WXX11__ || __WXGTK__ || __WXMOTIF__
diff --git a/src/wxWindows.xcodeproj/project.pbxproj b/src/wxWindows.xcodeproj/project.pbxproj
index 4cf9499908..c75d504603 100644
--- a/src/wxWindows.xcodeproj/project.pbxproj
+++ b/src/wxWindows.xcodeproj/project.pbxproj
@@ -3301,6 +3301,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 18B5B98A08564B5D002803C9 /* Build configuration list for PBXNativeTarget "static" */;
 			buildPhases = (
+				4059FD3C0BA95691001F6B1C /* ShellScript */,
 				4086C744063AB2FF00D4CD53 /* Headers */,
 				4086C746063AB2FF00D4CD53 /* Sources */,
 				4086C8C8063AB2FF00D4CD53 /* Frameworks */,
@@ -3371,6 +3372,19 @@
 /* End PBXRezBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		4059FD3C0BA95691001F6B1C /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "$SRCROOT/../distrib/mac/pbsetup-sh \"${SRCROOT}\" \"${SYMROOT}\"";
+		};
 		4086CA56063AB30000D4CD53 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -4489,8 +4503,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				DYLIB_COMPATIBILITY_VERSION = 2.6;
-				DYLIB_CURRENT_VERSION = 2.6.0;
+				DYLIB_COMPATIBILITY_VERSION = 2.8;
+				DYLIB_CURRENT_VERSION = 2.8.3;
 				GCC_INPUT_FILETYPE = automatic;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PFE_FILE_C_DIALECTS = "c++";
@@ -4532,8 +4546,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				DYLIB_COMPATIBILITY_VERSION = 2.6;
-				DYLIB_CURRENT_VERSION = 2.6.0;
+				DYLIB_COMPATIBILITY_VERSION = 2.8;
+				DYLIB_CURRENT_VERSION = 2.8.3;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_INPUT_FILETYPE = automatic;
 				GCC_PFE_FILE_C_DIALECTS = "c++";
@@ -4574,10 +4588,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(NATIVE_ARCH)";
 				DEBUG_INFORMATION_FORMAT = stabs;
-				DYLIB_COMPATIBILITY_VERSION = 2.6;
-				DYLIB_CURRENT_VERSION = 2.6.0;
+				DYLIB_COMPATIBILITY_VERSION = 2.8;
+				DYLIB_CURRENT_VERSION = 2.8.3;
 				EXECUTABLE_PREFIX = lib;
 				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -4629,8 +4642,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				DYLIB_COMPATIBILITY_VERSION = 2.6;
-				DYLIB_CURRENT_VERSION = 2.6.0;
+				DYLIB_COMPATIBILITY_VERSION = 2.8;
+				DYLIB_CURRENT_VERSION = 2.8.3;
 				EXECUTABLE_PREFIX = lib;
 				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
@@ -4716,10 +4729,6 @@
 		18B5B99F08564B5D002803C9 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_OPTIMIZATION_LEVEL = 1;
 				GCC_PREPROCESSOR_DEFINITIONS = "__WXDEBUG__\n";
diff --git a/src/x11/dcclient.cpp b/src/x11/dcclient.cpp
index d4fa32eb39..291b93b268 100644
--- a/src/x11/dcclient.cpp
+++ b/src/x11/dcclient.cpp
@@ -1779,8 +1779,6 @@ void wxWindowDC::SetFont( const wxFont &font )
 
     m_font = font;
 
-    return;
-
 #if wxUSE_UNICODE
     m_fontdesc = font.GetNativeFontInfo()->description;
 #endif
diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index f10becfa7f..c509d3e75d 100644
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -160,6 +160,8 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
     if (pos2.y == wxDefaultCoord)
         pos2.y = 0;
 
+    AdjustForParentClientOrigin(pos2.x, pos2.y);
+
 #if wxUSE_TWO_WINDOWS
     bool need_two_windows =
         ((( wxSUNKEN_BORDER | wxRAISED_BORDER | wxSIMPLE_BORDER | wxHSCROLL | wxVSCROLL ) & m_windowStyle) != 0);
diff --git a/src/xrc/xh_bmpbt.cpp b/src/xrc/xh_bmpbt.cpp
index 7b1b22db03..bdf588ac9b 100644
--- a/src/xrc/xh_bmpbt.cpp
+++ b/src/xrc/xh_bmpbt.cpp
@@ -58,6 +58,8 @@ wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
         button->SetBitmapFocus(GetBitmap(wxT("focus")));
     if (GetParamNode(wxT("disabled")))
         button->SetBitmapDisabled(GetBitmap(wxT("disabled")));
+    if (GetParamNode(wxT("hover")))
+        button->SetBitmapHover(GetBitmap(wxT("hover")));
 
     return button;
 }
diff --git a/src/xrc/xh_gdctl.cpp b/src/xrc/xh_gdctl.cpp
index 08a90fa19c..5a56eecdd5 100644
--- a/src/xrc/xh_gdctl.cpp
+++ b/src/xrc/xh_gdctl.cpp
@@ -34,6 +34,7 @@ wxGenericDirCtrlXmlHandler::wxGenericDirCtrlXmlHandler()
     XRC_ADD_STYLE(wxDIRCTRL_3D_INTERNAL);
     XRC_ADD_STYLE(wxDIRCTRL_SELECT_FIRST);
     XRC_ADD_STYLE(wxDIRCTRL_SHOW_FILTERS);
+    XRC_ADD_STYLE(wxDIRCTRL_EDIT_LABELS);
     AddWindowStyles();
 }
 
diff --git a/src/xrc/xh_hyperlink.cpp b/src/xrc/xh_hyperlink.cpp
index b19f47e8be..7d0f0d5c98 100644
--- a/src/xrc/xh_hyperlink.cpp
+++ b/src/xrc/xh_hyperlink.cpp
@@ -51,6 +51,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkCtrlXmlHandler, wxXmlResourceHandler)
 
 wxHyperlinkCtrlXmlHandler::wxHyperlinkCtrlXmlHandler()
 {
+    XRC_ADD_STYLE(wxHL_CONTEXTMENU);
+    XRC_ADD_STYLE(wxHL_ALIGN_LEFT);
+    XRC_ADD_STYLE(wxHL_ALIGN_RIGHT);
+    XRC_ADD_STYLE(wxHL_ALIGN_CENTRE);
+    XRC_ADD_STYLE(wxHL_DEFAULT_STYLE);
+    
     AddWindowStyles();
 }
 
@@ -61,7 +67,8 @@ wxObject *wxHyperlinkCtrlXmlHandler::DoCreateResource()
     SetupWindow(control);
     control->Create(m_parentAsWindow, GetID(),
         GetParamValue(wxT("label")), GetParamValue(wxT("url")),
-        GetPosition(), GetSize(), GetStyle());
+        GetPosition(), GetSize(),
+        GetStyle(wxT("style"), wxHL_DEFAULT_STYLE));
 
     return control;
 }
diff --git a/src/xrc/xh_statbar.cpp b/src/xrc/xh_statbar.cpp
index fc701a23f7..c982570ded 100644
--- a/src/xrc/xh_statbar.cpp
+++ b/src/xrc/xh_statbar.cpp
@@ -88,6 +88,8 @@ wxObject *wxStatusBarXmlHandler::DoCreateResource()
         delete [] style;
     }
 
+    CreateChildren(statbar);
+
     if (m_parentAsWindow)
     {
         wxFrame *parentFrame = wxDynamicCast(m_parent, wxFrame);
diff --git a/src/xrc/xh_unkwn.cpp b/src/xrc/xh_unkwn.cpp
index d970968913..a5e869fb6a 100644
--- a/src/xrc/xh_unkwn.cpp
+++ b/src/xrc/xh_unkwn.cpp
@@ -68,8 +68,7 @@ void wxUnknownControlContainer::AddChild(wxWindowBase *child)
 
     wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
     sizer->Add((wxWindow*)child, 1, wxEXPAND);
-    SetSizer(sizer);
-    Layout();
+    SetSizerAndFit(sizer);
 }
 
 void wxUnknownControlContainer::RemoveChild(wxWindowBase *child)
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 2b896d2dd9..cda415e689 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 TEST_CXXFLAGS = $(__test_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/tests/mbconv/mbconvtest.cpp b/tests/mbconv/mbconvtest.cpp
index f7bebaad1a..d6e5bdd513 100644
--- a/tests/mbconv/mbconvtest.cpp
+++ b/tests/mbconv/mbconvtest.cpp
@@ -212,6 +212,7 @@ private:
 CPPUNIT_TEST_SUITE_REGISTRATION( MBConvTestCase );
 
 // also include in it's own registry so that these tests can be run alone
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( MBConvTestCase, "MBConvTestCase" );
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( MBConvTestCase, "MBConv" );
 
 void MBConvTestCase::WC2CP1250()
diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp
index 85e91dad86..37a7840bba 100644
--- a/tests/strings/strings.cpp
+++ b/tests/strings/strings.cpp
@@ -53,6 +53,7 @@ private:
 #endif // wxLongLong_t
         CPPUNIT_TEST( ToDouble );
         CPPUNIT_TEST( WriteBuf );
+        CPPUNIT_TEST( CharStr );
     CPPUNIT_TEST_SUITE_END();
 
     void String();
@@ -76,6 +77,7 @@ private:
 #endif // wxLongLong_t
     void ToDouble();
     void WriteBuf();
+    void CharStr();
 
     DECLARE_NO_COPY_CLASS(StringTestCase)
 };
@@ -630,3 +632,15 @@ void StringTestCase::WriteBuf()
     }
 }
 
+
+static bool IsFoo(/* non-const */ char *s)
+{
+    return strcmp(s, "foo") == 0;
+}
+
+void StringTestCase::CharStr()
+{
+    wxString s(_T("foo"));
+
+    CPPUNIT_ASSERT( IsFoo(s.char_str()) );
+}
diff --git a/utils/HelpGen/helpgen.dsp b/utils/HelpGen/helpgen.dsp
deleted file mode 100644
index 30abedd5e4..0000000000
--- a/utils/HelpGen/helpgen.dsp
+++ /dev/null
@@ -1,471 +0,0 @@
-# Microsoft Developer Studio Project File - Name="HelpGen" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=HelpGen - Win32 DLL Release
-!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 "helpgen.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 "helpgen.mak" CFG="HelpGen - Win32 DLL Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "HelpGen - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "HelpGen - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "HelpGen - Win32 Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "HelpGen - Win32 Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "HelpGen - Win32 Universal Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "HelpGen - Win32 Universal Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "HelpGen - Win32 Universal Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "HelpGen - Win32 Universal Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "HelpGen - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "HelpGen - Win32 DLL Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "HelpGen - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "HelpGen - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "HelpGen - Win32 DLL Universal Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "HelpGen - Win32 DLL Universal Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "HelpGen - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "HelpGen - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "HelpGen - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswd"
-# PROP BASE Intermediate_Dir "vc_mswd\HelpGen"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswd"
-# PROP Intermediate_Dir "vc_mswd\HelpGen"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswd\HelpGen.pdb /Od /I ".\..\..\include" /I ".\..\..\lib\vc_lib\mswd" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_CONSOLE" /c
-# ADD CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswd\HelpGen.pdb /Od /I ".\..\..\include" /I ".\..\..\lib\vc_lib\mswd" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_CONSOLE" /c
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\include" /i ".\..\..\lib\vc_lib\mswd" /i "." /d _CONSOLE
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\include" /i ".\..\..\lib\vc_lib\mswd" /i "." /d _CONSOLE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswd\HelpGen.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:console
-# ADD LINK32 wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswd\HelpGen.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:console
-
-!ELSEIF  "$(CFG)" == "HelpGen - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_msw"
-# PROP BASE Intermediate_Dir "vc_msw\HelpGen"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_msw"
-# PROP Intermediate_Dir "vc_msw\HelpGen"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MD /Fdvc_msw\HelpGen.pdb /O1 /I ".\..\..\include" /I ".\..\..\lib\vc_lib\msw" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c
-# ADD CPP /nologo /FD /GR /GX /MD /Fdvc_msw\HelpGen.pdb /O1 /I ".\..\..\include" /I ".\..\..\lib\vc_lib\msw" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\include" /i ".\..\..\lib\vc_lib\msw" /i "." /d _CONSOLE
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\include" /i ".\..\..\lib\vc_lib\msw" /i "." /d _CONSOLE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_msw\HelpGen.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:console
-# ADD LINK32 wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_msw\HelpGen.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:console
-
-!ELSEIF  "$(CFG)" == "HelpGen - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswud"
-# PROP BASE Intermediate_Dir "vc_mswud\HelpGen"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswud"
-# PROP Intermediate_Dir "vc_mswud\HelpGen"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswud\HelpGen.pdb /Od /I ".\..\..\include" /I ".\..\..\lib\vc_lib\mswud" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /c
-# ADD CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswud\HelpGen.pdb /Od /I ".\..\..\include" /I ".\..\..\lib\vc_lib\mswud" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /c
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\include" /i ".\..\..\lib\vc_lib\mswud" /i "." /d _CONSOLE
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\include" /i ".\..\..\lib\vc_lib\mswud" /i "." /d _CONSOLE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswud\HelpGen.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:console
-# ADD LINK32 wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswud\HelpGen.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:console
-
-!ELSEIF  "$(CFG)" == "HelpGen - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswu"
-# PROP BASE Intermediate_Dir "vc_mswu\HelpGen"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswu"
-# PROP Intermediate_Dir "vc_mswu\HelpGen"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MD /Fdvc_mswu\HelpGen.pdb /O1 /I ".\..\..\include" /I ".\..\..\lib\vc_lib\mswu" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /c
-# ADD CPP /nologo /FD /GR /GX /MD /Fdvc_mswu\HelpGen.pdb /O1 /I ".\..\..\include" /I ".\..\..\lib\vc_lib\mswu" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /c
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\include" /i ".\..\..\lib\vc_lib\mswu" /i "." /d _CONSOLE
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\include" /i ".\..\..\lib\vc_lib\mswu" /i "." /d _CONSOLE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswu\HelpGen.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:console
-# ADD LINK32 wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswu\HelpGen.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:console
-
-!ELSEIF  "$(CFG)" == "HelpGen - Win32 Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivd"
-# PROP BASE Intermediate_Dir "vc_mswunivd\HelpGen"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivd"
-# PROP Intermediate_Dir "vc_mswunivd\HelpGen"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswunivd\HelpGen.pdb /Od /I ".\..\..\include" /I ".\..\..\lib\vc_lib\mswunivd" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_CONSOLE" /c
-# ADD CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswunivd\HelpGen.pdb /Od /I ".\..\..\include" /I ".\..\..\lib\vc_lib\mswunivd" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_CONSOLE" /c
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\include" /i ".\..\..\lib\vc_lib\mswunivd" /i "." /d _CONSOLE
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\include" /i ".\..\..\lib\vc_lib\mswunivd" /i "." /d _CONSOLE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivd\HelpGen.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:console
-# ADD LINK32 wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivd\HelpGen.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:console
-
-!ELSEIF  "$(CFG)" == "HelpGen - Win32 Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswuniv"
-# PROP BASE Intermediate_Dir "vc_mswuniv\HelpGen"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswuniv"
-# PROP Intermediate_Dir "vc_mswuniv\HelpGen"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MD /Fdvc_mswuniv\HelpGen.pdb /O1 /I ".\..\..\include" /I ".\..\..\lib\vc_lib\mswuniv" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_CONSOLE" /c
-# ADD CPP /nologo /FD /GR /GX /MD /Fdvc_mswuniv\HelpGen.pdb /O1 /I ".\..\..\include" /I ".\..\..\lib\vc_lib\mswuniv" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_CONSOLE" /c
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\include" /i ".\..\..\lib\vc_lib\mswuniv" /i "." /d _CONSOLE
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\include" /i ".\..\..\lib\vc_lib\mswuniv" /i "." /d _CONSOLE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswuniv\HelpGen.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:console
-# ADD LINK32 wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswuniv\HelpGen.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:console
-
-!ELSEIF  "$(CFG)" == "HelpGen - Win32 Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivud"
-# PROP BASE Intermediate_Dir "vc_mswunivud\HelpGen"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivud"
-# PROP Intermediate_Dir "vc_mswunivud\HelpGen"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswunivud\HelpGen.pdb /Od /I ".\..\..\include" /I ".\..\..\lib\vc_lib\mswunivud" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /c
-# ADD CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswunivud\HelpGen.pdb /Od /I ".\..\..\include" /I ".\..\..\lib\vc_lib\mswunivud" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_CONSOLE" /c
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\include" /i ".\..\..\lib\vc_lib\mswunivud" /i "." /d _CONSOLE
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\include" /i ".\..\..\lib\vc_lib\mswunivud" /i "." /d _CONSOLE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivud\HelpGen.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:console
-# ADD LINK32 wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivud\HelpGen.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:console
-
-!ELSEIF  "$(CFG)" == "HelpGen - Win32 Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivu"
-# PROP BASE Intermediate_Dir "vc_mswunivu\HelpGen"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivu"
-# PROP Intermediate_Dir "vc_mswunivu\HelpGen"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MD /Fdvc_mswunivu\HelpGen.pdb /O1 /I ".\..\..\include" /I ".\..\..\lib\vc_lib\mswunivu" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /c
-# ADD CPP /nologo /FD /GR /GX /MD /Fdvc_mswunivu\HelpGen.pdb /O1 /I ".\..\..\include" /I ".\..\..\lib\vc_lib\mswunivu" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /c
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\include" /i ".\..\..\lib\vc_lib\mswunivu" /i "." /d _CONSOLE
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\include" /i ".\..\..\lib\vc_lib\mswunivu" /i "." /d _CONSOLE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivu\HelpGen.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:console
-# ADD LINK32 wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivu\HelpGen.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:console
-
-!ELSEIF  "$(CFG)" == "HelpGen - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswddll"
-# PROP BASE Intermediate_Dir "vc_mswddll\HelpGen"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswddll"
-# PROP Intermediate_Dir "vc_mswddll\HelpGen"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswddll\HelpGen.pdb /Od /I ".\..\..\include" /I ".\..\..\lib\vc_dll\mswd" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_CONSOLE" /c
-# ADD CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswddll\HelpGen.pdb /Od /I ".\..\..\include" /I ".\..\..\lib\vc_dll\mswd" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_CONSOLE" /c
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\include" /i ".\..\..\lib\vc_dll\mswd" /i "." /d "WXUSINGDLL" /d _CONSOLE
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\include" /i ".\..\..\lib\vc_dll\mswd" /i "." /d "WXUSINGDLL" /d _CONSOLE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswddll\HelpGen.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:console
-# ADD LINK32 wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswddll\HelpGen.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:console
-
-!ELSEIF  "$(CFG)" == "HelpGen - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswdll"
-# PROP BASE Intermediate_Dir "vc_mswdll\HelpGen"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswdll"
-# PROP Intermediate_Dir "vc_mswdll\HelpGen"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MD /Fdvc_mswdll\HelpGen.pdb /O1 /I ".\..\..\include" /I ".\..\..\lib\vc_dll\msw" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_CONSOLE" /c
-# ADD CPP /nologo /FD /GR /GX /MD /Fdvc_mswdll\HelpGen.pdb /O1 /I ".\..\..\include" /I ".\..\..\lib\vc_dll\msw" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_CONSOLE" /c
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\include" /i ".\..\..\lib\vc_dll\msw" /i "." /d "WXUSINGDLL" /d _CONSOLE
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\include" /i ".\..\..\lib\vc_dll\msw" /i "." /d "WXUSINGDLL" /d _CONSOLE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswdll\HelpGen.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:console
-# ADD LINK32 wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswdll\HelpGen.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:console
-
-!ELSEIF  "$(CFG)" == "HelpGen - Win32 DLL Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswuddll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\HelpGen"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswuddll"
-# PROP Intermediate_Dir "vc_mswuddll\HelpGen"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswuddll\HelpGen.pdb /Od /I ".\..\..\include" /I ".\..\..\lib\vc_dll\mswud" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c
-# ADD CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswuddll\HelpGen.pdb /Od /I ".\..\..\include" /I ".\..\..\lib\vc_dll\mswud" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\include" /i ".\..\..\lib\vc_dll\mswud" /i "." /d "WXUSINGDLL" /d _CONSOLE
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\include" /i ".\..\..\lib\vc_dll\mswud" /i "." /d "WXUSINGDLL" /d _CONSOLE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswuddll\HelpGen.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:console
-# ADD LINK32 wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswuddll\HelpGen.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:console
-
-!ELSEIF  "$(CFG)" == "HelpGen - Win32 DLL Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswudll"
-# PROP BASE Intermediate_Dir "vc_mswudll\HelpGen"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswudll"
-# PROP Intermediate_Dir "vc_mswudll\HelpGen"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MD /Fdvc_mswudll\HelpGen.pdb /O1 /I ".\..\..\include" /I ".\..\..\lib\vc_dll\mswu" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c
-# ADD CPP /nologo /FD /GR /GX /MD /Fdvc_mswudll\HelpGen.pdb /O1 /I ".\..\..\include" /I ".\..\..\lib\vc_dll\mswu" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\include" /i ".\..\..\lib\vc_dll\mswu" /i "." /d "WXUSINGDLL" /d _CONSOLE
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\include" /i ".\..\..\lib\vc_dll\mswu" /i "." /d "WXUSINGDLL" /d _CONSOLE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswudll\HelpGen.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:console
-# ADD LINK32 wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswudll\HelpGen.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:console
-
-!ELSEIF  "$(CFG)" == "HelpGen - Win32 DLL Universal Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivddll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\HelpGen"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivddll"
-# PROP Intermediate_Dir "vc_mswunivddll\HelpGen"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\HelpGen.pdb /Od /I ".\..\..\include" /I ".\..\..\lib\vc_dll\mswunivd" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_CONSOLE" /c
-# ADD CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\HelpGen.pdb /Od /I ".\..\..\include" /I ".\..\..\lib\vc_dll\mswunivd" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_CONSOLE" /c
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\include" /i ".\..\..\lib\vc_dll\mswunivd" /i "." /d "WXUSINGDLL" /d _CONSOLE
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\include" /i ".\..\..\lib\vc_dll\mswunivd" /i "." /d "WXUSINGDLL" /d _CONSOLE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivddll\HelpGen.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:console
-# ADD LINK32 wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivddll\HelpGen.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:console
-
-!ELSEIF  "$(CFG)" == "HelpGen - Win32 DLL Universal Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivdll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\HelpGen"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivdll"
-# PROP Intermediate_Dir "vc_mswunivdll\HelpGen"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MD /Fdvc_mswunivdll\HelpGen.pdb /O1 /I ".\..\..\include" /I ".\..\..\lib\vc_dll\mswuniv" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_CONSOLE" /c
-# ADD CPP /nologo /FD /GR /GX /MD /Fdvc_mswunivdll\HelpGen.pdb /O1 /I ".\..\..\include" /I ".\..\..\lib\vc_dll\mswuniv" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_CONSOLE" /c
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\include" /i ".\..\..\lib\vc_dll\mswuniv" /i "." /d "WXUSINGDLL" /d _CONSOLE
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\include" /i ".\..\..\lib\vc_dll\mswuniv" /i "." /d "WXUSINGDLL" /d _CONSOLE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivdll\HelpGen.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:console
-# ADD LINK32 wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivdll\HelpGen.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:console
-
-!ELSEIF  "$(CFG)" == "HelpGen - Win32 DLL Universal Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "vc_mswunivuddll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\HelpGen"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "vc_mswunivuddll"
-# PROP Intermediate_Dir "vc_mswunivuddll\HelpGen"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\HelpGen.pdb /Od /I ".\..\..\include" /I ".\..\..\lib\vc_dll\mswunivud" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c
-# ADD CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\HelpGen.pdb /Od /I ".\..\..\include" /I ".\..\..\lib\vc_dll\mswunivud" /W4 /I "." /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\include" /i ".\..\..\lib\vc_dll\mswunivud" /i "." /d "WXUSINGDLL" /d _CONSOLE
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\include" /i ".\..\..\lib\vc_dll\mswunivud" /i "." /d "WXUSINGDLL" /d _CONSOLE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\HelpGen.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:console
-# ADD LINK32 wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\HelpGen.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:console
-
-!ELSEIF  "$(CFG)" == "HelpGen - Win32 DLL Universal Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "vc_mswunivudll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\HelpGen"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "vc_mswunivudll"
-# PROP Intermediate_Dir "vc_mswunivudll\HelpGen"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MD /Fdvc_mswunivudll\HelpGen.pdb /O1 /I ".\..\..\include" /I ".\..\..\lib\vc_dll\mswunivu" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c
-# ADD CPP /nologo /FD /GR /GX /MD /Fdvc_mswunivudll\HelpGen.pdb /O1 /I ".\..\..\include" /I ".\..\..\lib\vc_dll\mswunivu" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /c
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\include" /i ".\..\..\lib\vc_dll\mswunivu" /i "." /d "WXUSINGDLL" /d _CONSOLE
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\include" /i ".\..\..\lib\vc_dll\mswunivu" /i "." /d "WXUSINGDLL" /d _CONSOLE
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivudll\HelpGen.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:console
-# ADD LINK32 wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivudll\HelpGen.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:console
-
-!ENDIF
-
-# Begin Target
-
-# Name "HelpGen - Win32 Debug"
-# Name "HelpGen - Win32 Release"
-# Name "HelpGen - Win32 Unicode Debug"
-# Name "HelpGen - Win32 Unicode Release"
-# Name "HelpGen - Win32 Universal Debug"
-# Name "HelpGen - Win32 Universal Release"
-# Name "HelpGen - Win32 Universal Unicode Debug"
-# Name "HelpGen - Win32 Universal Unicode Release"
-# Name "HelpGen - Win32 DLL Debug"
-# Name "HelpGen - Win32 DLL Release"
-# Name "HelpGen - Win32 DLL Unicode Debug"
-# Name "HelpGen - Win32 DLL Unicode Release"
-# Name "HelpGen - Win32 DLL Universal Debug"
-# Name "HelpGen - Win32 DLL Universal Release"
-# Name "HelpGen - Win32 DLL Universal Unicode Debug"
-# Name "HelpGen - Win32 DLL Universal Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\HelpGen.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\cjparser.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\docripper.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\ifcontext.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\markup.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\scriptbinder.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\sourcepainter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\srcparser.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
diff --git a/utils/HelpGen/makefile.bcc b/utils/HelpGen/makefile.bcc
deleted file mode 100644
index 3f62df1ccc..0000000000
--- a/utils/HelpGen/makefile.bcc
+++ /dev/null
@@ -1,181 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!ifndef BCCDIR
-BCCDIR = $(MAKEDIR)\..
-!endif
-
-!include ../../build/msw/config.bcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-!if "$(BCCDIR)" == "\.."
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-
-### Variables: ###
-
-HELPGEN_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \
-	$(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-	$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \
-	-I. $(__DLLFLAG_p) $(CXXFLAGS)
-HELPGEN_OBJECTS =  \
-	$(OBJS)\HelpGen_HelpGen.obj \
-	$(OBJS)\HelpGen_cjparser.obj \
-	$(OBJS)\HelpGen_docripper.obj \
-	$(OBJS)\HelpGen_ifcontext.obj \
-	$(OBJS)\HelpGen_markup.obj \
-	$(OBJS)\HelpGen_scriptbinder.obj \
-	$(OBJS)\HelpGen_sourcepainter.obj \
-	$(OBJS)\HelpGen_srcparser.obj
-OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-
-### Conditionally set variables: ###
-
-!if "$(SHARED)" == "0"
-LIBDIRNAME = .\..\..\lib\bcc_lib$(CFG)
-!endif
-!if "$(SHARED)" == "1"
-LIBDIRNAME = .\..\..\lib\bcc_dll$(CFG)
-!endif
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_6 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_6 = 
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 = 
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\HelpGen.exe
-
-$(OBJS)\HelpGen_HelpGen.obj: .\src\HelpGen.cpp
-	$(CXX) -q -c -P -o$@ $(HELPGEN_CXXFLAGS) $**
-
-$(OBJS)\HelpGen_cjparser.obj: .\src\cjparser.cpp
-	$(CXX) -q -c -P -o$@ $(HELPGEN_CXXFLAGS) $**
-
-$(OBJS)\HelpGen_docripper.obj: .\src\docripper.cpp
-	$(CXX) -q -c -P -o$@ $(HELPGEN_CXXFLAGS) $**
-
-$(OBJS)\HelpGen_ifcontext.obj: .\src\ifcontext.cpp
-	$(CXX) -q -c -P -o$@ $(HELPGEN_CXXFLAGS) $**
-
-$(OBJS)\HelpGen_markup.obj: .\src\markup.cpp
-	$(CXX) -q -c -P -o$@ $(HELPGEN_CXXFLAGS) $**
-
-$(OBJS)\HelpGen_scriptbinder.obj: .\src\scriptbinder.cpp
-	$(CXX) -q -c -P -o$@ $(HELPGEN_CXXFLAGS) $**
-
-$(OBJS)\HelpGen_sourcepainter.obj: .\src\sourcepainter.cpp
-	$(CXX) -q -c -P -o$@ $(HELPGEN_CXXFLAGS) $**
-
-$(OBJS)\HelpGen_srcparser.obj: .\src\srcparser.cpp
-	$(CXX) -q -c -P -o$@ $(HELPGEN_CXXFLAGS) $**
-
-$(OBJS)\HelpGen.exe: $(HELPGEN_OBJECTS)
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap @&&|
-	c0x32.obj $(HELPGEN_OBJECTS),$@,, $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
-|
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\HelpGen.exe del $(OBJS)\HelpGen.exe
-	-if exist $(OBJS)\HelpGen.tds del $(OBJS)\HelpGen.tds
-	-if exist $(OBJS)\HelpGen.ilc del $(OBJS)\HelpGen.ilc
-	-if exist $(OBJS)\HelpGen.ild del $(OBJS)\HelpGen.ild
-	-if exist $(OBJS)\HelpGen.ilf del $(OBJS)\HelpGen.ilf
-	-if exist $(OBJS)\HelpGen.ils del $(OBJS)\HelpGen.ils
diff --git a/utils/HelpGen/makefile.gcc b/utils/HelpGen/makefile.gcc
deleted file mode 100644
index 24bdecd4cf..0000000000
--- a/utils/HelpGen/makefile.gcc
+++ /dev/null
@@ -1,166 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-HELPGEN_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
-	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \
-	$(__DLLFLAG_p) $(CXXFLAGS)
-HELPGEN_OBJECTS =  \
-	$(OBJS)\HelpGen_HelpGen.o \
-	$(OBJS)\HelpGen_cjparser.o \
-	$(OBJS)\HelpGen_docripper.o \
-	$(OBJS)\HelpGen_ifcontext.o \
-	$(OBJS)\HelpGen_markup.o \
-	$(OBJS)\HelpGen_scriptbinder.o \
-	$(OBJS)\HelpGen_sourcepainter.o \
-	$(OBJS)\HelpGen_srcparser.o
-OBJS = \
-	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-
-### Conditionally set variables: ###
-
-ifeq ($(GCC_VERSION),2.95)
-GCCFLAGS = -fvtable-thunks
-endif
-ifeq ($(SHARED),0)
-LIBDIRNAME = .\..\..\lib\gcc_lib$(CFG)
-endif
-ifeq ($(SHARED),1)
-LIBDIRNAME = .\..\..\lib\gcc_dll$(CFG)
-endif
-ifeq ($(USE_GUI),0)
-PORTNAME = base
-endif
-ifeq ($(USE_GUI),1)
-PORTNAME = msw
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-WXDEBUGFLAG = d
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-WXDEBUGFLAG = d
-endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
-ifeq ($(UNICODE),1)
-WXUNICODEFLAG = u
-endif
-ifeq ($(WXUNIV),1)
-WXUNIVNAME = univ
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
-endif
-endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = 
-endif
-endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO = 
-endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
-endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
-endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
-endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
-endif
-ifeq ($(MSLU),1)
-__UNICOWS_LIB_p = -lunicows
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\HelpGen.exe
-
-$(OBJS)\HelpGen_HelpGen.o: ./src/HelpGen.cpp
-	$(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $<
-
-$(OBJS)\HelpGen_cjparser.o: ./src/cjparser.cpp
-	$(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $<
-
-$(OBJS)\HelpGen_docripper.o: ./src/docripper.cpp
-	$(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $<
-
-$(OBJS)\HelpGen_ifcontext.o: ./src/ifcontext.cpp
-	$(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $<
-
-$(OBJS)\HelpGen_markup.o: ./src/markup.cpp
-	$(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $<
-
-$(OBJS)\HelpGen_scriptbinder.o: ./src/scriptbinder.cpp
-	$(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $<
-
-$(OBJS)\HelpGen_sourcepainter.o: ./src/sourcepainter.cpp
-	$(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $<
-
-$(OBJS)\HelpGen_srcparser.o: ./src/srcparser.cpp
-	$(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $<
-
-$(OBJS)\HelpGen.exe: $(HELPGEN_OBJECTS)
-	$(CXX) -o $@ $(HELPGEN_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME)   $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\HelpGen.exe del $(OBJS)\HelpGen.exe
-
-.PHONY: all clean
diff --git a/utils/HelpGen/makefile.vc b/utils/HelpGen/makefile.vc
deleted file mode 100644
index 5f801f0621..0000000000
--- a/utils/HelpGen/makefile.vc
+++ /dev/null
@@ -1,219 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include <../../build/msw/config.vc>
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-HELPGEN_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
-	/DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\HelpGen.pdb $(____DEBUGRUNTIME_2_p) \
-	$(__OPTIMIZEFLAG_4) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) \
-	/D_CONSOLE $(CXXFLAGS) /GR /GX
-HELPGEN_OBJECTS =  \
-	$(OBJS)\HelpGen_HelpGen.obj \
-	$(OBJS)\HelpGen_cjparser.obj \
-	$(OBJS)\HelpGen_docripper.obj \
-	$(OBJS)\HelpGen_ifcontext.obj \
-	$(OBJS)\HelpGen_markup.obj \
-	$(OBJS)\HelpGen_scriptbinder.obj \
-	$(OBJS)\HelpGen_sourcepainter.obj \
-	$(OBJS)\HelpGen_srcparser.obj
-OBJS = \
-	vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-
-### Conditionally set variables: ###
-
-!if "$(SHARED)" == "0"
-LIBDIRNAME = .\..\..\lib\vc_lib$(CFG)
-!endif
-!if "$(SHARED)" == "1"
-LIBDIRNAME = .\..\..\lib\vc_dll$(CFG)
-!endif
-!if "$(USE_GUI)" == "0"
-PORTNAME = base
-!endif
-!if "$(USE_GUI)" == "1"
-PORTNAME = msw
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-WXDEBUGFLAG = d
-!endif
-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif
-!if "$(UNICODE)" == "1"
-WXUNICODEFLAG = u
-!endif
-!if "$(WXUNIV)" == "1"
-WXUNIVNAME = univ
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_1 = /DEBUG
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_3 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_3 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_3 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_3 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_3 = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = $(__DEBUGINFO_3)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_4 = /Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_4 = /O2
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 = T
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /D_UNICODE
-!endif
-!if "$(MSLU)" == "1"
-__UNICOWS_LIB_p = unicows.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-!endif
-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
-	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-!endif
-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO_2_p = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-____DEBUGINFO_2_p = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-____DEBUGINFO_2_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = $(____DEBUGINFO_2_p)
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(OBJS)\HelpGen.exe
-
-$(OBJS)\HelpGen_HelpGen.obj: .\src\HelpGen.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(HELPGEN_CXXFLAGS) $**
-
-$(OBJS)\HelpGen_cjparser.obj: .\src\cjparser.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(HELPGEN_CXXFLAGS) $**
-
-$(OBJS)\HelpGen_docripper.obj: .\src\docripper.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(HELPGEN_CXXFLAGS) $**
-
-$(OBJS)\HelpGen_ifcontext.obj: .\src\ifcontext.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(HELPGEN_CXXFLAGS) $**
-
-$(OBJS)\HelpGen_markup.obj: .\src\markup.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(HELPGEN_CXXFLAGS) $**
-
-$(OBJS)\HelpGen_scriptbinder.obj: .\src\scriptbinder.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(HELPGEN_CXXFLAGS) $**
-
-$(OBJS)\HelpGen_sourcepainter.obj: .\src\sourcepainter.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(HELPGEN_CXXFLAGS) $**
-
-$(OBJS)\HelpGen_srcparser.obj: .\src\srcparser.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(HELPGEN_CXXFLAGS) $**
-
-$(OBJS)\HelpGen.exe: $(HELPGEN_OBJECTS)
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<<
-	$(HELPGEN_OBJECTS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
-<<
-
-clean: 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\HelpGen.exe del $(OBJS)\HelpGen.exe
-	-if exist $(OBJS)\HelpGen.ilk del $(OBJS)\HelpGen.ilk
-	-if exist $(OBJS)\HelpGen.pdb del $(OBJS)\HelpGen.pdb
diff --git a/utils/HelpGen/makefile.wat b/utils/HelpGen/makefile.wat
deleted file mode 100644
index 615dfc93dd..0000000000
--- a/utils/HelpGen/makefile.wat
+++ /dev/null
@@ -1,225 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-!include ../../build/msw/config.wat
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-# Speed up compilation a bit:
-!ifdef __LOADDLL__
-!  loaddll wcc      wccd
-!  loaddll wccaxp   wccdaxp
-!  loaddll wcc386   wccd386
-!  loaddll wpp      wppdi86
-!  loaddll wppaxp   wppdaxp
-!  loaddll wpp386   wppd386
-!  loaddll wlink    wlink
-!  loaddll wlib     wlibd
-!endif
-
-# We need these variables in some bakefile-made rules:
-WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
-
-### Conditionally set variables: ###
-
-LIBDIRNAME =
-!ifeq SHARED 0
-LIBDIRNAME = .\..\..\lib\wat_lib$(CFG)
-!endif
-!ifeq SHARED 1
-LIBDIRNAME = .\..\..\lib\wat_dll$(CFG)
-!endif
-PORTNAME =
-!ifeq USE_GUI 0
-PORTNAME = base
-!endif
-!ifeq USE_GUI 1
-PORTNAME = msw
-!endif
-WXDEBUGFLAG =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-WXDEBUGFLAG = d
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-WXDEBUGFLAG = d
-!endif
-WXDLLFLAG =
-!ifeq SHARED 1
-WXDLLFLAG = dll
-!endif
-WXUNICODEFLAG =
-!ifeq UNICODE 1
-WXUNICODEFLAG = u
-!endif
-WXUNIVNAME =
-!ifeq WXUNIV 1
-WXUNIVNAME = univ
-!endif
-__DEBUGINFO_0 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d2
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d0
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_0 = -d0
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_0 = -d2
-!endif
-__DEBUGINFO_1 =
-!ifeq BUILD debug
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = debug all
-!endif
-!endif
-!ifeq BUILD release
-!ifeq DEBUG_INFO default
-__DEBUGINFO_1 = 
-!endif
-!endif
-!ifeq DEBUG_INFO 0
-__DEBUGINFO_1 = 
-!endif
-!ifeq DEBUG_INFO 1
-__DEBUGINFO_1 = debug all
-!endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
-!endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-__OPTIMIZEFLAG_2 =
-!ifeq BUILD debug
-__OPTIMIZEFLAG_2 = -od
-!endif
-!ifeq BUILD release
-__OPTIMIZEFLAG_2 = -ot -ox
-!endif
-__RUNTIME_LIBS_5 =
-!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS_5 = -br
-!endif
-!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS_5 = 
-!endif
-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -d_UNICODE
-!endif
-__WXLIB_BASE_p =
-!ifeq MONOLITHIC 0
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-!endif
-__WXLIB_MONO_p =
-!ifeq MONOLITHIC 1
-__WXLIB_MONO_p = &
-	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-!endif
-__WXUNIV_DEFINE_p =
-!ifeq WXUNIV 1
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
-!endif
-
-### Variables: ###
-
-HELPGEN_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
-	$(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
-	$(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) &
-	$(CXXFLAGS)
-HELPGEN_OBJECTS =  &
-	$(OBJS)\HelpGen_HelpGen.obj &
-	$(OBJS)\HelpGen_cjparser.obj &
-	$(OBJS)\HelpGen_docripper.obj &
-	$(OBJS)\HelpGen_ifcontext.obj &
-	$(OBJS)\HelpGen_markup.obj &
-	$(OBJS)\HelpGen_scriptbinder.obj &
-	$(OBJS)\HelpGen_sourcepainter.obj &
-	$(OBJS)\HelpGen_srcparser.obj
-OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-SETUPHDIR = &
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-
-
-all : $(OBJS)
-$(OBJS) :
-	-if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(OBJS)\HelpGen.exe
-
-$(OBJS)\HelpGen_HelpGen.obj :  .AUTODEPEND .\src\HelpGen.cpp
-	$(CXX) -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
-
-$(OBJS)\HelpGen_cjparser.obj :  .AUTODEPEND .\src\cjparser.cpp
-	$(CXX) -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
-
-$(OBJS)\HelpGen_docripper.obj :  .AUTODEPEND .\src\docripper.cpp
-	$(CXX) -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
-
-$(OBJS)\HelpGen_ifcontext.obj :  .AUTODEPEND .\src\ifcontext.cpp
-	$(CXX) -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
-
-$(OBJS)\HelpGen_markup.obj :  .AUTODEPEND .\src\markup.cpp
-	$(CXX) -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
-
-$(OBJS)\HelpGen_scriptbinder.obj :  .AUTODEPEND .\src\scriptbinder.cpp
-	$(CXX) -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
-
-$(OBJS)\HelpGen_sourcepainter.obj :  .AUTODEPEND .\src\sourcepainter.cpp
-	$(CXX) -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
-
-$(OBJS)\HelpGen_srcparser.obj :  .AUTODEPEND .\src\srcparser.cpp
-	$(CXX) -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
-
-$(OBJS)\HelpGen.exe :  $(HELPGEN_OBJECTS)
-	@%create $(OBJS)\HelpGen.lbc
-	@%append $(OBJS)\HelpGen.lbc option quiet
-	@%append $(OBJS)\HelpGen.lbc name $^@
-	@%append $(OBJS)\HelpGen.lbc option caseexact
-	@%append $(OBJS)\HelpGen.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_'
-	@for %i in ($(HELPGEN_OBJECTS)) do @%append $(OBJS)\HelpGen.lbc file %i
-	@for %i in ( $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\HelpGen.lbc library %i
-	@%append $(OBJS)\HelpGen.lbc
-	wlink @$(OBJS)\HelpGen.lbc
-
-clean : .SYMBOLIC 
-	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-	-if exist $(OBJS)\*.res del $(OBJS)\*.res
-	-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-	-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-	-if exist $(OBJS)\HelpGen.exe del $(OBJS)\HelpGen.exe
diff --git a/utils/helpview/src/Makefile.in b/utils/helpview/src/Makefile.in
index 4f66c6cb62..17e2f3cfdf 100644
--- a/utils/helpview/src/Makefile.in
+++ b/utils/helpview/src/Makefile.in
@@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.8
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/utils/helpview/src/helpview.cpp b/utils/helpview/src/helpview.cpp
index 72b3daa6a3..433afeca98 100644
--- a/utils/helpview/src/helpview.cpp
+++ b/utils/helpview/src/helpview.cpp
@@ -42,11 +42,16 @@ protected:
 
 IMPLEMENT_APP(hvApp)
 
+BEGIN_EVENT_TABLE(hvApp, wxApp)
+    EVT_IDLE(hvApp::OnIdle)
+END_EVENT_TABLE()
+
 hvApp::hvApp()
 {
 #if wxUSE_IPC
     m_server = NULL;
 #endif
+    m_exitIfNoMainWindow = false;
 }
 
 bool hvApp::OnInit()
@@ -55,6 +60,11 @@ bool hvApp::OnInit()
     delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
 #endif
 
+    // Don't exit on frame deletion, since the help window is programmed
+    // to cause the app to exit even if it is still open. We need to have the app
+    // close by other means.
+    SetExitOnFrameDelete(false);
+
     wxArtProvider::Push(new AlternateArtProvider);
 
 #ifdef __WXMAC__
@@ -62,7 +72,7 @@ bool hvApp::OnInit()
     wxFileName::MacRegisterDefaultTypeAndCreator( wxT("htb") , 'HTBD' , 'HTBA' ) ;
 #endif
 
-    int istyle = wxHF_DEFAULT_STYLE;
+    int istyle = wxHF_DEFAULT_STYLE|wxHF_OPEN_FILES;
 
     wxString service, windowName, titleFormat, argStr;
     wxString book[10];
@@ -218,10 +228,20 @@ bool hvApp::OnInit()
 #endif
 
     m_helpController->DisplayContents();
+    SetTopWindow(m_helpController->GetFrame());
+    m_exitIfNoMainWindow = true;
 
     return true;
 }
 
+void hvApp::OnIdle(wxIdleEvent& event)
+{
+    if (m_exitIfNoMainWindow && !GetTopWindow())
+        ExitMainLoop();
+
+    event.Skip();
+    event.RequestMore();
+}
 
 int hvApp::OnExit()
 {
diff --git a/utils/helpview/src/helpview.h b/utils/helpview/src/helpview.h
index bd1de5fd6c..b77599b438 100644
--- a/utils/helpview/src/helpview.h
+++ b/utils/helpview/src/helpview.h
@@ -50,14 +50,19 @@ public:
     wxList& GetConnections() { return m_connections; }
 #endif
 
+    /// Respond to idle event
+    void OnIdle(wxIdleEvent& event);
+
 private:
     wxHtmlHelpController*   m_helpController;
+    bool                    m_exitIfNoMainWindow;
 
 #if wxUSE_IPC
     wxList                  m_connections;
     hvServer*               m_server;
 #endif
 
+DECLARE_EVENT_TABLE()
 };
 
 #if wxUSE_IPC
diff --git a/utils/wxprop/src/prop.cpp b/utils/wxprop/src/prop.cpp
deleted file mode 100644
index 59802962de..0000000000
--- a/utils/wxprop/src/prop.cpp
+++ /dev/null
@@ -1,1119 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        prop.cpp
-// Purpose:     Propert sheet classes implementation
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:   	wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "prop.h"
-#endif
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-#if wxUSE_IOSTREAMH
-#if defined(__WXMSW__) && !defined(__GNUWIN32__)
-#include <strstrea.h>
-#else
-#include <strstream.h>
-#endif
-#else
-#include <strstream>
-#endif
-
-#include "wx/window.h"
-#include "wx/utils.h"
-#include "wx/list.h"
-#include "prop.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyValue, wxObject)
-
-wxPropertyValue::wxPropertyValue(void)
-{
-  m_type = wxPropertyValueNull;
-  m_next = NULL;
-  m_last = NULL;
-  m_value.first = NULL;
-  m_clientData = NULL;
-  m_modifiedFlag = FALSE;
-}
-
-wxPropertyValue::wxPropertyValue(const wxPropertyValue& copyFrom)
-{
-  m_modifiedFlag = FALSE;
-  Copy((wxPropertyValue& )copyFrom);
-}
-
-wxPropertyValue::wxPropertyValue(const char *val)
-{
-  m_modifiedFlag = FALSE;
-  m_type = wxPropertyValueString;
-
-  m_value.string = copystring(val);
-  m_clientData = NULL;
-  m_next = NULL;
-  m_last = NULL;
-}
-
-wxPropertyValue::wxPropertyValue(const wxString& val)
-{
-  m_modifiedFlag = FALSE;
-  m_type = wxPropertyValueString;
-
-  m_value.string = copystring((const char *)val);
-  m_clientData = NULL;
-  m_next = NULL;
-  m_last = NULL;
-}
-
-wxPropertyValue::wxPropertyValue(long the_integer)
-{
-  m_modifiedFlag = FALSE;
-  m_type = wxPropertyValueInteger;
-  m_value.integer = the_integer;
-  m_clientData = NULL;
-  m_next = NULL;
-}
-
-wxPropertyValue::wxPropertyValue(bool val)
-{
-  m_modifiedFlag = FALSE;
-  m_type = wxPropertyValuebool;
-  m_value.integer = val;
-  m_clientData = NULL;
-  m_next = NULL;
-}
-
-wxPropertyValue::wxPropertyValue(float the_real)
-{
-  m_modifiedFlag = FALSE;
-  m_type = wxPropertyValueReal;
-  m_value.real = the_real;
-  m_clientData = NULL;
-  m_next = NULL;
-}
-
-wxPropertyValue::wxPropertyValue(double the_real)
-{
-  m_modifiedFlag = FALSE;
-  m_type = wxPropertyValueReal;
-  m_value.real = (float)the_real;
-  m_clientData = NULL;
-  m_next = NULL;
-}
-
-// Pointer versions: we have a pointer to the real C++ value.
-wxPropertyValue::wxPropertyValue(char **val)
-{
-  m_modifiedFlag = FALSE;
-  m_type = wxPropertyValueStringPtr;
-
-  m_value.stringPtr = val;
-  m_clientData = NULL;
-  m_next = NULL;
-  m_last = NULL;
-}
-
-wxPropertyValue::wxPropertyValue(long *val)
-{
-  m_modifiedFlag = FALSE;
-  m_type = wxPropertyValueIntegerPtr;
-  m_value.integerPtr = val;
-  m_clientData = NULL;
-  m_next = NULL;
-}
-
-wxPropertyValue::wxPropertyValue(bool *val)
-{
-  m_modifiedFlag = FALSE;
-  m_type = wxPropertyValueboolPtr;
-  m_value.boolPtr = val;
-  m_clientData = NULL;
-  m_next = NULL;
-}
-
-wxPropertyValue::wxPropertyValue(float *val)
-{
-  m_modifiedFlag = FALSE;
-  m_type = wxPropertyValueRealPtr;
-  m_value.realPtr = val;
-  m_clientData = NULL;
-  m_next = NULL;
-}
-
-wxPropertyValue::wxPropertyValue(wxList *the_list)
-{
-  m_modifiedFlag = FALSE;
-  m_type = wxPropertyValueList;
-  m_clientData = NULL;
-  m_last = NULL;
-  m_value.first = NULL;
-
-  wxNode *node = the_list->First();
-  while (node)
-  {
-    wxPropertyValue *expr = (wxPropertyValue *)node->Data();
-    Append(expr);
-    node = node->Next();
-  }
-
-  delete the_list;
-}
-
-wxPropertyValue::wxPropertyValue(wxStringList *the_list)
-{
-  m_modifiedFlag = FALSE;
-  m_type = wxPropertyValueList;
-  m_clientData = NULL;
-  m_last = NULL;
-  m_value.first = NULL;
-
-  wxNode *node = the_list->First();
-  while (node)
-  {
-    char *s = (char *)node->Data();
-    Append(new wxPropertyValue(s));
-    node = node->Next();
-  }
-  delete the_list;
-}
-
-wxPropertyValue::~wxPropertyValue(void)
-{
-  switch (m_type)
-  {
-    case wxPropertyValueInteger:
-    case wxPropertyValuebool:
-    case wxPropertyValueReal:
-    {
-     break;
-    }
-   case wxPropertyValueString:
-   {
-     delete[] m_value.string;
-     break;
-   }
-   case wxPropertyValueList:
-   {
-     wxPropertyValue *expr = m_value.first;
-     while (expr)
-     {
-       wxPropertyValue *expr1 = expr->m_next;
-
-       delete expr;
-       expr = expr1;
-     }
-     break;
-   }
-   default:
-   case wxPropertyValueNull: break;
-  }
-}
-
-void wxPropertyValue::Append(wxPropertyValue *expr)
-{
-  m_modifiedFlag = TRUE;
-  if (!m_value.first)
-    m_value.first = expr;
-
-  if (m_last)
-    m_last->m_next = expr;
-  m_last = expr;
-}
-
-void wxPropertyValue::Insert(wxPropertyValue *expr)
-{
-  m_modifiedFlag = TRUE;
-  expr->m_next = m_value.first;
-  m_value.first = expr;
-
-  if (!m_last)
-    m_last = expr;
-}
-
-// Delete from list
-void wxPropertyValue::Delete(wxPropertyValue *node)
-{
-  wxPropertyValue *expr = GetFirst();
-  
-  wxPropertyValue *previous = NULL;
-  while (expr && (expr != node))
-  {
-    previous = expr;
-    expr = expr->GetNext();
-  }
-
-  if (expr)
-  {
-    if (previous)
-      previous->m_next = expr->m_next;
-      
-    // If node was the first in the list,
-    // make the list point to the NEXT one.
-    if (GetFirst() == expr)
-    {
-      m_value.first = expr->m_next;
-    }
-
-    // If node was the last in the list,
-    // make the list 'last' pointer point to the PREVIOUS one.
-    if (GetLast() == expr)
-    {
-      if (previous)
-        m_last = previous;
-      else
-        m_last = NULL;
-    }
-    m_modifiedFlag = TRUE;
-    delete expr;
-  }
-
-}
-
-void wxPropertyValue::ClearList(void)
-{
-  wxPropertyValue *val = GetFirst();
-  if (val)
-    m_modifiedFlag = TRUE;
-
-  while (val)
-  {
-    wxPropertyValue *next = val->GetNext();
-    delete val;
-    val = next;
-  }
-  m_value.first = NULL;
-  m_last = NULL;
-}
-
-wxPropertyValue *wxPropertyValue::NewCopy(void) const
-{
-  switch (m_type)
-  {
-    case wxPropertyValueInteger:
-      return new wxPropertyValue(m_value.integer);
-    case wxPropertyValuebool:
-      return new wxPropertyValue((bool) (m_value.integer != 0));
-    case wxPropertyValueReal:
-      return new wxPropertyValue(m_value.real);
-    case wxPropertyValueString:
-      return new wxPropertyValue(m_value.string);
-    case wxPropertyValueList:
-    {
-      wxPropertyValue *expr = m_value.first;
-      wxPropertyValue *new_list = new wxPropertyValue;
-      new_list->SetType(wxPropertyValueList);
-      while (expr)
-      {
-        wxPropertyValue *expr2 = expr->NewCopy();
-        new_list->Append(expr2);
-        expr = expr->m_next;
-      }
-      return new_list;
-    }
-   case wxPropertyValueIntegerPtr:
-     return new wxPropertyValue(m_value.integerPtr);
-   case wxPropertyValueRealPtr:
-     return new wxPropertyValue(m_value.realPtr);
-   case wxPropertyValueboolPtr:
-     return new wxPropertyValue(m_value.boolPtr);
-   case wxPropertyValueStringPtr:
-     return new wxPropertyValue(m_value.stringPtr);
-
-   case wxPropertyValueNull: 
-#ifdef __X__
-    cerr << "Should never get here!\n";
-#endif
-    break;
-  }
-  return NULL;
-}
-
-void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
-{
-  m_type = copyFrom.Type();
-
-  switch (m_type)
-  {
-    case wxPropertyValueInteger:
-      (*this) = copyFrom.IntegerValue();
-      return ;
-
-    case wxPropertyValueReal:
-      (*this) = copyFrom.RealValue();
-      return ;
-      
-    case wxPropertyValueString:
-      (*this) = wxString(copyFrom.StringValue());
-      return ;
-      
-    case wxPropertyValuebool:
-      (*this) = copyFrom.BoolValue();
-      return ;
-
-    // Pointers
-    case wxPropertyValueboolPtr:
-      (*this) = copyFrom.BoolValuePtr();
-      return ;
-    case wxPropertyValueRealPtr:
-      (*this) = copyFrom.RealValuePtr();
-      return ;
-    case wxPropertyValueIntegerPtr:
-      (*this) = copyFrom.IntegerValuePtr();
-      return ;
-    case wxPropertyValueStringPtr:
-    {
-      char** s = copyFrom.StringValuePtr();
-      (*this) = s != 0;
-      return ;
-    }
-      
-    case wxPropertyValueList:
-    {
-      m_value.first = NULL;
-      m_next = NULL;
-      m_last = NULL;
-      wxPropertyValue *expr = copyFrom.m_value.first;
-      while (expr)
-      {
-        wxPropertyValue *expr2 = expr->NewCopy();
-        Append(expr2);
-        expr = expr->m_next;
-      }
-      return;
-    }
-   case wxPropertyValueNull: 
-#ifdef __X__
-    cerr << "Should never get here!\n";
-#endif
-    break;
-  }
-}
-
-// Return nth argument of a clause (starting from 1)
-wxPropertyValue *wxPropertyValue::Arg(wxPropertyValueType type, int arg) const
-{
-  wxPropertyValue *expr = m_value.first;
-  for (int i = 1; i < arg; i++)
-    if (expr)
-      expr = expr->m_next;
-
-  if (expr && (expr->m_type == type))
-    return expr;
-  else
-    return NULL;
-}
-
-// Return nth argument of a list expression (starting from zero)
-wxPropertyValue *wxPropertyValue::Nth(int arg) const
-{
-  if (m_type != wxPropertyValueList)
-    return NULL;
-
-  wxPropertyValue *expr = m_value.first;
-  for (int i = 0; i < arg; i++)
-    if (expr)
-      expr = expr->m_next;
-    else return NULL;
-
-  if (expr)
-    return expr;
-  else
-    return NULL;
-}
-
-  // Returns the number of elements in a list expression
-int wxPropertyValue::Number(void) const
-{
-  if (m_type != wxPropertyValueList)
-    return 0;
-
-  int i = 0;
-  wxPropertyValue *expr = m_value.first;
-  while (expr)
-  {
-    expr = expr->m_next;
-    i ++;
-  }
-  return i;
-}
-
-void wxPropertyValue::WritePropertyClause(ostream& stream)  // Write this expression as a top-level clause
-{
-  if (m_type != wxPropertyValueList)
-    return;
-
-  wxPropertyValue *node = m_value.first;
-  if (node)
-  {
-    node->WritePropertyType(stream);
-    stream << "(";
-    node = node->m_next;
-    bool first = TRUE;
-    while (node)
-    {
-      if (!first)
-        stream << "  ";
-      node->WritePropertyType(stream);
-      node = node->m_next;
-      if (node) stream << ",\n";
-      first = FALSE;
-    }
-    stream << ").\n\n";
-  }
-}
-
-void wxPropertyValue::WritePropertyType(ostream& stream)    // Write as any other subexpression
-{
-  switch (m_type)
-  {
-    case wxPropertyValueInteger:
-    {
-      stream << m_value.integer;
-      break;
-    }
-    case wxPropertyValueIntegerPtr:
-    {
-      stream << *m_value.integerPtr;
-      break;
-    }
-    case wxPropertyValuebool:
-    {
-      if (m_value.integer)
-        stream << "True";
-      else
-        stream << "False";
-      break;
-    }
-    case wxPropertyValueboolPtr:
-    {
-      if (*m_value.integerPtr)
-        stream << "True";
-      else
-        stream << "False";
-      break;
-    }
-    case wxPropertyValueReal:
-    {
-      float f = m_value.real;
-      sprintf(wxBuffer, "%.6g", (double)f);
-      stream << wxBuffer;
-      break;
-    }
-    case wxPropertyValueRealPtr:
-    {
-      float f = *m_value.realPtr;
-/* Now the parser can cope with this.
-      // Prevent printing in 'e' notation. Any better way?
-      if (fabs(f) < 0.00001)
-        f = 0.0;
-*/
-      sprintf(wxBuffer, "%.6g", f);
-      stream << wxBuffer;
-      break;
-    }
-    case wxPropertyValueString:
-    {
-//      stream << "\"";
-      int i;
-      int len = strlen(m_value.string);
-      for (i = 0; i < len; i++)
-      {
-        char ch = m_value.string[i];
-//        if (ch == '"' || ch == '\\')
-//          stream << "\\";
-        stream << ch;
-      }
-
-//      stream << "\"";
-      break;
-    }
-    case wxPropertyValueStringPtr:
-    {
-      int i;
-      int len = strlen(*(m_value.stringPtr));
-      for (i = 0; i < len; i++)
-      {
-        char ch = *(m_value.stringPtr)[i];
-
-      }
-      break;
-    }
-    case wxPropertyValueList:
-    {
-      if (!m_value.first)
-        stream << "[]";
-      else
-      {
-        wxPropertyValue *expr = m_value.first;
-
-        stream << "[";
-        while (expr)
-        {
-          expr->WritePropertyType(stream);
-          expr = expr->m_next;
-          if (expr) stream << ", ";
-        }
-        stream << "]";
-      }
-      break;
-    }
-   case wxPropertyValueNull: break;
-  }
-}
-
-wxString wxPropertyValue::GetStringRepresentation(void)
-{
-  char buf[500];
-  buf[0] = 0;
-  
-  ostrstream str((char *)buf, (int)500, ios::out);
-  WritePropertyType(str);
-  str << '\0';
-  str.flush();
-
-  wxString theString(buf);
-  return theString;
-}
-
-void wxPropertyValue::operator=(const wxPropertyValue& val)
-{
-  m_modifiedFlag = TRUE;
-  Copy((wxPropertyValue&)val);
-}
-
-// void wxPropertyValue::operator=(const char *val)
-void wxPropertyValue::operator=(const wxString& val1)
-{
-  const char *val = (const char *)val1;
-
-  m_modifiedFlag = TRUE;
-  if (m_type == wxPropertyValueNull)
-    m_type = wxPropertyValueString;
-
-  if (m_type == wxPropertyValueString)
-  {
-    if (val)
-      m_value.string = copystring(val);
-    else
-      m_value.string = NULL;
-  }
-  else if (m_type == wxPropertyValueStringPtr)
-  {
-    if (*m_value.stringPtr)
-      delete[] *m_value.stringPtr;
-    if (val)
-      *m_value.stringPtr = copystring(val);
-    else
-      *m_value.stringPtr = NULL;
-  }
-  
-  m_clientData = NULL;
-  m_next = NULL;
-  m_last = NULL;
-
-}
-
-void wxPropertyValue::operator=(const long val)
-{
-  m_modifiedFlag = TRUE;
-  if (m_type == wxPropertyValueNull)
-    m_type = wxPropertyValueInteger;
-
-  if (m_type == wxPropertyValueInteger)
-    m_value.integer = val;
-  else if (m_type == wxPropertyValueIntegerPtr)
-    *m_value.integerPtr = val;
-  else if (m_type == wxPropertyValueReal)
-    m_value.real = (float)val;
-  else if (m_type == wxPropertyValueRealPtr)
-    *m_value.realPtr = (float)val;
-
-  m_clientData = NULL;
-  m_next = NULL;
-}
-
-void wxPropertyValue::operator=(const bool val)
-{
-  m_modifiedFlag = TRUE;
-  if (m_type == wxPropertyValueNull)
-    m_type = wxPropertyValuebool;
-
-  if (m_type == wxPropertyValuebool)
-    m_value.integer = (long)val;
-  else if (m_type == wxPropertyValueboolPtr)
-    *m_value.boolPtr = val;
-
-  m_clientData = NULL;
-  m_next = NULL;
-}
-
-void wxPropertyValue::operator=(const float val)
-{
-  m_modifiedFlag = TRUE;
-  if (m_type == wxPropertyValueNull)
-    m_type = wxPropertyValueReal;
-
-  if (m_type == wxPropertyValueInteger)
-    m_value.integer = (long)val;
-  else if (m_type == wxPropertyValueIntegerPtr)
-    *m_value.integerPtr = (long)val;
-  else if (m_type == wxPropertyValueReal)
-    m_value.real = val;
-  else if (m_type == wxPropertyValueRealPtr)
-    *m_value.realPtr = val;
-
-  m_clientData = NULL;
-  m_next = NULL;
-}
-
-void wxPropertyValue::operator=(const char **val)
-{
-  m_modifiedFlag = TRUE;
-  m_type = wxPropertyValueStringPtr;
-
-  if (val)
-    m_value.stringPtr = (char **)val;
-  else
-    m_value.stringPtr = NULL;
-  m_clientData = NULL;
-  m_next = NULL;
-  m_last = NULL;
-
-}
-
-void wxPropertyValue::operator=(const long *val)
-{
-  m_modifiedFlag = TRUE;
-  m_type = wxPropertyValueIntegerPtr;
-  m_value.integerPtr = (long *)val;
-  m_clientData = NULL;
-  m_next = NULL;
-}
-
-void wxPropertyValue::operator=(const bool *val)
-{
-  m_modifiedFlag = TRUE;
-  m_type = wxPropertyValueboolPtr;
-  m_value.boolPtr = (bool *)val;
-  m_clientData = NULL;
-  m_next = NULL;
-}
-
-void wxPropertyValue::operator=(const float *val)
-{
-  m_modifiedFlag = TRUE;
-  m_type = wxPropertyValueRealPtr;
-  m_value.realPtr = (float *)val;
-  m_clientData = NULL;
-  m_next = NULL;
-}
-
-long wxPropertyValue::IntegerValue(void) const
-  {
-    if (m_type == wxPropertyValueInteger)
-      return m_value.integer;
-    else if (m_type == wxPropertyValueReal)
-      return (long)m_value.real;
-    else if (m_type == wxPropertyValueIntegerPtr)
-      return *m_value.integerPtr;
-    else if (m_type == wxPropertyValueRealPtr)
-      return (long)(*m_value.realPtr);
-    else return 0;
-  }
-
-long *wxPropertyValue::IntegerValuePtr(void) const
-{
-  return m_value.integerPtr;
-}
-
-float wxPropertyValue::RealValue(void) const {
-    if (m_type == wxPropertyValueReal)
-      return m_value.real;
-    else if (m_type == wxPropertyValueRealPtr)
-      return *m_value.realPtr;
-    else if (m_type == wxPropertyValueInteger)
-      return (float)m_value.integer;
-    else if (m_type == wxPropertyValueIntegerPtr)
-      return (float)*(m_value.integerPtr);
-    else return 0.0;
-  }
-
-float *wxPropertyValue::RealValuePtr(void) const
-{
-  return m_value.realPtr;
-}
-
-bool wxPropertyValue::BoolValue(void) const {
-    if (m_type == wxPropertyValueReal)
-      return (m_value.real != 0.0);
-    if (m_type == wxPropertyValueRealPtr)
-      return (*(m_value.realPtr) != 0.0);
-    else if (m_type == wxPropertyValueInteger)
-      return (m_value.integer != 0);
-    else if (m_type == wxPropertyValueIntegerPtr)
-      return (*(m_value.integerPtr) != 0);
-    else if (m_type == wxPropertyValuebool)
-      return (m_value.integer != 0);
-    else if (m_type == wxPropertyValueboolPtr)
-      return (*(m_value.boolPtr) != 0);
-    else return FALSE;
-  }
-
-bool *wxPropertyValue::BoolValuePtr(void) const
-{
-  return m_value.boolPtr;
-}
-
-char *wxPropertyValue::StringValue(void) const {
-    if (m_type == wxPropertyValueString)
-      return m_value.string;
-    else if (m_type == wxPropertyValueStringPtr)
-      return *(m_value.stringPtr);
-    else return NULL;
-  }
-
-char **wxPropertyValue::StringValuePtr(void) const
-{
-  return m_value.stringPtr;
-}
-
-/*
- * A property (name plus value)
- */
- 
-IMPLEMENT_DYNAMIC_CLASS(wxProperty, wxObject)
-
-wxProperty::wxProperty(void)
-{
-  m_propertyRole = (char *)NULL;
-  m_propertyValidator = NULL;
-  m_propertyWindow = NULL;
-  m_enabled = TRUE;
-}
-
-wxProperty::wxProperty(wxProperty& copyFrom)
-{
-  m_value = copyFrom.GetValue();
-  m_name = copyFrom.GetName();
-  m_propertyRole = copyFrom.GetRole();
-  m_propertyValidator = copyFrom.GetValidator();
-  m_enabled = copyFrom.IsEnabled();
-  m_propertyWindow = NULL;
-}
-
-wxProperty::wxProperty(wxString nm, wxString role, wxPropertyValidator *ed):m_name(nm), m_propertyRole(role)
-{
-  m_propertyValidator = ed;
-  m_propertyWindow = NULL;
-  m_enabled = TRUE;
-}
-
-wxProperty::wxProperty(wxString nm, const wxPropertyValue& val, wxString role, wxPropertyValidator *ed):
-  m_name(nm), m_value(val), m_propertyRole(role)
-{
-  m_propertyValidator = ed;
-  m_propertyWindow = NULL;
-  m_enabled = TRUE;
-}
-
-wxProperty::~wxProperty(void)
-{
-  if (m_propertyValidator)
-    delete m_propertyValidator;
-}
-
-wxPropertyValue& wxProperty::GetValue(void) const
-{
-  return (wxPropertyValue&) m_value;
-}
-
-wxPropertyValidator *wxProperty::GetValidator(void) const
-{
-  return m_propertyValidator;
-}
-
-wxString& wxProperty::GetName(void) const
-{
-  return (wxString&) m_name;
-}
-
-wxString& wxProperty::GetRole(void) const
-{
-  return (wxString&) m_propertyRole;
-}
-
-void wxProperty::SetValue(const wxPropertyValue& val)
-{
-  m_value = val;
-}
-
-void wxProperty::SetValidator(wxPropertyValidator *ed)
-{
-  m_propertyValidator = ed;
-}
-
-void wxProperty::SetRole(wxString& role)
-{
-  m_propertyRole = role;
-}
-
-void wxProperty::SetName(wxString& nm)
-{
-  m_name = nm;
-}
-
-void wxProperty::operator=(const wxPropertyValue& val)
-{
-  m_value = val;
-}
-
-/*
- * Base property view class
- */
- 
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyView, wxEvtHandler)
-
-wxPropertyView::wxPropertyView(long flags)
-{
-  m_buttonFlags = flags;
-  m_propertySheet = NULL;
-  m_currentValidator = NULL;
-  m_currentProperty = NULL;
-}
-
-wxPropertyView::~wxPropertyView(void)
-{
-}
-
-void wxPropertyView::AddRegistry(wxPropertyValidatorRegistry *registry)
-{
-  m_validatorRegistryList.Append(registry);
-}
-
-wxPropertyValidator *wxPropertyView::FindPropertyValidator(wxProperty *property)
-{
-  if (property->GetValidator())
-    return property->GetValidator();
-    
-  wxNode *node = m_validatorRegistryList.First();
-  while (node)
-  {
-    wxPropertyValidatorRegistry *registry = (wxPropertyValidatorRegistry *)node->Data();
-    wxPropertyValidator *validator = registry->GetValidator(property->GetRole());
-    if (validator)
-      return validator;
-    node = node->Next();
-  }
-  return NULL;
-/*
-  if (!wxDefaultPropertyValidator)
-    wxDefaultPropertyValidator = new wxPropertyListValidator;
-  return wxDefaultPropertyValidator;
-*/
-}
-
-/*
- * Property sheet
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertySheet, wxObject)
-
-wxPropertySheet::wxPropertySheet(void):m_properties(wxKEY_STRING)
-{
-}
-
-wxPropertySheet::~wxPropertySheet(void)
-{
-  Clear();
-}
-
-bool wxPropertySheet::Save( ostream& WXUNUSED(str) )
-{
-  return FALSE;
-}
-
-bool wxPropertySheet::Load( ostream& WXUNUSED(str) )
-{
-  return FALSE;
-}
-
-void wxPropertySheet::UpdateAllViews( wxPropertyView *WXUNUSED(thisView) )
-{
-}
-
-// Add a property
-void wxPropertySheet::AddProperty(wxProperty *property)
-{
-  m_properties.Append((const char*) property->GetName(), property);
-}
-
-// Get property by name
-wxProperty *wxPropertySheet::GetProperty(wxString name)
-{
-  wxNode *node = m_properties.Find((const char*) name);
-  if (!node)
-    return NULL;
-  else
-    return (wxProperty *)node->Data();
-}
-
-// Clear all properties
-void wxPropertySheet::Clear(void)
-{
-  wxNode *node = m_properties.First();
-  while (node)
-  {
-    wxProperty *prop = (wxProperty *)node->Data();
-    wxNode *next = node->Next();
-    delete prop;
-    delete node;
-    node = next;
-  }
-}
-
-// Sets/clears the modified flag for each property value
-void wxPropertySheet::SetAllModified(bool flag)
-{
-  wxNode *node = m_properties.First();
-  while (node)
-  {
-    wxProperty *prop = (wxProperty *)node->Data();
-    prop->GetValue().SetModified(flag);
-    node = node->Next();
-  }  
-}
-
-/*
- * Property validator registry
- *
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyValidatorRegistry, wxHashTable)
-
-wxPropertyValidatorRegistry::wxPropertyValidatorRegistry(void):wxHashTable(wxKEY_STRING)
-{
-}
-
-wxPropertyValidatorRegistry::~wxPropertyValidatorRegistry(void)
-{
-  ClearRegistry();
-}
-
-void wxPropertyValidatorRegistry::RegisterValidator(const wxString& typeName, wxPropertyValidator *validator)
-{
-  Put((const char*) typeName, validator);
-}
-
-wxPropertyValidator *wxPropertyValidatorRegistry::GetValidator(const wxString& typeName)
-{
-  return (wxPropertyValidator *)Get((const char*) typeName);
-}
-
-void wxPropertyValidatorRegistry::ClearRegistry(void)
-{
-  BeginFind();
-  wxNode *node;
-  while (node = Next())
-  {
-    delete (wxPropertyValidator *)node->Data();
-  }
-}
-
- /*
-  * Property validator
-  */
-
-
-IMPLEMENT_ABSTRACT_CLASS(wxPropertyValidator, wxEvtHandler)
-
-wxPropertyValidator::wxPropertyValidator(long flags)
-{
-  m_validatorFlags = flags;
-  m_validatorProperty = NULL;
-}
-
-wxPropertyValidator::~wxPropertyValidator(void)
-{}
-
-bool wxPropertyValidator::StringToFloat (char *s, float *number) {
-	double num;
-	bool ok = StringToDouble (s, &num);
-	*number = (float) num;
-	return ok;
-}
-
-bool wxPropertyValidator::StringToDouble (char *s, double *number) {
-    bool ok = TRUE;
-    char *value_ptr;
-    *number = strtod (s, &value_ptr);
-    if (value_ptr) {
-		int len = strlen (value_ptr);
-		for (int i = 0; i < len; i++) {
-			ok = (isspace (value_ptr[i]) != 0);
-			if (!ok) return FALSE;
-		}
-    }
-    return ok;
-}
-
-bool wxPropertyValidator::StringToInt (char *s, int *number) {
-	long num;
-	bool ok = StringToLong (s, &num);
-	*number = (int) num;
-	return ok;
-}
-
-bool wxPropertyValidator::StringToLong (char *s, long *number) {
-    bool ok = TRUE;
-    char *value_ptr;
-    *number = strtol (s, &value_ptr, 10);
-    if (value_ptr) {
-		int len = strlen (value_ptr);
-		for (int i = 0; i < len; i++) {
-			ok = (isspace (value_ptr[i]) != 0);
-			if (!ok) return FALSE;
-		}
-    }
-    return ok;
-}
-
-char *wxPropertyValidator::FloatToString (float number) {
-	static char buf[20];
-	sprintf (buf, "%.6g", number);
-	return buf;
-}
-
-char *wxPropertyValidator::DoubleToString (double number) {
-	static char buf[20];
-	sprintf (buf, "%.6g", number);
-	return buf;
-}
-
-char *wxPropertyValidator::IntToString (int number) {
-	return ::IntToString (number);
-}
-
-char *wxPropertyValidator::LongToString (long number) {
-	return ::LongToString (number);
-  }
-
-
diff --git a/version-script.in b/version-script.in
index 231bb6a082..43e9c4bc35 100644
--- a/version-script.in
+++ b/version-script.in
@@ -24,15 +24,30 @@
 # and once released its version cannot be changed.
 
 
+# public symbols added in 2.8.4 (please keep in alphabetical order):
+@WX_VERSION_TAG@.4 {
+    global:
+        # wxString::[w]char_str()
+        *wxString*char_str*;
+        # wxWritable[W]CharBuffer
+        *wxWritableCharBuffer*;
+        *wxWritableWCharBuffer*;
+};
+
 # public symbols added in 2.8.2 (please keep in alphabetical order):
 @WX_VERSION_TAG@.2 {
     global:
         # wxFileHistory::Set/GetBaseId()
         *wxFileHistory*etBaseId*;
-        *wxSizerFlags*Shaped*;
+        *wxSafeConvert*;
+        *wxSearchCtrl*SetDescriptiveText*;
+        *wxSearchCtrl*GetDescriptiveText*;
+        *wxSizerFlags*Bottom*;
         *wxSizerFlags*FixedMinSize*;
-	*wxSearchCtrl*SetDescriptiveText*;
-	*wxSearchCtrl*GetDescriptiveText*;
+        *wxSizerFlags*Shaped*;
+        *wxSizerFlags*Top*;
+        *wxToolBar*SetToolNormalBitmap;
+        *wxToolBar*SetToolDisabledBitmap;
 };
 
 # public symbols added in 2.8.1 (please keep in alphabetical order):
@@ -43,10 +58,10 @@
         *wxDirDialog*etStyle*;
         # Mac OS X only, but it still must go in IIUC
         *wxListCtrl*SetFocus*;
-		*wxListCtrl*OnChar*;
-		*wxListCtrl*OnRightDown*;
-		*wxListCtrl*OnMiddleDown*;
-		*wxListCtrl*FireMouseEvent*;
+        *wxListCtrl*OnChar*;
+        *wxListCtrl*OnRightDown*;
+        *wxListCtrl*OnMiddleDown*;
+        *wxListCtrl*FireMouseEvent*;
         # wxTreeCtrl::CollapseAll[Children]() and IsEmpty
         *wxTreeCtrl*CollapseAll*;
         *wxTreeCtrl*IsEmpty*;
diff --git a/wxBase.spec b/wxBase.spec
index 731b0c66db..cb0eedaa82 100644
--- a/wxBase.spec
+++ b/wxBase.spec
@@ -1,7 +1,7 @@
 %define pref /usr
-%define ver  2.8.1
+%define ver  2.8.4
 %define ver2 2.8
-%define rel  1
+%define rel  4
 
 # Configurable settings (use --with(out) unicode on rpmbuild command line):
 %define unicode 0
diff --git a/wxGTK.spec b/wxGTK.spec
index 2aa7b81794..2df881045e 100644
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -1,7 +1,7 @@
 %define _prefix /usr
-%define ver  2.8.1
+%define ver  2.8.4
 %define ver2 2.8
-%define rel  1
+%define rel  4
 
 # Configurable settings (use --with(out) {unicode,gtk2} on rpmbuild cmd line):
 %define unicode 1
diff --git a/wxMGL.spec b/wxMGL.spec
index 6d2b3d5553..813e521b7d 100644
--- a/wxMGL.spec
+++ b/wxMGL.spec
@@ -1,7 +1,7 @@
 %define pref /usr
-%define ver 2.8.1
+%define ver  2.8.4
 %define ver2 2.8
-%define rel 1
+%define rel  4
 
 Summary: The SciTech MGL port of the wxWindows library
 Name: wxMGL
diff --git a/wxMotif.spec b/wxMotif.spec
index 6eeb1438c9..eb642b6083 100644
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -1,7 +1,7 @@
 %define pref /usr
-%define ver  2.8.1
+%define ver  2.8.4
 %define ver2 2.8
-%define rel  1
+%define rel  4
 
 %define portname   motif
 %define name       wx-%{portname}
diff --git a/wxPython/config.py b/wxPython/config.py
index 334dda3009..0850373317 100644
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -38,8 +38,8 @@ import distutils.command.clean
 
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 8
-VER_RELEASE      = 1
-VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWidgets
+VER_RELEASE      = 4
+VER_SUBREL       = 0      # wxPython release num for x.y.z release of wxWidgets
 VER_FLAGS        = ""     # release flags, such as prerelease or RC num, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
diff --git a/wxPython/contrib/gizmos/wxCode/src/treelistctrl.cpp b/wxPython/contrib/gizmos/wxCode/src/treelistctrl.cpp
index 6cded83c61..311c818ca5 100644
--- a/wxPython/contrib/gizmos/wxCode/src/treelistctrl.cpp
+++ b/wxPython/contrib/gizmos/wxCode/src/treelistctrl.cpp
@@ -1336,7 +1336,7 @@ int wxTreeListHeaderWindow::XToCol(int x)
 
 void wxTreeListHeaderWindow::RefreshColLabel(int col)
 {
-    if ( col > GetColumnCount() )
+    if ( col >= GetColumnCount() )
         return;
     
     int x = 0;
@@ -1860,7 +1860,7 @@ bool wxTreeListMainWindow::Create (wxTreeListCtrl *parent,
     if (major < 10) style |= wxTR_ROW_LINES;
 #endif
 
-    wxScrolledWindow::Create (parent, id, pos, size, style|wxHSCROLL|wxVSCROLL, name);
+    wxScrolledWindow::Create (parent, id, pos, size, style|wxHSCROLL|wxVSCROLL|wxWANTS_CHARS, name);
 
 #if wxUSE_VALIDATORS
     SetValidator(validator);
@@ -4681,6 +4681,18 @@ int wxTreeListCtrl::GetColumnCount() const
 
 void wxTreeListCtrl::SetColumnWidth(int column, int width)
 {
+    if (width == wxLIST_AUTOSIZE_USEHEADER)
+    {
+        wxFont font = m_header_win->GetFont();
+        m_header_win->GetTextExtent(m_header_win->GetColumnText(column), &width, NULL, NULL, NULL, font.Ok()? &font: NULL);
+        //search wxTreeListHeaderWindow::OnPaint to understand this:
+        width += 2*EXTRA_WIDTH + MARGIN;
+    }
+    else if (width == wxLIST_AUTOSIZE)
+    {
+        width = m_main_win->GetBestColumnWidth(column);
+    }
+    
     m_header_win->SetColumnWidth (column, width);
     m_header_win->Refresh();
 }
diff --git a/wxPython/demo/AlphaDrawing.py b/wxPython/demo/AlphaDrawing.py
index 7023b7beda..6fb15a97c3 100644
--- a/wxPython/demo/AlphaDrawing.py
+++ b/wxPython/demo/AlphaDrawing.py
@@ -35,7 +35,13 @@ then these squares should be transparent.
             dc.SetBrush(wx.Brush(brushclr))
             rect.SetPosition(pos)
             dc.DrawRoundedRectangleRect(rect, 8)
-            
+
+        # some additional testing stuff
+        #dc.SetPen(wx.Pen(wx.Colour(0,0,255, 196)))
+        #dc.SetBrush(wx.Brush(wx.Colour(0,0,255, 64)))
+        #dc.DrawCircle(50, 275, 25)
+        #dc.DrawEllipse(100, 275, 75, 50)
+        
         
 #----------------------------------------------------------------------
 
diff --git a/wxPython/demo/AnimateCtrl.py b/wxPython/demo/AnimateCtrl.py
index e993e4ee77..276771ec59 100644
--- a/wxPython/demo/AnimateCtrl.py
+++ b/wxPython/demo/AnimateCtrl.py
@@ -25,10 +25,10 @@ class TestPanel(wx.Panel):
             ctrl = wx.animate.AnimationCtrl(self, -1, ani)
             ctrl.SetUseWindowBackgroundColour()
             ctrl.Play()
-            sizer.Add(ctrl, 0, wx.ALL, 10)
+            sizer.AddF(ctrl, wx.SizerFlags().Border(wx.ALL, 10))
 
         border = wx.BoxSizer()
-        border.Add(sizer, 1, wx.EXPAND|wx.ALL, 20)
+        border.AddF(sizer, wx.SizerFlags(1).Expand().Border(wx.ALL, 20))
         self.SetSizer(border)
         
 
diff --git a/wxPython/demo/CustomTreeCtrl.py b/wxPython/demo/CustomTreeCtrl.py
index 25214d52fa..d9faaaee0f 100644
--- a/wxPython/demo/CustomTreeCtrl.py
+++ b/wxPython/demo/CustomTreeCtrl.py
@@ -764,7 +764,8 @@ class CustomTreeCtrlDemo(wx.Panel):
         splitter = wx.SplitterWindow(self, -1, style=wx.CLIP_CHILDREN | wx.SP_LIVE_UPDATE | wx.SP_3D)
 
         # Create the CustomTreeCtrl, using a derived class defined below
-        self.tree = CustomTreeCtrl(splitter, -1, log=self.log, style=wx.SUNKEN_BORDER)           
+        self.tree = CustomTreeCtrl(splitter, -1, log=self.log, 
+                                   style= wx.SUNKEN_BORDER| CT.TR_HAS_BUTTONS | CT.TR_HAS_VARIABLE_ROW_HEIGHT)           
 
         self.leftpanel = wx.ScrolledWindow(splitter, -1, style=wx.SUNKEN_BORDER)
         self.leftpanel.SetScrollRate(20,20)
@@ -1239,11 +1240,10 @@ class CustomTreeCtrl(CT.CustomTreeCtrl):
 
     def __init__(self, parent, id=wx.ID_ANY, pos=wx.DefaultPosition,
                  size=wx.DefaultSize,
-                 style=wx.SUNKEN_BORDER,
-                 ctstyle=CT.TR_HAS_BUTTONS | CT.TR_HAS_VARIABLE_ROW_HEIGHT,
+                 style=wx.SUNKEN_BORDER | CT.TR_HAS_BUTTONS | CT.TR_HAS_VARIABLE_ROW_HEIGHT,
                  log=None):
 
-        CT.CustomTreeCtrl.__init__(self, parent, id, pos, size, style, ctstyle)
+        CT.CustomTreeCtrl.__init__(self, parent, id, pos, size, style)
 
         alldata = dir(CT)
 
diff --git a/wxPython/demo/Dialog.py b/wxPython/demo/Dialog.py
index 7bb49f85bc..4c75b19c5b 100644
--- a/wxPython/demo/Dialog.py
+++ b/wxPython/demo/Dialog.py
@@ -110,8 +110,8 @@ class TestPanel(wx.Panel):
             useMetal = self.cb.IsChecked()
             
         dlg = TestDialog(self, -1, "Sample Dialog", size=(350, 200),
-                         #style=wxCAPTION | wxSYSTEM_MENU | wxTHICK_FRAME,
-                         style=wx.DEFAULT_DIALOG_STYLE,
+                         #style=wx.CAPTION | wx.SYSTEM_MENU | wx.THICK_FRAME,
+                         style=wx.DEFAULT_DIALOG_STYLE, # & ~wx.CLOSE_BOX,
                          useMetal=useMetal,
                          )
         dlg.CenterOnScreen()
diff --git a/wxPython/demo/DirDialog.py b/wxPython/demo/DirDialog.py
index c1b1c2a433..eed1be3beb 100644
--- a/wxPython/demo/DirDialog.py
+++ b/wxPython/demo/DirDialog.py
@@ -15,7 +15,10 @@ class TestPanel(wx.Panel):
     def OnButton(self, evt):
         # In this case we include a "New directory" button. 
         dlg = wx.DirDialog(self, "Choose a directory:",
-                          style=wx.DD_DEFAULT_STYLE|wx.DD_NEW_DIR_BUTTON)
+                          style=wx.DD_DEFAULT_STYLE
+                           #| wx.DD_DIR_MUST_EXIST
+                           #| wx.DD_CHANGE_DIR
+                           )
 
         # If the user selects OK, then we process the dialog's data.
         # This is done by getting the path data from the dialog - BEFORE
diff --git a/wxPython/demo/DragImage.py b/wxPython/demo/DragImage.py
index 2592c97728..d8f7ef3458 100644
--- a/wxPython/demo/DragImage.py
+++ b/wxPython/demo/DragImage.py
@@ -58,6 +58,11 @@ class DragCanvas(wx.ScrolledWindow):
         shape.fullscreen = True
         self.shapes.append(shape)
 
+        bmp = images.getTheKidBitmap()
+        shape = DragShape(bmp)
+        shape.pos = (200, 5)
+        self.shapes.append(shape)
+
         # Make a shape from some text
         text = "Some Text"
         bg_colour = wx.Colour(57, 115, 57)  # matches the bg image
@@ -84,11 +89,6 @@ class DragCanvas(wx.ScrolledWindow):
         self.shapes.append(shape)
 
 
-        bmp = images.getTheKidBitmap()
-        shape = DragShape(bmp)
-        shape.pos = (200, 5)
-        self.shapes.append(shape)
-
         self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground)
         self.Bind(wx.EVT_PAINT, self.OnPaint)
         self.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown)
diff --git a/wxPython/demo/DynamicSashWindow.py b/wxPython/demo/DynamicSashWindow.py
index b06438b6ee..bd1ccbc34a 100644
--- a/wxPython/demo/DynamicSashWindow.py
+++ b/wxPython/demo/DynamicSashWindow.py
@@ -91,11 +91,11 @@ class SimpleView(wx.Panel):
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):
-    if wx.Platform == "__WXMAC__":
-        from Main import MessagePanel
-        win = MessagePanel(nb, 'This demo currently fails on the Mac. The problem is being looked into...',
-                           'Sorry', wx.ICON_WARNING)
-        return win
+##     if wx.Platform == "__WXMAC__":
+##         from Main import MessagePanel
+##         win = MessagePanel(nb, 'This demo currently fails on the Mac. The problem is being looked into...',
+##                            'Sorry', wx.ICON_WARNING)
+##         return win
 
     if 1:
         win = gizmos.DynamicSashWindow(nb, -1, style =  wx.CLIP_CHILDREN
diff --git a/wxPython/demo/FlatNotebook.py b/wxPython/demo/FlatNotebook.py
index 18b5ee0d37..0de95de359 100644
--- a/wxPython/demo/FlatNotebook.py
+++ b/wxPython/demo/FlatNotebook.py
@@ -58,6 +58,7 @@ MENU_DISABLE_TAB = wx.NewId()
 MENU_ENABLE_DRAG_N_DROP = wx.NewId()
 MENU_DCLICK_CLOSES_TAB = wx.NewId()
 MENU_USE_VC8_STYLE = wx.NewId()
+MENU_USE_FF2_STYLE = wx.NewId()
 MENU_HIDE_ON_SINGLE_TAB = wx.NewId()
 
 MENU_SET_ACTIVE_TEXT_COLOR = wx.NewId()
@@ -179,6 +180,10 @@ class FlatNotebookDemo(wx.Frame):
         self.Bind(wx.EVT_MENU, self.OnFancyStyle, item)
         styleMenu.AppendItem(item)
 
+        item = wx.MenuItem(styleMenu, MENU_USE_FF2_STYLE, "Use Firefox 2 Style", "Use Firefox 2 Style", wx.ITEM_RADIO)
+        self.Bind(wx.EVT_MENU, self.OnFF2Style, item)
+        styleMenu.AppendItem(item)
+        
         self._visualMenu.AppendMenu(wx.ID_ANY, "Tabs Style", styleMenu)
 
         item = wx.MenuItem(self._visualMenu, MENU_SELECT_GRADIENT_COLOR_FROM, "Select fancy tab style 'from' color",
@@ -443,12 +448,25 @@ class FlatNotebookDemo(wx.Frame):
         self._bShowImages = event.IsChecked()
 
 
+    def OnFF2Style(self, event):
+
+        style = self.book.GetWindowStyleFlag()
+
+        # remove old tabs style
+        mirror = ~(fnb.FNB_VC71 | fnb.FNB_VC8 | fnb.FNB_FANCY_TABS | fnb.FNB_FF2)
+        style &= mirror
+
+        style |= fnb.FNB_FF2
+
+        self.book.SetWindowStyleFlag(style)
+
+
     def OnVC71Style(self, event):
 
         style = self.book.GetWindowStyleFlag()
 
         # remove old tabs style
-        mirror = ~(fnb.FNB_VC71 | fnb.FNB_VC8 | fnb.FNB_FANCY_TABS)
+        mirror = ~(fnb.FNB_VC71 | fnb.FNB_VC8 | fnb.FNB_FANCY_TABS | fnb.FNB_FF2)
         style &= mirror
 
         style |= fnb.FNB_VC71
@@ -461,7 +479,7 @@ class FlatNotebookDemo(wx.Frame):
         style = self.book.GetWindowStyleFlag()
 
         # remove old tabs style
-        mirror = ~(fnb.FNB_VC71 | fnb.FNB_VC8 | fnb.FNB_FANCY_TABS)
+        mirror = ~(fnb.FNB_VC71 | fnb.FNB_VC8 | fnb.FNB_FANCY_TABS | fnb.FNB_FF2)
         style &= mirror
 
         # set new style
@@ -475,7 +493,7 @@ class FlatNotebookDemo(wx.Frame):
         style = self.book.GetWindowStyleFlag()
 
         # remove old tabs style
-        mirror = ~(fnb.FNB_VC71 | fnb.FNB_VC8 | fnb.FNB_FANCY_TABS)
+        mirror = ~(fnb.FNB_VC71 | fnb.FNB_VC8 | fnb.FNB_FANCY_TABS | fnb.FNB_FF2)
         style &= mirror
 
         self.book.SetWindowStyleFlag(style)
@@ -486,7 +504,7 @@ class FlatNotebookDemo(wx.Frame):
         style = self.book.GetWindowStyleFlag()
 
         # remove old tabs style
-        mirror = ~(fnb.FNB_VC71 | fnb.FNB_VC8 | fnb.FNB_FANCY_TABS)
+        mirror = ~(fnb.FNB_VC71 | fnb.FNB_VC8 | fnb.FNB_FANCY_TABS | fnb.FNB_FF2)
         style &= mirror
 
         style |= fnb.FNB_FANCY_TABS
diff --git a/wxPython/demo/FloatCanvas.py b/wxPython/demo/FloatCanvas.py
index 038d496c66..0b1c54cfd6 100644
--- a/wxPython/demo/FloatCanvas.py
+++ b/wxPython/demo/FloatCanvas.py
@@ -1,27 +1,18 @@
+#!/usr/bin/env python
 
-
-#print "running:", wx.__version__
-##First, make sure Numeric or numarray can be imported.
 try:
-    import Numeric
-    import RandomArray
-    haveNumeric = True
+    import numpy as N
+    import numpy.random as RandomArray
+    haveNumpy = True
+    #print "Using numpy, version:", N.__version__
 except ImportError:
-    # Numeric isn't there, let's try numarray
-    try:
-        import numarray as Numeric
-        import numarray.random_array as RandomArray
-        haveNumeric = True
-    except ImportError:
-        # numarray isn't there either
-        haveNumeric = False
-        errorText = (
-        "The FloatCanvas requires either the Numeric or numarray module\n\n"
-        "You can get them at:\n"
-        "http://sourceforge.net/projects/numpy\n\n"
-        "NOTE: The Numeric module is substantially faster than numarray for this\n"
-        "purpose, if you have lots of objects\n"
-        )
+            # numpy isn't there
+            haveNumpy = False
+            errorText = (
+            "The FloatCanvas requires the numpy module, version 1.* \n\n"
+            "You can get info about it at:\n"
+            "http://numpy.scipy.org/\n\n"
+            )
       
 #---------------------------------------------------------------------------
 
@@ -100,7 +91,10 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             item = draw_menu.Append(-1, "&Arrows","Run a test of Arrows")
             self.Bind(wx.EVT_MENU, self.ArrowTest, item)
 
-            item = draw_menu.Append(-1, "&Hide","Run a test of the Show() Hide() Show() and methods")
+            item = draw_menu.Append(-1, "&ArrowLine Test","Run a test of drawing Arrow Lines")
+            self.Bind(wx.EVT_MENU, self.ArrowLineTest, item)
+
+            item = draw_menu.Append(-1, "&Hide","Run a test of hiding and showing objects")
             self.Bind(wx.EVT_MENU, self.HideTest, item)
 
             MenuBar.Append(draw_menu, "&Tests")
@@ -122,9 +116,11 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
 
             
             # Add the Canvas
-            self.Canvas = NavCanvas.NavCanvas(self,
-                                              Debug = 0,
-                                              BackgroundColor = "DARK SLATE BLUE")
+            NC = NavCanvas.NavCanvas(self,
+                                     Debug = 0,
+                                     BackgroundColor = "DARK SLATE BLUE")
+
+            self.Canvas = NC.Canvas # reference the contained FloatCanvas
 
             self.MsgWindow = wx.TextCtrl(self, wx.ID_ANY,
                                          "Look Here for output from events\n",
@@ -135,13 +131,14 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             
             ##Create a sizer to manage the Canvas and message window
             MainSizer = wx.BoxSizer(wx.VERTICAL)
-            MainSizer.Add(self.Canvas, 4, wx.EXPAND)
+            MainSizer.Add(NC, 4, wx.EXPAND)
             MainSizer.Add(self.MsgWindow, 1, wx.EXPAND | wx.ALL, 5)
 
             self.SetSizer(MainSizer)
-            wx.EVT_CLOSE(self, self.OnCloseWindow)
+            self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
 
-            FloatCanvas.EVT_MOTION(self.Canvas, self.OnMove ) 
+            self.Canvas.Bind(FloatCanvas.EVT_MOTION, self.OnMove) 
+            self.Canvas.Bind(FloatCanvas.EVT_MOUSEWHEEL, self.OnWheel) 
 
             self.EventsAreBound = False
 
@@ -161,56 +158,39 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
         def BindAllMouseEvents(self):
             if not self.EventsAreBound:
                 ## Here is how you catch FloatCanvas mouse events
-                FloatCanvas.EVT_LEFT_DOWN(self.Canvas, self.OnLeftDown ) 
-                FloatCanvas.EVT_LEFT_UP(self.Canvas, self.OnLeftUp )
-                FloatCanvas.EVT_LEFT_DCLICK(self.Canvas, self.OnLeftDouble ) 
+                self.Canvas.Bind(FloatCanvas.EVT_LEFT_DOWN, self.OnLeftDown) 
+                self.Canvas.Bind(FloatCanvas.EVT_LEFT_UP, self.OnLeftUp)
+                self.Canvas.Bind(FloatCanvas.EVT_LEFT_DCLICK, self.OnLeftDouble) 
 
-                FloatCanvas.EVT_MIDDLE_DOWN(self.Canvas, self.OnMiddleDown ) 
-                FloatCanvas.EVT_MIDDLE_UP(self.Canvas, self.OnMiddleUp ) 
-                FloatCanvas.EVT_MIDDLE_DCLICK(self.Canvas, self.OnMiddleDouble ) 
+                self.Canvas.Bind(FloatCanvas.EVT_MIDDLE_DOWN, self.OnMiddleDown) 
+                self.Canvas.Bind(FloatCanvas.EVT_MIDDLE_UP, self.OnMiddleUp) 
+                self.Canvas.Bind(FloatCanvas.EVT_MIDDLE_DCLICK, self.OnMiddleDouble) 
 
-                FloatCanvas.EVT_RIGHT_DOWN(self.Canvas, self.OnRightDown ) 
-                FloatCanvas.EVT_RIGHT_UP(self.Canvas, self.OnRightUp ) 
-                FloatCanvas.EVT_RIGHT_DCLICK(self.Canvas, self.OnRightDouble ) 
+                self.Canvas.Bind(FloatCanvas.EVT_RIGHT_DOWN, self.OnRightDown) 
+                self.Canvas.Bind(FloatCanvas.EVT_RIGHT_UP, self.OnRightUp) 
+                self.Canvas.Bind(FloatCanvas.EVT_RIGHT_DCLICK, self.OnRightDouble) 
 
-                FloatCanvas.EVT_MOUSEWHEEL(self.Canvas, self.OnWheel ) 
             self.EventsAreBound = True
 
+
         def UnBindAllMouseEvents(self):
             ## Here is how you unbind FloatCanvas mouse events
-            FloatCanvas.EVT_LEFT_DOWN(self.Canvas, None ) 
-            FloatCanvas.EVT_LEFT_UP(self.Canvas, None )
-            FloatCanvas.EVT_LEFT_DCLICK(self.Canvas, None) 
+            self.Canvas.Unbind(FloatCanvas.EVT_LEFT_DOWN)
+            self.Canvas.Unbind(FloatCanvas.EVT_LEFT_UP)
+            self.Canvas.Unbind(FloatCanvas.EVT_LEFT_DCLICK)
 
-            FloatCanvas.EVT_MIDDLE_DOWN(self.Canvas, None )
-            FloatCanvas.EVT_MIDDLE_UP(self.Canvas, None )
-            FloatCanvas.EVT_MIDDLE_DCLICK(self.Canvas, None )
+            self.Canvas.Unbind(FloatCanvas.EVT_MIDDLE_DOWN)
+            self.Canvas.Unbind(FloatCanvas.EVT_MIDDLE_UP)
+            self.Canvas.Unbind(FloatCanvas.EVT_MIDDLE_DCLICK)
 
-            FloatCanvas.EVT_RIGHT_DOWN(self.Canvas, None )
-            FloatCanvas.EVT_RIGHT_UP(self.Canvas, None )
-            FloatCanvas.EVT_RIGHT_DCLICK(self.Canvas, None )
-
-            FloatCanvas.EVT_MOUSEWHEEL(self.Canvas, None )
-            FloatCanvas.EVT_LEFT_DOWN(self.Canvas, None ) 
-            FloatCanvas.EVT_LEFT_UP(self.Canvas, None )
-            FloatCanvas.EVT_LEFT_DCLICK(self.Canvas, None) 
-
-            FloatCanvas.EVT_MIDDLE_DOWN(self.Canvas, None )
-            FloatCanvas.EVT_MIDDLE_UP(self.Canvas, None )
-            FloatCanvas.EVT_MIDDLE_DCLICK(self.Canvas, None )
-
-            FloatCanvas.EVT_RIGHT_DOWN(self.Canvas, None )
-            FloatCanvas.EVT_RIGHT_UP(self.Canvas, None )
-            FloatCanvas.EVT_RIGHT_DCLICK(self.Canvas, None )
-
-            FloatCanvas.EVT_MOUSEWHEEL(self.Canvas, None )
+            self.Canvas.Unbind(FloatCanvas.EVT_RIGHT_DOWN)
+            self.Canvas.Unbind(FloatCanvas.EVT_RIGHT_UP)
+            self.Canvas.Unbind(FloatCanvas.EVT_RIGHT_DCLICK)
 
             self.EventsAreBound = False
 
 
         def PrintCoords(self,event):
-            #print "coords are: %s"%(event.Coords,)
-            #print "pixel coords are: %s\n"%(event.GetPosition(),)
             self.Log("coords are: %s"%(event.Coords,))
             self.Log("pixel coords are: %s\n"%(event.GetPosition(),))
 
@@ -256,7 +236,7 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             self.PrintCoords(event)
 
         def OnRightUp(self, event):
-            self.Log("RightDown")
+            self.Log("RightUp")
             self.PrintCoords(event)
 
         def OnRightDouble(self, event):
@@ -278,6 +258,7 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             Updates the status bar with the world coordinates
             """
             self.SetStatusText("%.2f, %.2f"%tuple(event.Coords))
+            event.Skip()
 
         def OnAbout(self, event):
             dlg = wx.MessageDialog(self,
@@ -293,8 +274,7 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
 
         def Clear(self,event = None):
             self.UnBindAllMouseEvents()
-            self.Canvas.ClearAll()
-            self.Canvas.SetProjectionFun(None)
+            self.Canvas.InitAll()
             self.Canvas.Draw()
 
         def OnQuit(self,event):
@@ -304,7 +284,12 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             self.Destroy()
 
         def DrawTest(self,event=None):
-            wx.GetApp().Yield()
+            """
+            This demo draws a few of everything
+
+            """
+            
+            wx.GetApp().Yield(True)
 
             Range = (-10,10)
             colors = self.colors
@@ -312,8 +297,12 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             self.BindAllMouseEvents()
             Canvas = self.Canvas
 
-            Canvas.ClearAll()
-            Canvas.SetProjectionFun(None)
+            Canvas.InitAll()
+            #            
+            ## these set the limits for how much you can zoom in and out
+            Canvas.MinScale = 14
+            Canvas.MaxScale = 500
+            
 
             ############# Random tests of everything ##############
 
@@ -417,6 +406,18 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
                                 LineColor = colors[random.randint(0,len(colors)-1)],
                                 ArrowHeadAngle = random.uniform(20,90))
 
+            # ArrowLines
+            for i in range(5):
+                points = []
+                for j in range(random.randint(2,10)):
+                    point = (random.randint(Range[0],Range[1]),random.randint(Range[0],Range[1]))
+                    points.append(point)
+                lw = random.randint(1,10)
+                cf = random.randint(0,len(colors)-1)
+                cl = random.randint(0,len(colors)-1)
+                Canvas.AddArrowLine(points, LineWidth = lw, LineColor = colors[cl], ArrowHeadSize= 16)
+
+
             Canvas.ZoomToBB()
 
         def TestAnimation(self,event=None):
@@ -429,15 +430,13 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             having to re-draw the whole background.
 
             """
-            wx.GetApp().Yield()
+            wx.GetApp().Yield(True)
             Range = (-10,10)
             self.Range = Range
 
             self.UnBindAllMouseEvents()
             Canvas = self.Canvas
-
-            Canvas.ClearAll()
-            Canvas.SetProjectionFun(None)
+            Canvas.InitAll()
 
             ##		Random tests of everything:
             colors = self.colors
@@ -543,14 +542,13 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             self.Timer.Start(self.FrameDelay)
             #print "Did %i frames in %f seconds"%(N, (time.time() - start) )
 
-        def TestHitTest(self,event=None):
-            wx.GetApp().Yield()
+        def TestHitTest(self, event=None):
+            wx.GetApp().Yield(True)
 
             self.UnBindAllMouseEvents()
             Canvas = self.Canvas
 
-            Canvas.ClearAll()
-            Canvas.SetProjectionFun(None)
+            Canvas.InitAll()
 
             #Add a Hit-able rectangle
             w, h = 60, 20
@@ -558,7 +556,7 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             dx = 80
             dy = 40
             x, y = 20, 20
-            FontSize = 8
+            FontSize = 10
 
             #Add one that is not HitAble
             Canvas.AddRectangle((x,y), (w, h), LineWidth = 2)
@@ -709,7 +707,7 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             R.Name = color
             R.Bind(FloatCanvas.EVT_FC_ENTER_OBJECT, self.RectMouseOver)
             R.Bind(FloatCanvas.EVT_FC_LEAVE_OBJECT, self.RectMouseLeave)
-            Canvas.AddText("Mouse ENter&Leave", (x, y), Size = FontSize, Position = "bl")
+            Canvas.AddText("Mouse Enter&Leave", (x, y), Size = FontSize, Position = "bl")
             Canvas.AddText(R.Name, (x, y+h), Size = FontSize, Position = "tl")
 
             x = 20
@@ -722,7 +720,7 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
 
             x += dx
             color = "SEA GREEN"
-            Points = Numeric.array(( (x, y), (x, y+2.*h/3), (x+w, y+h), (x+w, y+h/2.), (x + 2.*w/3, y+h/2.), (x + 2.*w/3,y) ), Numeric.Float)
+            Points = N.array(( (x, y), (x, y+2.*h/3), (x+w, y+h), (x+w, y+h/2.), (x + 2.*w/3, y+h/2.), (x + 2.*w/3,y) ), N.float_)
             R = Canvas.AddPolygon(Points,  LineWidth = 2, FillColor = color)
             R.Name = color + " Polygon"
             R.Bind(FloatCanvas.EVT_FC_RIGHT_DOWN, self.RectGotHitRight)
@@ -731,7 +729,7 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
 
             x += dx
             color = "Red"
-            Points = Numeric.array(( (x, y), (x, y+2.*h/3), (x+w, y+h), (x+w, y+h/2.), (x + 2.*w/3, y+h/2.), (x + 2.*w/3,y) ), Numeric.Float)
+            Points = N.array(( (x, y), (x, y+2.*h/3), (x+w, y+h), (x+w, y+h/2.), (x + 2.*w/3, y+h/2.), (x + 2.*w/3,y) ), N.float_)
             R = Canvas.AddPointSet(Points,  Diameter = 4, Color = color)
             R.Name = "PointSet"
             R.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.PointSetGotHit)
@@ -755,7 +753,7 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             x += dx
             color = "Cyan"
             Point = (x + w/2, y)
-            #Points = Numeric.array(( (x, y), (x, y+2.*h/3), (x+w, y+h), (x+w, y+h/2.), (x + 2.*w/3, y+h/2.), (x + 2.*w/3,y) ), Numeric.Float)
+            #Points = N.array(( (x, y), (x, y+2.*h/3), (x+w, y+h), (x+w, y+h/2.), (x + 2.*w/3, y+h/2.), (x + 2.*w/3,y) ), N.float_)
             R = Canvas.AddSquarePoint(Point,  Size = 8, Color = color)
             R.Name = "SquarePoint"
             R.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.RectGotHit)
@@ -766,13 +764,12 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             self.Canvas.ZoomToBB()
 
         def TestHitTestForeground(self,event=None):
-            wx.GetApp().Yield()
+            wx.GetApp().Yield(True)
 
             self.UnBindAllMouseEvents()
             Canvas = self.Canvas
 
-            Canvas.ClearAll()
-            Canvas.SetProjectionFun(None)
+            Canvas.InitAll()
 
             #Add a Hitable rectangle
             w, h = 60, 20
@@ -871,13 +868,14 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
 
 
         def TestText(self, event= None):
-            wx.GetApp().Yield()
+            wx.GetApp().Yield(True)
 
             self.BindAllMouseEvents()
             Canvas = self.Canvas
-            Canvas.ClearAll()
-            Canvas.SetProjectionFun(None)
+            Canvas.InitAll()
+            
 
+            DefaultSize = 12           
             Point  = (3, 0)
 
             ## Add a non-visible rectangle, just to get a Bounding Box
@@ -889,29 +887,29 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
 
             # Text
             String = "Some text"
-            self.Canvas.AddText("Top Left",Point,Size = 14,Color = "Yellow",BackgroundColor = "Blue", Position = "tl")
-            self.Canvas.AddText("Bottom Left",Point,Size = 14,Color = "Cyan",BackgroundColor = "Black",Position = "bl")
-            self.Canvas.AddText("Top Right",Point,Size = 14,Color = "Black",BackgroundColor = "Cyan",Position = "tr")
-            self.Canvas.AddText("Bottom Right",Point,Size = 14,Color = "Blue",BackgroundColor = "Yellow",Position = "br")
+            self.Canvas.AddText("Top Left",Point,Size = DefaultSize,Color = "Yellow",BackgroundColor = "Blue", Position = "tl")
+            self.Canvas.AddText("Bottom Left",Point,Size = DefaultSize,Color = "Cyan",BackgroundColor = "Black",Position = "bl")
+            self.Canvas.AddText("Top Right",Point,Size = DefaultSize,Color = "Black",BackgroundColor = "Cyan",Position = "tr")
+            self.Canvas.AddText("Bottom Right",Point,Size = DefaultSize,Color = "Blue",BackgroundColor = "Yellow",Position = "br")
             Canvas.AddPointSet((Point), Color = "White", Diameter = 2)
 
             Point  = (3, 2)
 
             Canvas.AddPointSet((Point), Color = "White", Diameter = 2)
-            self.Canvas.AddText("Top Center",Point,Size = 14,Color = "Black",Position = "tc")
-            self.Canvas.AddText("Bottom Center",Point,Size = 14,Color = "White",Position = "bc")
+            self.Canvas.AddText("Top Center",Point,Size = DefaultSize,Color = "Black",Position = "tc")
+            self.Canvas.AddText("Bottom Center",Point,Size = DefaultSize,Color = "White",Position = "bc")
 
             Point  = (3, 4)
 
             Canvas.AddPointSet((Point), Color = "White", Diameter = 2)
-            self.Canvas.AddText("Center Right",Point,Size = 14,Color = "Black",Position = "cr")
-            self.Canvas.AddText("Center Left",Point,Size = 14,Color = "Black",Position = "cl")
+            self.Canvas.AddText("Center Right",Point,Size = DefaultSize,Color = "Black",Position = "cr")
+            self.Canvas.AddText("Center Left",Point,Size = DefaultSize,Color = "Black",Position = "cl")
 
             Point  = (3, -2)
 
             Canvas.AddPointSet((Point), Color = "White", Diameter = 2)
             self.Canvas.AddText("Center Center",
-                                Point, Size = 14,
+                                Point, Size = DefaultSize,
                                 Color = "Black",
                                 Position = "cc")
 
@@ -927,18 +925,17 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             self.Canvas.AddText("ROMAN ITALIC BOLD Font", (-10, -5), Family = wx.ROMAN, Weight=wx.BOLD, Style=wx.ITALIC)
 
             # NOTE: this font exists on my Linux box..who knows were else you'll find it!
-            Font = wx.Font(20, wx.DEFAULT, wx.ITALIC, wx.NORMAL, False, "zapf chancery")
-            self.Canvas.AddText("zapf chancery Font", (-10, -6), Font = Font)
+            Font = wx.Font(20, wx.DEFAULT, wx.ITALIC, wx.NORMAL, False, "helvetica")
+            self.Canvas.AddText("Helvetica Italic", (-10, -6), Font = Font)
 
             self.Canvas.ZoomToBB()
 
         def TestScaledText(self, event= None):
-            wx.GetApp().Yield()
+            wx.GetApp().Yield(True)
 
             self.BindAllMouseEvents()
             Canvas = self.Canvas
-            Canvas.ClearAll()
-            Canvas.SetProjectionFun(None)
+            Canvas.InitAll()
 
             Point  = (0, 0)
 
@@ -977,24 +974,23 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             Canvas.AddPointSet((x,0), Color = "White", Diameter = 4)
 
 
-            # NOTE: this font exists on my Linux box..who knows were else you'll find it!
+            # NOTE: this font exists on my OS-X.who knows were else you'll find it!
             Point = (-100, 50)
-            Font = wx.Font(12, wx.DEFAULT, wx.ITALIC, wx.NORMAL, False, "zapf chancery")
-            T = self.Canvas.AddScaledText("zapf chancery Font", Point, Size = 20, Font = Font, Position = 'bc')
+            Font = wx.Font(12, wx.DEFAULT, wx.ITALIC, wx.NORMAL, False, "helvetica")
+            T = self.Canvas.AddScaledText("Helvetica Italic", Point, Size = 20, Font = Font, Position = 'bc')
 
             Point = (-50, -50)
-            Font = wx.Font(12, wx.DEFAULT, wx.ITALIC, wx.NORMAL, False, "bookman")
-            T = self.Canvas.AddScaledText("Bookman Font", Point, Size = 8, Font = Font)
+            Font = wx.Font(12, wx.DEFAULT, wx.ITALIC, wx.NORMAL, False, "times")
+            T = self.Canvas.AddScaledText("Times Font", Point, Size = 8, Font = Font)
 
             self.Canvas.ZoomToBB()
 
         def TestScaledTextBox(self, event= None):
-            wx.GetApp().Yield()
+            wx.GetApp().Yield(True)
 
             self.UnBindAllMouseEvents()
             Canvas = self.Canvas
-            Canvas.ClearAll()
-            Canvas.SetProjectionFun(None)
+            Canvas.InitAll()
 
             Point = (45,40)
             Box = Canvas.AddScaledTextBox("A Two Line\nString",
@@ -1010,7 +1006,7 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
                                           Family = wx.ROMAN,
                                           Style = wx.NORMAL,
                                           Weight = wx.NORMAL,
-                                          Underline = False,
+                                          Underlined = False,
                                           Position = 'br',
                                           Alignment = "left",
                                           InForeground = False)
@@ -1058,7 +1054,7 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
                                           Family = wx.TELETYPE,
                                           Style = wx.NORMAL,
                                           Weight = wx.NORMAL,
-                                          Underline = False,
+                                          Underlined = False,
                                           Position = 'cr',
                                           Alignment = "left",
                                           InForeground = False)
@@ -1076,7 +1072,7 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
                                           Family = wx.TELETYPE,
                                           Style = wx.NORMAL,
                                           Weight = wx.NORMAL,
-                                          Underline = False,
+                                          Underlined = False,
                                           Position = 'cl',
                                           Alignment = "left",
                                           InForeground = False)
@@ -1097,7 +1093,7 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
                                           Family = wx.TELETYPE,
                                           Style = wx.NORMAL,
                                           Weight = wx.NORMAL,
-                                          Underline = False,
+                                          Underlined = False,
                                           Position = 'tc',
                                           Alignment = "left",
                                           InForeground = False)
@@ -1115,7 +1111,7 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
                                           Family = wx.TELETYPE,
                                           Style = wx.NORMAL,
                                           Weight = wx.NORMAL,
-                                          Underline = False,
+                                          Underlined = False,
                                           Position = 'bc',
                                           Alignment = "left",
                                           InForeground = False)
@@ -1143,7 +1139,7 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
                                           Family = wx.ROMAN,
                                           Alignment = "right"
                                           )
-            Point = Numeric.array((100, -20), Numeric.Float)
+            Point = N.array((100, -20), N.float_)
             Box = Canvas.AddScaledTextBox("Here is even more auto wrapped text. This time the line spacing is set to 0.8. \n\nThe Padding is set to 0.",
                                           Point,
                                           Size = 3,
@@ -1157,8 +1153,8 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
                                           )
             Canvas.AddPoint(Point, "Red", 2)
 
-            Point = Numeric.array((0, -40), Numeric.Float)
-    #        Point = Numeric.array((0, 0), Numeric.Float)
+            Point = N.array((0, -40), N.float_)
+    #        Point = N.array((0, 0), N.float_)
             for Position in ["tl", "bl", "tr", "br"]:
     #        for Position in ["br"]:
                 Box = Canvas.AddScaledTextBox("Here is a\nfour liner\nanother line\nPosition=%s"%Position,
@@ -1176,7 +1172,7 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
                                           )
             Canvas.AddPoint(Point, "Red", 4)
 
-            Point = Numeric.array((-20, 60), Numeric.Float)
+            Point = N.array((-20, 60), N.float_)
             Box = Canvas.AddScaledTextBox("Here is some\ncentered\ntext",
                                           Point,
                                           Size = 4,
@@ -1192,7 +1188,7 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
                                           LineSpacing = 0.8
                                           )
 
-            Point = Numeric.array((-20, 20), Numeric.Float)
+            Point = N.array((-20, 20), N.float_)
             Box = Canvas.AddScaledTextBox("Here is some\nright aligned\ntext",
                                           Point,
                                           Size = 4,
@@ -1207,7 +1203,7 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
                                           LineSpacing = 0.8
                                           )
 
-            Point = Numeric.array((100, -60), Numeric.Float)
+            Point = N.array((100, -60), N.float_)
             Box = Canvas.AddScaledTextBox("Here is some auto wrapped text. This time it is centered, rather than right aligned.\n\nThe Padding is set to 2.",
                                           Point,
                                           Size = 3,
@@ -1230,13 +1226,12 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             self.Log("I'm the TextBox")
 
         def TestBitmap(self, event= None):
-            wx.GetApp().Yield()
+            wx.GetApp().Yield(True)
 
             self.UnBindAllMouseEvents()
             Canvas = self.Canvas
-            Canvas.ClearAll()
-            Canvas.SetProjectionFun(None)
-
+            Canvas.InitAll()
+            
             Canvas.AddRectangle((10, 20),
                                 (400, 100),
                                 LineWidth = 3,
@@ -1295,16 +1290,17 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             self.Canvas.ZoomToBB()
 
         def DrawMap(self,event = None):
-            wx.GetApp().Yield()
+            wx.GetApp().Yield(True)
             import os, time
+            
+            self.Canvas.InitAll()
+            self.Canvas.SetProjectionFun("FlatEarth")
             self.BindAllMouseEvents()
 
         ## Test of Actual Map Data
-            self.Canvas.ClearAll()
-            self.Canvas.SetProjectionFun("FlatEarth")
             #start = time.clock()
             self.Log("Loading Map from a File")
-            wx.GetApp().Yield() # so log text will get displayed now.
+            wx.GetApp().Yield(True) # so log text will get displayed now.
             Shorelines = self.Read_MapGen(os.path.join("data",'world.dat'),stats = 0)
             #print "It took %f seconds to load %i shorelines"%(time.clock() - start,len(Shorelines) )
             #start = time.clock()
@@ -1316,17 +1312,17 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             #print "It took %f seconds to draw %i shorelines"%(time.clock() - start,len(Shorelines) )
 
 
+
         def LineTest(self,event = None):
-            wx.GetApp().Yield()
+            wx.GetApp().Yield(True)
             import os, time
 #            import random
             colors = self.colors
             Range = (-10,10)
         ## Test of drawing lots of lines
             Canvas = self.Canvas
-            Canvas.ClearAll()
-            Canvas.SetProjectionFun(None)
-            #start = time.clock()
+            Canvas.InitAll()
+                        #start = time.clock()
             linepoints = []
             linecolors = []
             linewidths = []
@@ -1345,17 +1341,44 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             Canvas.ZoomToBB()
             #print "It took %f seconds to draw %i lines"%(time.clock() - start,len(linepoints) )
 
+        def ArrowLineTest(self,event = None):
+            wx.GetApp().Yield(True)
+            Canvas = self.Canvas
+            Canvas.InitAll()
+            #            import os, time
+##            import random
+            Range = (-100,100)
+            colors = self.colors
+
+            # Lines
+            for i in range(5):
+                points = []
+                for j in range(random.randint(2,10)):
+                    point = (random.randint(Range[0],Range[1]),random.randint(Range[0],Range[1]))
+                    points.append(point)
+                lw = random.randint(1,4)
+                cf = random.randint(0,len(colors)-1)
+                cl = random.randint(0,len(colors)-1)
+                al = random.randint(8,20)
+                aa = random.randint(20,90)
+                Canvas.AddArrowLine(points,
+                                    LineWidth = lw,
+                                    LineColor = colors[cl],
+                                    ArrowHeadSize = al,
+                                    ArrowHeadAngle = aa)
+
+            Canvas.ZoomToBB()
+
         def SpeedTest(self,event=None):
-            wx.GetApp().Yield()
+            wx.GetApp().Yield(True)
             BigRange = (-1000,1000)
             colors = self.colors
 
             self.UnBindAllMouseEvents()
             Canvas = self.Canvas
 
-            Canvas.ClearAll()
-            Canvas.SetProjectionFun(None)
-
+            Canvas.InitAll()
+            
             # Pointset
             coords = []
             for i in range(1000):
@@ -1369,7 +1392,7 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             Canvas.ZoomToBB()
 
         def PropertiesChangeTest(self,event=None):
-            wx.GetApp().Yield()
+            wx.GetApp().Yield(True)
 
             Range = (-10,10)
             colors = self.colors
@@ -1377,9 +1400,8 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             self.UnBindAllMouseEvents()
             Canvas = self.Canvas
 
-            Canvas.ClearAll()
-            Canvas.SetProjectionFun(None)
-
+            Canvas.InitAll()
+            
             self.ColorObjectsAll = []
             self.ColorObjectsLine = []
             self.ColorObjectsColor = []
@@ -1512,13 +1534,14 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             self.Canvas.Draw(Force = True)
 
         def ArrowTest(self,event=None):
-            wx.GetApp().Yield()
+            wx.GetApp().Yield(True)
             self.UnBindAllMouseEvents()
             Canvas = self.Canvas
 
-            Canvas.ClearAll()
-            Canvas.SetProjectionFun(None)
-
+            Canvas.InitAll()
+            Canvas.MinScale = 15
+            Canvas.MaxScale = 30
+            
             # put in a rectangle to get a bounding box
             Canvas.AddRectangle((0,0), (20,20), LineColor = None)
 
@@ -1534,16 +1557,18 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
 
             Canvas.AddText("Clickable Arrow", (4,18), Position = "bc")
             Arrow = Canvas.AddArrow((4,18), 80, Direction = 90 ,LineWidth = 3, LineColor = "Red",   ArrowHeadAngle = 30)
+            Arrow.HitLineWidth = 6
             Arrow.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.ArrowClicked)
 
-            Canvas.AddText("Changable Arrow", (16,4), Position = "cc")
+            Canvas.AddText("Changable Arrow: try clicking it", (16,4), Position = "tc")
             self.RotArrow = Canvas.AddArrow((16,4), 80, Direction = 0 ,LineWidth = 3, LineColor = "Green",   ArrowHeadAngle = 30)
+            self.RotArrow.HitLineWidth = 6
             self.RotArrow.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.RotateArrow)
 
             Canvas.ZoomToBB()
 
         def ArrowClicked(self,event):
-            print "The Arrow was Clicked"
+            self.Log("The Arrow was Clicked")
 
         def RotateArrow(self,event):
             ##print "The Changeable Arrow was Clicked"
@@ -1557,13 +1582,12 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             self.Canvas.Draw(Force = True)
 
         def HideTest(self, event=None):
-            wx.GetApp().Yield()
+            wx.GetApp().Yield(True)
 
             self.UnBindAllMouseEvents()
             Canvas = self.Canvas
-            Canvas.ClearAll()
-            Canvas.SetProjectionFun(None)
-
+            Canvas.InitAll()
+            
             Range = (-10,10)
 
             # Create a couple random Polygons
@@ -1616,22 +1640,32 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
 
         def HidePoly(self, Button):
             Poly = Button.HidePoly
+
             if Poly.Visible:
-                Poly.Hide()
+                Poly.Visible = False
                 Button.SetText(Button.String.replace("Hide","Show"))
             else:
-                Poly.Show()
+                Poly.Visible = True
                 Button.SetText(Button.String.replace("Show", "Hide"))
             self.Canvas.Draw(True)
 
+
         def TempTest(self, event= None):
-            wx.GetApp().Yield()
+            """
+            
+            This is the start of a poly editor test, but it's not complete
+            so you can only run it through a command line flag:
+            
+            python FloatCanvasDemo.py --temp
+            
+            """
+            
+            wx.GetApp().Yield(True)
 
             self.UnBindAllMouseEvents()
             Canvas = self.Canvas
-            Canvas.ClearAll()
-            Canvas.SetProjectionFun(None)
-
+            Canvas.InitAll()
+            
             Range = (-10,10)
 
             # Create a random Polygon
@@ -1654,7 +1688,6 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             Canvas.ZoomToBB()
 
         def SelectPoly(self, Object):
-            print "In SelectPoly"
             Canvas = self.Canvas
             if Object is self.SelectedPoly:
                 pass
@@ -1673,7 +1706,7 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             Canvas.Draw()
 
         def SelectPointHit(self, Point):
-            print "Point Num: %i Hit"%Point.VerticeNum
+            self.Log("Point Num: %i Hit"%Point.VerticeNum)
             self.SelectedPoint = Point
 
         def Read_MapGen(self, filename, stats = 0,AllLines=0):
@@ -1697,11 +1730,11 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
             for line in data:
                 if line:
                     if line == "# -b": #New segment beginning
-                        if segment: Shorelines.append(Numeric.array(segment))
+                        if segment: Shorelines.append(N.array(segment))
                         segment = []
                     else:
                         segment.append(map(float,string.split(line)))
-            if segment: Shorelines.append(Numeric.array(segment))
+            if segment: Shorelines.append(N.array(segment))
 
             if stats:
                 NumSegments = len(Shorelines)
@@ -1728,13 +1761,16 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import
       
 if __name__ == "__main__":
 
+    # running stand alone, Use wxversion:
+#    import wxversion
+#    wxversion.select("2.6")
+#    wxversion.select("2.8")
     import wx
    
     
     # check options:
     import sys, getopt
-    optlist, args = getopt.getopt(sys.argv[1:],'l',["local",
-                                                    "all",
+    optlist, args = getopt.getopt(sys.argv[1:],'l',["all",
                                                     "text",
                                                     "map",
                                                     "stext",
@@ -1747,40 +1783,15 @@ if __name__ == "__main__":
                                                     "temp",
                                                     "props",
                                                     "arrow",
+                                                    "arrowline",
                                                     "hide"])
 
-    if not haveNumeric:
+    if not haveNumpy:
         raise ImportError(errorText)
     StartUpDemo = "all" # the default
-    for opt in optlist:
-        if opt[0] == "--all":
-            StartUpDemo = "all"
-        elif opt[0] == "--text":
-            StartUpDemo = "text"
-        elif opt[0] == "--map":
-            StartUpDemo = "map"
-        elif opt[0] == "--stext":
-            StartUpDemo = "stext"
-        elif opt[0] == "--stextbox":
-            StartUpDemo = "stextbox"
-        elif opt[0] == "--bitmap":
-            StartUpDemo = "bitmap"
-        elif opt[0] == "--hit":
-            StartUpDemo = "hit"
-        elif opt[0] == "--hitf":
-            StartUpDemo = "hitf"
-        elif opt[0] == "--animate":
-            StartUpDemo = "animate"
-        elif opt[0] == "--speed":
-            StartUpDemo = "speed"
-        elif opt[0] == "--temp":
-            StartUpDemo = "temp"
-        elif opt[0] == "--props":
-            StartUpDemo = "props"
-        elif opt[0] == "--arrow":
-            StartUpDemo = "arrow"
-        elif opt[0] == "--hide":
-            StartUpDemo = "hide"
+    if optlist:
+        StartUpDemo = optlist[0][0][2:]
+
 
     class DemoApp(wx.App):
         """
@@ -1844,6 +1855,7 @@ if __name__ == "__main__":
             frame.Show()
 
             ## check to see if the demo is set to start in a particular mode.
+            ## fixme: should this be in a dict instead?
             if StartUpDemo == "text":
                 frame.TestText()
             elif StartUpDemo == "stext":
@@ -1859,25 +1871,20 @@ if __name__ == "__main__":
             elif StartUpDemo == "hit":
                 frame.TestHitTest()
             elif StartUpDemo == "hitf":
-                "starting TestHitTestForeground"
                 frame.TestHitTestForeground()
             elif StartUpDemo == "animate":
-                "starting TestAnimation"
                 frame.TestAnimation()
             elif StartUpDemo == "speed":
-                "starting SpeedTest"
                 frame.SpeedTest()
             elif StartUpDemo == "temp":
-                "starting temp Test"
                 frame.TempTest()
             elif StartUpDemo == "props":
-                "starting PropertiesChange Test"
                 frame.PropertiesChangeTest()
             elif StartUpDemo == "arrow":
-                "starting arrow Test"
                 frame.ArrowTest()
+            elif StartUpDemo == "arrowline":
+                frame.ArrowLineTest()
             elif StartUpDemo == "hide":
-                "starting Hide Test"
                 frame.HideTest()
 
             return True
@@ -1889,14 +1896,14 @@ else:
     # It's not running stand-alone, set up for wxPython demo.
     # don't  neeed wxversion here.
     import wx
-    if not haveNumeric:
+    if not haveNumpy:
         ## TestPanel and runTest used for integration into wxPython Demo
         class TestPanel(wx.Panel):
             def __init__(self, parent, log):
                 self.log = log
                 wx.Panel.__init__(self, parent, -1)
 
-                import images
+                from wx.lib.floatcanvas.ScreenShot import getScreenShotBitmap
 
                 note1 = wx.StaticText(self, -1, errorText)
                 note2 = wx.StaticText(self, -1, "This is what the FloatCanvas can look like:")
@@ -1904,7 +1911,7 @@ else:
                 S.Add((10, 10), 1)
                 S.Add(note1, 0, wx.ALIGN_CENTER)
                 S.Add(note2, 0, wx.ALIGN_CENTER | wx.BOTTOM, 4)
-                S.Add(wx.StaticBitmap(self,-1,images.getFloatCanvasBitmap()),0,wx.ALIGN_CENTER)
+                S.Add(wx.StaticBitmap(self,-1,getScreenShotBitmap()),0,wx.ALIGN_CENTER)
                 S.Add((10, 10), 1)
                 self.SetSizer(S)
                 self.Layout()
diff --git a/wxPython/demo/GraphicsContext.py b/wxPython/demo/GraphicsContext.py
index bc2d3039eb..e598362381 100644
--- a/wxPython/demo/GraphicsContext.py
+++ b/wxPython/demo/GraphicsContext.py
@@ -19,7 +19,13 @@ class TestPanel(wx.Panel):
 
     def OnPaint(self, evt):
         dc = wx.PaintDC(self)
-        gc = wx.GraphicsContext.Create(dc)
+        try:
+            gc = wx.GraphicsContext.Create(dc)
+        except NotImplementedError:
+            dc.DrawText("This build of wxPython does not support the wx.GraphicsContext "
+                        "family of classes.",
+                        25, 25)
+            return
 
         font = wx.SystemSettings.GetFont(wx.SYS_DEFAULT_GUI_FONT)
         font.SetWeight(wx.BOLD)
@@ -64,6 +70,13 @@ class TestPanel(wx.Panel):
         gc.DrawText("Scale", 0, -BASE2)
         gc.Translate(0, 20)
 
+        # for testing clipping
+        #gc.Clip(0, 0, 100, 100)
+        #rgn = wx.RegionFromPoints([ (0,0), (75,0), (75,25,), (100, 25),
+        #                            (100,100), (0,100), (0,0)  ])
+        #gc.ClipRegion(rgn)
+        #gc.ResetClip()
+        
         gc.SetBrush(wx.Brush(wx.Colour(178,  34,  34, 128)))   # 128 == half transparent
         for cnt in range(8):
             gc.Scale(1.08, 1.08)    # increase scale by 8%
@@ -75,7 +88,7 @@ class TestPanel(wx.Panel):
         gc.PushState()             # save it again
         gc.Translate(400, 200)
         gc.DrawText("Rotate", 0, -BASE2)
-
+        
         gc.Translate(0, 75)
         for angle in range(0, 360, 30):
             gc.PushState()         # save this new current state so we can pop back to 
diff --git a/wxPython/demo/GridDragable.py b/wxPython/demo/GridDragable.py
index 8f375b8eb7..0eaa795f4c 100644
--- a/wxPython/demo/GridDragable.py
+++ b/wxPython/demo/GridDragable.py
@@ -103,17 +103,17 @@ class CustomDataTable(gridlib.PyGridTableBase):
 
             # Notify the grid
             grid.BeginBatch()
-            msg = gridlib.GridTableMessage(
-                    self, gridlib.GRIDTABLE_NOTIFY_COLS_DELETED, frm, 1
-                    )
-                    
-            grid.ProcessTableMessage(msg)
-            
+           
             msg = gridlib.GridTableMessage(
                     self, gridlib.GRIDTABLE_NOTIFY_COLS_INSERTED, to, 1
                     )
-
             grid.ProcessTableMessage(msg)
+
+            msg = gridlib.GridTableMessage(
+                    self, gridlib.GRIDTABLE_NOTIFY_COLS_DELETED, frm, 1
+                    )
+            grid.ProcessTableMessage(msg)
+            
             grid.EndBatch()
 
     # Move the row
@@ -138,16 +138,15 @@ class CustomDataTable(gridlib.PyGridTableBase):
             grid.BeginBatch()
 
             msg = gridlib.GridTableMessage(
-                    self, gridlib.GRIDTABLE_NOTIFY_ROWS_DELETED, frm, 1
+                    self, gridlib.GRIDTABLE_NOTIFY_ROWS_INSERTED, to, 1
                     )
-
             grid.ProcessTableMessage(msg)
 
             msg = gridlib.GridTableMessage(
-                    self, gridlib.GRIDTABLE_NOTIFY_ROWS_INSERTED, to, 1
+                    self, gridlib.GRIDTABLE_NOTIFY_ROWS_DELETED, frm, 1
                     )
-
             grid.ProcessTableMessage(msg)
+    
             grid.EndBatch()
 
 
diff --git a/wxPython/demo/GridSimple.py b/wxPython/demo/GridSimple.py
index 0748d09f7e..ab358bff24 100644
--- a/wxPython/demo/GridSimple.py
+++ b/wxPython/demo/GridSimple.py
@@ -242,7 +242,8 @@ class TestFrame(wx.Frame):
 
 if __name__ == '__main__':
     import sys
-    app = wx.PySimpleApp()
+    from wx.lib.mixins.inspect import InspectableApp
+    app = InspectableApp(False)
     frame = TestFrame(None, sys.stdout)
     frame.Show(True)
     #import wx.py
diff --git a/wxPython/demo/I18N.py b/wxPython/demo/I18N.py
index c04c5506e8..e35f483a9b 100644
--- a/wxPython/demo/I18N.py
+++ b/wxPython/demo/I18N.py
@@ -177,7 +177,10 @@ class LanguageSelectPanel(wx.Panel):
         
         # create a locale object for this language
         self.locale = wx.Locale(lang)
-        self.locale.AddCatalog('wxpydemo')
+        if self.locale.IsOk():
+            self.locale.AddCatalog('wxpydemo')
+        else:
+            self.locale = None
 
     def translateExample(self):
         self.translatedST.SetLabel(_(self.englishBaseCh.GetStringSelection()))
diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 64b08bba9b..35946ef9e0 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -70,6 +70,7 @@ _treeList = [
         'SearchCtrl',
         'SizedControls',
         'AUI_MDI',
+        'TreeMixin',
         ]),
 
     # managed windows == things with a (optional) caption you can close
@@ -214,6 +215,7 @@ _treeList = [
         'Throbber',
         'Ticker',
         'TimeCtrl',
+        'TreeMixin',
         'VListBox',
         ]),
 
@@ -1374,6 +1376,7 @@ class wxPythonDemo(wx.Frame):
     #---------------------------------------------
     
     def RecreateTree(self, evt=None):
+        self.tree.Freeze()
         self.tree.DeleteAllItems()
         self.root = self.tree.AddRoot("wxPython Overview")
         firstChild = None
@@ -1393,6 +1396,7 @@ class wxPythonDemo(wx.Frame):
             self.tree.Expand(firstChild)
         if filter:
             self.tree.ExpandAll()
+        self.tree.Thaw()
     
     def WriteText(self, text):
         if text[-1:] == '\n':
@@ -1685,9 +1689,17 @@ class wxPythonDemo(wx.Frame):
 
 
     def OnOpenWidgetInspector(self, evt):
-        # Activate the widget inspector that was mixed in with the
-        # app, see MyApp and MyApp.OnInit below.
-        wx.GetApp().ShowInspectionTool()
+        # Activate the widget inspection tool
+        from wx.lib.inspection import InspectionTool
+        if not InspectionTool().initialized:
+            InspectionTool().Init()
+
+        # Find a widget to be selected in the tree.  Use either the
+        # one under the cursor, if any, or this frame.
+        wnd = wx.FindWindowAtPointer()
+        if not wnd:
+            wnd = self
+        InspectionTool().Show(wnd, True)
 
         
     #---------------------------------------------
@@ -1789,8 +1801,7 @@ class MySplashScreen(wx.SplashScreen):
             self.Raise()
 
         
-import wx.lib.mixins.inspect
-class MyApp(wx.App, wx.lib.mixins.inspect.InspectionMixin):
+class MyApp(wx.App):
     def OnInit(self):
         """
         Create and show the splash screen.  It will then create and show
@@ -1811,9 +1822,6 @@ class MyApp(wx.App, wx.lib.mixins.inspect.InspectionMixin):
         splash = MySplashScreen()
         splash.Show()
 
-        # Setup the InspectionMixin
-        self.Init()
-        
         return True
 
 
diff --git a/wxPython/demo/MaskedNumCtrl.py b/wxPython/demo/MaskedNumCtrl.py
index 28a488584b..6926f8da5a 100644
--- a/wxPython/demo/MaskedNumCtrl.py
+++ b/wxPython/demo/MaskedNumCtrl.py
@@ -54,6 +54,7 @@ The controls at the top reconfigure the resulting control at the bottom.
 
 
         self.limit_target = wx.CheckBox( panel, -1, "Limit control" )
+        self.limit_on_field_change = wx.CheckBox( panel, -1, "Limit on field change" )
         self.allow_none = wx.CheckBox( panel, -1, "Allow empty control" )
         self.group_digits = wx.CheckBox( panel, -1, "Group digits" )
         self.group_digits.SetValue( True )
@@ -102,21 +103,26 @@ value entry ctrl:""")
 
 
         grid1.Add( self.limit_target, 0, wx.ALIGN_LEFT|wx.ALL, 5 )
-        grid1.Add( self.allow_none, 0, wx.ALIGN_LEFT|wx.ALL, 5 )
+        grid1.Add( self.limit_on_field_change, 0, wx.ALIGN_LEFT|wx.ALL, 5 )
+        
         hbox1 = wx.BoxSizer( wx.HORIZONTAL )
         hbox1.Add( (17,5), 0, wx.ALIGN_LEFT|wx.ALL, 5)
-        hbox1.Add( self.group_digits, 0, wx.ALIGN_LEFT|wx.LEFT, 5 )
+        hbox1.Add( self.allow_none, 0, wx.ALIGN_LEFT|wx.ALL, 5 )
         grid1.Add( hbox1, 0, wx.ALIGN_LEFT|wx.ALL, 5)
         grid1.Add( (5,5), 0, wx.ALIGN_LEFT|wx.ALL, 5)
 
-        grid1.Add( self.allow_negative, 0, wx.ALIGN_LEFT|wx.ALL, 5 )
-        grid1.Add( self.use_parens, 0, wx.ALIGN_LEFT|wx.ALL, 5 )
+        grid1.Add( self.group_digits, 0, wx.ALIGN_LEFT|wx.LEFT, 5 )
+        grid1.Add( self.allow_negative, 0, wx.ALIGN_LEFT|wx.ALL, 5 )        
         hbox2 = wx.BoxSizer( wx.HORIZONTAL )
         hbox2.Add( (17,5), 0, wx.ALIGN_LEFT|wx.ALL, 5)
-        hbox2.Add( self.select_on_entry, 0, wx.ALIGN_LEFT|wx.LEFT, 5 )
+        hbox2.Add( self.use_parens, 0, wx.ALIGN_LEFT|wx.ALL, 5 )
         grid1.Add( hbox2, 0, wx.ALIGN_LEFT|wx.ALL, 5)
         grid1.Add( (5,5), 0, wx.ALIGN_LEFT|wx.ALL, 5)
-
+        
+        grid1.Add( self.select_on_entry, 0, wx.ALIGN_LEFT|wx.LEFT, 5 )
+        grid1.Add( (5,5), 0, wx.ALIGN_LEFT|wx.ALL, 5)
+        grid1.Add( (5,5), 0, wx.ALIGN_LEFT|wx.ALL, 5)
+        grid1.Add( (5,5), 0, wx.ALIGN_LEFT|wx.ALL, 5)
 
         grid2 = wx.FlexGridSizer( 0, 2, 0, 0 )
         grid2.Add( label, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
@@ -151,7 +157,8 @@ value entry ctrl:""")
         self.Bind(masked.EVT_NUM, self.SetTargetMinMax, self.min )
         self.Bind(masked.EVT_NUM, self.SetTargetMinMax, self.max )
 
-        self.Bind(wx.EVT_CHECKBOX, self.SetTargetMinMax, self.limit_target )
+        self.Bind(wx.EVT_CHECKBOX, self.OnSetLimited, self.limit_target )
+        self.Bind(wx.EVT_CHECKBOX, self.OnSetLimitOnFieldChange, self.limit_on_field_change )
         self.Bind(wx.EVT_CHECKBOX, self.OnSetAllowNone, self.allow_none )
         self.Bind(wx.EVT_CHECKBOX, self.OnSetGroupDigits, self.group_digits )
         self.Bind(wx.EVT_CHECKBOX, self.OnSetAllowNegative, self.allow_negative )
@@ -218,10 +225,26 @@ value entry ctrl:""")
         self.SetTargetMinMax()
 
 
+    def OnSetLimited( self, event ):
+        limited = self.limit_target.GetValue()
+        self.target_ctl.SetLimited( limited )
+        limit_on_field_change = self.limit_on_field_change.GetValue()
+        if limited and limit_on_field_change:
+            self.limit_on_field_change.SetValue(False)
+            self.target_ctl.SetLimitOnFieldChange( False )
+        self.SetTargetMinMax()
+
+
+    def OnSetLimitOnFieldChange( self, event ):
+        limit_on_field_change = self.limit_on_field_change.GetValue()
+        self.target_ctl.SetLimitOnFieldChange( limit_on_field_change )
+        limited = self.limit_target.GetValue()
+        if limited and limit_on_field_change:
+            self.limit_target.SetValue(False)
+            self.target_ctl.SetLimited( False )
+
     def SetTargetMinMax( self, event=None ):
         min = max = None
-        self.target_ctl.SetLimited( self.limit_target.GetValue() )
-
         if self.set_min.GetValue():
             min = self.min.GetValue()
         if self.set_max.GetValue():
diff --git a/wxPython/demo/ScrolledWindow.py b/wxPython/demo/ScrolledWindow.py
index 35087538d8..d5b0728be2 100644
--- a/wxPython/demo/ScrolledWindow.py
+++ b/wxPython/demo/ScrolledWindow.py
@@ -157,10 +157,8 @@ class MyCanvas(wx.ScrolledWindow):
         self.x, self.y = self.ConvertEventCoords(event)
 
     def ConvertEventCoords(self, event):
-        xView, yView = self.GetViewStart()
-        xDelta, yDelta = self.GetScrollPixelsPerUnit()
-        return (event.GetX() + (xView * xDelta),
-                event.GetY() + (yView * yDelta))
+        newpos = self.CalcUnscrolledPosition(event.GetX(), event.GetY())
+        return newpos
 
     def OnLeftButtonEvent(self, event):
         if event.LeftDown():
@@ -172,23 +170,34 @@ class MyCanvas(wx.ScrolledWindow):
 
         elif event.Dragging() and self.drawing:
             if BUFFERED:
-                # If doing buffered drawing, create the buffered DC, giving it
-                # it a real DC to blit to when done.
-                cdc = wx.ClientDC(self)
-                self.PrepareDC(cdc)
-                dc = wx.BufferedDC(cdc, self.buffer)
+                # If doing buffered drawing we'll just update the
+                # buffer here and then refresh that portion of the
+                # window, then that portion of the buffer will be
+                # redrawn in the EVT_PAINT handler.
+                dc = wx.BufferedDC(None, self.buffer)
             else:
+                # otherwise we'll draw directly to a wx.ClientDC
                 dc = wx.ClientDC(self)
                 self.PrepareDC(dc)
 
-            dc.BeginDrawing()
             dc.SetPen(wx.Pen('MEDIUM FOREST GREEN', 4))
             coords = (self.x, self.y) + self.ConvertEventCoords(event)
             self.curLine.append(coords)
             dc.DrawLine(*coords)
             self.SetXY(event)
-            dc.EndDrawing()
-
+            
+            if BUFFERED:
+                # figure out what part of the window to refresh
+                x1,y1, x2,y2 = dc.GetBoundingBox()
+                x1,y1 = self.CalcScrolledPosition(x1, y1)
+                x2,y2 = self.CalcScrolledPosition(x2, y2)
+                # make a rectangle
+                rect = wx.Rect()
+                rect.SetTopLeft((x1,y1))
+                rect.SetBottomRight((x2,y2))
+                rect.Inflate(2,2)
+                # refresh it
+                self.RefreshRect(rect)
 
         elif event.LeftUp() and self.drawing:
             self.lines.append(self.curLine)
diff --git a/wxPython/demo/SearchCtrl.py b/wxPython/demo/SearchCtrl.py
index 83edf2e757..c43a31c955 100644
--- a/wxPython/demo/SearchCtrl.py
+++ b/wxPython/demo/SearchCtrl.py
@@ -41,8 +41,9 @@ class TestPanel(wx.Panel):
 
         self.Bind(wx.EVT_SEARCHCTRL_SEARCH_BTN, self.OnSearch, self.search)
         self.Bind(wx.EVT_SEARCHCTRL_CANCEL_BTN, self.OnCancel, self.search)
-        self.search.Bind(wx.EVT_TEXT_ENTER, self.OnDoSearch, self.search)
-        
+        self.Bind(wx.EVT_TEXT_ENTER, self.OnDoSearch, self.search)
+        ##self.Bind(wx.EVT_TEXT, self.OnDoSearch, self.search)        
+
 
     def OnToggleSearchButton(self, evt):
         self.search.ShowSearchButton( evt.GetInt() )
diff --git a/wxPython/demo/SizedControls.py b/wxPython/demo/SizedControls.py
index 63b237a3e7..857e88f4a7 100644
--- a/wxPython/demo/SizedControls.py
+++ b/wxPython/demo/SizedControls.py
@@ -310,7 +310,9 @@ def runTest(frame, nb, log):
     win = TestPanel(nb, log)
     return win
 
-if __name__ == "__main__":  
-    app = wx.PySimpleApp()
-    dlg = FormDialog()
-    dlg.ShowModal()
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])
+
diff --git a/wxPython/demo/TreeListCtrl.py b/wxPython/demo/TreeListCtrl.py
index c5371334a2..6501392437 100644
--- a/wxPython/demo/TreeListCtrl.py
+++ b/wxPython/demo/TreeListCtrl.py
@@ -75,8 +75,13 @@ class TestPanel(wx.Panel):
         self.tree.Expand(self.root)
 
         self.tree.GetMainWindow().Bind(wx.EVT_RIGHT_UP, self.OnRightUp)
+        self.tree.Bind(wx.EVT_TREE_ITEM_ACTIVATED, self.OnActivate)
 
 
+    def OnActivate(self, evt):
+        self.log.write('OnActivate: %s' % self.tree.GetItemText(evt.GetItem()))
+        
+
     def OnRightUp(self, evt):
         pos = evt.GetPosition()
         item, flags, col = self.tree.HitTest(pos)
diff --git a/wxPython/demo/TreeMixin.py b/wxPython/demo/TreeMixin.py
new file mode 100644
index 0000000000..7c31599a3f
--- /dev/null
+++ b/wxPython/demo/TreeMixin.py
@@ -0,0 +1,261 @@
+import wx, wx.lib.customtreectrl, wx.gizmos
+import treemixin
+
+
+class TreeModel(object):
+    ''' TreeModel holds the domain objects that are shown in the different
+    tree controls. Each domain object is simply a two-tuple consisting of
+    a label and a list of child tuples, i.e. (label, [list of child tuples]). 
+    '''
+    def __init__(self, *args, **kwargs):
+        self.items = []
+        self.itemCounter = 0
+        super(TreeModel, self).__init__(*args, **kwargs)
+
+    def GetItem(self, indices):
+        text, children = 'Hidden root', self.items
+        for index in indices:
+            text, children = children[index]
+        return text, children
+
+    def GetText(self, indices):
+        return self.GetItem(indices)[0]
+
+    def GetChildren(self, indices):
+        return self.GetItem(indices)[1]
+
+    def GetChildrenCount(self, indices):
+        return len(self.GetChildren(indices))
+
+    def SetChildrenCount(self, indices, count):
+        children = self.GetChildren(indices)
+        while len(children) > count:
+            children.pop()
+        while len(children) < count:
+            children.append(('item %d'%self.itemCounter, []))
+            self.itemCounter += 1
+
+    def MoveItem(self, itemToMoveIndex, newParentIndex):
+        itemToMove = self.GetItem(itemToMoveIndex)
+        newParentChildren = self.GetChildren(newParentIndex)
+        newParentChildren.append(itemToMove)
+        oldParentChildren = self.GetChildren(itemToMoveIndex[:-1])
+        oldParentChildren.remove(itemToMove)
+
+
+class DemoTreeMixin(treemixin.VirtualTree, treemixin.DragAndDrop, 
+                    treemixin.ExpansionState):
+    def __init__(self, *args, **kwargs):
+        self.model = kwargs.pop('treemodel')
+        self.log = kwargs.pop('log')
+        super(DemoTreeMixin, self).__init__(*args, **kwargs)
+        self.CreateImageList()
+
+    def CreateImageList(self):
+        size = (16, 16)
+        self.imageList = wx.ImageList(*size)
+        for art in wx.ART_FOLDER, wx.ART_FILE_OPEN, wx.ART_NORMAL_FILE:
+            self.imageList.Add(wx.ArtProvider.GetBitmap(art, wx.ART_OTHER, 
+                                                        size))
+        self.AssignImageList(self.imageList)
+
+    def OnGetItemText(self, indices):
+        return self.model.GetText(indices)
+
+    def OnGetChildrenCount(self, indices):
+        return self.model.GetChildrenCount(indices)
+
+    def OnGetItemFont(self, indices):
+        # Show how to change the item font. Here we use a small font for
+        # items that have children and the default font otherwise.
+        if self.model.GetChildrenCount(indices) > 0:
+            return wx.SMALL_FONT
+        else:
+            return super(DemoTreeMixin, self).OnGetItemFont(indices)
+
+    def OnGetItemTextColour(self, indices):
+        # Show how to change the item text colour. In this case second level
+        # items are coloured red and third level items are blue. All other
+        # items have the default text colour.
+        if len(indices) % 2 == 0:
+            return wx.RED
+        elif len(indices) % 3 == 0:
+            return wx.BLUE
+        else:
+            return super(DemoTreeMixin, self).OnGetItemTextColour(indices)
+
+    def OnGetItemBackgroundColour(self, indices):
+        # Show how to change the item background colour. In this case the
+        # background colour of each third item is green.
+        if indices[-1] == 2:
+            return wx.GREEN
+        else: 
+            return super(DemoTreeMixin, 
+                         self).OnGetItemBackgroundColour(indices)
+
+    def OnGetItemImage(self, indices, which):
+        # Return the right icon depending on whether the item has children.
+        if which in [wx.TreeItemIcon_Normal, wx.TreeItemIcon_Selected]:
+            if self.model.GetChildrenCount(indices):
+                return 0
+            else:
+                return 2
+        else:
+            return 1
+
+    def OnDrop(self, dropTarget, dragItem):
+        dropIndex = self.GetIndexOfItem(dropTarget)
+        dropText = self.model.GetText(dropIndex)
+        dragIndex = self.GetIndexOfItem(dragItem)
+        dragText = self.model.GetText(dragIndex)
+        self.log.write('drop %s %s on %s %s'%(dragText, dragIndex,
+            dropText, dropIndex))
+        self.model.MoveItem(dragIndex, dropIndex)
+        self.GetParent().RefreshItems()
+
+
+class VirtualTreeCtrl(DemoTreeMixin, wx.TreeCtrl):
+    pass
+
+
+class VirtualTreeListCtrl(DemoTreeMixin, wx.gizmos.TreeListCtrl):
+    def __init__(self, *args, **kwargs):
+        kwargs['style'] = wx.TR_DEFAULT_STYLE | wx.TR_FULL_ROW_HIGHLIGHT
+        super(VirtualTreeListCtrl, self).__init__(*args, **kwargs)
+        self.AddColumn('Column 0')
+        self.AddColumn('Column 1')
+        for art in wx.ART_TIP, wx.ART_WARNING:
+            self.imageList.Add(wx.ArtProvider.GetBitmap(art, wx.ART_OTHER, 
+                                                        (16, 16)))
+
+    def OnGetItemText(self, indices, column=0):
+        # Return a different label depending on column.
+        return '%s, column %d'%\
+            (super(VirtualTreeListCtrl, self).OnGetItemText(indices), column)
+
+    def OnGetItemImage(self, indices, which, column=0):
+        # Also change the image of the other columns when the item has 
+        # children.
+        if column == 0:
+            return super(VirtualTreeListCtrl, self).OnGetItemImage(indices, 
+                                                                   which)
+        elif self.OnGetChildrenCount(indices):
+            return 4
+        else:
+            return 3
+
+
+class VirtualCustomTreeCtrl(DemoTreeMixin, 
+                            wx.lib.customtreectrl.CustomTreeCtrl):
+    def __init__(self, *args, **kwargs):
+        self.checked = {}
+        kwargs['style'] = wx.TR_HIDE_ROOT | \
+            wx.TR_HAS_BUTTONS | wx.TR_FULL_ROW_HIGHLIGHT
+        super(VirtualCustomTreeCtrl, self).__init__(*args, **kwargs)
+        self.Bind(wx.lib.customtreectrl.EVT_TREE_ITEM_CHECKED,
+                  self.OnItemChecked)
+
+    def OnGetItemType(self, indices):
+        if len(indices) == 1:
+            return 1
+        elif len(indices) == 2:
+            return 2
+        else:
+            return 0
+
+    def OnGetItemChecked(self, indices):
+        return self.checked.get(indices, False)
+
+    def OnItemChecked(self, event):
+        item = event.GetItem()
+        itemIndex = self.GetIndexOfItem(item)
+        if self.GetItemType(item) == 2: 
+            # It's a radio item; reset other items on the same level
+            for nr in range(self.GetChildrenCount(self.GetItemParent(item))):
+                self.checked[itemIndex[:-1]+(nr,)] = False
+        self.checked[itemIndex] = True
+
+
+
+class TreeNotebook(wx.Notebook):
+    def __init__(self, *args, **kwargs):
+        treemodel = kwargs.pop('treemodel')
+        log = kwargs.pop('log')
+        super(TreeNotebook, self).__init__(*args, **kwargs)
+        self.trees = []
+        for class_, title in [(VirtualTreeCtrl, 'TreeCtrl'),
+                              (VirtualTreeListCtrl, 'TreeListCtrl'),
+                              (VirtualCustomTreeCtrl, 'CustomTreeCtrl')]:
+            tree = class_(self, treemodel=treemodel, log=log)
+            self.trees.append(tree)
+            self.AddPage(tree, title)
+        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.OnPageChanged)
+
+    def OnPageChanged(self, event):
+        oldTree = self.GetPage(event.OldSelection)
+        newTree = self.GetPage(event.Selection)
+        newTree.RefreshItems()
+        newTree.SetExpansionState(oldTree.GetExpansionState())
+        event.Skip()
+
+    def GetIndicesOfSelectedItems(self):
+        tree = self.trees[self.GetSelection()]
+        if tree.GetSelections():
+            return [tree.GetIndexOfItem(item) for item in tree.GetSelections()]
+        else:
+            return [()]
+
+    def RefreshItems(self):
+        tree = self.trees[self.GetSelection()]
+        tree.RefreshItems()
+        tree.UnselectAll()
+
+
+class TestPanel(wx.Panel):
+    def __init__(self, parent, log):
+        self.log = log
+        super(TestPanel, self).__init__(parent)
+        self.treemodel = TreeModel()
+        self.CreateControls()
+        self.LayoutControls()
+
+    def CreateControls(self):
+        self.notebook = TreeNotebook(self, treemodel=self.treemodel, 
+                                     log=self.log)
+        self.label = wx.StaticText(self, label='Number of children: ')
+        self.childrenCountCtrl = wx.SpinCtrl(self, value='0', max=10000)
+        self.button = wx.Button(self, label='Update children')
+        self.button.Bind(wx.EVT_BUTTON, self.OnEnter)
+
+    def LayoutControls(self):
+        hSizer = wx.BoxSizer(wx.HORIZONTAL)
+        options = dict(flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL, border=2)
+        hSizer.Add(self.label, **options)
+        hSizer.Add(self.childrenCountCtrl, 2, **options)
+        hSizer.Add(self.button, **options)
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        sizer.Add(self.notebook, 1, wx.EXPAND)
+        sizer.Add(hSizer, 0, wx.EXPAND)
+        self.SetSizer(sizer)
+
+    def OnEnter(self, event):
+        indicesList = self.notebook.GetIndicesOfSelectedItems()
+        newChildrenCount = self.childrenCountCtrl.GetValue()
+        for indices in indicesList:
+            text = self.treemodel.GetText(indices)
+            oldChildrenCount = self.treemodel.GetChildrenCount(indices)
+            self.log.write('%s %s now has %d children (was %d)'%(text, indices,
+                newChildrenCount, oldChildrenCount))
+            self.treemodel.SetChildrenCount(indices, newChildrenCount)
+        self.notebook.RefreshItems()
+
+
+def runTest(frame, nb, log):
+    win = TestPanel(nb, log)
+    return win
+
+
+if __name__ == '__main__':
+    import sys, os, run
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])
+
diff --git a/wxPython/demo/run.py b/wxPython/demo/run.py
index 5b1fffb091..b7b1a38ec0 100755
--- a/wxPython/demo/run.py
+++ b/wxPython/demo/run.py
@@ -18,7 +18,7 @@ on the command line.
 """
 
 import wx
-import wx.lib.mixins.inspect
+import wx.lib.mixins.inspection
 import sys, os
 
 # stuff for debugging
@@ -40,7 +40,7 @@ class Log:
     write = WriteText
 
 
-class RunDemoApp(wx.App, wx.lib.mixins.inspect.InspectionMixin):
+class RunDemoApp(wx.App, wx.lib.mixins.inspection.InspectionMixin):
     def __init__(self, name, module, useShell):
         self.name = name
         self.demoModule = module
diff --git a/wxPython/distrib/all/build-all b/wxPython/distrib/all/build-all
index aca8fbba8a..425c9acbd5 100755
--- a/wxPython/distrib/all/build-all
+++ b/wxPython/distrib/all/build-all
@@ -73,7 +73,7 @@ def getTasks(config_env):
 
     
     beastTask1 = Task(
-        [ #Job("beast.23",     "distrib/all/build-windows", ["2.3"], env=config_env),
+        [ Job("beast.23",     "distrib/all/build-windows", ["2.3"], env=config_env),
 #          Job("co-rh9.23",    "distrib/all/build-rpm", ["beast", "co-rh9",   "rh9",   "2.3"], env=config_env),
           Job("beast.24",     "distrib/all/build-windows", ["2.4"], env=config_env),
 #          Job("co-rh9.24",    "distrib/all/build-rpm", ["beast", "co-rh9",   "rh9",   "2.4"], env=config_env),
@@ -89,7 +89,8 @@ def getTasks(config_env):
           ])
 
     xavierTask = Task([
-        Job("xavier", "distrib/all/build-deb", ["xavier", "/work/chroot/dapper", "dapper"], env=config_env),
+        Job("xavier.d", "distrib/all/build-deb", ["xavier", "/work/chroot/dapper", "dapper"], env=config_env),
+        Job("xavier.f", "distrib/all/build-deb", ["xavier", "/work/chroot/feisty", "feisty"], env=config_env),
         ])
 
     buildTasks = [ #jaguarTask,
diff --git a/wxPython/distrib/all/build-deb b/wxPython/distrib/all/build-deb
index 6bfc3f9315..442a53e708 100755
--- a/wxPython/distrib/all/build-deb
+++ b/wxPython/distrib/all/build-deb
@@ -25,8 +25,8 @@ function TestOnline {
 if [ $skipdeb != yes ]; then
     # We use a chroot environment on the build machine for the debian
     # builds, so this build is pretty simple.  Just copy the tarball
-    # and a build script to /tmp, and then run do-build-deb in the
-    # chroot.
+    # and a build script to the build machine, and then run
+    # do-build-deb in the chroot.
 
     if TestOnline $host; then
     
@@ -37,7 +37,7 @@ if [ $skipdeb != yes ]; then
 	scp $STAGING_DIR/wxPython-src* distrib/all/do-build-deb \
             root@$host:$chRootRoot/$LINUX_BUILD
     
-	ssh root@$host "dchroot --chroot $chRootName --directory $LINUX_BUILD \"do-build-deb $VERSION $VER2\""
+	ssh root@$host "dchroot --chroot $chRootName --directory $LINUX_BUILD \"./do-build-deb $VERSION $VER2\""
 
 	echo "Fetching the results..."
 	mkdir -p $STAGING_DIR/$chRootName
diff --git a/wxPython/distrib/makedev.bat b/wxPython/distrib/makedev.bat
index 85ce3afb03..24c2cabfd1 100755
--- a/wxPython/distrib/makedev.bat
+++ b/wxPython/distrib/makedev.bat
@@ -6,6 +6,12 @@ rem   or extensions that can share the same DLL.
 setlocal
 set BASE=_distrib_zip\wxPython-%1
 
+set TYPE=h
+if %2 == "debug" set TYPE=d
+
+set DELTYPE=d
+if %2 == "debug" set DELTYPE=h 
+
 rem **** Make a directory to build up a distribution tree
 mkdir _distrib_zip
 mkdir %BASE%
@@ -30,19 +36,19 @@ copy  %WXWIN%\wxPython\src\*.py              %BASE%\include\wx\wxPython\i_files
 
 mkdir %BASE%\lib
 mkdir %BASE%\lib\vc_dll
-mkdir %BASE%\lib\vc_dll\mswh
-mkdir %BASE%\lib\vc_dll\mswuh
+mkdir %BASE%\lib\vc_dll\msw%TYPE%
+mkdir %BASE%\lib\vc_dll\mswu%TYPE%
 
-copy /s %WXWIN%\lib\vc_dll\mswh\*            %BASE%\lib\vc_dll\mswh
-copy /s %WXWIN%\lib\vc_dll\mswuh\*           %BASE%\lib\vc_dll\mswuh
+copy /s %WXWIN%\lib\vc_dll\msw%TYPE%\*            %BASE%\lib\vc_dll\mswh
+copy /s %WXWIN%\lib\vc_dll\mswu%TYPE%\*           %BASE%\lib\vc_dll\mswuh
 copy %WXWIN%\lib\vc_dll\*                    %BASE%\lib\vc_dll
 
 
 rem *** remove unneeded files
 cd _distrib_zip
 
-ffind /SB wx*d_*.*		>  del-files
-ffind /SB wx*d.*		>> del-files
+ffind /SB wx*%DELTYPE%_*.*		>  del-files
+ffind /SB wx*%DELTYPE%.*		>> del-files
 ffind /SB .#*			>> del-files
 ffind /SB .cvsignore		>> del-files
 
@@ -68,8 +74,10 @@ rm del-files
 rm del-dirs
 
 rem *** bundle it all up  TODO: don't hard-code the 2.8
-tar cvf ../dist/wxPython2.8-win32-devel-%1.tar wxPython-%1
-bzip2 -9 ../dist/wxPython2.8-win32-devel-%1.tar
+set EXT=
+if %2 == "debug" set EXT="-debug"
+tar cvf ../dist/wxPython2.8-win32-devel-%1%EXT%.tar wxPython-%1
+bzip2 -9 ../dist/wxPython2.8-win32-devel-%1%EXT%.tar
 
 rem *** cleanup
 cd ..
diff --git a/wxPython/distrib/makerpm b/wxPython/distrib/makerpm
index 028cd1f65d..5acb514db4 100755
--- a/wxPython/distrib/makerpm
+++ b/wxPython/distrib/makerpm
@@ -3,6 +3,7 @@
 # Build an RPM containing both wxGTK and wxPython
 
 ##set -o xtrace
+##set -o errexit
 
 spectemplate=distrib/wxPythonFull.spec.in
 
@@ -236,7 +237,7 @@ fi
 #----------------------------------------------------------------------
 # build the RPM
 
-if [ -z "${skiprpm}" ]; then
+if [ "${skiprpm}" != "1" ]; then
     echo "*** Building RPMs..."
     cp ${distdir}/${tarver}.tar.bz2 ${rpmtop}/SOURCES
 
diff --git a/wxPython/docs/CHANGES.html b/wxPython/docs/CHANGES.html
index dc1150e3a2..db143a344e 100644
--- a/wxPython/docs/CHANGES.html
+++ b/wxPython/docs/CHANGES.html
@@ -11,16 +11,125 @@
 <div class="document" id="recent-changes-for-wxpython">
 <h1 class="title">Recent Changes for wxPython</h1>
 <div class="section">
-<h1><a id="id1" name="id1">2.8.1.0</a></h1>
+<h1><a id="id1" name="id1">2.8.3.0</a></h1>
 <ul class="simple">
-<li>8-Jan-2006</li>
+<li>22-March-2007</li>
+</ul>
+<p>Added wx.ToolBar.SetToolNormalBitmap and SetToolDisabledBitmap
+methods.  (Keep in mind however that the disabled bitmap is currently
+generated on the fly by most native toolbar widgets, so this
+SetToolDisabledBitmap method won't have any affect on them...)</p>
+<p>Refactored the inspection tool such that it can be used as a wx.App
+mix-in class as it was used before (with the wx.lib.mixins.inspect
+module) and also as a non mix-in tool (using wx.lib.inspect.InspectionTool).</p>
+<p>Add wx.lib.mixins.treemixin from Frank Niessink.</p>
+<p>Added the wx.SizerFlags class, and also added AddF, InsertF and
+PrependF methods to wx.Sizer.  The wxSizerFlags class provides a
+convienient and easier to read way to add items to a sizer.  It was
+added as a new set of methods of the wx.Sizer class so as to not
+disturb existing code.  For example, instead of writing:</p>
+<pre class="literal-block">
+sizer.Add(ctrl, 0, wx.EXPAND | wx.ALL, 10)
+</pre>
+<p>you can now write:</p>
+<pre class="literal-block">
+sizer.AddF(ctrl, wx.SizerFlags().Expand().Border(wx.ALL,10))
+</pre>
+<p>Will Sadkin provided a patch for the wx.lib.masked package that fixes
+its support for using the navigation keys on the numeric keypad.</p>
+<p>wx.lib.plot: patch #1663937 to allow user to turn off scientific
+notation on plot.</p>
+<p>wxGTK: Most of the remaining TODOs for the wx.GraphicsContext on wxGTK
+have been done.  This includes implementations for GetTextExtent,
+Clip, DrawBitmap, fixing the drawing position of text to be at the
+upper left corner instead of the baseline, etc.</p>
+<p>wx.lib.customtreectrl patches from Andrea:</p>
+<blockquote>
+<ol class="arabic simple">
+<li>ExpandAll has been renamed as ExpandAllChildren, and the new
+ExpandAll now takes no input arguments (consistent with
+wx.TreeCtrl)</li>
+<li>ctstyle keyword is now defaulted to 0: every style related to
+CustomTreeCtrl and the underlying wx.PyScrolledWindow should be
+declared using the keyword &quot;style&quot; only. For backward
+compatibility, ctstyle continues to work as I merged ctstyle and
+style in the __init__ method.</li>
+<li>GetClassDefaultAttributes is now a classmethod.</li>
+<li>UnselectAll bug fixed.</li>
+</ol>
+</blockquote>
+<p>Renamed the wx.lib.inspect and wx.lib.mixins.inspect modules to
+inspection, in order to avoid conflicts with the inspect module in the
+standard Python library.</p>
+<p>Lots of changes to XRCed from Roman Rolinsky:</p>
+<blockquote>
+<ul class="simple">
+<li>Preferences for default &quot;sizeritem&quot; parameters for new panels and
+controls can be configured (&quot;File&quot;&gt;&quot;Preferences...&quot;).</li>
+<li>Implemented comment object for including simple one-line comments and
+comment directives as tree nodes. No validation is performed for a
+valid XML string so comments must not contain &quot;--&gt;&quot;. Comment directive
+is a special comment starting with '%' character, followed by a line
+of python code. It is executed using 'exec' when the resource file is
+opened. This is useful to import plugin modules containing custom
+handlers which are specific to the resource file, hovewer this is of
+course a security hole if you use foreign XRC files. A warning is
+displayed if the preference option 'ask' is selected (by default).</li>
+<li>Added support for custom controls and plugin modules. Refer to this
+wxPythonWiki for the details:  <a class="reference" href="http://wiki.wxpython.org/index.cgi/XRCed#custom">http://wiki.wxpython.org/index.cgi/XRCed#custom</a></li>
+<li>Tool panel sections can be collapsed/expanded by clicking on the
+label of a tool group.</li>
+<li>Some undo/redo and other fixes.</li>
+<li>Fixes for wxMSW (notebook highlighting, control sizes, tree Unselect).</li>
+<li>Notebook page highlighting fix. Highlight resizes when the window
+is resized. ParamUnit spin button detects event handler re-entry
+(wxGTK probably has a bug in wxSpinButton with repeated events).</li>
+<li>Fix for dealing with empty 'growable' property, using MiniFrame
+for properties panel, the panel is restored together with the
+main window.</li>
+</ul>
+</blockquote>
+</div>
+<div class="section">
+<h1><a id="id2" name="id2">2.8.1.1</a></h1>
+<ul class="simple">
+<li>19-Jan-2007</li>
+</ul>
+<p>wxMSW: Fix lack of spin control update event when control lost focus</p>
+<p>Added a typeId property to the PyEventBinder class that holds the
+eventType ID used for that event.  So when you need the eventType
+(such as when sending your own instance of standard events) you can
+use, for example, wx.EVT_BUTTON.typeId instead of
+wx.wxEVT_COMMAND_BUTTON_CLICKED.   Note that there are a few composite
+events, such as EVT_MOUSE and EVT_SCROLL, that will actually bind
+multiple event types at once, and in these cases the typeId property
+may not give you what you want.  You should use te component events in
+these cases.</p>
+<p>PyCrust now has an option for showing/hiding the notebook.</p>
+<p>wxMSW:  Corrected drawing of bitmaps for disabled menu items.</p>
+<p>Enhanced the wx.lib.mixins.inspect module.  In addition to showing a
+PyCrust window it is now a widget browser, which provides a tree
+loaded up with all the widgets in the app, optionally with the sizers
+too, and also a panel displaying the properties of the selected
+window.  Run the demo and type Ctrl-Alt-I keystroke (or Cmd-Alt-I on
+the Mac) to see how it works.  You can add this to your own apps with
+just a few lines of code.</p>
+<p>Added wx.SearchCtrl.[Get|Set]DescriptiveText</p>
+<p>wxMac: Added support for the wx.FRAME_FLOAT_ON_PARENT style.</p>
+<p>wxMac: the popups used for call tips and autocomplete lists in
+StyledTextCtrl (such as in PyShell) are now top-level float-on-parent
+windows so they are no longer clipped by the bounds of the stc window.</p>
+</div>
+<div class="section">
+<h1><a id="id3" name="id3">2.8.1.0</a></h1>
+<ul class="simple">
+<li>8-Jan-2007</li>
 </ul>
 <p>Added EVT_TASKBAR_CLICK and use it to show taskbar icon menu on right
 button release, not press, under MSW (bug 1623761)</p>
-<p>Added wxTreeCtrl::CollapseAll[Children]() and IsEmpty() methods;
-documented wxTreeItemId (patch 1622125)</p>
-<p>Fix wxMDIChidFrame::GetPosition() (patch 1626610)</p>
-<p>Fix attribute memory leak in wxGrid::ShowCellEditControl() (patch
+<p>Added wx.TreeCtrl.CollapseAll[Children]() and IsEmpty() methods</p>
+<p>Fix wx.MDIChidFrame.GetPosition() (patch 1626610)</p>
+<p>Fix attribute memory leak in wx.grid.Grid::ShowCellEditControl() (patch
 1629949)</p>
 <p>wxGTK: Fix for controls on a toolbar being the full height of the
 toolbar instead of their natural height.</p>
@@ -34,7 +143,7 @@ essentially implement the MDI interface using a normal wx.Frame and a
 wx.aui.AuiNotebook.</p>
 </div>
 <div class="section">
-<h1><a id="id2" name="id2">2.8.0.1</a></h1>
+<h1><a id="id4" name="id4">2.8.0.1</a></h1>
 <ul class="simple">
 <li>11-Dec-2006</li>
 </ul>
@@ -84,7 +193,7 @@ introduce native search widgets.</p>
 uses the native renderer to draw the button.</p>
 </div>
 <div class="section">
-<h1><a id="id3" name="id3">2.7.2.0</a></h1>
+<h1><a id="id5" name="id5">2.7.2.0</a></h1>
 <ul class="simple">
 <li>7-Nov-2006</li>
 </ul>
@@ -124,7 +233,7 @@ constructor to use it instead of the default ActiveMovie backend,
 (assuming the quicktime DLLs are available on the system.)</p>
 </div>
 <div class="section">
-<h1><a id="id4" name="id4">2.7.1.3</a></h1>
+<h1><a id="id6" name="id6">2.7.1.3</a></h1>
 <ul class="simple">
 <li>26-Oct-2006</li>
 </ul>
@@ -144,7 +253,7 @@ SystemOption to zero.  In a future release this will be the default.</p>
 the new wx.GraphicsContext and wx.GraphicsPath classes.</p>
 </div>
 <div class="section">
-<h1><a id="id5" name="id5">2.7.1.2</a></h1>
+<h1><a id="id7" name="id7">2.7.1.2</a></h1>
 <ul class="simple">
 <li>21-Oct-2006</li>
 </ul>
@@ -171,7 +280,7 @@ correctly with this.</li>
 <p>Fixed refcount leak in wx.Window.GetChildren.</p>
 </div>
 <div class="section">
-<h1><a id="id6" name="id6">2.7.1.1</a></h1>
+<h1><a id="id8" name="id8">2.7.1.1</a></h1>
 <ul class="simple">
 <li>18-Oct-2006</li>
 </ul>
@@ -434,7 +543,7 @@ wx.PaintDC or wx.BufferedPaintDC.  This uses the new
 wx.Window.IsDoubleBuffered method.</p>
 </div>
 <div class="section">
-<h1><a id="id7" name="id7">2.6.3.3</a></h1>
+<h1><a id="id9" name="id9">2.6.3.3</a></h1>
 <ul class="simple">
 <li>15-July-2006</li>
 </ul>
@@ -471,7 +580,7 @@ machines, but at least all compile errors and warnings related to it
 have been resolved.</p>
 </div>
 <div class="section">
-<h1><a id="id8" name="id8">2.6.3.2</a></h1>
+<h1><a id="id10" name="id10">2.6.3.2</a></h1>
 <ul class="simple">
 <li>3-April-2006</li>
 </ul>
@@ -505,7 +614,7 @@ already shown.</p>
 is selected only with the keyboard.</p>
 </div>
 <div class="section">
-<h1><a id="id9" name="id9">2.6.3.0</a></h1>
+<h1><a id="id11" name="id11">2.6.3.0</a></h1>
 <ul class="simple">
 <li>27-March-2006</li>
 </ul>
@@ -567,7 +676,7 @@ zoomed plot and move it around with a mouse drag.</p>
 <p>Added wx.StandardPaths.GetDocumentsDir() (patch 1214360)</p>
 </div>
 <div class="section">
-<h1><a id="id10" name="id10">2.6.2.1</a></h1>
+<h1><a id="id12" name="id12">2.6.2.1</a></h1>
 <ul class="simple">
 <li>10-Jan-2006</li>
 </ul>
@@ -736,7 +845,7 @@ be easy to accommodate, all you need to do is add a parenthesis
 pair:  (...x, y, ...) ---&gt;  (...(x,y), ...)</blockquote>
 </div>
 <div class="section">
-<h1><a id="id11" name="id11">2.6.1.0</a></h1>
+<h1><a id="id13" name="id13">2.6.1.0</a></h1>
 <ul class="simple">
 <li>4-June-2005</li>
 </ul>
@@ -764,7 +873,7 @@ calls.</p>
 change will get written at the next flush.</p>
 </div>
 <div class="section">
-<h1><a id="id12" name="id12">2.6.0.1</a></h1>
+<h1><a id="id14" name="id14">2.6.0.1</a></h1>
 <ul class="simple">
 <li>30-May-2005</li>
 </ul>
@@ -877,7 +986,7 @@ there is a range of allowed values (so a wx.SpinCtrl is used instead
 of a wx.TextCtrl.)</p>
 </div>
 <div class="section">
-<h1><a id="id13" name="id13">2.6.0.0</a></h1>
+<h1><a id="id15" name="id15">2.6.0.0</a></h1>
 <ul class="simple">
 <li>26-Apr-2005</li>
 </ul>
@@ -955,7 +1064,7 @@ EVT_KEY_UP and EVT_TEXT events from its embedded text control.</p>
 </dl>
 </div>
 <div class="section">
-<h1><a id="id14" name="id14">2.5.5.1</a></h1>
+<h1><a id="id16" name="id16">2.5.5.1</a></h1>
 <ul class="simple">
 <li>8-Apr-2005</li>
 </ul>
@@ -1024,7 +1133,7 @@ folks.</p>
 <p>Added the ActiveGrid IDE as a sample application.</p>
 </div>
 <div class="section">
-<h1><a id="id15" name="id15">2.5.4.1</a></h1>
+<h1><a id="id17" name="id17">2.5.4.1</a></h1>
 <ul class="simple">
 <li>16-Mar-2005</li>
 </ul>
@@ -1258,7 +1367,7 @@ wx.Image.</p>
 </dl>
 </div>
 <div class="section">
-<h1><a id="id16" name="id16">2.5.3.1</a></h1>
+<h1><a id="id18" name="id18">2.5.3.1</a></h1>
 <ul class="simple">
 <li>9-Nov-2004</li>
 </ul>
@@ -1415,7 +1524,7 @@ it.</p>
 version installs, and comes with an uninstaller script.</p>
 </div>
 <div class="section">
-<h1><a id="id17" name="id17">2.5.2.8</a></h1>
+<h1><a id="id19" name="id19">2.5.2.8</a></h1>
 <ul class="simple">
 <li>27-Aug-2004</li>
 </ul>
@@ -1447,7 +1556,7 @@ wxCheckListBox.</li>
 </blockquote>
 </div>
 <div class="section">
-<h1><a id="id18" name="id18">2.5.2.7</a></h1>
+<h1><a id="id20" name="id20">2.5.2.7</a></h1>
 <ul class="simple">
 <li>14-Aug-2004</li>
 </ul>
@@ -1631,7 +1740,7 @@ MigrationGuide for more details on using the new module.</p>
 <p>Floats are allowed again as function parameters where ints are expected.</p>
 </div>
 <div class="section">
-<h1><a id="id20" name="id20">2.4.2.4</a></h1>
+<h1><a id="id22" name="id22">2.4.2.4</a></h1>
 <ul class="simple">
 <li>1-Oct-2003</li>
 </ul>
@@ -1644,7 +1753,7 @@ demonstrated in the Threads sample in the demo.</p>
 <p>Added Chris Barker's FloatCanvas.</p>
 </div>
 <div class="section">
-<h1><a id="id21" name="id21">2.4.1.2</a></h1>
+<h1><a id="id23" name="id23">2.4.1.2</a></h1>
 <ul class="simple">
 <li>19-Jun-2003</li>
 </ul>
@@ -1699,7 +1808,7 @@ and Spacers can be specified with a wxSize (or 2-tuple) parameter</p>
 <p>Added wxCursorFromBits.</p>
 </div>
 <div class="section">
-<h1><a id="id22" name="id22">2.4.0.7</a></h1>
+<h1><a id="id24" name="id24">2.4.0.7</a></h1>
 <ul class="simple">
 <li>24-Mar-2003</li>
 </ul>
@@ -1739,7 +1848,7 @@ think I am testing in the future...</p>
 <p>Updated to 0.9b of PyCrust.</p>
 </div>
 <div class="section">
-<h1><a id="id23" name="id23">2.4.0.4</a></h1>
+<h1><a id="id25" name="id25">2.4.0.4</a></h1>
 <ul class="simple">
 <li>7-Mar-2003</li>
 </ul>
@@ -1800,7 +1909,7 @@ doesn't have a standard place for them.</p>
 <p>Updated to the 0.9a version of PyCrust</p>
 </div>
 <div class="section">
-<h1><a id="id24" name="id24">2.4.0.2</a></h1>
+<h1><a id="id26" name="id26">2.4.0.2</a></h1>
 <ul class="simple">
 <li>23-Jan-2003</li>
 </ul>
@@ -1809,7 +1918,7 @@ doesn't have a standard place for them.</p>
 <p>Added wxPyColourChooser by Michael Gilfix.</p>
 </div>
 <div class="section">
-<h1><a id="id25" name="id25">2.4.0.1</a></h1>
+<h1><a id="id27" name="id27">2.4.0.1</a></h1>
 <ul class="simple">
 <li>10-Jan-2003</li>
 </ul>
@@ -1819,14 +1928,14 @@ enhancements.</p>
 wxPython/lib/dialogs.py for more details.</p>
 </div>
 <div class="section">
-<h1><a id="id26" name="id26">2.3.4.2</a></h1>
+<h1><a id="id28" name="id28">2.3.4.2</a></h1>
 <ul class="simple">
 <li>21-Dec-2002</li>
 </ul>
 <p>Various bug fixes.</p>
 </div>
 <div class="section">
-<h1><a id="id27" name="id27">2.3.4.1</a></h1>
+<h1><a id="id29" name="id29">2.3.4.1</a></h1>
 <ul class="simple">
 <li>18-Dec-2002</li>
 </ul>
@@ -1884,7 +1993,7 @@ HTMLHelp viewer does.  Changed how the wxPythonDocs tarball is built
 and added a script to launch the doc viewer.</p>
 </div>
 <div class="section">
-<h1><a id="id28" name="id28">2.3.3.1</a></h1>
+<h1><a id="id30" name="id30">2.3.3.1</a></h1>
 <ul class="simple">
 <li>19-Sep-2002</li>
 </ul>
@@ -2030,7 +2139,7 @@ example.</p>
 <p>Added wxTimeCtrl from Will Sadkin.</p>
 </div>
 <div class="section">
-<h1><a id="id29" name="id29">2.3.2.1</a></h1>
+<h1><a id="id31" name="id31">2.3.2.1</a></h1>
 <ul class="simple">
 <li>20-Dec-2001</li>
 </ul>
@@ -2040,7 +2149,7 @@ without barfing and is also still compatible with Python debuggers.</p>
 <p>Added some patches from library contributors.</p>
 </div>
 <div class="section">
-<h1><a id="id30" name="id30">2.3.2</a></h1>
+<h1><a id="id32" name="id32">2.3.2</a></h1>
 <ul class="simple">
 <li>11-Dec-2001</li>
 </ul>
@@ -2126,7 +2235,7 @@ wxPython/contrib/dllwidget and wxPython/demo/dllwidget for more
 details.</p>
 </div>
 <div class="section">
-<h1><a id="id31" name="id31">2.3.1</a></h1>
+<h1><a id="id33" name="id33">2.3.1</a></h1>
 <ul class="simple">
 <li>10-Jul-2001</li>
 </ul>
@@ -2143,7 +2252,7 @@ subclass wxXmlResourceHandler, etc...</p>
 <p>Added enhanced wxVTKRenderWindow by Prabhu Ramachandran</p>
 </div>
 <div class="section">
-<h1><a id="id32" name="id32">2.3.0</a></h1>
+<h1><a id="id34" name="id34">2.3.0</a></h1>
 <ul class="simple">
 <li>22-May-2001</li>
 </ul>
@@ -2243,7 +2352,7 @@ by having smaller functional apps to play with.  They can be found in
 wxPython/samples.</p>
 </div>
 <div class="section">
-<h1><a id="id33" name="id33">2.2.7</a></h1>
+<h1><a id="id35" name="id35">2.2.7</a></h1>
 <ul class="simple">
 <li>19-Jun-2001</li>
 </ul>
@@ -2251,7 +2360,7 @@ wxPython/samples.</p>
 changes and fixes in the wxWindows library.</p>
 </div>
 <div class="section">
-<h1><a id="id34" name="id34">2.2.5</a></h1>
+<h1><a id="id36" name="id36">2.2.5</a></h1>
 <ul class="simple">
 <li>30-Jan-2001</li>
 </ul>
diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index 2c959dfad8..d2ba5aaf80 100644
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -1,6 +1,187 @@
 Recent Changes for wxPython
 =====================================================================
 
+2.8.4.0
+-------
+* 
+
+wxGTK: Make wx.NO_BORDER style work with wx.RadioBox (patch 1525406)
+
+Update to 0.9.1 of TreeMixin.
+
+wx.lib.customtreectrl: Patch from Andrea that fixes the following
+problems/issues:
+
+ * ZeroDivisionError when using the Vista selection style and calling
+   SelectItem; for some strange reason, sometimes the item rect is
+   not initialized and that generates the ZeroDivisionError when
+   painting the selection rectangle;
+
+ * Added a DeleteWindow method to GenericTreeItem class, for items
+   that hold a widget next to them;
+
+ * Renamed CustomTreeCtrl method IsEnabled to IsItemEnabled, otherwise
+   it conflicts with wx.Window.IsEnabled;
+
+ * Now CustomTreeCtrl behaves correctly when the widget attached to an
+   item is narrower (in height) than the item text;
+
+
+wx.lib.flatnotebook: Patch from Andrea that implements the following:
+
+ * A new style FNB_FF2: my intentions were to make it like Firefox 2,
+   however it turned out to be an hybrid between wxAUI notebook glose
+   style & FF2 ...I still think it looks OK. The main purpose for
+   making it more like wxAUI is to allow applications that uses both
+   to have same look and feel (or as close as it can get...);
+
+ * Changed the behavior of the left/right rotation arrows to rotate
+   single tab at a time and not bulk of tabs;
+
+ * Updated the demo module.
+
+XRCed now uses a wx.FileHistory object for managing the recent files
+menu. 
+
+wx.DateSpan and wx.TimeSpan now use lower case property names in order
+to not conflict with the same named static methods that already
+existed.
+
+wx.aui.PyAuiDocArt and wx.aui.PyAuiTabArt can now be derived from in
+wxPython and plugged in to wx.AUI.
+
+XRCed has a new experimental feature to add controls by draging icons
+on the test window using the right button. Mouse position is tracked
+to highlight the future parent.
+
+Updates to MaskedEdit controls from Will Sadkin:
+
+  maskededit.py:
+    Added parameter option stopFieldChangeIfInvalid, which can be used to 
+    relax the validation rules for a control, but make best efforts to stop 
+    navigation out of that field should its current value be invalid.  Note: 
+    this does not prevent the value from remaining invalid if focus for the 
+    control is lost, via mousing etc.
+
+  numctrl.py, demo / MaskedNumCtrl.py:
+    In response to user request, added limitOnFieldChange feature, so that
+    out-of-bounds values can be temporarily added to the control, but should
+    navigation be attempted out of an invalid field, it will not navigate,
+    and if focus is lost on a control so limited with an invalid value, it
+    will change the value to the nearest bound.
+
+  combobox.py:
+    Added handler for EVT_COMBOBOX to address apparently inconsistent behavior
+    of control when the dropdown control is used to do a selection.
+
+  textctrl.py
+    Added support for ChangeValue() function, similar to that of the base
+    control, added in wxPython 2.7.1.1.
+
+Update to latest FloatCanvas from Chris Barker.
+
+
+
+
+
+
+2.8.3.0
+-------
+* 22-March-2007
+
+Added wx.ToolBar.SetToolNormalBitmap and SetToolDisabledBitmap
+methods.  (Keep in mind however that the disabled bitmap is currently
+generated on the fly by most native toolbar widgets, so this
+SetToolDisabledBitmap method won't have any affect on them...)
+
+Refactored the inspection tool such that it can be used as a wx.App
+mix-in class as it was used before (with the wx.lib.mixins.inspect
+module) and also as a non mix-in tool (using wx.lib.inspect.InspectionTool). 
+
+Add wx.lib.mixins.treemixin from Frank Niessink.
+
+Added the wx.SizerFlags class, and also added AddF, InsertF and
+PrependF methods to wx.Sizer.  The wxSizerFlags class provides a
+convienient and easier to read way to add items to a sizer.  It was
+added as a new set of methods of the wx.Sizer class so as to not
+disturb existing code.  For example, instead of writing::
+
+    sizer.Add(ctrl, 0, wx.EXPAND | wx.ALL, 10)
+
+you can now write::
+
+    sizer.AddF(ctrl, wx.SizerFlags().Expand().Border(wx.ALL,10))
+
+
+Will Sadkin provided a patch for the wx.lib.masked package that fixes
+its support for using the navigation keys on the numeric keypad.
+
+wx.lib.plot: patch #1663937 to allow user to turn off scientific
+notation on plot.
+
+wxGTK: Most of the remaining TODOs for the wx.GraphicsContext on wxGTK
+have been done.  This includes implementations for GetTextExtent,
+Clip, DrawBitmap, fixing the drawing position of text to be at the
+upper left corner instead of the baseline, etc.
+
+wx.lib.customtreectrl patches from Andrea:
+
+  1. ExpandAll has been renamed as ExpandAllChildren, and the new
+     ExpandAll now takes no input arguments (consistent with
+     wx.TreeCtrl)
+
+  2. ctstyle keyword is now defaulted to 0: every style related to
+     CustomTreeCtrl and the underlying wx.PyScrolledWindow should be
+     declared using the keyword "style" only. For backward
+     compatibility, ctstyle continues to work as I merged ctstyle and
+     style in the __init__ method.
+
+  3. GetClassDefaultAttributes is now a classmethod.
+
+  4. UnselectAll bug fixed.
+
+
+Renamed the wx.lib.inspect and wx.lib.mixins.inspect modules to
+inspection, in order to avoid conflicts with the inspect module in the
+standard Python library.
+
+Lots of changes to XRCed from Roman Rolinsky:
+
+  *  Preferences for default "sizeritem" parameters for new panels and
+     controls can be configured ("File">"Preferences...").
+
+  *  Implemented comment object for including simple one-line comments and
+     comment directives as tree nodes. No validation is performed for a
+     valid XML string so comments must not contain "-->". Comment directive
+     is a special comment starting with '%' character, followed by a line
+     of python code. It is executed using 'exec' when the resource file is
+     opened. This is useful to import plugin modules containing custom
+     handlers which are specific to the resource file, hovewer this is of
+     course a security hole if you use foreign XRC files. A warning is
+     displayed if the preference option 'ask' is selected (by default).
+
+  *  Added support for custom controls and plugin modules. Refer to this
+     wxPythonWiki for the details:  http://wiki.wxpython.org/index.cgi/XRCed#custom
+
+  *  Tool panel sections can be collapsed/expanded by clicking on the
+     label of a tool group.
+
+  *  Some undo/redo and other fixes.
+
+  *  Fixes for wxMSW (notebook highlighting, control sizes, tree Unselect).
+
+  *  Notebook page highlighting fix. Highlight resizes when the window
+     is resized. ParamUnit spin button detects event handler re-entry
+     (wxGTK probably has a bug in wxSpinButton with repeated events).
+
+  *  Fix for dealing with empty 'growable' property, using MiniFrame
+     for properties panel, the panel is restored together with the
+     main window.
+
+
+
+
+
 2.8.1.1
 -------
 * 19-Jan-2007
@@ -43,7 +224,7 @@ windows so they are no longer clipped by the bounds of the stc window.
 
 2.8.1.0
 -------
-* 8-Jan-2006
+* 8-Jan-2007
 
 Added EVT_TASKBAR_CLICK and use it to show taskbar icon menu on right
 button release, not press, under MSW (bug 1623761)
diff --git a/wxPython/samples/doodle/setup.py b/wxPython/samples/doodle/setup.py
index 32f33f8a2e..6977a0500e 100644
--- a/wxPython/samples/doodle/setup.py
+++ b/wxPython/samples/doodle/setup.py
@@ -21,5 +21,10 @@ setup( name = "superdoodle",
        #console = ["superdoodle.py"]
        windows = ["superdoodle.py"],
        #data_files = DATA,
+       options = {"py2exe" : { "compressed": 0,
+                               "optimize": 2,
+                               "bundle_files": 1,
+                               }},
+       zipfile = None
        )
 
diff --git a/wxPython/src/_bitmap.i b/wxPython/src/_bitmap.i
index 1316e7cd35..994d5e93e8 100644
--- a/wxPython/src/_bitmap.i
+++ b/wxPython/src/_bitmap.i
@@ -319,7 +319,7 @@ the ``type`` parameter.", "");
     %extend {
         DocStr(CopyFromBuffer,
                "Copy data from a RGB buffer object to replace the bitmap pixel data.
-See `wxBitmapFromBuffer` for more details.", "");
+See `wx.BitmapFromBuffer` for more details.", "");
         void CopyFromBuffer(buffer data, int DATASIZE)
         {
             int height=self->GetHeight();
@@ -352,7 +352,7 @@ See `wxBitmapFromBuffer` for more details.", "");
 
         DocStr(CopyFromBufferRGBA,
                "Copy data from a RGBA buffer object to replace the bitmap pixel data.
-See `wxBitmapFromBufferRGBA` for more details.", "");
+See `wx.BitmapFromBufferRGBA` for more details.", "");
         void CopyFromBufferRGBA(buffer data, int DATASIZE)
         {
             int height=self->GetHeight();
diff --git a/wxPython/src/_cmndlgs.i b/wxPython/src/_cmndlgs.i
index f488af7ecb..3204c12b7a 100644
--- a/wxPython/src/_cmndlgs.i
+++ b/wxPython/src/_cmndlgs.i
@@ -113,9 +113,10 @@ wxColour wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL,
 //--------------------------------------------------------------------------------
 
 enum {
+    wxDD_CHANGE_DIR,
+    wxDD_DIR_MUST_EXIST,
     wxDD_NEW_DIR_BUTTON,
     wxDD_DEFAULT_STYLE,
-    wxDD_CHANGE_DIR,
 };
 
 DocStr(wxDirDialog,
@@ -129,10 +130,12 @@ Window  Styles
                           wx.DEFAULT_DIALOG_STYLE, wx.DD_NEW_DIR_BUTTON
                           and wx.RESIZE_BORDER.
 
-    wx.DD_NEW_DIR_BUTTON  Add 'Create new directory' button and allow
-                          directory names to be editable. On Windows
-                          the new directory button is only available
-                          with recent versions of the common dialogs.
+    wx.DD_DIR_MUST_EXIST  The dialog will allow the user to choose only an
+                          existing folder. When this style is not given, a
+                          'Create new directory' button is added to the dialog
+                          (on Windows) or some other way is provided to the
+                          user to type the name of a new folder.
+                          Use this instead of deprecated wx.DD_NEW_DIR_BUTTON.
 
     wx.DD_CHANGE_DIR      Change the current working directory to the
                           directory chosen by the user.
diff --git a/wxPython/src/_combobox.i b/wxPython/src/_combobox.i
index d593ea6f12..bfd6f5088c 100644
--- a/wxPython/src/_combobox.i
+++ b/wxPython/src/_combobox.i
@@ -81,7 +81,7 @@ public:
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxPyComboBoxNameStr),
-        "__init__(Window parent, int id, String value=EmptyString,
+        "__init__(Window parent, int id=-1, String value=EmptyString,
     Point pos=DefaultPosition, Size size=DefaultSize,
     List choices=EmptyList, long style=0, Validator validator=DefaultValidator,
     String name=ComboBoxNameStr) -> ComboBox",
@@ -102,7 +102,7 @@ public:
                      long style = 0,
                      const wxValidator& validator = wxDefaultValidator,
                      const wxString& name = wxPyChoiceNameStr),
-        "Create(Window parent, int id, String value=EmptyString,
+        "Create(Window parent, int id=-1, String value=EmptyString,
     Point pos=DefaultPosition, Size size=DefaultSize,
     List choices=EmptyList, long style=0, Validator validator=DefaultValidator,
     String name=ChoiceNameStr) -> bool",
diff --git a/wxPython/src/_datetime.i b/wxPython/src/_datetime.i
index 8216236511..36a18d9994 100644
--- a/wxPython/src/_datetime.i
+++ b/wxPython/src/_datetime.i
@@ -1074,12 +1074,12 @@ public:
          return self.Format().encode(wx.GetDefaultPyEncoding())
      }
 
-    %property(Days, GetDays, doc="See `GetDays`");
-    %property(Hours, GetHours, doc="See `GetHours`");
-    %property(Milliseconds, GetMilliseconds, doc="See `GetMilliseconds`");
-    %property(Minutes, GetMinutes, doc="See `GetMinutes`");
-    %property(Seconds, GetSeconds, doc="See `GetSeconds`");
-    %property(Weeks, GetWeeks, doc="See `GetWeeks`");
+    %property(days, GetDays, doc="See `GetDays`");
+    %property(hours, GetHours, doc="See `GetHours`");
+    %property(milliseconds, GetMilliseconds, doc="See `GetMilliseconds`");
+    %property(minutes, GetMinutes, doc="See `GetMinutes`");
+    %property(seconds, GetSeconds, doc="See `GetSeconds`");
+    %property(weeks, GetWeeks, doc="See `GetWeeks`");
 };
 
 
@@ -1206,11 +1206,11 @@ public:
         bool __ne__(const wxDateSpan* other) { return other ? (*self != *other) : true;  }
     }
 
-    %property(Days, GetDays, SetDays, doc="See `GetDays` and `SetDays`");
-    %property(Months, GetMonths, SetMonths, doc="See `GetMonths` and `SetMonths`");
-    %property(TotalDays, GetTotalDays, doc="See `GetTotalDays`");
-    %property(Weeks, GetWeeks, SetWeeks, doc="See `GetWeeks` and `SetWeeks`");
-    %property(Years, GetYears, SetYears, doc="See `GetYears` and `SetYears`");
+    %property(days, GetDays, SetDays, doc="See `GetDays` and `SetDays`");
+    %property(months, GetMonths, SetMonths, doc="See `GetMonths` and `SetMonths`");
+    %property(totalDays, GetTotalDays, doc="See `GetTotalDays`");
+    %property(weeks, GetWeeks, SetWeeks, doc="See `GetWeeks` and `SetWeeks`");
+    %property(years, GetYears, SetYears, doc="See `GetYears` and `SetYears`");
 };
 
 
diff --git a/wxPython/src/_event.i b/wxPython/src/_event.i
index 0632593d0e..72c3a142da 100644
--- a/wxPython/src/_event.i
+++ b/wxPython/src/_event.i
@@ -662,7 +662,7 @@ false otherwise (if it was).", "");
 DocStr(wxScrollEvent,
 "A scroll event holds information about events sent from stand-alone
 scrollbars and sliders. Note that scrolled windows do not send
-instnaces of this event class, but send the `wx.ScrollWinEvent`
+instances of this event class, but send the `wx.ScrollWinEvent`
 instead.", "
 
 Events
diff --git a/wxPython/src/_gdicmn.i b/wxPython/src/_gdicmn.i
index 7d2ff9e7ba..87b2b5c900 100644
--- a/wxPython/src/_gdicmn.i
+++ b/wxPython/src/_gdicmn.i
@@ -572,7 +572,7 @@ public:
 
 
     DocDeclStr(
-        wxRect&, Inflate(wxCoord dx, wxCoord dy),
+        wxRect, Inflate(wxCoord dx, wxCoord dy),
         "Increases the size of the rectangle.
 
 The left border is moved farther left and the right border is moved
diff --git a/wxPython/src/_graphics.i b/wxPython/src/_graphics.i
index 1b261790a0..8b667a7235 100644
--- a/wxPython/src/_graphics.i
+++ b/wxPython/src/_graphics.i
@@ -422,27 +422,19 @@ public :
 
 DocStr(wxGraphicsMatrix,
 "A wx.GraphicsMatrix is a native representation of an affine
-matrix. The contents are specific an private to the respective
+matrix. The contents are specific and private to the respective
 renderer. The only way to get a valid instance is via a CreateMatrix
 call on the graphics context or the renderer instance.", "");
 class wxGraphicsMatrix : public wxGraphicsObject
 {
 public :
-    wxGraphicsMatrix(); 
+//    wxGraphicsMatrix(); 
     virtual ~wxGraphicsMatrix();
 
     DocDeclStr(
         virtual void , Concat( const wxGraphicsMatrix& t ),
         "Concatenates the passed in matrix to the current matrix.", "");
 
-//     %extend  {
-//         DocStr(Copy,
-//                "Copy the passed in matrix to this one.", "");
-//         void Copy( const wxGraphicsMatrix& t ) {
-//             *self = t;
-//         }
-//     }
-
 
     DocDeclStr(
         virtual void , Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
@@ -515,7 +507,7 @@ way to make this value usable.", "");
 class wxGraphicsPath : public wxGraphicsObject
 {
 public :
-    wxGraphicsPath();
+//    wxGraphicsPath();
     virtual ~wxGraphicsPath();
 
 
@@ -678,13 +670,15 @@ public:
         static wxGraphicsContext* , CreateFromNative( void * context ) ,
         "Creates a wx.GraphicsContext from a native context. This native
 context must be eg a CGContextRef for Core Graphics, a Graphics
-pointer for GDIPlus or a cairo_t pointer for Cairo.", "");
+pointer for GDIPlus or a cairo_t pointer for Cairo.  NOTE: For
+wxPython we still need a way to make this value usable.", "");
     
 
     %newobject CreateFromNative;
     DocDeclStr(
         static wxGraphicsContext* , CreateFromNativeWindow( void * window ) ,
-        "Creates a wx.GraphicsContext from a native window.", "");
+        "Creates a wx.GraphicsContext from a native window.  NOTE: For wxPython
+we still need a way to make this value usable.", "");
     
 
 
@@ -807,8 +801,7 @@ this context.", "");
     DocDeclStr(
         virtual wxGraphicsMatrix , GetTransform() const,
         "Gets the current transformation matrix of this context.", "");
-    
-    
+        
 
 
     DocStr(SetPen, "Sets the stroke pen", "");
@@ -945,8 +938,9 @@ and the current brush is used for filling.", "");
 
 
     %extend {
-        DocStr(StrokeLineSegements,
-               "Stroke disconnected lines from begin to end points", "");
+        DocAStr(StrokeLineSegements,
+                "StrokeLineSegments(self, List beginPoints, List endPoints)",
+                "Stroke disconnected lines from begin to end points", "");
         void StrokeLineSegements(PyObject* beginPoints, PyObject* endPoints)
         {
             size_t c1, c2, count;
diff --git a/wxPython/src/_menu.i b/wxPython/src/_menu.i
index c19a304862..db3c33ce71 100644
--- a/wxPython/src/_menu.i
+++ b/wxPython/src/_menu.i
@@ -367,7 +367,6 @@ public:
     }
     
     %property(Frame, GetFrame, doc="See `GetFrame`");
-    %property(Menu, GetMenu, doc="See `GetMenu`");
     %property(MenuCount, GetMenuCount, doc="See `GetMenuCount`");
     %property(Menus, GetMenus, SetMenus, doc="See `GetMenus` and `SetMenus`");
 };
diff --git a/wxPython/src/_sizers.i b/wxPython/src/_sizers.i
index 2b1e26a76c..d86fae7441 100644
--- a/wxPython/src/_sizers.i
+++ b/wxPython/src/_sizers.i
@@ -21,6 +21,155 @@
 //---------------------------------------------------------------------------
 %newgroup;
 
+DocStr(wxSizerFlags,
+"Normally, when you add an item to a sizer via `wx.Sizer.Add`, you have
+to specify a lot of flags and parameters which can be unwieldy. This
+is where wx.SizerFlags comes in: it allows you to specify all
+parameters using the named methods instead. For example, instead of::
+
+    sizer.Add(ctrl, 0, wx.EXPAND | wx.ALL, 10)
+
+you can now write::
+
+    sizer.AddF(ctrl, wx.SizerFlags().Expand().Border(wx.ALL, 10))
+
+This is more readable and also allows you to create wx.SizerFlags
+objects which can be reused for several sizer items.::
+
+    flagsExpand = wx.SizerFlags(1)
+    flagsExpand.Expand().Border(wx.ALL, 10)
+    sizer.AddF(ctrl1, flagsExpand)
+    sizer.AddF(ctrl2, flagsExpand)
+
+Note that by specification, all methods of wx.SizerFlags return the
+wx.SizerFlags object itself allowing chaining multiple method calls
+like in the examples above.", "");
+
+class wxSizerFlags
+{
+public:
+    // construct the flags object initialized with the given proportion (0 by
+    // default)
+    DocCtorStr(
+        wxSizerFlags(int proportion = 0),
+        "Constructs the flags object with the specified proportion.", "");
+    
+    ~wxSizerFlags();
+
+    // This typemap ensures that the returned object is the same
+    // Python instance as what was passed in as `self`, instead of
+    // creating a new proxy as SWIG would normally do.
+    %typemap(out) wxSizerFlags& { $result = $self; Py_INCREF($result); }
+
+    DocDeclStr(
+        wxSizerFlags& , Proportion(int proportion),
+        "Sets the item's proportion value.", "");
+    
+    DocDeclStr(
+        wxSizerFlags& , Align(int alignment),
+        "Sets the item's alignment", "");
+    
+    DocDeclStr(
+        wxSizerFlags& , Expand(),
+        "Sets the wx.EXPAND flag, which will cause the item to be expanded to
+fill as much space as it is given by the sizer.", "");
+    
+    DocDeclStr(
+        wxSizerFlags& , Centre(),
+        "Same as `Center` for those with an alternate dialect of English.", "");
+    
+    DocDeclStr(
+        wxSizerFlags& , Center(),
+        "Sets the centering alignment flags.", "");
+    
+    DocDeclStr(
+        wxSizerFlags& , Left(),
+        "Aligns the object to the left, a shortcut for calling
+Align(wx.ALIGN_LEFT)", "");
+    
+    DocDeclStr(
+        wxSizerFlags& , Right(),
+        "Aligns the object to the right, a shortcut for calling
+Align(wx.ALIGN_RIGHT)", "");
+    
+    DocDeclStr(
+        wxSizerFlags& , Top(),
+        "Aligns the object to the top of the available space, a shortcut for
+calling Align(wx.ALIGN_TOP)", "");
+    
+    DocDeclStr(
+        wxSizerFlags& , Bottom(),
+        "Aligns the object to the bottom of the available space, a shortcut for
+calling Align(wx.ALIGN_BOTTOM)", "");
+    
+    DocDeclStr(
+        wxSizerFlags& , Shaped(),
+        "Sets the wx.SHAPED flag.", "");
+    
+    DocDeclStr(
+        wxSizerFlags& , FixedMinSize(),
+        "Sets the wx.FIXED_MINSIZE flag.", "");
+    
+
+    
+    %extend {
+        DocDeclStr(
+            wxSizerFlags& , Border(int direction=wxALL, int borderInPixels=-1),
+            "Sets the border of the item in the direction(s) or sides given by the
+direction parameter.  If the borderInPixels value is not given then
+the default border size (see `GetDefaultBorder`) will be used.", "")
+        {
+            if (borderInPixels == -1)
+                return self->Border(direction);
+            else
+                return self->Border(direction, borderInPixels);
+        }
+    }
+
+    DocDeclStr(
+        wxSizerFlags& , DoubleBorder(int direction = wxALL),
+        "Sets the border in the given direction to twice the default border
+size.", "");
+    
+    DocDeclStr(
+        wxSizerFlags& , TripleBorder(int direction = wxALL),
+        "Sets the border in the given direction to three times the default
+border size.", "");
+    
+    DocDeclStr(
+        wxSizerFlags& , HorzBorder(),
+        "Sets the left and right borders to the default border size.", "");
+    
+    DocDeclStr(
+        wxSizerFlags& , DoubleHorzBorder(),
+        "Sets the left and right borders to twice the default border size.", "");
+    
+
+    // Clear the typemap
+    %typemap(out) wxSizerFlags& ;
+    
+
+    
+    DocDeclStr(
+        static int , GetDefaultBorder(),
+        "Returns the default border size used by the other border methods", "");
+    
+
+    DocDeclStr(
+        int , GetProportion() const,
+        "Returns the proportion value to be used in the sizer item.", "");
+    
+    DocDeclStr(
+        int , GetFlags() const,
+        "Returns the flags value to be used in the sizer item.", "");
+    
+    DocDeclStr(
+        int , GetBorderInPixels() const,
+        "Returns the border value in pixels to be used in the sizer item.", "");
+};
+
+//---------------------------------------------------------------------------
+
 DocStr(wxSizerItem,
 "The wx.SizerItem class is used to track the position, size and other
 attributes of each item managed by a `wx.Sizer`. It is not usually
@@ -444,7 +593,7 @@ public:
 
         - **sizer**: The (child-)sizer to be added to the sizer. This
           allows placing a child sizer in a sizer and thus to create
-          hierarchies of sizers (typically a vertical box as the top
+          hierarchies of sizers (for example a vertical box as the top
           sizer and several horizontal boxes on the level beneath).
 
         - **size**: A `wx.Size` or a 2-element sequence of integers
@@ -552,8 +701,34 @@ public:
                 return NULL;
         }
 
-//    virtual wxSizerItem* AddSpacer(int size);
-//    virtual wxSizerItem* AddStretchSpacer(int prop = 1);
+
+        DocAStr(AddF,
+                "AddF(self, item, wx.SizerFlags flags) -> wx.SizerItem",
+                "Similar to `Add` but uses the `wx.SizerFlags` convenience class for
+setting the various flags, options and borders.", "");
+        wxSizerItem* AddF(PyObject* item, wxSizerFlags& flags) {
+            
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
+            if ( info.sizer )
+                PyObject_SetAttrString(item,"thisown",Py_False);
+            wxPyEndBlockThreads(blocked);
+
+            // Now call the real Add method if a valid item type was found
+            if ( info.window )
+                return self->Add(info.window, flags);
+            else if ( info.sizer )
+                return self->Add(info.sizer, flags);
+            else if (info.gotSize)
+                return self->Add(info.size.GetWidth(), info.size.GetHeight(),
+                                 flags.GetProportion(),
+                                 flags.GetFlags(),
+                                 flags.GetBorderInPixels());
+            else
+                return NULL;
+        }
+
+        
 
         DocAStr(Insert,
                 "Insert(self, int before, item, int proportion=0, int flag=0, int border=0,
@@ -586,8 +761,35 @@ the item at index *before*.  See `Add` for a description of the parameters.", ""
         }
 
 
-//    virtual wxSizerItem* InsertSpacer(size_t index, int size);
-//    virtual wxSizerItem* InsertStretchSpacer(size_t index, int prop = 1);
+        
+        DocAStr(InsertF,
+                "InsertF(self, int before, item, wx.SizerFlags flags) -> wx.SizerItem",
+                "Similar to `Insert`, but uses the `wx.SizerFlags` convenience class
+for setting the various flags, options and borders.", "");
+        wxSizerItem* InsertF(int before, PyObject* item, wxSizerFlags& flags) {
+
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
+            if ( info.sizer )
+                PyObject_SetAttrString(item,"thisown",Py_False);
+            wxPyEndBlockThreads(blocked);
+
+            // Now call the real Insert method if a valid item type was found
+            if ( info.window )
+                return self->Insert(before, info.window, flags);
+            else if ( info.sizer )
+                return self->Insert(before, info.sizer, flags);
+            else if (info.gotSize)
+                return self->Insert(before, info.size.GetWidth(), info.size.GetHeight(),
+                                    flags.GetProportion(),
+                                    flags.GetFlags(),
+                                    flags.GetBorderInPixels());
+            else
+                return NULL;
+        }
+
+
+        
 
         DocAStr(Prepend,
                 "Prepend(self, item, int proportion=0, int flag=0, int border=0,
@@ -619,10 +821,36 @@ this sizer.  See `Add` for a description of the parameters.", "");
                 return NULL;
         }
 
-//    virtual wxSizerItem* PrependSpacer(int size);
-//    virtual wxSizerItem* PrependStretchSpacer(int prop = 1);
 
         
+        DocAStr(PrependF,
+                "PrependF(self, item, wx.SizerFlags flags) -> wx.SizerItem",
+                "Similar to `Prepend` but uses the `wx.SizerFlags` convenience class
+for setting the various flags, options and borders.", "");
+        wxSizerItem* PrependF(PyObject* item, wxSizerFlags& flags) {
+            
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
+            if ( info.sizer )
+                PyObject_SetAttrString(item,"thisown",Py_False);
+            wxPyEndBlockThreads(blocked);
+
+            // Now call the real Add method if a valid item type was found
+            if ( info.window )
+                return self->Prepend(info.window, flags);
+            else if ( info.sizer )
+                return self->Prepend(info.sizer, flags);
+            else if (info.gotSize)
+                return self->Prepend(info.size.GetWidth(), info.size.GetHeight(),
+                                     flags.GetProportion(),
+                                     flags.GetFlags(),
+                                     flags.GetBorderInPixels());
+            else
+                return NULL;
+        }
+
+
+
         DocAStr(Remove,
                 "Remove(self, item) -> bool",
                 "Removes an item from the sizer and destroys it.  This method does not
@@ -675,18 +903,18 @@ was found and detached.", "");
 
 
         DocAStr(GetItem,
-                "GetItem(self, item) -> wx.SizerItem",
+                "GetItem(self, item, recursive=False) -> wx.SizerItem",
                 "Returns the `wx.SizerItem` which holds the *item* given.  The *item*
 parameter can be either a window, a sizer, or the zero-based index of
 the item to be found.", "");
-        wxSizerItem* GetItem(PyObject* item) {
+        wxSizerItem* GetItem(PyObject* item, bool recursive=false) {
             wxPyBlock_t blocked = wxPyBeginBlockThreads();
             wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
             wxPyEndBlockThreads(blocked);
             if ( info.window )
-                return self->GetItem(info.window);
+                return self->GetItem(info.window, recursive);
             else if ( info.sizer )
-                return self->GetItem(info.sizer);
+                return self->GetItem(info.sizer, recursive);
             else if ( info.gotPos )
                 return self->GetItem(info.pos);
             else
@@ -731,9 +959,9 @@ the item to be found.", "");
             """
             if isinstance(olditem, wx.Window):
                 return self._ReplaceWin(olditem, item, recursive)
-            elif isinstnace(olditem, wx.Sizer):
+            elif isinstance(olditem, wx.Sizer):
                 return self._ReplaceSizer(olditem, item, recursive)
-            elif isinstnace(olditem, int):
+            elif isinstance(olditem, int):
                 return self._ReplaceItem(olditem, item)
             else:
                 raise TypeError("Expected Window, Sizer, or integer for first parameter.")
diff --git a/wxPython/src/_toolbar.i b/wxPython/src/_toolbar.i
index f7e886494e..3180b8e515 100644
--- a/wxPython/src/_toolbar.i
+++ b/wxPython/src/_toolbar.i
@@ -442,6 +442,10 @@ public:
               long style = wxNO_BORDER | wxTB_HORIZONTAL,
               const wxString& name = wxPyToolBarNameStr);
 
+    // TODO: In 2.9 move these to the base class...
+    void SetToolNormalBitmap(int id, const wxBitmap& bitmap);
+    void SetToolDisabledBitmap(int id, const wxBitmap& bitmap);
+    
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 };
diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i
index 5c83b625f0..ac859829e9 100644
--- a/wxPython/src/_window.i
+++ b/wxPython/src/_window.i
@@ -34,15 +34,27 @@ struct wxVisualAttributes
         ~wxVisualAttributes() { delete self; }
     } 
     
-    // the font used for control label/text inside it
-    wxFont font;
+//     // the font used for control label/text inside it
+//     wxFont font;
+//     // the foreground colour
+//     wxColour colFg;
+//     // the background colour, may be wxNullColour if the controls background
+//     // colour is not solid
+//     wxColour colBg;
 
-    // the foreground colour
-    wxColour colFg;
+    // Use our own getters and properties instead of the ones that SWIG will
+    // generate, so copies of the attributes will be made when they are
+    // accessed, instead of using a pointer to the one in the object which may
+    // be temporary.
+    %extend {
+        wxFont   _get_font()      { return self->font; }
+        wxColour _get_colFg()     { return self->colFg; }
+        wxColour _get_colBg()     { return self->colBg; }
+    }
 
-    // the background colour, may be wxNullColour if the controls background
-    // colour is not solid
-    wxColour colBg;
+    %property(font,  _get_font)
+    %property(colFg, _get_colFg)
+    %property(colBg, _get_colBg)
 };
 
 
@@ -973,8 +985,16 @@ do not change.", "");
         wxWindow *, GetGrandParent() const,
         "Returns the parent of the parent of this window, or None if there
 isn't one.", "");
-    
 
+    
+    %extend {
+        DocDeclStr(wxWindow *, GetTopLevelParent(),
+                   "Returns the first frame or dialog in this window's parental hierarchy.", "")
+        {
+            return wxGetTopLevelParent(self);
+        }
+    }
+    
 
     DocDeclStr(
         virtual bool , IsTopLevel() const,
@@ -2072,9 +2092,15 @@ opaque.", "");
         self.thisown = pre.thisown
         pre.thisown = 0
         if hasattr(self, '_setOORInfo'):
-            self._setOORInfo(self)
+            try:
+                self._setOORInfo(self)
+            except TypeError:
+                pass
         if hasattr(self, '_setCallbackInfo'):
-            self._setCallbackInfo(self, pre.__class__)
+            try:
+                self._setCallbackInfo(self, pre.__class__)
+            except TypeError:
+                pass
     }
 
     %pythoncode {
@@ -2108,6 +2134,7 @@ opaque.", "");
     %property(Font, GetFont, SetFont, doc="See `GetFont` and `SetFont`");
     %property(ForegroundColour, GetForegroundColour, SetForegroundColour, doc="See `GetForegroundColour` and `SetForegroundColour`");
     %property(GrandParent, GetGrandParent, doc="See `GetGrandParent`");
+    %property(TopLevelParent, GetTopLevelParent, doc="See `GetTopLevelParent`");
     %property(Handle, GetHandle, doc="See `GetHandle`");
     %property(HelpText, GetHelpText, SetHelpText, doc="See `GetHelpText` and `SetHelpText`");
     %property(Id, GetId, SetId, doc="See `GetId` and `SetId`");
diff --git a/wxPython/src/aui.i b/wxPython/src/aui.i
index a5b3ff5f00..cf177c9609 100755
--- a/wxPython/src/aui.i
+++ b/wxPython/src/aui.i
@@ -202,6 +202,11 @@ The following example shows a simple implementation that utilizes
 %ignore wxAuiMDIParentFrame::~wxAuiMDIParentFrame;
 %rename(PreAuiMDIParentFrame) wxAuiMDIParentFrame::wxAuiMDIParentFrame();
 
+// Ignore these for now because they need a typemap for the return value, see below.
+%ignore wxAuiMDIParentFrame::GetNotebook;
+%ignore wxAuiMDIParentFrame::GetActiveChild;
+%ignore wxAuiMDIParentFrame::GetClientWindow;
+
 %pythonAppend wxAuiMDIChildFrame::wxAuiMDIChildFrame    "self._setOORInfo(self)";
 %pythonAppend wxAuiMDIChildFrame::wxAuiMDIChildFrame()  "val._setOORInfo(val)";
 %ignore wxAuiMDIChildFrame::~wxAuiMDIChildFrame;
@@ -213,6 +218,8 @@ The following example shows a simple implementation that utilizes
 %rename(PreAuiMDIClientWindow) wxAuiMDIClientWindow::wxAuiMDIClientWindow();
 
 
+%typemap(out) wxEvtHandler*             { $result = wxPyMake_wxObject($1, $owner); }
+
 //---------------------------------------------------------------------------
 // Get all our defs from the REAL header files.
 
@@ -300,12 +307,43 @@ The following example shows a simple implementation that utilizes
     ~wxAuiPaneButton() {}
 }
 
+%extend wxAuiMDIParentFrame {
+    %typemap(out) wxAuiNotebook*          { $result = wxPyMake_wxObject($1, $owner); }
+    %typemap(out) wxAuiMDIChildFrame*     { $result = wxPyMake_wxObject($1, $owner); }
+    %typemap(out) wxAuiMDIClientWindow*   { $result = wxPyMake_wxObject($1, $owner); }
+
+    %rename(GetNotebook) _GetNotebook;
+    %rename(GetActiveChild) _GetActiveChild;
+    %rename(GetClientWindow) _GetClientWindow;
+     
+    wxAuiNotebook* _GetNotebook() const
+    {
+        return self->GetNotebook();
+    }
+    
+    wxAuiMDIChildFrame* _GetActiveChild() const
+    {
+        return self->GetActiveChild();
+    }
+    
+    wxAuiMDIClientWindow* _GetClientWindow() const
+    {
+        return self->GetClientWindow();
+    }
+
+    %typemap(out) wxAuiNotebook*;       
+    %typemap(out) wxAuiMDIChildFrame*;  
+    %typemap(out) wxAuiMDIClientWindow*;
+}
+     
+     
 //---------------------------------------------------------------------------
 
 %{
 // A wxDocArt class that knows how to forward virtuals to Python methods
 class wxPyAuiDockArt :  public wxAuiDefaultDockArt
 {
+public:
     wxPyAuiDockArt() : wxAuiDefaultDockArt() {}
 
     DEC_PYCALLBACK_INT_INT(GetMetric);
@@ -479,9 +517,11 @@ methods to the Python methods implemented in the derived class.", "");
 
 class wxPyAuiDockArt :  public wxAuiDefaultDockArt
 {
+public:
     %pythonAppend wxPyAuiDockArt     setCallbackInfo(PyAuiDockArt)
-    wxPyAuiDocArt();
+    wxPyAuiDockArt();
 
+    void _setCallbackInfo(PyObject* self, PyObject* _class);
 };
 
 
@@ -527,6 +567,7 @@ class wxPyAuiDockArt :  public wxAuiDefaultDockArt
 // A wxTabArt class that knows how to forward virtuals to Python methods
 class wxPyAuiTabArt :  public wxAuiDefaultTabArt
 {
+public:
     wxPyAuiTabArt() : wxAuiDefaultTabArt() {}
 
     
@@ -714,7 +755,6 @@ class wxPyAuiTabArt :  public wxAuiDefaultTabArt
     DEC_PYCALLBACK__FONT(SetNormalFont);
     DEC_PYCALLBACK__FONT(SetSelectedFont);
     DEC_PYCALLBACK__FONT(SetMeasuringFont);
-//    DEC_PYCALLBACK_INT_WIN(GetBestTabCtrlSize);
 
     PYPRIVATE;
 };
@@ -723,7 +763,6 @@ class wxPyAuiTabArt :  public wxAuiDefaultTabArt
 IMP_PYCALLBACK__FONT(wxPyAuiTabArt, wxAuiDefaultTabArt, SetNormalFont);
 IMP_PYCALLBACK__FONT(wxPyAuiTabArt, wxAuiDefaultTabArt, SetSelectedFont);
 IMP_PYCALLBACK__FONT(wxPyAuiTabArt, wxAuiDefaultTabArt, SetMeasuringFont);
-//IMP_PYCALLBACK_INT_WIN(wxPyAuiTabArt, wxAuiDefaultTabArt, GetBestTabCtrlSize);
 %}
 
 
@@ -734,9 +773,11 @@ methods to the Python methods implemented in the derived class.", "");
 
 class wxPyAuiTabArt :  public wxAuiDefaultTabArt
 {
+public:
     %pythonAppend wxPyAuiTabArt     setCallbackInfo(PyAuiTabArt)
     wxPyAuiTabArt();
 
+    void _setCallbackInfo(PyObject* self, PyObject* _class);   
 };
 
 
diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i
index 4b63e19d07..531b5e4218 100644
--- a/wxPython/src/grid.i
+++ b/wxPython/src/grid.i
@@ -839,7 +839,7 @@ public:
     void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
         bool found;
         wxPyBlock_t blocked = wxPyBeginBlockThreads();
-        if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)"))) {
+        if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground"))) {
             PyObject* ao = wxPyMake_wxGridCellAttr(attr,false);
             PyObject* ro = wxPyConstructObject((void*)&rectCell, wxT("wxRect"), 0);
 
@@ -1606,7 +1606,7 @@ public:
     def __str__(self):                   return str(self.Get())
     def __repr__(self):                  return 'wxGridCellCoords'+str(self.Get())
     def __len__(self):                   return len(self.Get())
-    def __getitem__(self, index):        return self.asTuple()[index]
+    def __getitem__(self, index):        return self.Get()[index]
     def __setitem__(self, index, val):
         if index == 0: self.SetRow(val)
         elif index == 1: self.SetCol(val)
diff --git a/wxPython/src/gtk/_controls.py b/wxPython/src/gtk/_controls.py
index 233923129c..f945fc8941 100644
--- a/wxPython/src/gtk/_controls.py
+++ b/wxPython/src/gtk/_controls.py
@@ -579,7 +579,7 @@ class ComboBox(_core.Control,_core.ItemContainer):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
-        __init__(Window parent, int id, String value=EmptyString,
+        __init__(Window parent, int id=-1, String value=EmptyString,
             Point pos=DefaultPosition, Size size=DefaultSize,
             List choices=EmptyList, long style=0, Validator validator=DefaultValidator,
             String name=ComboBoxNameStr) -> ComboBox
@@ -591,7 +591,7 @@ class ComboBox(_core.Control,_core.ItemContainer):
 
     def Create(*args, **kwargs):
         """
-        Create(Window parent, int id, String value=EmptyString,
+        Create(Window parent, int id=-1, String value=EmptyString,
             Point pos=DefaultPosition, Size size=DefaultSize,
             List choices=EmptyList, long style=0, Validator validator=DefaultValidator,
             String name=ChoiceNameStr) -> bool
@@ -3973,6 +3973,14 @@ class ToolBar(ToolBarBase):
         """
         return _controls_.ToolBar_Create(*args, **kwargs)
 
+    def SetToolNormalBitmap(*args, **kwargs):
+        """SetToolNormalBitmap(self, int id, Bitmap bitmap)"""
+        return _controls_.ToolBar_SetToolNormalBitmap(*args, **kwargs)
+
+    def SetToolDisabledBitmap(*args, **kwargs):
+        """SetToolDisabledBitmap(self, int id, Bitmap bitmap)"""
+        return _controls_.ToolBar_SetToolDisabledBitmap(*args, **kwargs)
+
     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
diff --git a/wxPython/src/gtk/_controls_wrap.cpp b/wxPython/src/gtk/_controls_wrap.cpp
index 889e70551b..7672c0cada 100644
--- a/wxPython/src/gtk/_controls_wrap.cpp
+++ b/wxPython/src/gtk/_controls_wrap.cpp
@@ -26054,6 +26054,106 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_ToolBar_SetToolNormalBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxToolBar *arg1 = (wxToolBar *) 0 ;
+  int arg2 ;
+  wxBitmap *arg3 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "id",(char *) "bitmap", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBar_SetToolNormalBitmap",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxToolBar, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ToolBar_SetToolNormalBitmap" "', expected argument " "1"" of type '" "wxToolBar *""'"); 
+  }
+  arg1 = reinterpret_cast< wxToolBar * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ToolBar_SetToolNormalBitmap" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxBitmap,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ToolBar_SetToolNormalBitmap" "', expected argument " "3"" of type '" "wxBitmap const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ToolBar_SetToolNormalBitmap" "', expected argument " "3"" of type '" "wxBitmap const &""'"); 
+  }
+  arg3 = reinterpret_cast< wxBitmap * >(argp3);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetToolNormalBitmap(arg2,(wxBitmap const &)*arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ToolBar_SetToolDisabledBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxToolBar *arg1 = (wxToolBar *) 0 ;
+  int arg2 ;
+  wxBitmap *arg3 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "id",(char *) "bitmap", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBar_SetToolDisabledBitmap",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxToolBar, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ToolBar_SetToolDisabledBitmap" "', expected argument " "1"" of type '" "wxToolBar *""'"); 
+  }
+  arg1 = reinterpret_cast< wxToolBar * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ToolBar_SetToolDisabledBitmap" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxBitmap,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ToolBar_SetToolDisabledBitmap" "', expected argument " "3"" of type '" "wxBitmap const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ToolBar_SetToolDisabledBitmap" "', expected argument " "3"" of type '" "wxBitmap const &""'"); 
+  }
+  arg3 = reinterpret_cast< wxBitmap * >(argp3);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetToolDisabledBitmap(arg2,(wxBitmap const &)*arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_ToolBar_GetClassDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ;
@@ -47421,6 +47521,8 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"new_ToolBar", (PyCFunction) _wrap_new_ToolBar, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"new_PreToolBar", (PyCFunction)_wrap_new_PreToolBar, METH_NOARGS, NULL},
 	 { (char *)"ToolBar_Create", (PyCFunction) _wrap_ToolBar_Create, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"ToolBar_SetToolNormalBitmap", (PyCFunction) _wrap_ToolBar_SetToolNormalBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"ToolBar_SetToolDisabledBitmap", (PyCFunction) _wrap_ToolBar_SetToolDisabledBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"ToolBar_GetClassDefaultAttributes", (PyCFunction) _wrap_ToolBar_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"ToolBar_swigregister", ToolBar_swigregister, METH_VARARGS, NULL},
 	 { (char *)"ToolBar_swiginit", ToolBar_swiginit, METH_VARARGS, NULL},
diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py
index bcdab6ff04..eb1a2be528 100644
--- a/wxPython/src/gtk/_core.py
+++ b/wxPython/src/gtk/_core.py
@@ -4580,7 +4580,7 @@ class ScrollEvent(CommandEvent):
     """
     A scroll event holds information about events sent from stand-alone
     scrollbars and sliders. Note that scrolled windows do not send
-    instnaces of this event class, but send the `wx.ScrollWinEvent`
+    instances of this event class, but send the `wx.ScrollWinEvent`
     instead.
     """
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -8113,9 +8113,21 @@ class VisualAttributes(object):
         _core_.VisualAttributes_swiginit(self,_core_.new_VisualAttributes(*args, **kwargs))
     __swig_destroy__ = _core_.delete_VisualAttributes
     __del__ = lambda self : None;
-    font = property(_core_.VisualAttributes_font_get, _core_.VisualAttributes_font_set)
-    colFg = property(_core_.VisualAttributes_colFg_get, _core_.VisualAttributes_colFg_set)
-    colBg = property(_core_.VisualAttributes_colBg_get, _core_.VisualAttributes_colBg_set)
+    def _get_font(*args, **kwargs):
+        """_get_font(self) -> Font"""
+        return _core_.VisualAttributes__get_font(*args, **kwargs)
+
+    def _get_colFg(*args, **kwargs):
+        """_get_colFg(self) -> Colour"""
+        return _core_.VisualAttributes__get_colFg(*args, **kwargs)
+
+    def _get_colBg(*args, **kwargs):
+        """_get_colBg(self) -> Colour"""
+        return _core_.VisualAttributes__get_colBg(*args, **kwargs)
+
+    font = property(_get_font) 
+    colFg = property(_get_colFg) 
+    colBg = property(_get_colBg) 
 _core_.VisualAttributes_swigregister(VisualAttributes)
 NullAcceleratorTable = cvar.NullAcceleratorTable
 PanelNameStr = cvar.PanelNameStr
@@ -9097,6 +9109,14 @@ class Window(EvtHandler):
         """
         return _core_.Window_GetGrandParent(*args, **kwargs)
 
+    def GetTopLevelParent(*args, **kwargs):
+        """
+        GetTopLevelParent(self) -> Window
+
+        Returns the first frame or dialog in this window's parental hierarchy.
+        """
+        return _core_.Window_GetTopLevelParent(*args, **kwargs)
+
     def IsTopLevel(*args, **kwargs):
         """
         IsTopLevel(self) -> bool
@@ -10355,9 +10375,15 @@ class Window(EvtHandler):
         self.thisown = pre.thisown
         pre.thisown = 0
         if hasattr(self, '_setOORInfo'):
-            self._setOORInfo(self)
+            try:
+                self._setOORInfo(self)
+            except TypeError:
+                pass
         if hasattr(self, '_setCallbackInfo'):
-            self._setCallbackInfo(self, pre.__class__)
+            try:
+                self._setCallbackInfo(self, pre.__class__)
+            except TypeError:
+                pass
 
     def SendSizeEvent(self):
         self.GetEventHandler().ProcessEvent(wx.SizeEvent((-1,-1)))
@@ -10387,6 +10413,7 @@ class Window(EvtHandler):
     Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") 
     ForegroundColour = property(GetForegroundColour,SetForegroundColour,doc="See `GetForegroundColour` and `SetForegroundColour`") 
     GrandParent = property(GetGrandParent,doc="See `GetGrandParent`") 
+    TopLevelParent = property(GetTopLevelParent,doc="See `GetTopLevelParent`") 
     Handle = property(GetHandle,doc="See `GetHandle`") 
     HelpText = property(GetHelpText,SetHelpText,doc="See `GetHelpText` and `SetHelpText`") 
     Id = property(GetId,SetId,doc="See `GetId` and `SetId`") 
@@ -11030,7 +11057,6 @@ class MenuBar(Window):
             self.Append(m, l)
 
     Frame = property(GetFrame,doc="See `GetFrame`") 
-    Menu = property(GetMenu,doc="See `GetMenu`") 
     MenuCount = property(GetMenuCount,doc="See `GetMenuCount`") 
     Menus = property(GetMenus,SetMenus,doc="See `GetMenus` and `SetMenus`") 
 _core_.MenuBar_swigregister(MenuBar)
@@ -11565,6 +11591,222 @@ _core_.ControlWithItems_swigregister(ControlWithItems)
 
 #---------------------------------------------------------------------------
 
+class SizerFlags(object):
+    """
+    Normally, when you add an item to a sizer via `wx.Sizer.Add`, you have
+    to specify a lot of flags and parameters which can be unwieldy. This
+    is where wx.SizerFlags comes in: it allows you to specify all
+    parameters using the named methods instead. For example, instead of::
+
+        sizer.Add(ctrl, 0, wx.EXPAND | wx.ALL, 10)
+
+    you can now write::
+
+        sizer.AddF(ctrl, wx.SizerFlags().Expand().Border(wx.ALL, 10))
+
+    This is more readable and also allows you to create wx.SizerFlags
+    objects which can be reused for several sizer items.::
+
+        flagsExpand = wx.SizerFlags(1)
+        flagsExpand.Expand().Border(wx.ALL, 10)
+        sizer.AddF(ctrl1, flagsExpand)
+        sizer.AddF(ctrl2, flagsExpand)
+
+    Note that by specification, all methods of wx.SizerFlags return the
+    wx.SizerFlags object itself allowing chaining multiple method calls
+    like in the examples above.
+    """
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """
+        __init__(self, int proportion=0) -> SizerFlags
+
+        Constructs the flags object with the specified proportion.
+        """
+        _core_.SizerFlags_swiginit(self,_core_.new_SizerFlags(*args, **kwargs))
+    __swig_destroy__ = _core_.delete_SizerFlags
+    __del__ = lambda self : None;
+    def Proportion(*args, **kwargs):
+        """
+        Proportion(self, int proportion) -> SizerFlags
+
+        Sets the item's proportion value.
+        """
+        return _core_.SizerFlags_Proportion(*args, **kwargs)
+
+    def Align(*args, **kwargs):
+        """
+        Align(self, int alignment) -> SizerFlags
+
+        Sets the item's alignment
+        """
+        return _core_.SizerFlags_Align(*args, **kwargs)
+
+    def Expand(*args, **kwargs):
+        """
+        Expand(self) -> SizerFlags
+
+        Sets the wx.EXPAND flag, which will cause the item to be expanded to
+        fill as much space as it is given by the sizer.
+        """
+        return _core_.SizerFlags_Expand(*args, **kwargs)
+
+    def Centre(*args, **kwargs):
+        """
+        Centre(self) -> SizerFlags
+
+        Same as `Center` for those with an alternate dialect of English.
+        """
+        return _core_.SizerFlags_Centre(*args, **kwargs)
+
+    def Center(*args, **kwargs):
+        """
+        Center(self) -> SizerFlags
+
+        Sets the centering alignment flags.
+        """
+        return _core_.SizerFlags_Center(*args, **kwargs)
+
+    def Left(*args, **kwargs):
+        """
+        Left(self) -> SizerFlags
+
+        Aligns the object to the left, a shortcut for calling
+        Align(wx.ALIGN_LEFT)
+        """
+        return _core_.SizerFlags_Left(*args, **kwargs)
+
+    def Right(*args, **kwargs):
+        """
+        Right(self) -> SizerFlags
+
+        Aligns the object to the right, a shortcut for calling
+        Align(wx.ALIGN_RIGHT)
+        """
+        return _core_.SizerFlags_Right(*args, **kwargs)
+
+    def Top(*args, **kwargs):
+        """
+        Top(self) -> SizerFlags
+
+        Aligns the object to the top of the available space, a shortcut for
+        calling Align(wx.ALIGN_TOP)
+        """
+        return _core_.SizerFlags_Top(*args, **kwargs)
+
+    def Bottom(*args, **kwargs):
+        """
+        Bottom(self) -> SizerFlags
+
+        Aligns the object to the bottom of the available space, a shortcut for
+        calling Align(wx.ALIGN_BOTTOM)
+        """
+        return _core_.SizerFlags_Bottom(*args, **kwargs)
+
+    def Shaped(*args, **kwargs):
+        """
+        Shaped(self) -> SizerFlags
+
+        Sets the wx.SHAPED flag.
+        """
+        return _core_.SizerFlags_Shaped(*args, **kwargs)
+
+    def FixedMinSize(*args, **kwargs):
+        """
+        FixedMinSize(self) -> SizerFlags
+
+        Sets the wx.FIXED_MINSIZE flag.
+        """
+        return _core_.SizerFlags_FixedMinSize(*args, **kwargs)
+
+    def Border(*args, **kwargs):
+        """
+        Border(self, int direction=ALL, int borderInPixels=-1) -> SizerFlags
+
+        Sets the border of the item in the direction(s) or sides given by the
+        direction parameter.  If the borderInPixels value is not given then
+        the default border size (see `GetDefaultBorder`) will be used.
+        """
+        return _core_.SizerFlags_Border(*args, **kwargs)
+
+    def DoubleBorder(*args, **kwargs):
+        """
+        DoubleBorder(self, int direction=ALL) -> SizerFlags
+
+        Sets the border in the given direction to twice the default border
+        size.
+        """
+        return _core_.SizerFlags_DoubleBorder(*args, **kwargs)
+
+    def TripleBorder(*args, **kwargs):
+        """
+        TripleBorder(self, int direction=ALL) -> SizerFlags
+
+        Sets the border in the given direction to three times the default
+        border size.
+        """
+        return _core_.SizerFlags_TripleBorder(*args, **kwargs)
+
+    def HorzBorder(*args, **kwargs):
+        """
+        HorzBorder(self) -> SizerFlags
+
+        Sets the left and right borders to the default border size.
+        """
+        return _core_.SizerFlags_HorzBorder(*args, **kwargs)
+
+    def DoubleHorzBorder(*args, **kwargs):
+        """
+        DoubleHorzBorder(self) -> SizerFlags
+
+        Sets the left and right borders to twice the default border size.
+        """
+        return _core_.SizerFlags_DoubleHorzBorder(*args, **kwargs)
+
+    def GetDefaultBorder(*args, **kwargs):
+        """
+        GetDefaultBorder() -> int
+
+        Returns the default border size used by the other border methods
+        """
+        return _core_.SizerFlags_GetDefaultBorder(*args, **kwargs)
+
+    GetDefaultBorder = staticmethod(GetDefaultBorder)
+    def GetProportion(*args, **kwargs):
+        """
+        GetProportion(self) -> int
+
+        Returns the proportion value to be used in the sizer item.
+        """
+        return _core_.SizerFlags_GetProportion(*args, **kwargs)
+
+    def GetFlags(*args, **kwargs):
+        """
+        GetFlags(self) -> int
+
+        Returns the flags value to be used in the sizer item.
+        """
+        return _core_.SizerFlags_GetFlags(*args, **kwargs)
+
+    def GetBorderInPixels(*args, **kwargs):
+        """
+        GetBorderInPixels(self) -> int
+
+        Returns the border value in pixels to be used in the sizer item.
+        """
+        return _core_.SizerFlags_GetBorderInPixels(*args, **kwargs)
+
+_core_.SizerFlags_swigregister(SizerFlags)
+
+def SizerFlags_GetDefaultBorder(*args):
+  """
+    SizerFlags_GetDefaultBorder() -> int
+
+    Returns the default border size used by the other border methods
+    """
+  return _core_.SizerFlags_GetDefaultBorder(*args)
+
 class SizerItem(Object):
     """
     The wx.SizerItem class is used to track the position, size and other
@@ -11960,6 +12202,15 @@ class Sizer(Object):
         """
         return _core_.Sizer_Add(*args, **kwargs)
 
+    def AddF(*args, **kwargs):
+        """
+        AddF(self, item, wx.SizerFlags flags) -> wx.SizerItem
+
+        Similar to `Add` but uses the `wx.SizerFlags` convenience class for
+        setting the various flags, options and borders.
+        """
+        return _core_.Sizer_AddF(*args, **kwargs)
+
     def Insert(*args, **kwargs):
         """
         Insert(self, int before, item, int proportion=0, int flag=0, int border=0,
@@ -11970,6 +12221,15 @@ class Sizer(Object):
         """
         return _core_.Sizer_Insert(*args, **kwargs)
 
+    def InsertF(*args, **kwargs):
+        """
+        InsertF(self, int before, item, wx.SizerFlags flags) -> wx.SizerItem
+
+        Similar to `Insert`, but uses the `wx.SizerFlags` convenience class
+        for setting the various flags, options and borders.
+        """
+        return _core_.Sizer_InsertF(*args, **kwargs)
+
     def Prepend(*args, **kwargs):
         """
         Prepend(self, item, int proportion=0, int flag=0, int border=0,
@@ -11980,6 +12240,15 @@ class Sizer(Object):
         """
         return _core_.Sizer_Prepend(*args, **kwargs)
 
+    def PrependF(*args, **kwargs):
+        """
+        PrependF(self, item, wx.SizerFlags flags) -> wx.SizerItem
+
+        Similar to `Prepend` but uses the `wx.SizerFlags` convenience class
+        for setting the various flags, options and borders.
+        """
+        return _core_.Sizer_PrependF(*args, **kwargs)
+
     def Remove(*args, **kwargs):
         """
         Remove(self, item) -> bool
@@ -12007,7 +12276,7 @@ class Sizer(Object):
 
     def GetItem(*args, **kwargs):
         """
-        GetItem(self, item) -> wx.SizerItem
+        GetItem(self, item, recursive=False) -> wx.SizerItem
 
         Returns the `wx.SizerItem` which holds the *item* given.  The *item*
         parameter can be either a window, a sizer, or the zero-based index of
@@ -12047,9 +12316,9 @@ class Sizer(Object):
         """
         if isinstance(olditem, wx.Window):
             return self._ReplaceWin(olditem, item, recursive)
-        elif isinstnace(olditem, wx.Sizer):
+        elif isinstance(olditem, wx.Sizer):
             return self._ReplaceSizer(olditem, item, recursive)
-        elif isinstnace(olditem, int):
+        elif isinstance(olditem, int):
             return self._ReplaceItem(olditem, item)
         else:
             raise TypeError("Expected Window, Sizer, or integer for first parameter.")
diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp
index 5a2bb6f53d..443bd36d07 100644
--- a/wxPython/src/gtk/_core_wrap.cpp
+++ b/wxPython/src/gtk/_core_wrap.cpp
@@ -2582,24 +2582,25 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_wxSize swig_types[116]
 #define SWIGTYPE_p_wxSizeEvent swig_types[117]
 #define SWIGTYPE_p_wxSizer swig_types[118]
-#define SWIGTYPE_p_wxSizerItem swig_types[119]
-#define SWIGTYPE_p_wxStaticBox swig_types[120]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[121]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[122]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[123]
-#define SWIGTYPE_p_wxTGAHandler swig_types[124]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[125]
-#define SWIGTYPE_p_wxToolTip swig_types[126]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[127]
-#define SWIGTYPE_p_wxValidator swig_types[128]
-#define SWIGTYPE_p_wxVisualAttributes swig_types[129]
-#define SWIGTYPE_p_wxWindow swig_types[130]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[131]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[132]
-#define SWIGTYPE_p_wxXPMHandler swig_types[133]
-#define SWIGTYPE_p_wxZipFSHandler swig_types[134]
-static swig_type_info *swig_types[136];
-static swig_module_info swig_module = {swig_types, 135, 0, 0, 0, 0};
+#define SWIGTYPE_p_wxSizerFlags swig_types[119]
+#define SWIGTYPE_p_wxSizerItem swig_types[120]
+#define SWIGTYPE_p_wxStaticBox swig_types[121]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[122]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[123]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[124]
+#define SWIGTYPE_p_wxTGAHandler swig_types[125]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[126]
+#define SWIGTYPE_p_wxToolTip swig_types[127]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[128]
+#define SWIGTYPE_p_wxValidator swig_types[129]
+#define SWIGTYPE_p_wxVisualAttributes swig_types[130]
+#define SWIGTYPE_p_wxWindow swig_types[131]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[132]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[133]
+#define SWIGTYPE_p_wxXPMHandler swig_types[134]
+#define SWIGTYPE_p_wxZipFSHandler swig_types[135]
+static swig_type_info *swig_types[137];
+static swig_module_info swig_module = {swig_types, 136, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -3880,10 +3881,16 @@ public:
  static const wxString wxPyPanelNameStr(wxPanelNameStr); 
 SWIGINTERN wxVisualAttributes *new_wxVisualAttributes(){ return new wxVisualAttributes; }
 SWIGINTERN void delete_wxVisualAttributes(wxVisualAttributes *self){ delete self; }
+SWIGINTERN wxFont wxVisualAttributes__get_font(wxVisualAttributes *self){ return self->font; }
+SWIGINTERN wxColour wxVisualAttributes__get_colFg(wxVisualAttributes *self){ return self->colFg; }
+SWIGINTERN wxColour wxVisualAttributes__get_colBg(wxVisualAttributes *self){ return self->colBg; }
 SWIGINTERN PyObject *wxWindow_GetChildren(wxWindow *self){
             wxWindowList& list = self->GetChildren();
             return wxPy_ConvertList(&list);
         }
+SWIGINTERN wxWindow *wxWindow_GetTopLevelParent(wxWindow *self){
+            return wxGetTopLevelParent(self);
+        }
 SWIGINTERN bool wxWindow_RegisterHotKey(wxWindow *self,int hotkeyId,int modifiers,int keycode){
         #if wxUSE_HOTKEY
             return self->RegisterHotKey(hotkeyId, modifiers, keycode);
@@ -4021,6 +4028,12 @@ SWIGINTERN void wxItemContainer_SetClientData(wxItemContainer *self,int n,PyObje
         }
 
 
+SWIGINTERN wxSizerFlags &wxSizerFlags_Border(wxSizerFlags *self,int direction=wxALL,int borderInPixels=-1){
+            if (borderInPixels == -1)
+                return self->Border(direction);
+            else
+                return self->Border(direction, borderInPixels);
+        }
 SWIGINTERN wxSizerItem *new_wxSizerItem(wxWindow *window,int proportion,int flag,int border,PyObject *userData=NULL){
             wxPyUserData* data = NULL;
             if ( userData ) {
@@ -4164,6 +4177,27 @@ SWIGINTERN wxSizerItem *wxSizer_Add(wxSizer *self,PyObject *item,int proportion=
             else
                 return NULL;
         }
+SWIGINTERN wxSizerItem *wxSizer_AddF(wxSizer *self,PyObject *item,wxSizerFlags &flags){
+            
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
+            if ( info.sizer )
+                PyObject_SetAttrString(item,"thisown",Py_False);
+            wxPyEndBlockThreads(blocked);
+
+            // Now call the real Add method if a valid item type was found
+            if ( info.window )
+                return self->Add(info.window, flags);
+            else if ( info.sizer )
+                return self->Add(info.sizer, flags);
+            else if (info.gotSize)
+                return self->Add(info.size.GetWidth(), info.size.GetHeight(),
+                                 flags.GetProportion(),
+                                 flags.GetFlags(),
+                                 flags.GetBorderInPixels());
+            else
+                return NULL;
+        }
 SWIGINTERN wxSizerItem *wxSizer_Insert(wxSizer *self,int before,PyObject *item,int proportion=0,int flag=0,int border=0,PyObject *userData=NULL){
 
             wxPyUserData* data = NULL;
@@ -4186,6 +4220,27 @@ SWIGINTERN wxSizerItem *wxSizer_Insert(wxSizer *self,int before,PyObject *item,i
             else
                 return NULL;
         }
+SWIGINTERN wxSizerItem *wxSizer_InsertF(wxSizer *self,int before,PyObject *item,wxSizerFlags &flags){
+
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
+            if ( info.sizer )
+                PyObject_SetAttrString(item,"thisown",Py_False);
+            wxPyEndBlockThreads(blocked);
+
+            // Now call the real Insert method if a valid item type was found
+            if ( info.window )
+                return self->Insert(before, info.window, flags);
+            else if ( info.sizer )
+                return self->Insert(before, info.sizer, flags);
+            else if (info.gotSize)
+                return self->Insert(before, info.size.GetWidth(), info.size.GetHeight(),
+                                    flags.GetProportion(),
+                                    flags.GetFlags(),
+                                    flags.GetBorderInPixels());
+            else
+                return NULL;
+        }
 SWIGINTERN wxSizerItem *wxSizer_Prepend(wxSizer *self,PyObject *item,int proportion=0,int flag=0,int border=0,PyObject *userData=NULL){
 
             wxPyUserData* data = NULL;
@@ -4208,6 +4263,27 @@ SWIGINTERN wxSizerItem *wxSizer_Prepend(wxSizer *self,PyObject *item,int proport
             else
                 return NULL;
         }
+SWIGINTERN wxSizerItem *wxSizer_PrependF(wxSizer *self,PyObject *item,wxSizerFlags &flags){
+            
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
+            if ( info.sizer )
+                PyObject_SetAttrString(item,"thisown",Py_False);
+            wxPyEndBlockThreads(blocked);
+
+            // Now call the real Add method if a valid item type was found
+            if ( info.window )
+                return self->Prepend(info.window, flags);
+            else if ( info.sizer )
+                return self->Prepend(info.sizer, flags);
+            else if (info.gotSize)
+                return self->Prepend(info.size.GetWidth(), info.size.GetHeight(),
+                                     flags.GetProportion(),
+                                     flags.GetFlags(),
+                                     flags.GetBorderInPixels());
+            else
+                return NULL;
+        }
 SWIGINTERN bool wxSizer_Remove(wxSizer *self,PyObject *item){
             wxPyBlock_t blocked = wxPyBeginBlockThreads();
             wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
@@ -4234,14 +4310,14 @@ SWIGINTERN bool wxSizer_Detach(wxSizer *self,PyObject *item){
             else
                 return false;
         }
-SWIGINTERN wxSizerItem *wxSizer_GetItem(wxSizer *self,PyObject *item){
+SWIGINTERN wxSizerItem *wxSizer_GetItem(wxSizer *self,PyObject *item,bool recursive=false){
             wxPyBlock_t blocked = wxPyBeginBlockThreads();
             wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
             wxPyEndBlockThreads(blocked);
             if ( info.window )
-                return self->GetItem(info.window);
+                return self->GetItem(info.window, recursive);
             else if ( info.sizer )
-                return self->GetItem(info.sizer);
+                return self->GetItem(info.sizer, recursive);
             else if ( info.gotPos )
                 return self->GetItem(info.pos);
             else
@@ -7274,7 +7350,7 @@ SWIGINTERN PyObject *_wrap_Rect_Inflate(PyObject *SWIGUNUSEDPARM(self), PyObject
   wxRect *arg1 = (wxRect *) 0 ;
   int arg2 ;
   int arg3 ;
-  wxRect *result = 0 ;
+  wxRect result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -7305,13 +7381,10 @@ SWIGINTERN PyObject *_wrap_Rect_Inflate(PyObject *SWIGUNUSEDPARM(self), PyObject
   } 
   arg3 = static_cast< int >(val3);
   {
-    {
-      wxRect &_result_ref = (arg1)->Inflate(arg2,arg3);
-      result = (wxRect *) &_result_ref;
-    }
+    result = (arg1)->Inflate(arg2,arg3);
     if (PyErr_Occurred()) SWIG_fail;
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxRect, 0 |  0 );
+  resultobj = SWIG_NewPointerObj((new wxRect(static_cast< const wxRect& >(result))), SWIGTYPE_p_wxRect, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -32513,40 +32586,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_VisualAttributes_font_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_VisualAttributes__get_font(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-  wxFont *arg2 = (wxFont *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject *swig_obj[2] ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"VisualAttributes_font_set",2,2,swig_obj)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_font_set" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
-  }
-  arg1 = reinterpret_cast< wxVisualAttributes * >(argp1);
-  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxFont, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VisualAttributes_font_set" "', expected argument " "2"" of type '" "wxFont *""'"); 
-  }
-  arg2 = reinterpret_cast< wxFont * >(argp2);
-  if (arg1) (arg1)->font = *arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_VisualAttributes_font_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-  wxFont *result = 0 ;
+  wxFont result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
@@ -32555,51 +32598,26 @@ SWIGINTERN PyObject *_wrap_VisualAttributes_font_get(PyObject *SWIGUNUSEDPARM(se
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_font_get" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes__get_font" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
   }
   arg1 = reinterpret_cast< wxVisualAttributes * >(argp1);
-  result = (wxFont *)& ((arg1)->font);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, 0 |  0 );
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = wxVisualAttributes__get_font(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxFont(static_cast< const wxFont& >(result))), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_VisualAttributes_colFg_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_VisualAttributes__get_colFg(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-  wxColour *arg2 = (wxColour *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject *swig_obj[2] ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"VisualAttributes_colFg_set",2,2,swig_obj)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colFg_set" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
-  }
-  arg1 = reinterpret_cast< wxVisualAttributes * >(argp1);
-  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxColour, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VisualAttributes_colFg_set" "', expected argument " "2"" of type '" "wxColour *""'"); 
-  }
-  arg2 = reinterpret_cast< wxColour * >(argp2);
-  if (arg1) (arg1)->colFg = *arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_VisualAttributes_colFg_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-  wxColour *result = 0 ;
+  wxColour result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
@@ -32608,51 +32626,26 @@ SWIGINTERN PyObject *_wrap_VisualAttributes_colFg_get(PyObject *SWIGUNUSEDPARM(s
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colFg_get" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes__get_colFg" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
   }
   arg1 = reinterpret_cast< wxVisualAttributes * >(argp1);
-  result = (wxColour *)& ((arg1)->colFg);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 |  0 );
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = wxVisualAttributes__get_colFg(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_VisualAttributes_colBg_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_VisualAttributes__get_colBg(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-  wxColour *arg2 = (wxColour *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject *swig_obj[2] ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"VisualAttributes_colBg_set",2,2,swig_obj)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colBg_set" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
-  }
-  arg1 = reinterpret_cast< wxVisualAttributes * >(argp1);
-  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxColour, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VisualAttributes_colBg_set" "', expected argument " "2"" of type '" "wxColour *""'"); 
-  }
-  arg2 = reinterpret_cast< wxColour * >(argp2);
-  if (arg1) (arg1)->colBg = *arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_VisualAttributes_colBg_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-  wxColour *result = 0 ;
+  wxColour result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
@@ -32661,11 +32654,16 @@ SWIGINTERN PyObject *_wrap_VisualAttributes_colBg_get(PyObject *SWIGUNUSEDPARM(s
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colBg_get" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes__get_colBg" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
   }
   arg1 = reinterpret_cast< wxVisualAttributes * >(argp1);
-  result = (wxColour *)& ((arg1)->colBg);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 |  0 );
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = wxVisualAttributes__get_colBg(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -36401,6 +36399,36 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_Window_GetTopLevelParent(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxWindow *arg1 = (wxWindow *) 0 ;
+  wxWindow *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_GetTopLevelParent" "', expected argument " "1"" of type '" "wxWindow *""'"); 
+  }
+  arg1 = reinterpret_cast< wxWindow * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxWindow *)wxWindow_GetTopLevelParent(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_Window_IsTopLevel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;
@@ -48394,6 +48422,779 @@ SWIGINTERN PyObject *ControlWithItems_swigregister(PyObject *SWIGUNUSEDPARM(self
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *_wrap_new_SizerFlags(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  int arg1 = (int) 0 ;
+  wxSizerFlags *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "proportion", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_SizerFlags",kwnames,&obj0)) SWIG_fail;
+  if (obj0) {
+    ecode1 = SWIG_AsVal_int(obj0, &val1);
+    if (!SWIG_IsOK(ecode1)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SizerFlags" "', expected argument " "1"" of type '" "int""'");
+    } 
+    arg1 = static_cast< int >(val1);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxSizerFlags *)new wxSizerFlags(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerFlags, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_SizerFlags(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SizerFlags" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    delete arg1;
+    
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Proportion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int arg2 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "proportion", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerFlags_Proportion",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Proportion" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_Proportion" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Proportion(arg2);
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = obj0; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Align(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int arg2 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "alignment", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerFlags_Align",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Align" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_Align" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Align(arg2);
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = obj0; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Expand(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Expand" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Expand();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Centre(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Centre" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Centre();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Center(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Center" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Center();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Left(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Left" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Left();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Right(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Right" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Right();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Top(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Top" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Top();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Bottom(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Bottom" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Bottom();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Shaped(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Shaped" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Shaped();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_FixedMinSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_FixedMinSize" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->FixedMinSize();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Border(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int arg2 = (int) wxALL ;
+  int arg3 = (int) -1 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "direction",(char *) "borderInPixels", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:SizerFlags_Border",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Border" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  if (obj1) {
+    ecode2 = SWIG_AsVal_int(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_Border" "', expected argument " "2"" of type '" "int""'");
+    } 
+    arg2 = static_cast< int >(val2);
+  }
+  if (obj2) {
+    ecode3 = SWIG_AsVal_int(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SizerFlags_Border" "', expected argument " "3"" of type '" "int""'");
+    } 
+    arg3 = static_cast< int >(val3);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = wxSizerFlags_Border(arg1,arg2,arg3);
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = obj0; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_DoubleBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int arg2 = (int) wxALL ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "direction", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:SizerFlags_DoubleBorder",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_DoubleBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  if (obj1) {
+    ecode2 = SWIG_AsVal_int(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_DoubleBorder" "', expected argument " "2"" of type '" "int""'");
+    } 
+    arg2 = static_cast< int >(val2);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->DoubleBorder(arg2);
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = obj0; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_TripleBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int arg2 = (int) wxALL ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "direction", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:SizerFlags_TripleBorder",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_TripleBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  if (obj1) {
+    ecode2 = SWIG_AsVal_int(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_TripleBorder" "', expected argument " "2"" of type '" "int""'");
+    } 
+    arg2 = static_cast< int >(val2);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->TripleBorder(arg2);
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = obj0; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_HorzBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_HorzBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->HorzBorder();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_DoubleHorzBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_DoubleHorzBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->DoubleHorzBorder();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_GetDefaultBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int result;
+  
+  if (!SWIG_Python_UnpackTuple(args,"SizerFlags_GetDefaultBorder",0,0,0)) SWIG_fail;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)wxSizerFlags::GetDefaultBorder();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_GetProportion(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_GetProportion" "', expected argument " "1"" of type '" "wxSizerFlags const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxSizerFlags const *)arg1)->GetProportion();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_GetFlags(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_GetFlags" "', expected argument " "1"" of type '" "wxSizerFlags const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxSizerFlags const *)arg1)->GetFlags();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_GetBorderInPixels(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_GetBorderInPixels" "', expected argument " "1"" of type '" "wxSizerFlags const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxSizerFlags const *)arg1)->GetBorderInPixels();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *SizerFlags_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxSizerFlags, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *SizerFlags_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_SizerItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxSizerItem *result = 0 ;
@@ -49850,6 +50651,51 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_Sizer_AddF(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizer *arg1 = (wxSizer *) 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;
+  wxSizerFlags *arg3 = 0 ;
+  wxSizerItem *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "item",(char *) "flags", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Sizer_AddF",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_AddF" "', expected argument " "1"" of type '" "wxSizer *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizer * >(argp1);
+  arg2 = obj1;
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxSizerFlags,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Sizer_AddF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Sizer_AddF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); 
+  }
+  arg3 = reinterpret_cast< wxSizerFlags * >(argp3);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxSizerItem *)wxSizer_AddF(arg1,arg2,*arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerItem, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_Sizer_Insert(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSizer *arg1 = (wxSizer *) 0 ;
@@ -49930,6 +50776,60 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_Sizer_InsertF(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizer *arg1 = (wxSizer *) 0 ;
+  int arg2 ;
+  PyObject *arg3 = (PyObject *) 0 ;
+  wxSizerFlags *arg4 = 0 ;
+  wxSizerItem *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "before",(char *) "item",(char *) "flags", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Sizer_InsertF",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_InsertF" "', expected argument " "1"" of type '" "wxSizer *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizer * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Sizer_InsertF" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  arg3 = obj2;
+  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_wxSizerFlags,  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "Sizer_InsertF" "', expected argument " "4"" of type '" "wxSizerFlags &""'"); 
+  }
+  if (!argp4) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Sizer_InsertF" "', expected argument " "4"" of type '" "wxSizerFlags &""'"); 
+  }
+  arg4 = reinterpret_cast< wxSizerFlags * >(argp4);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxSizerItem *)wxSizer_InsertF(arg1,arg2,arg3,*arg4);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerItem, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_Sizer_Prepend(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSizer *arg1 = (wxSizer *) 0 ;
@@ -50001,6 +50901,51 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_Sizer_PrependF(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizer *arg1 = (wxSizer *) 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;
+  wxSizerFlags *arg3 = 0 ;
+  wxSizerItem *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "item",(char *) "flags", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Sizer_PrependF",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_PrependF" "', expected argument " "1"" of type '" "wxSizer *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizer * >(argp1);
+  arg2 = obj1;
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxSizerFlags,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Sizer_PrependF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Sizer_PrependF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); 
+  }
+  arg3 = reinterpret_cast< wxSizerFlags * >(argp3);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxSizerItem *)wxSizer_PrependF(arg1,arg2,*arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerItem, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_Sizer_Remove(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSizer *arg1 = (wxSizer *) 0 ;
@@ -50075,25 +51020,36 @@ SWIGINTERN PyObject *_wrap_Sizer_GetItem(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject *resultobj = 0;
   wxSizer *arg1 = (wxSizer *) 0 ;
   PyObject *arg2 = (PyObject *) 0 ;
+  bool arg3 = (bool) false ;
   wxSizerItem *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   char *  kwnames[] = {
-    (char *) "self",(char *) "item", NULL 
+    (char *) "self",(char *) "item",(char *) "recursive", NULL 
   };
   
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_GetItem",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Sizer_GetItem",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_GetItem" "', expected argument " "1"" of type '" "wxSizer *""'"); 
   }
   arg1 = reinterpret_cast< wxSizer * >(argp1);
   arg2 = obj1;
+  if (obj2) {
+    ecode3 = SWIG_AsVal_bool(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Sizer_GetItem" "', expected argument " "3"" of type '" "bool""'");
+    } 
+    arg3 = static_cast< bool >(val3);
+  }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxSizerItem *)wxSizer_GetItem(arg1,arg2);
+    result = (wxSizerItem *)wxSizer_GetItem(arg1,arg2,arg3);
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
@@ -57341,12 +58297,9 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"GetAccelFromString", (PyCFunction) _wrap_GetAccelFromString, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"new_VisualAttributes", (PyCFunction)_wrap_new_VisualAttributes, METH_NOARGS, NULL},
 	 { (char *)"delete_VisualAttributes", (PyCFunction)_wrap_delete_VisualAttributes, METH_O, NULL},
-	 { (char *)"VisualAttributes_font_set", _wrap_VisualAttributes_font_set, METH_VARARGS, NULL},
-	 { (char *)"VisualAttributes_font_get", (PyCFunction)_wrap_VisualAttributes_font_get, METH_O, NULL},
-	 { (char *)"VisualAttributes_colFg_set", _wrap_VisualAttributes_colFg_set, METH_VARARGS, NULL},
-	 { (char *)"VisualAttributes_colFg_get", (PyCFunction)_wrap_VisualAttributes_colFg_get, METH_O, NULL},
-	 { (char *)"VisualAttributes_colBg_set", _wrap_VisualAttributes_colBg_set, METH_VARARGS, NULL},
-	 { (char *)"VisualAttributes_colBg_get", (PyCFunction)_wrap_VisualAttributes_colBg_get, METH_O, NULL},
+	 { (char *)"VisualAttributes__get_font", (PyCFunction)_wrap_VisualAttributes__get_font, METH_O, NULL},
+	 { (char *)"VisualAttributes__get_colFg", (PyCFunction)_wrap_VisualAttributes__get_colFg, METH_O, NULL},
+	 { (char *)"VisualAttributes__get_colBg", (PyCFunction)_wrap_VisualAttributes__get_colBg, METH_O, NULL},
 	 { (char *)"VisualAttributes_swigregister", VisualAttributes_swigregister, METH_VARARGS, NULL},
 	 { (char *)"VisualAttributes_swiginit", VisualAttributes_swiginit, METH_VARARGS, NULL},
 	 { (char *)"new_Window", (PyCFunction) _wrap_new_Window, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -57449,6 +58402,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"Window_GetChildren", (PyCFunction)_wrap_Window_GetChildren, METH_O, NULL},
 	 { (char *)"Window_GetParent", (PyCFunction)_wrap_Window_GetParent, METH_O, NULL},
 	 { (char *)"Window_GetGrandParent", (PyCFunction)_wrap_Window_GetGrandParent, METH_O, NULL},
+	 { (char *)"Window_GetTopLevelParent", (PyCFunction)_wrap_Window_GetTopLevelParent, METH_O, NULL},
 	 { (char *)"Window_IsTopLevel", (PyCFunction)_wrap_Window_IsTopLevel, METH_O, NULL},
 	 { (char *)"Window_Reparent", (PyCFunction) _wrap_Window_Reparent, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Window_AddChild", (PyCFunction) _wrap_Window_AddChild, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -57756,6 +58710,30 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"ItemContainer_Select", (PyCFunction) _wrap_ItemContainer_Select, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"ItemContainer_swigregister", ItemContainer_swigregister, METH_VARARGS, NULL},
 	 { (char *)"ControlWithItems_swigregister", ControlWithItems_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_SizerFlags", (PyCFunction) _wrap_new_SizerFlags, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"delete_SizerFlags", (PyCFunction)_wrap_delete_SizerFlags, METH_O, NULL},
+	 { (char *)"SizerFlags_Proportion", (PyCFunction) _wrap_SizerFlags_Proportion, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"SizerFlags_Align", (PyCFunction) _wrap_SizerFlags_Align, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"SizerFlags_Expand", (PyCFunction)_wrap_SizerFlags_Expand, METH_O, NULL},
+	 { (char *)"SizerFlags_Centre", (PyCFunction)_wrap_SizerFlags_Centre, METH_O, NULL},
+	 { (char *)"SizerFlags_Center", (PyCFunction)_wrap_SizerFlags_Center, METH_O, NULL},
+	 { (char *)"SizerFlags_Left", (PyCFunction)_wrap_SizerFlags_Left, METH_O, NULL},
+	 { (char *)"SizerFlags_Right", (PyCFunction)_wrap_SizerFlags_Right, METH_O, NULL},
+	 { (char *)"SizerFlags_Top", (PyCFunction)_wrap_SizerFlags_Top, METH_O, NULL},
+	 { (char *)"SizerFlags_Bottom", (PyCFunction)_wrap_SizerFlags_Bottom, METH_O, NULL},
+	 { (char *)"SizerFlags_Shaped", (PyCFunction)_wrap_SizerFlags_Shaped, METH_O, NULL},
+	 { (char *)"SizerFlags_FixedMinSize", (PyCFunction)_wrap_SizerFlags_FixedMinSize, METH_O, NULL},
+	 { (char *)"SizerFlags_Border", (PyCFunction) _wrap_SizerFlags_Border, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"SizerFlags_DoubleBorder", (PyCFunction) _wrap_SizerFlags_DoubleBorder, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"SizerFlags_TripleBorder", (PyCFunction) _wrap_SizerFlags_TripleBorder, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"SizerFlags_HorzBorder", (PyCFunction)_wrap_SizerFlags_HorzBorder, METH_O, NULL},
+	 { (char *)"SizerFlags_DoubleHorzBorder", (PyCFunction)_wrap_SizerFlags_DoubleHorzBorder, METH_O, NULL},
+	 { (char *)"SizerFlags_GetDefaultBorder", (PyCFunction)_wrap_SizerFlags_GetDefaultBorder, METH_NOARGS, NULL},
+	 { (char *)"SizerFlags_GetProportion", (PyCFunction)_wrap_SizerFlags_GetProportion, METH_O, NULL},
+	 { (char *)"SizerFlags_GetFlags", (PyCFunction)_wrap_SizerFlags_GetFlags, METH_O, NULL},
+	 { (char *)"SizerFlags_GetBorderInPixels", (PyCFunction)_wrap_SizerFlags_GetBorderInPixels, METH_O, NULL},
+	 { (char *)"SizerFlags_swigregister", SizerFlags_swigregister, METH_VARARGS, NULL},
+	 { (char *)"SizerFlags_swiginit", SizerFlags_swiginit, METH_VARARGS, NULL},
 	 { (char *)"new_SizerItem", (PyCFunction)_wrap_new_SizerItem, METH_NOARGS, NULL},
 	 { (char *)"delete_SizerItem", (PyCFunction)_wrap_delete_SizerItem, METH_O, NULL},
 	 { (char *)"new_SizerItemWindow", (PyCFunction) _wrap_new_SizerItemWindow, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -57799,8 +58777,11 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"delete_Sizer", (PyCFunction)_wrap_delete_Sizer, METH_O, NULL},
 	 { (char *)"Sizer__setOORInfo", (PyCFunction) _wrap_Sizer__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Sizer_Add", (PyCFunction) _wrap_Sizer_Add, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"Sizer_AddF", (PyCFunction) _wrap_Sizer_AddF, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Sizer_Insert", (PyCFunction) _wrap_Sizer_Insert, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"Sizer_InsertF", (PyCFunction) _wrap_Sizer_InsertF, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Sizer_Prepend", (PyCFunction) _wrap_Sizer_Prepend, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"Sizer_PrependF", (PyCFunction) _wrap_Sizer_PrependF, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Sizer_Remove", (PyCFunction) _wrap_Sizer_Remove, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Sizer_Detach", (PyCFunction) _wrap_Sizer_Detach, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Sizer_GetItem", (PyCFunction) _wrap_Sizer_GetItem, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -57986,36 +58967,6 @@ static PyMethodDef SwigMethods[] = {
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
-static void *_p_wxGBSizerItemTo_p_wxSizerItem(void *x) {
-    return (void *)((wxSizerItem *)  ((wxGBSizerItem *) x));
-}
-static void *_p_wxBoxSizerTo_p_wxSizer(void *x) {
-    return (void *)((wxSizer *)  ((wxBoxSizer *) x));
-}
-static void *_p_wxStaticBoxSizerTo_p_wxSizer(void *x) {
-    return (void *)((wxSizer *) (wxBoxSizer *) ((wxStaticBoxSizer *) x));
-}
-static void *_p_wxStdDialogButtonSizerTo_p_wxSizer(void *x) {
-    return (void *)((wxSizer *) (wxBoxSizer *) ((wxStdDialogButtonSizer *) x));
-}
-static void *_p_wxGridBagSizerTo_p_wxSizer(void *x) {
-    return (void *)((wxSizer *) (wxGridSizer *)(wxFlexGridSizer *) ((wxGridBagSizer *) x));
-}
-static void *_p_wxGridSizerTo_p_wxSizer(void *x) {
-    return (void *)((wxSizer *)  ((wxGridSizer *) x));
-}
-static void *_p_wxFlexGridSizerTo_p_wxSizer(void *x) {
-    return (void *)((wxSizer *) (wxGridSizer *) ((wxFlexGridSizer *) x));
-}
-static void *_p_wxPySizerTo_p_wxSizer(void *x) {
-    return (void *)((wxSizer *)  ((wxPySizer *) x));
-}
-static void *_p_wxStaticBoxSizerTo_p_wxBoxSizer(void *x) {
-    return (void *)((wxBoxSizer *)  ((wxStaticBoxSizer *) x));
-}
-static void *_p_wxStdDialogButtonSizerTo_p_wxBoxSizer(void *x) {
-    return (void *)((wxBoxSizer *)  ((wxStdDialogButtonSizer *) x));
-}
 static void *_p_wxContextMenuEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *) (wxCommandEvent *) ((wxContextMenuEvent *) x));
 }
@@ -58130,113 +59081,8 @@ static void *_p_wxKeyEventTo_p_wxEvent(void *x) {
 static void *_p_wxScrollWinEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxScrollWinEvent *) x));
 }
-static void *_p_wxGridBagSizerTo_p_wxGridSizer(void *x) {
-    return (void *)((wxGridSizer *) (wxFlexGridSizer *) ((wxGridBagSizer *) x));
-}
-static void *_p_wxFlexGridSizerTo_p_wxGridSizer(void *x) {
-    return (void *)((wxGridSizer *)  ((wxFlexGridSizer *) x));
-}
-static void *_p_wxGridBagSizerTo_p_wxFlexGridSizer(void *x) {
-    return (void *)((wxFlexGridSizer *)  ((wxGridBagSizer *) x));
-}
-static void *_p_wxControlWithItemsTo_p_wxItemContainer(void *x) {
-    return (void *)((wxItemContainer *)  ((wxControlWithItems *) x));
-}
-static void *_p_wxControlWithItemsTo_p_wxControl(void *x) {
-    return (void *)((wxControl *)  ((wxControlWithItems *) x));
-}
-static void *_p_wxControlTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *) (wxWindow *) ((wxControl *) x));
-}
-static void *_p_wxWindowTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *)  ((wxWindow *) x));
-}
-static void *_p_wxControlWithItemsTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxControlWithItems *) x));
-}
-static void *_p_wxPyAppTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *)  ((wxPyApp *) x));
-}
-static void *_p_wxValidatorTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *)  ((wxValidator *) x));
-}
-static void *_p_wxPyValidatorTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *) (wxValidator *) ((wxPyValidator *) x));
-}
-static void *_p_wxMenuBarTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *) (wxWindow *) ((wxMenuBar *) x));
-}
-static void *_p_wxMenuTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *)  ((wxMenu *) x));
-}
-static void *_p_wxANIHandlerTo_p_wxCURHandler(void *x) {
-    return (void *)((wxCURHandler *)  ((wxANIHandler *) x));
-}
-static void *_p_wxCURHandlerTo_p_wxICOHandler(void *x) {
-    return (void *)((wxICOHandler *)  ((wxCURHandler *) x));
-}
-static void *_p_wxANIHandlerTo_p_wxICOHandler(void *x) {
-    return (void *)((wxICOHandler *) (wxCURHandler *) ((wxANIHandler *) x));
-}
-static void *_p_wxICOHandlerTo_p_wxBMPHandler(void *x) {
-    return (void *)((wxBMPHandler *)  ((wxICOHandler *) x));
-}
-static void *_p_wxCURHandlerTo_p_wxBMPHandler(void *x) {
-    return (void *)((wxBMPHandler *) (wxICOHandler *) ((wxCURHandler *) x));
-}
-static void *_p_wxANIHandlerTo_p_wxBMPHandler(void *x) {
-    return (void *)((wxBMPHandler *) (wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x));
-}
-static void *_p_wxPyImageHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxPyImageHandler *) x));
-}
-static void *_p_wxBMPHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxBMPHandler *) x));
-}
-static void *_p_wxICOHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *) (wxBMPHandler *) ((wxICOHandler *) x));
-}
-static void *_p_wxCURHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *) ((wxCURHandler *) x));
-}
-static void *_p_wxANIHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x));
-}
-static void *_p_wxPNGHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxPNGHandler *) x));
-}
-static void *_p_wxGIFHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxGIFHandler *) x));
-}
-static void *_p_wxPCXHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxPCXHandler *) x));
-}
-static void *_p_wxJPEGHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxJPEGHandler *) x));
-}
-static void *_p_wxPNMHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxPNMHandler *) x));
-}
-static void *_p_wxXPMHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxXPMHandler *) x));
-}
-static void *_p_wxTIFFHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxTIFFHandler *) x));
-}
-static void *_p_wxTGAHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxTGAHandler *) x));
-}
-static void *_p_wxPyFileSystemHandlerTo_p_wxFileSystemHandler(void *x) {
-    return (void *)((wxFileSystemHandler *)  ((wxPyFileSystemHandler *) x));
-}
-static void *_p_wxInternetFSHandlerTo_p_wxFileSystemHandler(void *x) {
-    return (void *)((wxFileSystemHandler *)  ((wxInternetFSHandler *) x));
-}
-static void *_p_wxZipFSHandlerTo_p_wxFileSystemHandler(void *x) {
-    return (void *)((wxFileSystemHandler *)  ((wxZipFSHandler *) x));
-}
-static void *_p_wxMemoryFSHandlerTo_p_wxFileSystemHandler(void *x) {
-    return (void *)((wxFileSystemHandler *)  ((wxMemoryFSHandler *) x));
+static void *_p_wxPyValidatorTo_p_wxValidator(void *x) {
+    return (void *)((wxValidator *)  ((wxPyValidator *) x));
 }
 static void *_p_wxLayoutConstraintsTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxLayoutConstraints *) x));
@@ -58475,6 +59321,144 @@ static void *_p_wxPyValidatorTo_p_wxObject(void *x) {
 static void *_p_wxValidatorTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *) ((wxValidator *) x));
 }
+static void *_p_wxGridBagSizerTo_p_wxFlexGridSizer(void *x) {
+    return (void *)((wxFlexGridSizer *)  ((wxGridBagSizer *) x));
+}
+static void *_p_wxGridBagSizerTo_p_wxGridSizer(void *x) {
+    return (void *)((wxGridSizer *) (wxFlexGridSizer *) ((wxGridBagSizer *) x));
+}
+static void *_p_wxFlexGridSizerTo_p_wxGridSizer(void *x) {
+    return (void *)((wxGridSizer *)  ((wxFlexGridSizer *) x));
+}
+static void *_p_wxControlWithItemsTo_p_wxControl(void *x) {
+    return (void *)((wxControl *)  ((wxControlWithItems *) x));
+}
+static void *_p_wxControlWithItemsTo_p_wxItemContainer(void *x) {
+    return (void *)((wxItemContainer *)  ((wxControlWithItems *) x));
+}
+static void *_p_wxStaticBoxSizerTo_p_wxBoxSizer(void *x) {
+    return (void *)((wxBoxSizer *)  ((wxStaticBoxSizer *) x));
+}
+static void *_p_wxStdDialogButtonSizerTo_p_wxBoxSizer(void *x) {
+    return (void *)((wxBoxSizer *)  ((wxStdDialogButtonSizer *) x));
+}
+static void *_p_wxBoxSizerTo_p_wxSizer(void *x) {
+    return (void *)((wxSizer *)  ((wxBoxSizer *) x));
+}
+static void *_p_wxStaticBoxSizerTo_p_wxSizer(void *x) {
+    return (void *)((wxSizer *) (wxBoxSizer *) ((wxStaticBoxSizer *) x));
+}
+static void *_p_wxStdDialogButtonSizerTo_p_wxSizer(void *x) {
+    return (void *)((wxSizer *) (wxBoxSizer *) ((wxStdDialogButtonSizer *) x));
+}
+static void *_p_wxGridBagSizerTo_p_wxSizer(void *x) {
+    return (void *)((wxSizer *) (wxGridSizer *)(wxFlexGridSizer *) ((wxGridBagSizer *) x));
+}
+static void *_p_wxGridSizerTo_p_wxSizer(void *x) {
+    return (void *)((wxSizer *)  ((wxGridSizer *) x));
+}
+static void *_p_wxFlexGridSizerTo_p_wxSizer(void *x) {
+    return (void *)((wxSizer *) (wxGridSizer *) ((wxFlexGridSizer *) x));
+}
+static void *_p_wxPySizerTo_p_wxSizer(void *x) {
+    return (void *)((wxSizer *)  ((wxPySizer *) x));
+}
+static void *_p_wxGBSizerItemTo_p_wxSizerItem(void *x) {
+    return (void *)((wxSizerItem *)  ((wxGBSizerItem *) x));
+}
+static void *_p_wxPyFileSystemHandlerTo_p_wxFileSystemHandler(void *x) {
+    return (void *)((wxFileSystemHandler *)  ((wxPyFileSystemHandler *) x));
+}
+static void *_p_wxInternetFSHandlerTo_p_wxFileSystemHandler(void *x) {
+    return (void *)((wxFileSystemHandler *)  ((wxInternetFSHandler *) x));
+}
+static void *_p_wxZipFSHandlerTo_p_wxFileSystemHandler(void *x) {
+    return (void *)((wxFileSystemHandler *)  ((wxZipFSHandler *) x));
+}
+static void *_p_wxMemoryFSHandlerTo_p_wxFileSystemHandler(void *x) {
+    return (void *)((wxFileSystemHandler *)  ((wxMemoryFSHandler *) x));
+}
+static void *_p_wxPyImageHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxPyImageHandler *) x));
+}
+static void *_p_wxBMPHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxBMPHandler *) x));
+}
+static void *_p_wxICOHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *) (wxBMPHandler *) ((wxICOHandler *) x));
+}
+static void *_p_wxCURHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *) ((wxCURHandler *) x));
+}
+static void *_p_wxANIHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x));
+}
+static void *_p_wxPNGHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxPNGHandler *) x));
+}
+static void *_p_wxGIFHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxGIFHandler *) x));
+}
+static void *_p_wxPCXHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxPCXHandler *) x));
+}
+static void *_p_wxJPEGHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxJPEGHandler *) x));
+}
+static void *_p_wxPNMHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxPNMHandler *) x));
+}
+static void *_p_wxXPMHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxXPMHandler *) x));
+}
+static void *_p_wxTIFFHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxTIFFHandler *) x));
+}
+static void *_p_wxTGAHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxTGAHandler *) x));
+}
+static void *_p_wxICOHandlerTo_p_wxBMPHandler(void *x) {
+    return (void *)((wxBMPHandler *)  ((wxICOHandler *) x));
+}
+static void *_p_wxCURHandlerTo_p_wxBMPHandler(void *x) {
+    return (void *)((wxBMPHandler *) (wxICOHandler *) ((wxCURHandler *) x));
+}
+static void *_p_wxANIHandlerTo_p_wxBMPHandler(void *x) {
+    return (void *)((wxBMPHandler *) (wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x));
+}
+static void *_p_wxCURHandlerTo_p_wxICOHandler(void *x) {
+    return (void *)((wxICOHandler *)  ((wxCURHandler *) x));
+}
+static void *_p_wxANIHandlerTo_p_wxICOHandler(void *x) {
+    return (void *)((wxICOHandler *) (wxCURHandler *) ((wxANIHandler *) x));
+}
+static void *_p_wxANIHandlerTo_p_wxCURHandler(void *x) {
+    return (void *)((wxCURHandler *)  ((wxANIHandler *) x));
+}
+static void *_p_wxControlTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *) (wxWindow *) ((wxControl *) x));
+}
+static void *_p_wxWindowTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *)  ((wxWindow *) x));
+}
+static void *_p_wxControlWithItemsTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxControlWithItems *) x));
+}
+static void *_p_wxPyAppTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *)  ((wxPyApp *) x));
+}
+static void *_p_wxValidatorTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *)  ((wxValidator *) x));
+}
+static void *_p_wxPyValidatorTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *) (wxValidator *) ((wxPyValidator *) x));
+}
+static void *_p_wxMenuBarTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *) (wxWindow *) ((wxMenuBar *) x));
+}
+static void *_p_wxMenuTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *)  ((wxMenu *) x));
+}
 static void *_p_wxControlTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *)  ((wxControl *) x));
 }
@@ -58514,9 +59498,6 @@ static void *_p_wxNotifyEventTo_p_wxCommandEvent(void *x) {
 static void *_p_wxPyCommandEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxPyCommandEvent *) x));
 }
-static void *_p_wxPyValidatorTo_p_wxValidator(void *x) {
-    return (void *)((wxValidator *)  ((wxPyValidator *) x));
-}
 static swig_type_info _swigt__p_buffer = {"_p_buffer", "buffer *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_form_ops_t = {"_p_form_ops_t", "enum form_ops_t *|form_ops_t *", 0, 0, (void*)0, 0};
@@ -58636,6 +59617,7 @@ static swig_type_info _swigt__p_wxShowEvent = {"_p_wxShowEvent", "wxShowEvent *"
 static swig_type_info _swigt__p_wxSize = {"_p_wxSize", "wxSize *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxSizeEvent = {"_p_wxSizeEvent", "wxSizeEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxSizer = {"_p_wxSizer", "wxSizer *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_wxSizerFlags = {"_p_wxSizerFlags", "wxSizerFlags *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxSizerItem = {"_p_wxSizerItem", "wxSizerItem *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxStaticBox = {"_p_wxStaticBox", "wxStaticBox *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxStaticBoxSizer = {"_p_wxStaticBoxSizer", "wxStaticBoxSizer *", 0, 0, (void*)0, 0};
@@ -58773,6 +59755,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxSize,
   &_swigt__p_wxSizeEvent,
   &_swigt__p_wxSizer,
+  &_swigt__p_wxSizerFlags,
   &_swigt__p_wxSizerItem,
   &_swigt__p_wxStaticBox,
   &_swigt__p_wxStaticBoxSizer,
@@ -58910,6 +59893,7 @@ static swig_cast_info _swigc__p_wxShowEvent[] = {  {&_swigt__p_wxShowEvent, 0, 0
 static swig_cast_info _swigc__p_wxSize[] = {  {&_swigt__p_wxSize, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSizeEvent[] = {  {&_swigt__p_wxSizeEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSizer[] = {  {&_swigt__p_wxSizer, 0, 0, 0},  {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxSizer, 0, 0},  {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxSizer, 0, 0},  {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxSizer, 0, 0},  {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxSizer, 0, 0},  {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxSizer, 0, 0},  {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxSizer, 0, 0},  {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxSizer, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxSizerFlags[] = {  {&_swigt__p_wxSizerFlags, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSizerItem[] = {  {&_swigt__p_wxSizerItem, 0, 0, 0},  {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxSizerItem, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxStaticBox[] = {  {&_swigt__p_wxStaticBox, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxStaticBoxSizer[] = {  {&_swigt__p_wxStaticBoxSizer, 0, 0, 0},{0, 0, 0, 0}};
@@ -59047,6 +60031,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxSize,
   _swigc__p_wxSizeEvent,
   _swigc__p_wxSizer,
+  _swigc__p_wxSizerFlags,
   _swigc__p_wxSizerItem,
   _swigc__p_wxStaticBox,
   _swigc__p_wxStaticBoxSizer,
diff --git a/wxPython/src/gtk/_gdi.py b/wxPython/src/gtk/_gdi.py
index 0d81802499..bb81158846 100644
--- a/wxPython/src/gtk/_gdi.py
+++ b/wxPython/src/gtk/_gdi.py
@@ -673,7 +673,7 @@ class Bitmap(GDIObject):
         CopyFromBuffer(self, buffer data)
 
         Copy data from a RGB buffer object to replace the bitmap pixel data.
-        See `wxBitmapFromBuffer` for more .
+        See `wx.BitmapFromBuffer` for more .
         """
         return _gdi_.Bitmap_CopyFromBuffer(*args, **kwargs)
 
@@ -682,7 +682,7 @@ class Bitmap(GDIObject):
         CopyFromBufferRGBA(self, buffer data)
 
         Copy data from a RGBA buffer object to replace the bitmap pixel data.
-        See `wxBitmapFromBufferRGBA` for more .
+        See `wx.BitmapFromBufferRGBA` for more .
         """
         return _gdi_.Bitmap_CopyFromBufferRGBA(*args, **kwargs)
 
@@ -5065,22 +5065,13 @@ _gdi_.GraphicsFont_swigregister(GraphicsFont)
 class GraphicsMatrix(GraphicsObject):
     """
     A wx.GraphicsMatrix is a native representation of an affine
-    matrix. The contents are specific an private to the respective
+    matrix. The contents are specific and private to the respective
     renderer. The only way to get a valid instance is via a CreateMatrix
     call on the graphics context or the renderer instance.
     """
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
-    def __init__(self, *args, **kwargs): 
-        """
-        __init__(self) -> GraphicsMatrix
-
-        A wx.GraphicsMatrix is a native representation of an affine
-        matrix. The contents are specific an private to the respective
-        renderer. The only way to get a valid instance is via a CreateMatrix
-        call on the graphics context or the renderer instance.
-        """
-        _gdi_.GraphicsMatrix_swiginit(self,_gdi_.new_GraphicsMatrix(*args, **kwargs))
     __swig_destroy__ = _gdi_.delete_GraphicsMatrix
     __del__ = lambda self : None;
     def Concat(*args, **kwargs):
@@ -5191,10 +5182,8 @@ _gdi_.GraphicsMatrix_swigregister(GraphicsMatrix)
 class GraphicsPath(GraphicsObject):
     """Proxy of C++ GraphicsPath class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
-    def __init__(self, *args, **kwargs): 
-        """__init__(self) -> GraphicsPath"""
-        _gdi_.GraphicsPath_swiginit(self,_gdi_.new_GraphicsPath(*args, **kwargs))
     __swig_destroy__ = _gdi_.delete_GraphicsPath
     __del__ = lambda self : None;
     def MoveToPoint(*args):
@@ -5402,7 +5391,8 @@ class GraphicsContext(GraphicsObject):
 
         Creates a wx.GraphicsContext from a native context. This native
         context must be eg a CGContextRef for Core Graphics, a Graphics
-        pointer for GDIPlus or a cairo_t pointer for Cairo.
+        pointer for GDIPlus or a cairo_t pointer for Cairo.  NOTE: For
+        wxPython we still need a way to make this value usable.
         """
         return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs)
 
@@ -5411,7 +5401,8 @@ class GraphicsContext(GraphicsObject):
         """
         CreateFromNativeWindow(void window) -> GraphicsContext
 
-        Creates a wx.GraphicsContext from a native window.
+        Creates a wx.GraphicsContext from a native window.  NOTE: For wxPython
+        we still need a way to make this value usable.
         """
         return _gdi_.GraphicsContext_CreateFromNativeWindow(*args, **kwargs)
 
@@ -5730,7 +5721,7 @@ class GraphicsContext(GraphicsObject):
 
     def StrokeLineSegements(*args, **kwargs):
         """
-        StrokeLineSegements(self, PyObject beginPoints, PyObject endPoints)
+        StrokeLineSegments(self, List beginPoints, List endPoints)
 
         Stroke disconnected lines from begin to end points
         """
@@ -5811,7 +5802,8 @@ def GraphicsContext_CreateFromNative(*args, **kwargs):
 
     Creates a wx.GraphicsContext from a native context. This native
     context must be eg a CGContextRef for Core Graphics, a Graphics
-    pointer for GDIPlus or a cairo_t pointer for Cairo.
+    pointer for GDIPlus or a cairo_t pointer for Cairo.  NOTE: For
+    wxPython we still need a way to make this value usable.
     """
   return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs)
 
@@ -5819,7 +5811,8 @@ def GraphicsContext_CreateFromNativeWindow(*args, **kwargs):
   """
     GraphicsContext_CreateFromNativeWindow(void window) -> GraphicsContext
 
-    Creates a wx.GraphicsContext from a native window.
+    Creates a wx.GraphicsContext from a native window.  NOTE: For wxPython
+    we still need a way to make this value usable.
     """
   return _gdi_.GraphicsContext_CreateFromNativeWindow(*args, **kwargs)
 
diff --git a/wxPython/src/gtk/_gdi_wrap.cpp b/wxPython/src/gtk/_gdi_wrap.cpp
index 4303b1b929..242fea44fd 100644
--- a/wxPython/src/gtk/_gdi_wrap.cpp
+++ b/wxPython/src/gtk/_gdi_wrap.cpp
@@ -25470,22 +25470,6 @@ SWIGINTERN PyObject *GraphicsFont_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObj
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_GraphicsMatrix(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxGraphicsMatrix *result = 0 ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"new_GraphicsMatrix",0,0,0)) SWIG_fail;
-  {
-    result = (wxGraphicsMatrix *)new wxGraphicsMatrix();
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsMatrix, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_delete_GraphicsMatrix(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxGraphicsMatrix *arg1 = (wxGraphicsMatrix *) 0 ;
@@ -26117,29 +26101,6 @@ SWIGINTERN PyObject *GraphicsMatrix_swigregister(PyObject *SWIGUNUSEDPARM(self),
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *GraphicsMatrix_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_GraphicsPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxGraphicsPath *result = 0 ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"new_GraphicsPath",0,0,0)) SWIG_fail;
-  {
-    if (!wxPyCheckForApp()) SWIG_fail;
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxGraphicsPath *)new wxGraphicsPath();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsPath, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_delete_GraphicsPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;
@@ -27384,10 +27345,6 @@ SWIGINTERN PyObject *GraphicsPath_swigregister(PyObject *SWIGUNUSEDPARM(self), P
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *GraphicsPath_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
 SWIGINTERN int NullGraphicsPen_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable NullGraphicsPen is read-only.");
   return 1;
@@ -39056,7 +39013,6 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"delete_GraphicsFont", (PyCFunction)_wrap_delete_GraphicsFont, METH_O, NULL},
 	 { (char *)"GraphicsFont_swigregister", GraphicsFont_swigregister, METH_VARARGS, NULL},
 	 { (char *)"GraphicsFont_swiginit", GraphicsFont_swiginit, METH_VARARGS, NULL},
-	 { (char *)"new_GraphicsMatrix", (PyCFunction)_wrap_new_GraphicsMatrix, METH_NOARGS, NULL},
 	 { (char *)"delete_GraphicsMatrix", (PyCFunction)_wrap_delete_GraphicsMatrix, METH_O, NULL},
 	 { (char *)"GraphicsMatrix_Concat", (PyCFunction) _wrap_GraphicsMatrix_Concat, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"GraphicsMatrix_Set", (PyCFunction) _wrap_GraphicsMatrix_Set, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -39071,8 +39027,6 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"GraphicsMatrix_TransformDistance", (PyCFunction) _wrap_GraphicsMatrix_TransformDistance, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"GraphicsMatrix_GetNativeMatrix", (PyCFunction)_wrap_GraphicsMatrix_GetNativeMatrix, METH_O, NULL},
 	 { (char *)"GraphicsMatrix_swigregister", GraphicsMatrix_swigregister, METH_VARARGS, NULL},
-	 { (char *)"GraphicsMatrix_swiginit", GraphicsMatrix_swiginit, METH_VARARGS, NULL},
-	 { (char *)"new_GraphicsPath", (PyCFunction)_wrap_new_GraphicsPath, METH_NOARGS, NULL},
 	 { (char *)"delete_GraphicsPath", (PyCFunction)_wrap_delete_GraphicsPath, METH_O, NULL},
 	 { (char *)"GraphicsPath_MoveToPoint", _wrap_GraphicsPath_MoveToPoint, METH_VARARGS, NULL},
 	 { (char *)"GraphicsPath_AddLineToPoint", _wrap_GraphicsPath_AddLineToPoint, METH_VARARGS, NULL},
@@ -39093,7 +39047,6 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"GraphicsPath_GetBox", (PyCFunction)_wrap_GraphicsPath_GetBox, METH_O, NULL},
 	 { (char *)"GraphicsPath_Contains", _wrap_GraphicsPath_Contains, METH_VARARGS, NULL},
 	 { (char *)"GraphicsPath_swigregister", GraphicsPath_swigregister, METH_VARARGS, NULL},
-	 { (char *)"GraphicsPath_swiginit", GraphicsPath_swiginit, METH_VARARGS, NULL},
 	 { (char *)"delete_GraphicsContext", (PyCFunction)_wrap_delete_GraphicsContext, METH_O, NULL},
 	 { (char *)"GraphicsContext_Create", _wrap_GraphicsContext_Create, METH_VARARGS, NULL},
 	 { (char *)"GraphicsContext_CreateMeasuringContext", (PyCFunction)_wrap_GraphicsContext_CreateMeasuringContext, METH_NOARGS, NULL},
diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py
index 795fff7b49..c4f2fde510 100644
--- a/wxPython/src/gtk/_misc.py
+++ b/wxPython/src/gtk/_misc.py
@@ -4362,12 +4362,12 @@ class TimeSpan(object):
     def __str__(self):
         return self.Format().encode(wx.GetDefaultPyEncoding())
 
-    Days = property(GetDays,doc="See `GetDays`") 
-    Hours = property(GetHours,doc="See `GetHours`") 
-    Milliseconds = property(GetMilliseconds,doc="See `GetMilliseconds`") 
-    Minutes = property(GetMinutes,doc="See `GetMinutes`") 
-    Seconds = property(GetSeconds,doc="See `GetSeconds`") 
-    Weeks = property(GetWeeks,doc="See `GetWeeks`") 
+    days = property(GetDays,doc="See `GetDays`") 
+    hours = property(GetHours,doc="See `GetHours`") 
+    milliseconds = property(GetMilliseconds,doc="See `GetMilliseconds`") 
+    minutes = property(GetMinutes,doc="See `GetMinutes`") 
+    seconds = property(GetSeconds,doc="See `GetSeconds`") 
+    weeks = property(GetWeeks,doc="See `GetWeeks`") 
 _misc_.TimeSpan_swigregister(TimeSpan)
 
 def TimeSpan_Milliseconds(*args, **kwargs):
@@ -4559,11 +4559,11 @@ class DateSpan(object):
         """__ne__(self, DateSpan other) -> bool"""
         return _misc_.DateSpan___ne__(*args, **kwargs)
 
-    Days = property(GetDays,SetDays,doc="See `GetDays` and `SetDays`") 
-    Months = property(GetMonths,SetMonths,doc="See `GetMonths` and `SetMonths`") 
-    TotalDays = property(GetTotalDays,doc="See `GetTotalDays`") 
-    Weeks = property(GetWeeks,SetWeeks,doc="See `GetWeeks` and `SetWeeks`") 
-    Years = property(GetYears,SetYears,doc="See `GetYears` and `SetYears`") 
+    days = property(GetDays,SetDays,doc="See `GetDays` and `SetDays`") 
+    months = property(GetMonths,SetMonths,doc="See `GetMonths` and `SetMonths`") 
+    totalDays = property(GetTotalDays,doc="See `GetTotalDays`") 
+    weeks = property(GetWeeks,SetWeeks,doc="See `GetWeeks` and `SetWeeks`") 
+    years = property(GetYears,SetYears,doc="See `GetYears` and `SetYears`") 
 _misc_.DateSpan_swigregister(DateSpan)
 
 def DateSpan_Days(*args, **kwargs):
diff --git a/wxPython/src/gtk/_windows.py b/wxPython/src/gtk/_windows.py
index 275d841160..1646cc9853 100644
--- a/wxPython/src/gtk/_windows.py
+++ b/wxPython/src/gtk/_windows.py
@@ -2305,9 +2305,10 @@ def GetColourFromUser(*args, **kwargs):
         String caption=EmptyString) -> Colour
     """
   return _windows_.GetColourFromUser(*args, **kwargs)
+DD_CHANGE_DIR = _windows_.DD_CHANGE_DIR
+DD_DIR_MUST_EXIST = _windows_.DD_DIR_MUST_EXIST
 DD_NEW_DIR_BUTTON = _windows_.DD_NEW_DIR_BUTTON
 DD_DEFAULT_STYLE = _windows_.DD_DEFAULT_STYLE
-DD_CHANGE_DIR = _windows_.DD_CHANGE_DIR
 class DirDialog(Dialog):
     """
     wx.DirDialog allows the user to select a directory by browising the
diff --git a/wxPython/src/gtk/_windows_wrap.cpp b/wxPython/src/gtk/_windows_wrap.cpp
index 16fe704ec8..426aa7f5bb 100644
--- a/wxPython/src/gtk/_windows_wrap.cpp
+++ b/wxPython/src/gtk/_windows_wrap.cpp
@@ -34974,9 +34974,10 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_addvarlink(SWIG_globals(),(char*)"FileSelectorDefaultWildcardStr",FileSelectorDefaultWildcardStr_get, FileSelectorDefaultWildcardStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"GetTextFromUserPromptStr",GetTextFromUserPromptStr_get, GetTextFromUserPromptStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"MessageBoxCaptionStr",MessageBoxCaptionStr_get, MessageBoxCaptionStr_set);
+  SWIG_Python_SetConstant(d, "DD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxDD_CHANGE_DIR)));
+  SWIG_Python_SetConstant(d, "DD_DIR_MUST_EXIST",SWIG_From_int(static_cast< int >(wxDD_DIR_MUST_EXIST)));
   SWIG_Python_SetConstant(d, "DD_NEW_DIR_BUTTON",SWIG_From_int(static_cast< int >(wxDD_NEW_DIR_BUTTON)));
   SWIG_Python_SetConstant(d, "DD_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxDD_DEFAULT_STYLE)));
-  SWIG_Python_SetConstant(d, "DD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxDD_CHANGE_DIR)));
   SWIG_Python_SetConstant(d, "OPEN",SWIG_From_int(static_cast< int >(wxOPEN)));
   SWIG_Python_SetConstant(d, "SAVE",SWIG_From_int(static_cast< int >(wxSAVE)));
   SWIG_Python_SetConstant(d, "OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxOVERWRITE_PROMPT)));
diff --git a/wxPython/src/gtk/aui.py b/wxPython/src/gtk/aui.py
index 6e572081bf..0bb10cbacb 100644
--- a/wxPython/src/gtk/aui.py
+++ b/wxPython/src/gtk/aui.py
@@ -1495,10 +1495,6 @@ class AuiMDIParentFrame(_windows.Frame):
         """GetArtProvider(self) -> AuiTabArt"""
         return _aui.AuiMDIParentFrame_GetArtProvider(*args, **kwargs)
 
-    def GetNotebook(*args, **kwargs):
-        """GetNotebook(self) -> AuiNotebook"""
-        return _aui.AuiMDIParentFrame_GetNotebook(*args, **kwargs)
-
     def GetWindowMenu(*args, **kwargs):
         """GetWindowMenu(self) -> Menu"""
         return _aui.AuiMDIParentFrame_GetWindowMenu(*args, **kwargs)
@@ -1515,18 +1511,10 @@ class AuiMDIParentFrame(_windows.Frame):
         """ProcessEvent(self, Event event) -> bool"""
         return _aui.AuiMDIParentFrame_ProcessEvent(*args, **kwargs)
 
-    def GetActiveChild(*args, **kwargs):
-        """GetActiveChild(self) -> AuiMDIChildFrame"""
-        return _aui.AuiMDIParentFrame_GetActiveChild(*args, **kwargs)
-
     def SetActiveChild(*args, **kwargs):
         """SetActiveChild(self, AuiMDIChildFrame pChildFrame)"""
         return _aui.AuiMDIParentFrame_SetActiveChild(*args, **kwargs)
 
-    def GetClientWindow(*args, **kwargs):
-        """GetClientWindow(self) -> AuiMDIClientWindow"""
-        return _aui.AuiMDIParentFrame_GetClientWindow(*args, **kwargs)
-
     def OnCreateClient(*args, **kwargs):
         """OnCreateClient(self) -> AuiMDIClientWindow"""
         return _aui.AuiMDIParentFrame_OnCreateClient(*args, **kwargs)
@@ -1551,6 +1539,18 @@ class AuiMDIParentFrame(_windows.Frame):
         """ActivatePrevious(self)"""
         return _aui.AuiMDIParentFrame_ActivatePrevious(*args, **kwargs)
 
+    def GetNotebook(*args, **kwargs):
+        """GetNotebook(self) -> AuiNotebook"""
+        return _aui.AuiMDIParentFrame_GetNotebook(*args, **kwargs)
+
+    def GetActiveChild(*args, **kwargs):
+        """GetActiveChild(self) -> AuiMDIChildFrame"""
+        return _aui.AuiMDIParentFrame_GetActiveChild(*args, **kwargs)
+
+    def GetClientWindow(*args, **kwargs):
+        """GetClientWindow(self) -> AuiMDIClientWindow"""
+        return _aui.AuiMDIParentFrame_GetClientWindow(*args, **kwargs)
+
 _aui.AuiMDIParentFrame_swigregister(AuiMDIParentFrame)
 
 def PreAuiMDIParentFrame(*args, **kwargs):
@@ -1719,8 +1719,22 @@ class PyAuiDockArt(AuiDefaultDockArt):
     methods to the Python methods implemented in the derived class.
     """
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """
+        __init__(self) -> PyAuiDockArt
+
+        This version of the `AuiDockArt` class has been instrumented to be
+        subclassable in Python and to reflect all calls to the C++ base class
+        methods to the Python methods implemented in the derived class.
+        """
+        _aui.PyAuiDockArt_swiginit(self,_aui.new_PyAuiDockArt(*args, **kwargs))
+        PyAuiDockArt._setCallbackInfo(self, self, PyAuiDockArt)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
+        return _aui.PyAuiDockArt__setCallbackInfo(*args, **kwargs)
+
 _aui.PyAuiDockArt_swigregister(PyAuiDockArt)
 
 class PyAuiTabArt(AuiDefaultTabArt):
@@ -1730,8 +1744,22 @@ class PyAuiTabArt(AuiDefaultTabArt):
     methods to the Python methods implemented in the derived class.
     """
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """
+        __init__(self) -> PyAuiTabArt
+
+        This version of the `TabArt` class has been instrumented to be
+        subclassable in Python and to reflect all calls to the C++ base class
+        methods to the Python methods implemented in the derived class.
+        """
+        _aui.PyAuiTabArt_swiginit(self,_aui.new_PyAuiTabArt(*args, **kwargs))
+        PyAuiTabArt._setCallbackInfo(self, self, PyAuiTabArt)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
+        return _aui.PyAuiTabArt__setCallbackInfo(*args, **kwargs)
+
 _aui.PyAuiTabArt_swigregister(PyAuiTabArt)
 
 
diff --git a/wxPython/src/gtk/aui_wrap.cpp b/wxPython/src/gtk/aui_wrap.cpp
index 7e14284be8..e5ff53d0de 100644
--- a/wxPython/src/gtk/aui_wrap.cpp
+++ b/wxPython/src/gtk/aui_wrap.cpp
@@ -2925,10 +2925,20 @@ SWIG_From_size_t  (size_t value)
   return SWIG_From_unsigned_SS_long  (static_cast< unsigned long >(value));
 }
 
+SWIGINTERN wxAuiNotebook *wxAuiMDIParentFrame__GetNotebook(wxAuiMDIParentFrame const *self){
+        return self->GetNotebook();
+    }
+SWIGINTERN wxAuiMDIChildFrame *wxAuiMDIParentFrame__GetActiveChild(wxAuiMDIParentFrame const *self){
+        return self->GetActiveChild();
+    }
+SWIGINTERN wxAuiMDIClientWindow *wxAuiMDIParentFrame__GetClientWindow(wxAuiMDIParentFrame const *self){
+        return self->GetClientWindow();
+    }
 
 // A wxDocArt class that knows how to forward virtuals to Python methods
 class wxPyAuiDockArt :  public wxAuiDefaultDockArt
 {
+public:
     wxPyAuiDockArt() : wxAuiDefaultDockArt() {}
 
     DEC_PYCALLBACK_INT_INT(GetMetric);
@@ -3097,6 +3107,7 @@ IMP_PYCALLBACK__INTCOLOUR(wxPyAuiDockArt, wxAuiDefaultDockArt, SetColour);
 // A wxTabArt class that knows how to forward virtuals to Python methods
 class wxPyAuiTabArt :  public wxAuiDefaultTabArt
 {
+public:
     wxPyAuiTabArt() : wxAuiDefaultTabArt() {}
 
     
@@ -3284,7 +3295,6 @@ class wxPyAuiTabArt :  public wxAuiDefaultTabArt
     DEC_PYCALLBACK__FONT(SetNormalFont);
     DEC_PYCALLBACK__FONT(SetSelectedFont);
     DEC_PYCALLBACK__FONT(SetMeasuringFont);
-//    DEC_PYCALLBACK_INT_WIN(GetBestTabCtrlSize);
 
     PYPRIVATE;
 };
@@ -3293,7 +3303,6 @@ class wxPyAuiTabArt :  public wxAuiDefaultTabArt
 IMP_PYCALLBACK__FONT(wxPyAuiTabArt, wxAuiDefaultTabArt, SetNormalFont);
 IMP_PYCALLBACK__FONT(wxPyAuiTabArt, wxAuiDefaultTabArt, SetSelectedFont);
 IMP_PYCALLBACK__FONT(wxPyAuiTabArt, wxAuiDefaultTabArt, SetMeasuringFont);
-//IMP_PYCALLBACK_INT_WIN(wxPyAuiTabArt, wxAuiDefaultTabArt, GetBestTabCtrlSize);
 
 #ifdef __cplusplus
 extern "C" {
@@ -16360,34 +16369,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetNotebook(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
-  wxAuiNotebook *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiMDIParentFrame, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetNotebook" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxAuiNotebook *)((wxAuiMDIParentFrame const *)arg1)->GetNotebook();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAuiNotebook, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetWindowMenu(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
@@ -16538,34 +16519,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetActiveChild(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
-  wxAuiMDIChildFrame *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiMDIParentFrame, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetActiveChild" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxAuiMDIChildFrame *)((wxAuiMDIParentFrame const *)arg1)->GetActiveChild();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAuiMDIChildFrame, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_SetActiveChild(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
@@ -16604,34 +16557,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetClientWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
-  wxAuiMDIClientWindow *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiMDIParentFrame, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetClientWindow" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxAuiMDIClientWindow *)((wxAuiMDIParentFrame const *)arg1)->GetClientWindow();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAuiMDIClientWindow, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_OnCreateClient(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
@@ -16808,6 +16733,96 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetNotebook(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
+  wxAuiNotebook *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiMDIParentFrame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetNotebook" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxAuiNotebook *)wxAuiMDIParentFrame__GetNotebook((wxAuiMDIParentFrame const *)arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetActiveChild(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
+  wxAuiMDIChildFrame *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiMDIParentFrame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetActiveChild" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxAuiMDIChildFrame *)wxAuiMDIParentFrame__GetActiveChild((wxAuiMDIParentFrame const *)arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetClientWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
+  wxAuiMDIClientWindow *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiMDIParentFrame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetClientWindow" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxAuiMDIClientWindow *)wxAuiMDIParentFrame__GetClientWindow((wxAuiMDIParentFrame const *)arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *AuiMDIParentFrame_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -18143,6 +18158,59 @@ SWIGINTERN PyObject *AuiMDIClientWindow_swiginit(PyObject *SWIGUNUSEDPARM(self),
   return SWIG_Python_InitShadowInstance(args);
 }
 
+SWIGINTERN PyObject *_wrap_new_PyAuiDockArt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyAuiDockArt *result = 0 ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"new_PyAuiDockArt",0,0,0)) SWIG_fail;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxPyAuiDockArt *)new wxPyAuiDockArt();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyAuiDockArt, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PyAuiDockArt__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyAuiDockArt *arg1 = (wxPyAuiDockArt *) 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;
+  PyObject *arg3 = (PyObject *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "self",(char *) "_class", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyAuiDockArt__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyAuiDockArt, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyAuiDockArt__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyAuiDockArt *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyAuiDockArt * >(argp1);
+  arg2 = obj1;
+  arg3 = obj2;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->_setCallbackInfo(arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *PyAuiDockArt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -18150,6 +18218,63 @@ SWIGINTERN PyObject *PyAuiDockArt_swigregister(PyObject *SWIGUNUSEDPARM(self), P
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *PyAuiDockArt_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_PyAuiTabArt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyAuiTabArt *result = 0 ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"new_PyAuiTabArt",0,0,0)) SWIG_fail;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxPyAuiTabArt *)new wxPyAuiTabArt();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyAuiTabArt, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PyAuiTabArt__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyAuiTabArt *arg1 = (wxPyAuiTabArt *) 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;
+  PyObject *arg3 = (PyObject *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "self",(char *) "_class", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyAuiTabArt__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyAuiTabArt, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyAuiTabArt__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyAuiTabArt *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyAuiTabArt * >(argp1);
+  arg2 = obj1;
+  arg3 = obj2;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->_setCallbackInfo(arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *PyAuiTabArt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -18157,6 +18282,10 @@ SWIGINTERN PyObject *PyAuiTabArt_swigregister(PyObject *SWIGUNUSEDPARM(self), Py
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *PyAuiTabArt_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 static PyMethodDef SwigMethods[] = {
 	 { (char *)"new_AuiPaneInfo", (PyCFunction)_wrap_new_AuiPaneInfo, METH_NOARGS, NULL},
 	 { (char *)"delete_AuiPaneInfo", (PyCFunction)_wrap_delete_AuiPaneInfo, METH_O, NULL},
@@ -18538,20 +18667,20 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"AuiMDIParentFrame_Create", (PyCFunction) _wrap_AuiMDIParentFrame_Create, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"AuiMDIParentFrame_SetArtProvider", (PyCFunction) _wrap_AuiMDIParentFrame_SetArtProvider, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"AuiMDIParentFrame_GetArtProvider", (PyCFunction)_wrap_AuiMDIParentFrame_GetArtProvider, METH_O, NULL},
-	 { (char *)"AuiMDIParentFrame_GetNotebook", (PyCFunction)_wrap_AuiMDIParentFrame_GetNotebook, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_GetWindowMenu", (PyCFunction)_wrap_AuiMDIParentFrame_GetWindowMenu, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_SetWindowMenu", (PyCFunction) _wrap_AuiMDIParentFrame_SetWindowMenu, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"AuiMDIParentFrame_SetChildMenuBar", (PyCFunction) _wrap_AuiMDIParentFrame_SetChildMenuBar, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"AuiMDIParentFrame_ProcessEvent", (PyCFunction) _wrap_AuiMDIParentFrame_ProcessEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"AuiMDIParentFrame_GetActiveChild", (PyCFunction)_wrap_AuiMDIParentFrame_GetActiveChild, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_SetActiveChild", (PyCFunction) _wrap_AuiMDIParentFrame_SetActiveChild, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"AuiMDIParentFrame_GetClientWindow", (PyCFunction)_wrap_AuiMDIParentFrame_GetClientWindow, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_OnCreateClient", (PyCFunction)_wrap_AuiMDIParentFrame_OnCreateClient, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_Cascade", (PyCFunction)_wrap_AuiMDIParentFrame_Cascade, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_Tile", (PyCFunction) _wrap_AuiMDIParentFrame_Tile, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"AuiMDIParentFrame_ArrangeIcons", (PyCFunction)_wrap_AuiMDIParentFrame_ArrangeIcons, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_ActivateNext", (PyCFunction)_wrap_AuiMDIParentFrame_ActivateNext, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_ActivatePrevious", (PyCFunction)_wrap_AuiMDIParentFrame_ActivatePrevious, METH_O, NULL},
+	 { (char *)"AuiMDIParentFrame_GetNotebook", (PyCFunction)_wrap_AuiMDIParentFrame_GetNotebook, METH_O, NULL},
+	 { (char *)"AuiMDIParentFrame_GetActiveChild", (PyCFunction)_wrap_AuiMDIParentFrame_GetActiveChild, METH_O, NULL},
+	 { (char *)"AuiMDIParentFrame_GetClientWindow", (PyCFunction)_wrap_AuiMDIParentFrame_GetClientWindow, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_swigregister", AuiMDIParentFrame_swigregister, METH_VARARGS, NULL},
 	 { (char *)"AuiMDIParentFrame_swiginit", AuiMDIParentFrame_swiginit, METH_VARARGS, NULL},
 	 { (char *)"new_PreAuiMDIChildFrame", (PyCFunction)_wrap_new_PreAuiMDIChildFrame, METH_NOARGS, NULL},
@@ -18589,8 +18718,14 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"AuiMDIClientWindow_SetSelection", (PyCFunction) _wrap_AuiMDIClientWindow_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"AuiMDIClientWindow_swigregister", AuiMDIClientWindow_swigregister, METH_VARARGS, NULL},
 	 { (char *)"AuiMDIClientWindow_swiginit", AuiMDIClientWindow_swiginit, METH_VARARGS, NULL},
+	 { (char *)"new_PyAuiDockArt", (PyCFunction)_wrap_new_PyAuiDockArt, METH_NOARGS, NULL},
+	 { (char *)"PyAuiDockArt__setCallbackInfo", (PyCFunction) _wrap_PyAuiDockArt__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"PyAuiDockArt_swigregister", PyAuiDockArt_swigregister, METH_VARARGS, NULL},
+	 { (char *)"PyAuiDockArt_swiginit", PyAuiDockArt_swiginit, METH_VARARGS, NULL},
+	 { (char *)"new_PyAuiTabArt", (PyCFunction)_wrap_new_PyAuiTabArt, METH_NOARGS, NULL},
+	 { (char *)"PyAuiTabArt__setCallbackInfo", (PyCFunction) _wrap_PyAuiTabArt__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"PyAuiTabArt_swigregister", PyAuiTabArt_swigregister, METH_VARARGS, NULL},
+	 { (char *)"PyAuiTabArt_swiginit", PyAuiTabArt_swiginit, METH_VARARGS, NULL},
 	 { NULL, NULL, 0, NULL }
 };
 
diff --git a/wxPython/src/gtk/grid.py b/wxPython/src/gtk/grid.py
index 4c0838bf04..2c4c942c79 100644
--- a/wxPython/src/gtk/grid.py
+++ b/wxPython/src/gtk/grid.py
@@ -1137,7 +1137,7 @@ class GridCellCoords(object):
     def __str__(self):                   return str(self.Get())
     def __repr__(self):                  return 'wxGridCellCoords'+str(self.Get())
     def __len__(self):                   return len(self.Get())
-    def __getitem__(self, index):        return self.asTuple()[index]
+    def __getitem__(self, index):        return self.Get()[index]
     def __setitem__(self, index, val):
         if index == 0: self.SetRow(val)
         elif index == 1: self.SetCol(val)
diff --git a/wxPython/src/gtk/grid_wrap.cpp b/wxPython/src/gtk/grid_wrap.cpp
index ff699cb5ce..474fc5f701 100644
--- a/wxPython/src/gtk/grid_wrap.cpp
+++ b/wxPython/src/gtk/grid_wrap.cpp
@@ -3445,7 +3445,7 @@ public:
     void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
         bool found;
         wxPyBlock_t blocked = wxPyBeginBlockThreads();
-        if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)"))) {
+        if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground"))) {
             PyObject* ao = wxPyMake_wxGridCellAttr(attr,false);
             PyObject* ro = wxPyConstructObject((void*)&rectCell, wxT("wxRect"), 0);
 
diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py
index 898eb10064..dfeb35ba6b 100644
--- a/wxPython/src/mac/_controls.py
+++ b/wxPython/src/mac/_controls.py
@@ -579,7 +579,7 @@ class ComboBox(_core.Control,_core.ItemContainer):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
-        __init__(Window parent, int id, String value=EmptyString,
+        __init__(Window parent, int id=-1, String value=EmptyString,
             Point pos=DefaultPosition, Size size=DefaultSize,
             List choices=EmptyList, long style=0, Validator validator=DefaultValidator,
             String name=ComboBoxNameStr) -> ComboBox
@@ -591,7 +591,7 @@ class ComboBox(_core.Control,_core.ItemContainer):
 
     def Create(*args, **kwargs):
         """
-        Create(Window parent, int id, String value=EmptyString,
+        Create(Window parent, int id=-1, String value=EmptyString,
             Point pos=DefaultPosition, Size size=DefaultSize,
             List choices=EmptyList, long style=0, Validator validator=DefaultValidator,
             String name=ChoiceNameStr) -> bool
@@ -3966,6 +3966,14 @@ class ToolBar(ToolBarBase):
         """
         return _controls_.ToolBar_Create(*args, **kwargs)
 
+    def SetToolNormalBitmap(*args, **kwargs):
+        """SetToolNormalBitmap(self, int id, Bitmap bitmap)"""
+        return _controls_.ToolBar_SetToolNormalBitmap(*args, **kwargs)
+
+    def SetToolDisabledBitmap(*args, **kwargs):
+        """SetToolDisabledBitmap(self, int id, Bitmap bitmap)"""
+        return _controls_.ToolBar_SetToolDisabledBitmap(*args, **kwargs)
+
     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
diff --git a/wxPython/src/mac/_controls_wrap.cpp b/wxPython/src/mac/_controls_wrap.cpp
index 556a522a73..88edf2fae3 100644
--- a/wxPython/src/mac/_controls_wrap.cpp
+++ b/wxPython/src/mac/_controls_wrap.cpp
@@ -25981,6 +25981,106 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_ToolBar_SetToolNormalBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxToolBar *arg1 = (wxToolBar *) 0 ;
+  int arg2 ;
+  wxBitmap *arg3 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "id",(char *) "bitmap", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBar_SetToolNormalBitmap",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxToolBar, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ToolBar_SetToolNormalBitmap" "', expected argument " "1"" of type '" "wxToolBar *""'"); 
+  }
+  arg1 = reinterpret_cast< wxToolBar * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ToolBar_SetToolNormalBitmap" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxBitmap,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ToolBar_SetToolNormalBitmap" "', expected argument " "3"" of type '" "wxBitmap const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ToolBar_SetToolNormalBitmap" "', expected argument " "3"" of type '" "wxBitmap const &""'"); 
+  }
+  arg3 = reinterpret_cast< wxBitmap * >(argp3);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetToolNormalBitmap(arg2,(wxBitmap const &)*arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ToolBar_SetToolDisabledBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxToolBar *arg1 = (wxToolBar *) 0 ;
+  int arg2 ;
+  wxBitmap *arg3 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "id",(char *) "bitmap", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBar_SetToolDisabledBitmap",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxToolBar, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ToolBar_SetToolDisabledBitmap" "', expected argument " "1"" of type '" "wxToolBar *""'"); 
+  }
+  arg1 = reinterpret_cast< wxToolBar * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ToolBar_SetToolDisabledBitmap" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxBitmap,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ToolBar_SetToolDisabledBitmap" "', expected argument " "3"" of type '" "wxBitmap const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ToolBar_SetToolDisabledBitmap" "', expected argument " "3"" of type '" "wxBitmap const &""'"); 
+  }
+  arg3 = reinterpret_cast< wxBitmap * >(argp3);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetToolDisabledBitmap(arg2,(wxBitmap const &)*arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_ToolBar_GetClassDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ;
@@ -47346,6 +47446,8 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"new_ToolBar", (PyCFunction) _wrap_new_ToolBar, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"new_PreToolBar", (PyCFunction)_wrap_new_PreToolBar, METH_NOARGS, NULL},
 	 { (char *)"ToolBar_Create", (PyCFunction) _wrap_ToolBar_Create, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"ToolBar_SetToolNormalBitmap", (PyCFunction) _wrap_ToolBar_SetToolNormalBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"ToolBar_SetToolDisabledBitmap", (PyCFunction) _wrap_ToolBar_SetToolDisabledBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"ToolBar_GetClassDefaultAttributes", (PyCFunction) _wrap_ToolBar_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"ToolBar_swigregister", ToolBar_swigregister, METH_VARARGS, NULL},
 	 { (char *)"ToolBar_swiginit", ToolBar_swiginit, METH_VARARGS, NULL},
diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py
index bcdab6ff04..eb1a2be528 100644
--- a/wxPython/src/mac/_core.py
+++ b/wxPython/src/mac/_core.py
@@ -4580,7 +4580,7 @@ class ScrollEvent(CommandEvent):
     """
     A scroll event holds information about events sent from stand-alone
     scrollbars and sliders. Note that scrolled windows do not send
-    instnaces of this event class, but send the `wx.ScrollWinEvent`
+    instances of this event class, but send the `wx.ScrollWinEvent`
     instead.
     """
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -8113,9 +8113,21 @@ class VisualAttributes(object):
         _core_.VisualAttributes_swiginit(self,_core_.new_VisualAttributes(*args, **kwargs))
     __swig_destroy__ = _core_.delete_VisualAttributes
     __del__ = lambda self : None;
-    font = property(_core_.VisualAttributes_font_get, _core_.VisualAttributes_font_set)
-    colFg = property(_core_.VisualAttributes_colFg_get, _core_.VisualAttributes_colFg_set)
-    colBg = property(_core_.VisualAttributes_colBg_get, _core_.VisualAttributes_colBg_set)
+    def _get_font(*args, **kwargs):
+        """_get_font(self) -> Font"""
+        return _core_.VisualAttributes__get_font(*args, **kwargs)
+
+    def _get_colFg(*args, **kwargs):
+        """_get_colFg(self) -> Colour"""
+        return _core_.VisualAttributes__get_colFg(*args, **kwargs)
+
+    def _get_colBg(*args, **kwargs):
+        """_get_colBg(self) -> Colour"""
+        return _core_.VisualAttributes__get_colBg(*args, **kwargs)
+
+    font = property(_get_font) 
+    colFg = property(_get_colFg) 
+    colBg = property(_get_colBg) 
 _core_.VisualAttributes_swigregister(VisualAttributes)
 NullAcceleratorTable = cvar.NullAcceleratorTable
 PanelNameStr = cvar.PanelNameStr
@@ -9097,6 +9109,14 @@ class Window(EvtHandler):
         """
         return _core_.Window_GetGrandParent(*args, **kwargs)
 
+    def GetTopLevelParent(*args, **kwargs):
+        """
+        GetTopLevelParent(self) -> Window
+
+        Returns the first frame or dialog in this window's parental hierarchy.
+        """
+        return _core_.Window_GetTopLevelParent(*args, **kwargs)
+
     def IsTopLevel(*args, **kwargs):
         """
         IsTopLevel(self) -> bool
@@ -10355,9 +10375,15 @@ class Window(EvtHandler):
         self.thisown = pre.thisown
         pre.thisown = 0
         if hasattr(self, '_setOORInfo'):
-            self._setOORInfo(self)
+            try:
+                self._setOORInfo(self)
+            except TypeError:
+                pass
         if hasattr(self, '_setCallbackInfo'):
-            self._setCallbackInfo(self, pre.__class__)
+            try:
+                self._setCallbackInfo(self, pre.__class__)
+            except TypeError:
+                pass
 
     def SendSizeEvent(self):
         self.GetEventHandler().ProcessEvent(wx.SizeEvent((-1,-1)))
@@ -10387,6 +10413,7 @@ class Window(EvtHandler):
     Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") 
     ForegroundColour = property(GetForegroundColour,SetForegroundColour,doc="See `GetForegroundColour` and `SetForegroundColour`") 
     GrandParent = property(GetGrandParent,doc="See `GetGrandParent`") 
+    TopLevelParent = property(GetTopLevelParent,doc="See `GetTopLevelParent`") 
     Handle = property(GetHandle,doc="See `GetHandle`") 
     HelpText = property(GetHelpText,SetHelpText,doc="See `GetHelpText` and `SetHelpText`") 
     Id = property(GetId,SetId,doc="See `GetId` and `SetId`") 
@@ -11030,7 +11057,6 @@ class MenuBar(Window):
             self.Append(m, l)
 
     Frame = property(GetFrame,doc="See `GetFrame`") 
-    Menu = property(GetMenu,doc="See `GetMenu`") 
     MenuCount = property(GetMenuCount,doc="See `GetMenuCount`") 
     Menus = property(GetMenus,SetMenus,doc="See `GetMenus` and `SetMenus`") 
 _core_.MenuBar_swigregister(MenuBar)
@@ -11565,6 +11591,222 @@ _core_.ControlWithItems_swigregister(ControlWithItems)
 
 #---------------------------------------------------------------------------
 
+class SizerFlags(object):
+    """
+    Normally, when you add an item to a sizer via `wx.Sizer.Add`, you have
+    to specify a lot of flags and parameters which can be unwieldy. This
+    is where wx.SizerFlags comes in: it allows you to specify all
+    parameters using the named methods instead. For example, instead of::
+
+        sizer.Add(ctrl, 0, wx.EXPAND | wx.ALL, 10)
+
+    you can now write::
+
+        sizer.AddF(ctrl, wx.SizerFlags().Expand().Border(wx.ALL, 10))
+
+    This is more readable and also allows you to create wx.SizerFlags
+    objects which can be reused for several sizer items.::
+
+        flagsExpand = wx.SizerFlags(1)
+        flagsExpand.Expand().Border(wx.ALL, 10)
+        sizer.AddF(ctrl1, flagsExpand)
+        sizer.AddF(ctrl2, flagsExpand)
+
+    Note that by specification, all methods of wx.SizerFlags return the
+    wx.SizerFlags object itself allowing chaining multiple method calls
+    like in the examples above.
+    """
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """
+        __init__(self, int proportion=0) -> SizerFlags
+
+        Constructs the flags object with the specified proportion.
+        """
+        _core_.SizerFlags_swiginit(self,_core_.new_SizerFlags(*args, **kwargs))
+    __swig_destroy__ = _core_.delete_SizerFlags
+    __del__ = lambda self : None;
+    def Proportion(*args, **kwargs):
+        """
+        Proportion(self, int proportion) -> SizerFlags
+
+        Sets the item's proportion value.
+        """
+        return _core_.SizerFlags_Proportion(*args, **kwargs)
+
+    def Align(*args, **kwargs):
+        """
+        Align(self, int alignment) -> SizerFlags
+
+        Sets the item's alignment
+        """
+        return _core_.SizerFlags_Align(*args, **kwargs)
+
+    def Expand(*args, **kwargs):
+        """
+        Expand(self) -> SizerFlags
+
+        Sets the wx.EXPAND flag, which will cause the item to be expanded to
+        fill as much space as it is given by the sizer.
+        """
+        return _core_.SizerFlags_Expand(*args, **kwargs)
+
+    def Centre(*args, **kwargs):
+        """
+        Centre(self) -> SizerFlags
+
+        Same as `Center` for those with an alternate dialect of English.
+        """
+        return _core_.SizerFlags_Centre(*args, **kwargs)
+
+    def Center(*args, **kwargs):
+        """
+        Center(self) -> SizerFlags
+
+        Sets the centering alignment flags.
+        """
+        return _core_.SizerFlags_Center(*args, **kwargs)
+
+    def Left(*args, **kwargs):
+        """
+        Left(self) -> SizerFlags
+
+        Aligns the object to the left, a shortcut for calling
+        Align(wx.ALIGN_LEFT)
+        """
+        return _core_.SizerFlags_Left(*args, **kwargs)
+
+    def Right(*args, **kwargs):
+        """
+        Right(self) -> SizerFlags
+
+        Aligns the object to the right, a shortcut for calling
+        Align(wx.ALIGN_RIGHT)
+        """
+        return _core_.SizerFlags_Right(*args, **kwargs)
+
+    def Top(*args, **kwargs):
+        """
+        Top(self) -> SizerFlags
+
+        Aligns the object to the top of the available space, a shortcut for
+        calling Align(wx.ALIGN_TOP)
+        """
+        return _core_.SizerFlags_Top(*args, **kwargs)
+
+    def Bottom(*args, **kwargs):
+        """
+        Bottom(self) -> SizerFlags
+
+        Aligns the object to the bottom of the available space, a shortcut for
+        calling Align(wx.ALIGN_BOTTOM)
+        """
+        return _core_.SizerFlags_Bottom(*args, **kwargs)
+
+    def Shaped(*args, **kwargs):
+        """
+        Shaped(self) -> SizerFlags
+
+        Sets the wx.SHAPED flag.
+        """
+        return _core_.SizerFlags_Shaped(*args, **kwargs)
+
+    def FixedMinSize(*args, **kwargs):
+        """
+        FixedMinSize(self) -> SizerFlags
+
+        Sets the wx.FIXED_MINSIZE flag.
+        """
+        return _core_.SizerFlags_FixedMinSize(*args, **kwargs)
+
+    def Border(*args, **kwargs):
+        """
+        Border(self, int direction=ALL, int borderInPixels=-1) -> SizerFlags
+
+        Sets the border of the item in the direction(s) or sides given by the
+        direction parameter.  If the borderInPixels value is not given then
+        the default border size (see `GetDefaultBorder`) will be used.
+        """
+        return _core_.SizerFlags_Border(*args, **kwargs)
+
+    def DoubleBorder(*args, **kwargs):
+        """
+        DoubleBorder(self, int direction=ALL) -> SizerFlags
+
+        Sets the border in the given direction to twice the default border
+        size.
+        """
+        return _core_.SizerFlags_DoubleBorder(*args, **kwargs)
+
+    def TripleBorder(*args, **kwargs):
+        """
+        TripleBorder(self, int direction=ALL) -> SizerFlags
+
+        Sets the border in the given direction to three times the default
+        border size.
+        """
+        return _core_.SizerFlags_TripleBorder(*args, **kwargs)
+
+    def HorzBorder(*args, **kwargs):
+        """
+        HorzBorder(self) -> SizerFlags
+
+        Sets the left and right borders to the default border size.
+        """
+        return _core_.SizerFlags_HorzBorder(*args, **kwargs)
+
+    def DoubleHorzBorder(*args, **kwargs):
+        """
+        DoubleHorzBorder(self) -> SizerFlags
+
+        Sets the left and right borders to twice the default border size.
+        """
+        return _core_.SizerFlags_DoubleHorzBorder(*args, **kwargs)
+
+    def GetDefaultBorder(*args, **kwargs):
+        """
+        GetDefaultBorder() -> int
+
+        Returns the default border size used by the other border methods
+        """
+        return _core_.SizerFlags_GetDefaultBorder(*args, **kwargs)
+
+    GetDefaultBorder = staticmethod(GetDefaultBorder)
+    def GetProportion(*args, **kwargs):
+        """
+        GetProportion(self) -> int
+
+        Returns the proportion value to be used in the sizer item.
+        """
+        return _core_.SizerFlags_GetProportion(*args, **kwargs)
+
+    def GetFlags(*args, **kwargs):
+        """
+        GetFlags(self) -> int
+
+        Returns the flags value to be used in the sizer item.
+        """
+        return _core_.SizerFlags_GetFlags(*args, **kwargs)
+
+    def GetBorderInPixels(*args, **kwargs):
+        """
+        GetBorderInPixels(self) -> int
+
+        Returns the border value in pixels to be used in the sizer item.
+        """
+        return _core_.SizerFlags_GetBorderInPixels(*args, **kwargs)
+
+_core_.SizerFlags_swigregister(SizerFlags)
+
+def SizerFlags_GetDefaultBorder(*args):
+  """
+    SizerFlags_GetDefaultBorder() -> int
+
+    Returns the default border size used by the other border methods
+    """
+  return _core_.SizerFlags_GetDefaultBorder(*args)
+
 class SizerItem(Object):
     """
     The wx.SizerItem class is used to track the position, size and other
@@ -11960,6 +12202,15 @@ class Sizer(Object):
         """
         return _core_.Sizer_Add(*args, **kwargs)
 
+    def AddF(*args, **kwargs):
+        """
+        AddF(self, item, wx.SizerFlags flags) -> wx.SizerItem
+
+        Similar to `Add` but uses the `wx.SizerFlags` convenience class for
+        setting the various flags, options and borders.
+        """
+        return _core_.Sizer_AddF(*args, **kwargs)
+
     def Insert(*args, **kwargs):
         """
         Insert(self, int before, item, int proportion=0, int flag=0, int border=0,
@@ -11970,6 +12221,15 @@ class Sizer(Object):
         """
         return _core_.Sizer_Insert(*args, **kwargs)
 
+    def InsertF(*args, **kwargs):
+        """
+        InsertF(self, int before, item, wx.SizerFlags flags) -> wx.SizerItem
+
+        Similar to `Insert`, but uses the `wx.SizerFlags` convenience class
+        for setting the various flags, options and borders.
+        """
+        return _core_.Sizer_InsertF(*args, **kwargs)
+
     def Prepend(*args, **kwargs):
         """
         Prepend(self, item, int proportion=0, int flag=0, int border=0,
@@ -11980,6 +12240,15 @@ class Sizer(Object):
         """
         return _core_.Sizer_Prepend(*args, **kwargs)
 
+    def PrependF(*args, **kwargs):
+        """
+        PrependF(self, item, wx.SizerFlags flags) -> wx.SizerItem
+
+        Similar to `Prepend` but uses the `wx.SizerFlags` convenience class
+        for setting the various flags, options and borders.
+        """
+        return _core_.Sizer_PrependF(*args, **kwargs)
+
     def Remove(*args, **kwargs):
         """
         Remove(self, item) -> bool
@@ -12007,7 +12276,7 @@ class Sizer(Object):
 
     def GetItem(*args, **kwargs):
         """
-        GetItem(self, item) -> wx.SizerItem
+        GetItem(self, item, recursive=False) -> wx.SizerItem
 
         Returns the `wx.SizerItem` which holds the *item* given.  The *item*
         parameter can be either a window, a sizer, or the zero-based index of
@@ -12047,9 +12316,9 @@ class Sizer(Object):
         """
         if isinstance(olditem, wx.Window):
             return self._ReplaceWin(olditem, item, recursive)
-        elif isinstnace(olditem, wx.Sizer):
+        elif isinstance(olditem, wx.Sizer):
             return self._ReplaceSizer(olditem, item, recursive)
-        elif isinstnace(olditem, int):
+        elif isinstance(olditem, int):
             return self._ReplaceItem(olditem, item)
         else:
             raise TypeError("Expected Window, Sizer, or integer for first parameter.")
diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp
index 85e3e613af..9dc34b6ede 100644
--- a/wxPython/src/mac/_core_wrap.cpp
+++ b/wxPython/src/mac/_core_wrap.cpp
@@ -2582,24 +2582,25 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_wxSize swig_types[116]
 #define SWIGTYPE_p_wxSizeEvent swig_types[117]
 #define SWIGTYPE_p_wxSizer swig_types[118]
-#define SWIGTYPE_p_wxSizerItem swig_types[119]
-#define SWIGTYPE_p_wxStaticBox swig_types[120]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[121]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[122]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[123]
-#define SWIGTYPE_p_wxTGAHandler swig_types[124]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[125]
-#define SWIGTYPE_p_wxToolTip swig_types[126]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[127]
-#define SWIGTYPE_p_wxValidator swig_types[128]
-#define SWIGTYPE_p_wxVisualAttributes swig_types[129]
-#define SWIGTYPE_p_wxWindow swig_types[130]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[131]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[132]
-#define SWIGTYPE_p_wxXPMHandler swig_types[133]
-#define SWIGTYPE_p_wxZipFSHandler swig_types[134]
-static swig_type_info *swig_types[136];
-static swig_module_info swig_module = {swig_types, 135, 0, 0, 0, 0};
+#define SWIGTYPE_p_wxSizerFlags swig_types[119]
+#define SWIGTYPE_p_wxSizerItem swig_types[120]
+#define SWIGTYPE_p_wxStaticBox swig_types[121]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[122]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[123]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[124]
+#define SWIGTYPE_p_wxTGAHandler swig_types[125]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[126]
+#define SWIGTYPE_p_wxToolTip swig_types[127]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[128]
+#define SWIGTYPE_p_wxValidator swig_types[129]
+#define SWIGTYPE_p_wxVisualAttributes swig_types[130]
+#define SWIGTYPE_p_wxWindow swig_types[131]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[132]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[133]
+#define SWIGTYPE_p_wxXPMHandler swig_types[134]
+#define SWIGTYPE_p_wxZipFSHandler swig_types[135]
+static swig_type_info *swig_types[137];
+static swig_module_info swig_module = {swig_types, 136, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -3880,10 +3881,16 @@ public:
  static const wxString wxPyPanelNameStr(wxPanelNameStr); 
 SWIGINTERN wxVisualAttributes *new_wxVisualAttributes(){ return new wxVisualAttributes; }
 SWIGINTERN void delete_wxVisualAttributes(wxVisualAttributes *self){ delete self; }
+SWIGINTERN wxFont wxVisualAttributes__get_font(wxVisualAttributes *self){ return self->font; }
+SWIGINTERN wxColour wxVisualAttributes__get_colFg(wxVisualAttributes *self){ return self->colFg; }
+SWIGINTERN wxColour wxVisualAttributes__get_colBg(wxVisualAttributes *self){ return self->colBg; }
 SWIGINTERN PyObject *wxWindow_GetChildren(wxWindow *self){
             wxWindowList& list = self->GetChildren();
             return wxPy_ConvertList(&list);
         }
+SWIGINTERN wxWindow *wxWindow_GetTopLevelParent(wxWindow *self){
+            return wxGetTopLevelParent(self);
+        }
 SWIGINTERN void wxWindow_SetDoubleBuffered(wxWindow *self,bool on){}
 SWIGINTERN bool wxWindow_RegisterHotKey(wxWindow *self,int hotkeyId,int modifiers,int keycode){
         #if wxUSE_HOTKEY
@@ -4020,6 +4027,12 @@ SWIGINTERN void wxItemContainer_SetClientData(wxItemContainer *self,int n,PyObje
         }
 
 
+SWIGINTERN wxSizerFlags &wxSizerFlags_Border(wxSizerFlags *self,int direction=wxALL,int borderInPixels=-1){
+            if (borderInPixels == -1)
+                return self->Border(direction);
+            else
+                return self->Border(direction, borderInPixels);
+        }
 SWIGINTERN wxSizerItem *new_wxSizerItem(wxWindow *window,int proportion,int flag,int border,PyObject *userData=NULL){
             wxPyUserData* data = NULL;
             if ( userData ) {
@@ -4163,6 +4176,27 @@ SWIGINTERN wxSizerItem *wxSizer_Add(wxSizer *self,PyObject *item,int proportion=
             else
                 return NULL;
         }
+SWIGINTERN wxSizerItem *wxSizer_AddF(wxSizer *self,PyObject *item,wxSizerFlags &flags){
+            
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
+            if ( info.sizer )
+                PyObject_SetAttrString(item,"thisown",Py_False);
+            wxPyEndBlockThreads(blocked);
+
+            // Now call the real Add method if a valid item type was found
+            if ( info.window )
+                return self->Add(info.window, flags);
+            else if ( info.sizer )
+                return self->Add(info.sizer, flags);
+            else if (info.gotSize)
+                return self->Add(info.size.GetWidth(), info.size.GetHeight(),
+                                 flags.GetProportion(),
+                                 flags.GetFlags(),
+                                 flags.GetBorderInPixels());
+            else
+                return NULL;
+        }
 SWIGINTERN wxSizerItem *wxSizer_Insert(wxSizer *self,int before,PyObject *item,int proportion=0,int flag=0,int border=0,PyObject *userData=NULL){
 
             wxPyUserData* data = NULL;
@@ -4185,6 +4219,27 @@ SWIGINTERN wxSizerItem *wxSizer_Insert(wxSizer *self,int before,PyObject *item,i
             else
                 return NULL;
         }
+SWIGINTERN wxSizerItem *wxSizer_InsertF(wxSizer *self,int before,PyObject *item,wxSizerFlags &flags){
+
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
+            if ( info.sizer )
+                PyObject_SetAttrString(item,"thisown",Py_False);
+            wxPyEndBlockThreads(blocked);
+
+            // Now call the real Insert method if a valid item type was found
+            if ( info.window )
+                return self->Insert(before, info.window, flags);
+            else if ( info.sizer )
+                return self->Insert(before, info.sizer, flags);
+            else if (info.gotSize)
+                return self->Insert(before, info.size.GetWidth(), info.size.GetHeight(),
+                                    flags.GetProportion(),
+                                    flags.GetFlags(),
+                                    flags.GetBorderInPixels());
+            else
+                return NULL;
+        }
 SWIGINTERN wxSizerItem *wxSizer_Prepend(wxSizer *self,PyObject *item,int proportion=0,int flag=0,int border=0,PyObject *userData=NULL){
 
             wxPyUserData* data = NULL;
@@ -4207,6 +4262,27 @@ SWIGINTERN wxSizerItem *wxSizer_Prepend(wxSizer *self,PyObject *item,int proport
             else
                 return NULL;
         }
+SWIGINTERN wxSizerItem *wxSizer_PrependF(wxSizer *self,PyObject *item,wxSizerFlags &flags){
+            
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
+            if ( info.sizer )
+                PyObject_SetAttrString(item,"thisown",Py_False);
+            wxPyEndBlockThreads(blocked);
+
+            // Now call the real Add method if a valid item type was found
+            if ( info.window )
+                return self->Prepend(info.window, flags);
+            else if ( info.sizer )
+                return self->Prepend(info.sizer, flags);
+            else if (info.gotSize)
+                return self->Prepend(info.size.GetWidth(), info.size.GetHeight(),
+                                     flags.GetProportion(),
+                                     flags.GetFlags(),
+                                     flags.GetBorderInPixels());
+            else
+                return NULL;
+        }
 SWIGINTERN bool wxSizer_Remove(wxSizer *self,PyObject *item){
             wxPyBlock_t blocked = wxPyBeginBlockThreads();
             wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
@@ -4233,14 +4309,14 @@ SWIGINTERN bool wxSizer_Detach(wxSizer *self,PyObject *item){
             else
                 return false;
         }
-SWIGINTERN wxSizerItem *wxSizer_GetItem(wxSizer *self,PyObject *item){
+SWIGINTERN wxSizerItem *wxSizer_GetItem(wxSizer *self,PyObject *item,bool recursive=false){
             wxPyBlock_t blocked = wxPyBeginBlockThreads();
             wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
             wxPyEndBlockThreads(blocked);
             if ( info.window )
-                return self->GetItem(info.window);
+                return self->GetItem(info.window, recursive);
             else if ( info.sizer )
-                return self->GetItem(info.sizer);
+                return self->GetItem(info.sizer, recursive);
             else if ( info.gotPos )
                 return self->GetItem(info.pos);
             else
@@ -7273,7 +7349,7 @@ SWIGINTERN PyObject *_wrap_Rect_Inflate(PyObject *SWIGUNUSEDPARM(self), PyObject
   wxRect *arg1 = (wxRect *) 0 ;
   int arg2 ;
   int arg3 ;
-  wxRect *result = 0 ;
+  wxRect result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -7304,13 +7380,10 @@ SWIGINTERN PyObject *_wrap_Rect_Inflate(PyObject *SWIGUNUSEDPARM(self), PyObject
   } 
   arg3 = static_cast< int >(val3);
   {
-    {
-      wxRect &_result_ref = (arg1)->Inflate(arg2,arg3);
-      result = (wxRect *) &_result_ref;
-    }
+    result = (arg1)->Inflate(arg2,arg3);
     if (PyErr_Occurred()) SWIG_fail;
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxRect, 0 |  0 );
+  resultobj = SWIG_NewPointerObj((new wxRect(static_cast< const wxRect& >(result))), SWIGTYPE_p_wxRect, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -32512,40 +32585,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_VisualAttributes_font_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_VisualAttributes__get_font(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-  wxFont *arg2 = (wxFont *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject *swig_obj[2] ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"VisualAttributes_font_set",2,2,swig_obj)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_font_set" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
-  }
-  arg1 = reinterpret_cast< wxVisualAttributes * >(argp1);
-  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxFont, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VisualAttributes_font_set" "', expected argument " "2"" of type '" "wxFont *""'"); 
-  }
-  arg2 = reinterpret_cast< wxFont * >(argp2);
-  if (arg1) (arg1)->font = *arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_VisualAttributes_font_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-  wxFont *result = 0 ;
+  wxFont result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
@@ -32554,51 +32597,26 @@ SWIGINTERN PyObject *_wrap_VisualAttributes_font_get(PyObject *SWIGUNUSEDPARM(se
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_font_get" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes__get_font" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
   }
   arg1 = reinterpret_cast< wxVisualAttributes * >(argp1);
-  result = (wxFont *)& ((arg1)->font);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, 0 |  0 );
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = wxVisualAttributes__get_font(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxFont(static_cast< const wxFont& >(result))), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_VisualAttributes_colFg_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_VisualAttributes__get_colFg(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-  wxColour *arg2 = (wxColour *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject *swig_obj[2] ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"VisualAttributes_colFg_set",2,2,swig_obj)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colFg_set" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
-  }
-  arg1 = reinterpret_cast< wxVisualAttributes * >(argp1);
-  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxColour, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VisualAttributes_colFg_set" "', expected argument " "2"" of type '" "wxColour *""'"); 
-  }
-  arg2 = reinterpret_cast< wxColour * >(argp2);
-  if (arg1) (arg1)->colFg = *arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_VisualAttributes_colFg_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-  wxColour *result = 0 ;
+  wxColour result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
@@ -32607,51 +32625,26 @@ SWIGINTERN PyObject *_wrap_VisualAttributes_colFg_get(PyObject *SWIGUNUSEDPARM(s
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colFg_get" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes__get_colFg" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
   }
   arg1 = reinterpret_cast< wxVisualAttributes * >(argp1);
-  result = (wxColour *)& ((arg1)->colFg);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 |  0 );
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = wxVisualAttributes__get_colFg(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_VisualAttributes_colBg_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_VisualAttributes__get_colBg(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-  wxColour *arg2 = (wxColour *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject *swig_obj[2] ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"VisualAttributes_colBg_set",2,2,swig_obj)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colBg_set" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
-  }
-  arg1 = reinterpret_cast< wxVisualAttributes * >(argp1);
-  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxColour, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VisualAttributes_colBg_set" "', expected argument " "2"" of type '" "wxColour *""'"); 
-  }
-  arg2 = reinterpret_cast< wxColour * >(argp2);
-  if (arg1) (arg1)->colBg = *arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_VisualAttributes_colBg_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-  wxColour *result = 0 ;
+  wxColour result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
@@ -32660,11 +32653,16 @@ SWIGINTERN PyObject *_wrap_VisualAttributes_colBg_get(PyObject *SWIGUNUSEDPARM(s
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colBg_get" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes__get_colBg" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
   }
   arg1 = reinterpret_cast< wxVisualAttributes * >(argp1);
-  result = (wxColour *)& ((arg1)->colBg);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 |  0 );
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = wxVisualAttributes__get_colBg(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -36400,6 +36398,36 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_Window_GetTopLevelParent(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxWindow *arg1 = (wxWindow *) 0 ;
+  wxWindow *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_GetTopLevelParent" "', expected argument " "1"" of type '" "wxWindow *""'"); 
+  }
+  arg1 = reinterpret_cast< wxWindow * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxWindow *)wxWindow_GetTopLevelParent(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_Window_IsTopLevel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;
@@ -48393,6 +48421,779 @@ SWIGINTERN PyObject *ControlWithItems_swigregister(PyObject *SWIGUNUSEDPARM(self
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *_wrap_new_SizerFlags(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  int arg1 = (int) 0 ;
+  wxSizerFlags *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "proportion", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_SizerFlags",kwnames,&obj0)) SWIG_fail;
+  if (obj0) {
+    ecode1 = SWIG_AsVal_int(obj0, &val1);
+    if (!SWIG_IsOK(ecode1)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SizerFlags" "', expected argument " "1"" of type '" "int""'");
+    } 
+    arg1 = static_cast< int >(val1);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxSizerFlags *)new wxSizerFlags(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerFlags, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_SizerFlags(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SizerFlags" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    delete arg1;
+    
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Proportion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int arg2 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "proportion", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerFlags_Proportion",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Proportion" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_Proportion" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Proportion(arg2);
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = obj0; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Align(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int arg2 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "alignment", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerFlags_Align",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Align" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_Align" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Align(arg2);
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = obj0; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Expand(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Expand" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Expand();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Centre(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Centre" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Centre();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Center(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Center" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Center();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Left(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Left" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Left();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Right(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Right" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Right();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Top(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Top" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Top();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Bottom(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Bottom" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Bottom();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Shaped(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Shaped" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Shaped();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_FixedMinSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_FixedMinSize" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->FixedMinSize();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Border(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int arg2 = (int) wxALL ;
+  int arg3 = (int) -1 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "direction",(char *) "borderInPixels", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:SizerFlags_Border",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Border" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  if (obj1) {
+    ecode2 = SWIG_AsVal_int(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_Border" "', expected argument " "2"" of type '" "int""'");
+    } 
+    arg2 = static_cast< int >(val2);
+  }
+  if (obj2) {
+    ecode3 = SWIG_AsVal_int(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SizerFlags_Border" "', expected argument " "3"" of type '" "int""'");
+    } 
+    arg3 = static_cast< int >(val3);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = wxSizerFlags_Border(arg1,arg2,arg3);
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = obj0; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_DoubleBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int arg2 = (int) wxALL ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "direction", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:SizerFlags_DoubleBorder",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_DoubleBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  if (obj1) {
+    ecode2 = SWIG_AsVal_int(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_DoubleBorder" "', expected argument " "2"" of type '" "int""'");
+    } 
+    arg2 = static_cast< int >(val2);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->DoubleBorder(arg2);
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = obj0; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_TripleBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int arg2 = (int) wxALL ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "direction", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:SizerFlags_TripleBorder",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_TripleBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  if (obj1) {
+    ecode2 = SWIG_AsVal_int(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_TripleBorder" "', expected argument " "2"" of type '" "int""'");
+    } 
+    arg2 = static_cast< int >(val2);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->TripleBorder(arg2);
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = obj0; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_HorzBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_HorzBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->HorzBorder();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_DoubleHorzBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_DoubleHorzBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->DoubleHorzBorder();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_GetDefaultBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int result;
+  
+  if (!SWIG_Python_UnpackTuple(args,"SizerFlags_GetDefaultBorder",0,0,0)) SWIG_fail;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)wxSizerFlags::GetDefaultBorder();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_GetProportion(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_GetProportion" "', expected argument " "1"" of type '" "wxSizerFlags const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxSizerFlags const *)arg1)->GetProportion();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_GetFlags(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_GetFlags" "', expected argument " "1"" of type '" "wxSizerFlags const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxSizerFlags const *)arg1)->GetFlags();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_GetBorderInPixels(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_GetBorderInPixels" "', expected argument " "1"" of type '" "wxSizerFlags const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxSizerFlags const *)arg1)->GetBorderInPixels();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *SizerFlags_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxSizerFlags, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *SizerFlags_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_SizerItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxSizerItem *result = 0 ;
@@ -49849,6 +50650,51 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_Sizer_AddF(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizer *arg1 = (wxSizer *) 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;
+  wxSizerFlags *arg3 = 0 ;
+  wxSizerItem *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "item",(char *) "flags", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Sizer_AddF",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_AddF" "', expected argument " "1"" of type '" "wxSizer *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizer * >(argp1);
+  arg2 = obj1;
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxSizerFlags,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Sizer_AddF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Sizer_AddF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); 
+  }
+  arg3 = reinterpret_cast< wxSizerFlags * >(argp3);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxSizerItem *)wxSizer_AddF(arg1,arg2,*arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerItem, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_Sizer_Insert(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSizer *arg1 = (wxSizer *) 0 ;
@@ -49929,6 +50775,60 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_Sizer_InsertF(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizer *arg1 = (wxSizer *) 0 ;
+  int arg2 ;
+  PyObject *arg3 = (PyObject *) 0 ;
+  wxSizerFlags *arg4 = 0 ;
+  wxSizerItem *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "before",(char *) "item",(char *) "flags", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Sizer_InsertF",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_InsertF" "', expected argument " "1"" of type '" "wxSizer *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizer * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Sizer_InsertF" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  arg3 = obj2;
+  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_wxSizerFlags,  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "Sizer_InsertF" "', expected argument " "4"" of type '" "wxSizerFlags &""'"); 
+  }
+  if (!argp4) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Sizer_InsertF" "', expected argument " "4"" of type '" "wxSizerFlags &""'"); 
+  }
+  arg4 = reinterpret_cast< wxSizerFlags * >(argp4);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxSizerItem *)wxSizer_InsertF(arg1,arg2,arg3,*arg4);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerItem, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_Sizer_Prepend(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSizer *arg1 = (wxSizer *) 0 ;
@@ -50000,6 +50900,51 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_Sizer_PrependF(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizer *arg1 = (wxSizer *) 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;
+  wxSizerFlags *arg3 = 0 ;
+  wxSizerItem *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "item",(char *) "flags", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Sizer_PrependF",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_PrependF" "', expected argument " "1"" of type '" "wxSizer *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizer * >(argp1);
+  arg2 = obj1;
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxSizerFlags,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Sizer_PrependF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Sizer_PrependF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); 
+  }
+  arg3 = reinterpret_cast< wxSizerFlags * >(argp3);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxSizerItem *)wxSizer_PrependF(arg1,arg2,*arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerItem, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_Sizer_Remove(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSizer *arg1 = (wxSizer *) 0 ;
@@ -50074,25 +51019,36 @@ SWIGINTERN PyObject *_wrap_Sizer_GetItem(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject *resultobj = 0;
   wxSizer *arg1 = (wxSizer *) 0 ;
   PyObject *arg2 = (PyObject *) 0 ;
+  bool arg3 = (bool) false ;
   wxSizerItem *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   char *  kwnames[] = {
-    (char *) "self",(char *) "item", NULL 
+    (char *) "self",(char *) "item",(char *) "recursive", NULL 
   };
   
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_GetItem",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Sizer_GetItem",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_GetItem" "', expected argument " "1"" of type '" "wxSizer *""'"); 
   }
   arg1 = reinterpret_cast< wxSizer * >(argp1);
   arg2 = obj1;
+  if (obj2) {
+    ecode3 = SWIG_AsVal_bool(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Sizer_GetItem" "', expected argument " "3"" of type '" "bool""'");
+    } 
+    arg3 = static_cast< bool >(val3);
+  }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxSizerItem *)wxSizer_GetItem(arg1,arg2);
+    result = (wxSizerItem *)wxSizer_GetItem(arg1,arg2,arg3);
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
@@ -57340,12 +58296,9 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"GetAccelFromString", (PyCFunction) _wrap_GetAccelFromString, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"new_VisualAttributes", (PyCFunction)_wrap_new_VisualAttributes, METH_NOARGS, NULL},
 	 { (char *)"delete_VisualAttributes", (PyCFunction)_wrap_delete_VisualAttributes, METH_O, NULL},
-	 { (char *)"VisualAttributes_font_set", _wrap_VisualAttributes_font_set, METH_VARARGS, NULL},
-	 { (char *)"VisualAttributes_font_get", (PyCFunction)_wrap_VisualAttributes_font_get, METH_O, NULL},
-	 { (char *)"VisualAttributes_colFg_set", _wrap_VisualAttributes_colFg_set, METH_VARARGS, NULL},
-	 { (char *)"VisualAttributes_colFg_get", (PyCFunction)_wrap_VisualAttributes_colFg_get, METH_O, NULL},
-	 { (char *)"VisualAttributes_colBg_set", _wrap_VisualAttributes_colBg_set, METH_VARARGS, NULL},
-	 { (char *)"VisualAttributes_colBg_get", (PyCFunction)_wrap_VisualAttributes_colBg_get, METH_O, NULL},
+	 { (char *)"VisualAttributes__get_font", (PyCFunction)_wrap_VisualAttributes__get_font, METH_O, NULL},
+	 { (char *)"VisualAttributes__get_colFg", (PyCFunction)_wrap_VisualAttributes__get_colFg, METH_O, NULL},
+	 { (char *)"VisualAttributes__get_colBg", (PyCFunction)_wrap_VisualAttributes__get_colBg, METH_O, NULL},
 	 { (char *)"VisualAttributes_swigregister", VisualAttributes_swigregister, METH_VARARGS, NULL},
 	 { (char *)"VisualAttributes_swiginit", VisualAttributes_swiginit, METH_VARARGS, NULL},
 	 { (char *)"new_Window", (PyCFunction) _wrap_new_Window, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -57448,6 +58401,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"Window_GetChildren", (PyCFunction)_wrap_Window_GetChildren, METH_O, NULL},
 	 { (char *)"Window_GetParent", (PyCFunction)_wrap_Window_GetParent, METH_O, NULL},
 	 { (char *)"Window_GetGrandParent", (PyCFunction)_wrap_Window_GetGrandParent, METH_O, NULL},
+	 { (char *)"Window_GetTopLevelParent", (PyCFunction)_wrap_Window_GetTopLevelParent, METH_O, NULL},
 	 { (char *)"Window_IsTopLevel", (PyCFunction)_wrap_Window_IsTopLevel, METH_O, NULL},
 	 { (char *)"Window_Reparent", (PyCFunction) _wrap_Window_Reparent, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Window_AddChild", (PyCFunction) _wrap_Window_AddChild, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -57755,6 +58709,30 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"ItemContainer_Select", (PyCFunction) _wrap_ItemContainer_Select, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"ItemContainer_swigregister", ItemContainer_swigregister, METH_VARARGS, NULL},
 	 { (char *)"ControlWithItems_swigregister", ControlWithItems_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_SizerFlags", (PyCFunction) _wrap_new_SizerFlags, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"delete_SizerFlags", (PyCFunction)_wrap_delete_SizerFlags, METH_O, NULL},
+	 { (char *)"SizerFlags_Proportion", (PyCFunction) _wrap_SizerFlags_Proportion, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"SizerFlags_Align", (PyCFunction) _wrap_SizerFlags_Align, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"SizerFlags_Expand", (PyCFunction)_wrap_SizerFlags_Expand, METH_O, NULL},
+	 { (char *)"SizerFlags_Centre", (PyCFunction)_wrap_SizerFlags_Centre, METH_O, NULL},
+	 { (char *)"SizerFlags_Center", (PyCFunction)_wrap_SizerFlags_Center, METH_O, NULL},
+	 { (char *)"SizerFlags_Left", (PyCFunction)_wrap_SizerFlags_Left, METH_O, NULL},
+	 { (char *)"SizerFlags_Right", (PyCFunction)_wrap_SizerFlags_Right, METH_O, NULL},
+	 { (char *)"SizerFlags_Top", (PyCFunction)_wrap_SizerFlags_Top, METH_O, NULL},
+	 { (char *)"SizerFlags_Bottom", (PyCFunction)_wrap_SizerFlags_Bottom, METH_O, NULL},
+	 { (char *)"SizerFlags_Shaped", (PyCFunction)_wrap_SizerFlags_Shaped, METH_O, NULL},
+	 { (char *)"SizerFlags_FixedMinSize", (PyCFunction)_wrap_SizerFlags_FixedMinSize, METH_O, NULL},
+	 { (char *)"SizerFlags_Border", (PyCFunction) _wrap_SizerFlags_Border, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"SizerFlags_DoubleBorder", (PyCFunction) _wrap_SizerFlags_DoubleBorder, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"SizerFlags_TripleBorder", (PyCFunction) _wrap_SizerFlags_TripleBorder, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"SizerFlags_HorzBorder", (PyCFunction)_wrap_SizerFlags_HorzBorder, METH_O, NULL},
+	 { (char *)"SizerFlags_DoubleHorzBorder", (PyCFunction)_wrap_SizerFlags_DoubleHorzBorder, METH_O, NULL},
+	 { (char *)"SizerFlags_GetDefaultBorder", (PyCFunction)_wrap_SizerFlags_GetDefaultBorder, METH_NOARGS, NULL},
+	 { (char *)"SizerFlags_GetProportion", (PyCFunction)_wrap_SizerFlags_GetProportion, METH_O, NULL},
+	 { (char *)"SizerFlags_GetFlags", (PyCFunction)_wrap_SizerFlags_GetFlags, METH_O, NULL},
+	 { (char *)"SizerFlags_GetBorderInPixels", (PyCFunction)_wrap_SizerFlags_GetBorderInPixels, METH_O, NULL},
+	 { (char *)"SizerFlags_swigregister", SizerFlags_swigregister, METH_VARARGS, NULL},
+	 { (char *)"SizerFlags_swiginit", SizerFlags_swiginit, METH_VARARGS, NULL},
 	 { (char *)"new_SizerItem", (PyCFunction)_wrap_new_SizerItem, METH_NOARGS, NULL},
 	 { (char *)"delete_SizerItem", (PyCFunction)_wrap_delete_SizerItem, METH_O, NULL},
 	 { (char *)"new_SizerItemWindow", (PyCFunction) _wrap_new_SizerItemWindow, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -57798,8 +58776,11 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"delete_Sizer", (PyCFunction)_wrap_delete_Sizer, METH_O, NULL},
 	 { (char *)"Sizer__setOORInfo", (PyCFunction) _wrap_Sizer__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Sizer_Add", (PyCFunction) _wrap_Sizer_Add, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"Sizer_AddF", (PyCFunction) _wrap_Sizer_AddF, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Sizer_Insert", (PyCFunction) _wrap_Sizer_Insert, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"Sizer_InsertF", (PyCFunction) _wrap_Sizer_InsertF, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Sizer_Prepend", (PyCFunction) _wrap_Sizer_Prepend, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"Sizer_PrependF", (PyCFunction) _wrap_Sizer_PrependF, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Sizer_Remove", (PyCFunction) _wrap_Sizer_Remove, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Sizer_Detach", (PyCFunction) _wrap_Sizer_Detach, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Sizer_GetItem", (PyCFunction) _wrap_Sizer_GetItem, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -57985,36 +58966,6 @@ static PyMethodDef SwigMethods[] = {
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
-static void *_p_wxGBSizerItemTo_p_wxSizerItem(void *x) {
-    return (void *)((wxSizerItem *)  ((wxGBSizerItem *) x));
-}
-static void *_p_wxBoxSizerTo_p_wxSizer(void *x) {
-    return (void *)((wxSizer *)  ((wxBoxSizer *) x));
-}
-static void *_p_wxStaticBoxSizerTo_p_wxSizer(void *x) {
-    return (void *)((wxSizer *) (wxBoxSizer *) ((wxStaticBoxSizer *) x));
-}
-static void *_p_wxStdDialogButtonSizerTo_p_wxSizer(void *x) {
-    return (void *)((wxSizer *) (wxBoxSizer *) ((wxStdDialogButtonSizer *) x));
-}
-static void *_p_wxGridBagSizerTo_p_wxSizer(void *x) {
-    return (void *)((wxSizer *) (wxGridSizer *)(wxFlexGridSizer *) ((wxGridBagSizer *) x));
-}
-static void *_p_wxGridSizerTo_p_wxSizer(void *x) {
-    return (void *)((wxSizer *)  ((wxGridSizer *) x));
-}
-static void *_p_wxFlexGridSizerTo_p_wxSizer(void *x) {
-    return (void *)((wxSizer *) (wxGridSizer *) ((wxFlexGridSizer *) x));
-}
-static void *_p_wxPySizerTo_p_wxSizer(void *x) {
-    return (void *)((wxSizer *)  ((wxPySizer *) x));
-}
-static void *_p_wxStaticBoxSizerTo_p_wxBoxSizer(void *x) {
-    return (void *)((wxBoxSizer *)  ((wxStaticBoxSizer *) x));
-}
-static void *_p_wxStdDialogButtonSizerTo_p_wxBoxSizer(void *x) {
-    return (void *)((wxBoxSizer *)  ((wxStdDialogButtonSizer *) x));
-}
 static void *_p_wxContextMenuEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *) (wxCommandEvent *) ((wxContextMenuEvent *) x));
 }
@@ -58129,113 +59080,8 @@ static void *_p_wxKeyEventTo_p_wxEvent(void *x) {
 static void *_p_wxScrollWinEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxScrollWinEvent *) x));
 }
-static void *_p_wxGridBagSizerTo_p_wxGridSizer(void *x) {
-    return (void *)((wxGridSizer *) (wxFlexGridSizer *) ((wxGridBagSizer *) x));
-}
-static void *_p_wxFlexGridSizerTo_p_wxGridSizer(void *x) {
-    return (void *)((wxGridSizer *)  ((wxFlexGridSizer *) x));
-}
-static void *_p_wxGridBagSizerTo_p_wxFlexGridSizer(void *x) {
-    return (void *)((wxFlexGridSizer *)  ((wxGridBagSizer *) x));
-}
-static void *_p_wxControlWithItemsTo_p_wxItemContainer(void *x) {
-    return (void *)((wxItemContainer *)  ((wxControlWithItems *) x));
-}
-static void *_p_wxControlWithItemsTo_p_wxControl(void *x) {
-    return (void *)((wxControl *)  ((wxControlWithItems *) x));
-}
-static void *_p_wxControlTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *) (wxWindow *) ((wxControl *) x));
-}
-static void *_p_wxWindowTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *)  ((wxWindow *) x));
-}
-static void *_p_wxControlWithItemsTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxControlWithItems *) x));
-}
-static void *_p_wxPyAppTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *)  ((wxPyApp *) x));
-}
-static void *_p_wxValidatorTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *)  ((wxValidator *) x));
-}
-static void *_p_wxPyValidatorTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *) (wxValidator *) ((wxPyValidator *) x));
-}
-static void *_p_wxMenuBarTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *) (wxWindow *) ((wxMenuBar *) x));
-}
-static void *_p_wxMenuTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *)  ((wxMenu *) x));
-}
-static void *_p_wxANIHandlerTo_p_wxCURHandler(void *x) {
-    return (void *)((wxCURHandler *)  ((wxANIHandler *) x));
-}
-static void *_p_wxCURHandlerTo_p_wxICOHandler(void *x) {
-    return (void *)((wxICOHandler *)  ((wxCURHandler *) x));
-}
-static void *_p_wxANIHandlerTo_p_wxICOHandler(void *x) {
-    return (void *)((wxICOHandler *) (wxCURHandler *) ((wxANIHandler *) x));
-}
-static void *_p_wxICOHandlerTo_p_wxBMPHandler(void *x) {
-    return (void *)((wxBMPHandler *)  ((wxICOHandler *) x));
-}
-static void *_p_wxCURHandlerTo_p_wxBMPHandler(void *x) {
-    return (void *)((wxBMPHandler *) (wxICOHandler *) ((wxCURHandler *) x));
-}
-static void *_p_wxANIHandlerTo_p_wxBMPHandler(void *x) {
-    return (void *)((wxBMPHandler *) (wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x));
-}
-static void *_p_wxPyImageHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxPyImageHandler *) x));
-}
-static void *_p_wxBMPHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxBMPHandler *) x));
-}
-static void *_p_wxICOHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *) (wxBMPHandler *) ((wxICOHandler *) x));
-}
-static void *_p_wxCURHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *) ((wxCURHandler *) x));
-}
-static void *_p_wxANIHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x));
-}
-static void *_p_wxPNGHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxPNGHandler *) x));
-}
-static void *_p_wxGIFHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxGIFHandler *) x));
-}
-static void *_p_wxPCXHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxPCXHandler *) x));
-}
-static void *_p_wxJPEGHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxJPEGHandler *) x));
-}
-static void *_p_wxPNMHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxPNMHandler *) x));
-}
-static void *_p_wxXPMHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxXPMHandler *) x));
-}
-static void *_p_wxTIFFHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxTIFFHandler *) x));
-}
-static void *_p_wxTGAHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxTGAHandler *) x));
-}
-static void *_p_wxPyFileSystemHandlerTo_p_wxFileSystemHandler(void *x) {
-    return (void *)((wxFileSystemHandler *)  ((wxPyFileSystemHandler *) x));
-}
-static void *_p_wxInternetFSHandlerTo_p_wxFileSystemHandler(void *x) {
-    return (void *)((wxFileSystemHandler *)  ((wxInternetFSHandler *) x));
-}
-static void *_p_wxZipFSHandlerTo_p_wxFileSystemHandler(void *x) {
-    return (void *)((wxFileSystemHandler *)  ((wxZipFSHandler *) x));
-}
-static void *_p_wxMemoryFSHandlerTo_p_wxFileSystemHandler(void *x) {
-    return (void *)((wxFileSystemHandler *)  ((wxMemoryFSHandler *) x));
+static void *_p_wxPyValidatorTo_p_wxValidator(void *x) {
+    return (void *)((wxValidator *)  ((wxPyValidator *) x));
 }
 static void *_p_wxLayoutConstraintsTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxLayoutConstraints *) x));
@@ -58474,6 +59320,144 @@ static void *_p_wxPyValidatorTo_p_wxObject(void *x) {
 static void *_p_wxValidatorTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *) ((wxValidator *) x));
 }
+static void *_p_wxGridBagSizerTo_p_wxFlexGridSizer(void *x) {
+    return (void *)((wxFlexGridSizer *)  ((wxGridBagSizer *) x));
+}
+static void *_p_wxGridBagSizerTo_p_wxGridSizer(void *x) {
+    return (void *)((wxGridSizer *) (wxFlexGridSizer *) ((wxGridBagSizer *) x));
+}
+static void *_p_wxFlexGridSizerTo_p_wxGridSizer(void *x) {
+    return (void *)((wxGridSizer *)  ((wxFlexGridSizer *) x));
+}
+static void *_p_wxControlWithItemsTo_p_wxControl(void *x) {
+    return (void *)((wxControl *)  ((wxControlWithItems *) x));
+}
+static void *_p_wxControlWithItemsTo_p_wxItemContainer(void *x) {
+    return (void *)((wxItemContainer *)  ((wxControlWithItems *) x));
+}
+static void *_p_wxStaticBoxSizerTo_p_wxBoxSizer(void *x) {
+    return (void *)((wxBoxSizer *)  ((wxStaticBoxSizer *) x));
+}
+static void *_p_wxStdDialogButtonSizerTo_p_wxBoxSizer(void *x) {
+    return (void *)((wxBoxSizer *)  ((wxStdDialogButtonSizer *) x));
+}
+static void *_p_wxBoxSizerTo_p_wxSizer(void *x) {
+    return (void *)((wxSizer *)  ((wxBoxSizer *) x));
+}
+static void *_p_wxStaticBoxSizerTo_p_wxSizer(void *x) {
+    return (void *)((wxSizer *) (wxBoxSizer *) ((wxStaticBoxSizer *) x));
+}
+static void *_p_wxStdDialogButtonSizerTo_p_wxSizer(void *x) {
+    return (void *)((wxSizer *) (wxBoxSizer *) ((wxStdDialogButtonSizer *) x));
+}
+static void *_p_wxGridBagSizerTo_p_wxSizer(void *x) {
+    return (void *)((wxSizer *) (wxGridSizer *)(wxFlexGridSizer *) ((wxGridBagSizer *) x));
+}
+static void *_p_wxGridSizerTo_p_wxSizer(void *x) {
+    return (void *)((wxSizer *)  ((wxGridSizer *) x));
+}
+static void *_p_wxFlexGridSizerTo_p_wxSizer(void *x) {
+    return (void *)((wxSizer *) (wxGridSizer *) ((wxFlexGridSizer *) x));
+}
+static void *_p_wxPySizerTo_p_wxSizer(void *x) {
+    return (void *)((wxSizer *)  ((wxPySizer *) x));
+}
+static void *_p_wxGBSizerItemTo_p_wxSizerItem(void *x) {
+    return (void *)((wxSizerItem *)  ((wxGBSizerItem *) x));
+}
+static void *_p_wxPyFileSystemHandlerTo_p_wxFileSystemHandler(void *x) {
+    return (void *)((wxFileSystemHandler *)  ((wxPyFileSystemHandler *) x));
+}
+static void *_p_wxInternetFSHandlerTo_p_wxFileSystemHandler(void *x) {
+    return (void *)((wxFileSystemHandler *)  ((wxInternetFSHandler *) x));
+}
+static void *_p_wxZipFSHandlerTo_p_wxFileSystemHandler(void *x) {
+    return (void *)((wxFileSystemHandler *)  ((wxZipFSHandler *) x));
+}
+static void *_p_wxMemoryFSHandlerTo_p_wxFileSystemHandler(void *x) {
+    return (void *)((wxFileSystemHandler *)  ((wxMemoryFSHandler *) x));
+}
+static void *_p_wxPyImageHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxPyImageHandler *) x));
+}
+static void *_p_wxBMPHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxBMPHandler *) x));
+}
+static void *_p_wxICOHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *) (wxBMPHandler *) ((wxICOHandler *) x));
+}
+static void *_p_wxCURHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *) ((wxCURHandler *) x));
+}
+static void *_p_wxANIHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x));
+}
+static void *_p_wxPNGHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxPNGHandler *) x));
+}
+static void *_p_wxGIFHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxGIFHandler *) x));
+}
+static void *_p_wxPCXHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxPCXHandler *) x));
+}
+static void *_p_wxJPEGHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxJPEGHandler *) x));
+}
+static void *_p_wxPNMHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxPNMHandler *) x));
+}
+static void *_p_wxXPMHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxXPMHandler *) x));
+}
+static void *_p_wxTIFFHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxTIFFHandler *) x));
+}
+static void *_p_wxTGAHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxTGAHandler *) x));
+}
+static void *_p_wxICOHandlerTo_p_wxBMPHandler(void *x) {
+    return (void *)((wxBMPHandler *)  ((wxICOHandler *) x));
+}
+static void *_p_wxCURHandlerTo_p_wxBMPHandler(void *x) {
+    return (void *)((wxBMPHandler *) (wxICOHandler *) ((wxCURHandler *) x));
+}
+static void *_p_wxANIHandlerTo_p_wxBMPHandler(void *x) {
+    return (void *)((wxBMPHandler *) (wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x));
+}
+static void *_p_wxCURHandlerTo_p_wxICOHandler(void *x) {
+    return (void *)((wxICOHandler *)  ((wxCURHandler *) x));
+}
+static void *_p_wxANIHandlerTo_p_wxICOHandler(void *x) {
+    return (void *)((wxICOHandler *) (wxCURHandler *) ((wxANIHandler *) x));
+}
+static void *_p_wxANIHandlerTo_p_wxCURHandler(void *x) {
+    return (void *)((wxCURHandler *)  ((wxANIHandler *) x));
+}
+static void *_p_wxControlTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *) (wxWindow *) ((wxControl *) x));
+}
+static void *_p_wxWindowTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *)  ((wxWindow *) x));
+}
+static void *_p_wxControlWithItemsTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxControlWithItems *) x));
+}
+static void *_p_wxPyAppTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *)  ((wxPyApp *) x));
+}
+static void *_p_wxValidatorTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *)  ((wxValidator *) x));
+}
+static void *_p_wxPyValidatorTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *) (wxValidator *) ((wxPyValidator *) x));
+}
+static void *_p_wxMenuBarTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *) (wxWindow *) ((wxMenuBar *) x));
+}
+static void *_p_wxMenuTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *)  ((wxMenu *) x));
+}
 static void *_p_wxControlTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *)  ((wxControl *) x));
 }
@@ -58513,9 +59497,6 @@ static void *_p_wxNotifyEventTo_p_wxCommandEvent(void *x) {
 static void *_p_wxPyCommandEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxPyCommandEvent *) x));
 }
-static void *_p_wxPyValidatorTo_p_wxValidator(void *x) {
-    return (void *)((wxValidator *)  ((wxPyValidator *) x));
-}
 static swig_type_info _swigt__p_buffer = {"_p_buffer", "buffer *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_form_ops_t = {"_p_form_ops_t", "enum form_ops_t *|form_ops_t *", 0, 0, (void*)0, 0};
@@ -58635,6 +59616,7 @@ static swig_type_info _swigt__p_wxShowEvent = {"_p_wxShowEvent", "wxShowEvent *"
 static swig_type_info _swigt__p_wxSize = {"_p_wxSize", "wxSize *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxSizeEvent = {"_p_wxSizeEvent", "wxSizeEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxSizer = {"_p_wxSizer", "wxSizer *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_wxSizerFlags = {"_p_wxSizerFlags", "wxSizerFlags *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxSizerItem = {"_p_wxSizerItem", "wxSizerItem *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxStaticBox = {"_p_wxStaticBox", "wxStaticBox *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxStaticBoxSizer = {"_p_wxStaticBoxSizer", "wxStaticBoxSizer *", 0, 0, (void*)0, 0};
@@ -58772,6 +59754,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxSize,
   &_swigt__p_wxSizeEvent,
   &_swigt__p_wxSizer,
+  &_swigt__p_wxSizerFlags,
   &_swigt__p_wxSizerItem,
   &_swigt__p_wxStaticBox,
   &_swigt__p_wxStaticBoxSizer,
@@ -58909,6 +59892,7 @@ static swig_cast_info _swigc__p_wxShowEvent[] = {  {&_swigt__p_wxShowEvent, 0, 0
 static swig_cast_info _swigc__p_wxSize[] = {  {&_swigt__p_wxSize, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSizeEvent[] = {  {&_swigt__p_wxSizeEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSizer[] = {  {&_swigt__p_wxSizer, 0, 0, 0},  {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxSizer, 0, 0},  {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxSizer, 0, 0},  {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxSizer, 0, 0},  {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxSizer, 0, 0},  {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxSizer, 0, 0},  {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxSizer, 0, 0},  {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxSizer, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxSizerFlags[] = {  {&_swigt__p_wxSizerFlags, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSizerItem[] = {  {&_swigt__p_wxSizerItem, 0, 0, 0},  {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxSizerItem, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxStaticBox[] = {  {&_swigt__p_wxStaticBox, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxStaticBoxSizer[] = {  {&_swigt__p_wxStaticBoxSizer, 0, 0, 0},{0, 0, 0, 0}};
@@ -59046,6 +60030,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxSize,
   _swigc__p_wxSizeEvent,
   _swigc__p_wxSizer,
+  _swigc__p_wxSizerFlags,
   _swigc__p_wxSizerItem,
   _swigc__p_wxStaticBox,
   _swigc__p_wxStaticBoxSizer,
diff --git a/wxPython/src/mac/_gdi.py b/wxPython/src/mac/_gdi.py
index 700016b8f3..51046d2c14 100644
--- a/wxPython/src/mac/_gdi.py
+++ b/wxPython/src/mac/_gdi.py
@@ -676,7 +676,7 @@ class Bitmap(GDIObject):
         CopyFromBuffer(self, buffer data)
 
         Copy data from a RGB buffer object to replace the bitmap pixel data.
-        See `wxBitmapFromBuffer` for more .
+        See `wx.BitmapFromBuffer` for more .
         """
         return _gdi_.Bitmap_CopyFromBuffer(*args, **kwargs)
 
@@ -685,7 +685,7 @@ class Bitmap(GDIObject):
         CopyFromBufferRGBA(self, buffer data)
 
         Copy data from a RGBA buffer object to replace the bitmap pixel data.
-        See `wxBitmapFromBufferRGBA` for more .
+        See `wx.BitmapFromBufferRGBA` for more .
         """
         return _gdi_.Bitmap_CopyFromBufferRGBA(*args, **kwargs)
 
@@ -5092,22 +5092,13 @@ _gdi_.GraphicsFont_swigregister(GraphicsFont)
 class GraphicsMatrix(GraphicsObject):
     """
     A wx.GraphicsMatrix is a native representation of an affine
-    matrix. The contents are specific an private to the respective
+    matrix. The contents are specific and private to the respective
     renderer. The only way to get a valid instance is via a CreateMatrix
     call on the graphics context or the renderer instance.
     """
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
-    def __init__(self, *args, **kwargs): 
-        """
-        __init__(self) -> GraphicsMatrix
-
-        A wx.GraphicsMatrix is a native representation of an affine
-        matrix. The contents are specific an private to the respective
-        renderer. The only way to get a valid instance is via a CreateMatrix
-        call on the graphics context or the renderer instance.
-        """
-        _gdi_.GraphicsMatrix_swiginit(self,_gdi_.new_GraphicsMatrix(*args, **kwargs))
     __swig_destroy__ = _gdi_.delete_GraphicsMatrix
     __del__ = lambda self : None;
     def Concat(*args, **kwargs):
@@ -5218,10 +5209,8 @@ _gdi_.GraphicsMatrix_swigregister(GraphicsMatrix)
 class GraphicsPath(GraphicsObject):
     """Proxy of C++ GraphicsPath class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
-    def __init__(self, *args, **kwargs): 
-        """__init__(self) -> GraphicsPath"""
-        _gdi_.GraphicsPath_swiginit(self,_gdi_.new_GraphicsPath(*args, **kwargs))
     __swig_destroy__ = _gdi_.delete_GraphicsPath
     __del__ = lambda self : None;
     def MoveToPoint(*args):
@@ -5429,7 +5418,8 @@ class GraphicsContext(GraphicsObject):
 
         Creates a wx.GraphicsContext from a native context. This native
         context must be eg a CGContextRef for Core Graphics, a Graphics
-        pointer for GDIPlus or a cairo_t pointer for Cairo.
+        pointer for GDIPlus or a cairo_t pointer for Cairo.  NOTE: For
+        wxPython we still need a way to make this value usable.
         """
         return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs)
 
@@ -5438,7 +5428,8 @@ class GraphicsContext(GraphicsObject):
         """
         CreateFromNativeWindow(void window) -> GraphicsContext
 
-        Creates a wx.GraphicsContext from a native window.
+        Creates a wx.GraphicsContext from a native window.  NOTE: For wxPython
+        we still need a way to make this value usable.
         """
         return _gdi_.GraphicsContext_CreateFromNativeWindow(*args, **kwargs)
 
@@ -5757,7 +5748,7 @@ class GraphicsContext(GraphicsObject):
 
     def StrokeLineSegements(*args, **kwargs):
         """
-        StrokeLineSegements(self, PyObject beginPoints, PyObject endPoints)
+        StrokeLineSegments(self, List beginPoints, List endPoints)
 
         Stroke disconnected lines from begin to end points
         """
@@ -5838,7 +5829,8 @@ def GraphicsContext_CreateFromNative(*args, **kwargs):
 
     Creates a wx.GraphicsContext from a native context. This native
     context must be eg a CGContextRef for Core Graphics, a Graphics
-    pointer for GDIPlus or a cairo_t pointer for Cairo.
+    pointer for GDIPlus or a cairo_t pointer for Cairo.  NOTE: For
+    wxPython we still need a way to make this value usable.
     """
   return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs)
 
@@ -5846,7 +5838,8 @@ def GraphicsContext_CreateFromNativeWindow(*args, **kwargs):
   """
     GraphicsContext_CreateFromNativeWindow(void window) -> GraphicsContext
 
-    Creates a wx.GraphicsContext from a native window.
+    Creates a wx.GraphicsContext from a native window.  NOTE: For wxPython
+    we still need a way to make this value usable.
     """
   return _gdi_.GraphicsContext_CreateFromNativeWindow(*args, **kwargs)
 
diff --git a/wxPython/src/mac/_gdi_wrap.cpp b/wxPython/src/mac/_gdi_wrap.cpp
index eba872fabd..355172afc6 100644
--- a/wxPython/src/mac/_gdi_wrap.cpp
+++ b/wxPython/src/mac/_gdi_wrap.cpp
@@ -25679,22 +25679,6 @@ SWIGINTERN PyObject *GraphicsFont_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObj
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_GraphicsMatrix(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxGraphicsMatrix *result = 0 ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"new_GraphicsMatrix",0,0,0)) SWIG_fail;
-  {
-    result = (wxGraphicsMatrix *)new wxGraphicsMatrix();
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsMatrix, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_delete_GraphicsMatrix(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxGraphicsMatrix *arg1 = (wxGraphicsMatrix *) 0 ;
@@ -26326,29 +26310,6 @@ SWIGINTERN PyObject *GraphicsMatrix_swigregister(PyObject *SWIGUNUSEDPARM(self),
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *GraphicsMatrix_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_GraphicsPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxGraphicsPath *result = 0 ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"new_GraphicsPath",0,0,0)) SWIG_fail;
-  {
-    if (!wxPyCheckForApp()) SWIG_fail;
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxGraphicsPath *)new wxGraphicsPath();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsPath, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_delete_GraphicsPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;
@@ -27593,10 +27554,6 @@ SWIGINTERN PyObject *GraphicsPath_swigregister(PyObject *SWIGUNUSEDPARM(self), P
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *GraphicsPath_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
 SWIGINTERN int NullGraphicsPen_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable NullGraphicsPen is read-only.");
   return 1;
@@ -39272,7 +39229,6 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"delete_GraphicsFont", (PyCFunction)_wrap_delete_GraphicsFont, METH_O, NULL},
 	 { (char *)"GraphicsFont_swigregister", GraphicsFont_swigregister, METH_VARARGS, NULL},
 	 { (char *)"GraphicsFont_swiginit", GraphicsFont_swiginit, METH_VARARGS, NULL},
-	 { (char *)"new_GraphicsMatrix", (PyCFunction)_wrap_new_GraphicsMatrix, METH_NOARGS, NULL},
 	 { (char *)"delete_GraphicsMatrix", (PyCFunction)_wrap_delete_GraphicsMatrix, METH_O, NULL},
 	 { (char *)"GraphicsMatrix_Concat", (PyCFunction) _wrap_GraphicsMatrix_Concat, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"GraphicsMatrix_Set", (PyCFunction) _wrap_GraphicsMatrix_Set, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -39287,8 +39243,6 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"GraphicsMatrix_TransformDistance", (PyCFunction) _wrap_GraphicsMatrix_TransformDistance, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"GraphicsMatrix_GetNativeMatrix", (PyCFunction)_wrap_GraphicsMatrix_GetNativeMatrix, METH_O, NULL},
 	 { (char *)"GraphicsMatrix_swigregister", GraphicsMatrix_swigregister, METH_VARARGS, NULL},
-	 { (char *)"GraphicsMatrix_swiginit", GraphicsMatrix_swiginit, METH_VARARGS, NULL},
-	 { (char *)"new_GraphicsPath", (PyCFunction)_wrap_new_GraphicsPath, METH_NOARGS, NULL},
 	 { (char *)"delete_GraphicsPath", (PyCFunction)_wrap_delete_GraphicsPath, METH_O, NULL},
 	 { (char *)"GraphicsPath_MoveToPoint", _wrap_GraphicsPath_MoveToPoint, METH_VARARGS, NULL},
 	 { (char *)"GraphicsPath_AddLineToPoint", _wrap_GraphicsPath_AddLineToPoint, METH_VARARGS, NULL},
@@ -39309,7 +39263,6 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"GraphicsPath_GetBox", (PyCFunction)_wrap_GraphicsPath_GetBox, METH_O, NULL},
 	 { (char *)"GraphicsPath_Contains", _wrap_GraphicsPath_Contains, METH_VARARGS, NULL},
 	 { (char *)"GraphicsPath_swigregister", GraphicsPath_swigregister, METH_VARARGS, NULL},
-	 { (char *)"GraphicsPath_swiginit", GraphicsPath_swiginit, METH_VARARGS, NULL},
 	 { (char *)"delete_GraphicsContext", (PyCFunction)_wrap_delete_GraphicsContext, METH_O, NULL},
 	 { (char *)"GraphicsContext_Create", _wrap_GraphicsContext_Create, METH_VARARGS, NULL},
 	 { (char *)"GraphicsContext_CreateMeasuringContext", (PyCFunction)_wrap_GraphicsContext_CreateMeasuringContext, METH_NOARGS, NULL},
diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py
index 6ac360873b..1bd6383b80 100644
--- a/wxPython/src/mac/_misc.py
+++ b/wxPython/src/mac/_misc.py
@@ -4362,12 +4362,12 @@ class TimeSpan(object):
     def __str__(self):
         return self.Format().encode(wx.GetDefaultPyEncoding())
 
-    Days = property(GetDays,doc="See `GetDays`") 
-    Hours = property(GetHours,doc="See `GetHours`") 
-    Milliseconds = property(GetMilliseconds,doc="See `GetMilliseconds`") 
-    Minutes = property(GetMinutes,doc="See `GetMinutes`") 
-    Seconds = property(GetSeconds,doc="See `GetSeconds`") 
-    Weeks = property(GetWeeks,doc="See `GetWeeks`") 
+    days = property(GetDays,doc="See `GetDays`") 
+    hours = property(GetHours,doc="See `GetHours`") 
+    milliseconds = property(GetMilliseconds,doc="See `GetMilliseconds`") 
+    minutes = property(GetMinutes,doc="See `GetMinutes`") 
+    seconds = property(GetSeconds,doc="See `GetSeconds`") 
+    weeks = property(GetWeeks,doc="See `GetWeeks`") 
 _misc_.TimeSpan_swigregister(TimeSpan)
 
 def TimeSpan_Milliseconds(*args, **kwargs):
@@ -4559,11 +4559,11 @@ class DateSpan(object):
         """__ne__(self, DateSpan other) -> bool"""
         return _misc_.DateSpan___ne__(*args, **kwargs)
 
-    Days = property(GetDays,SetDays,doc="See `GetDays` and `SetDays`") 
-    Months = property(GetMonths,SetMonths,doc="See `GetMonths` and `SetMonths`") 
-    TotalDays = property(GetTotalDays,doc="See `GetTotalDays`") 
-    Weeks = property(GetWeeks,SetWeeks,doc="See `GetWeeks` and `SetWeeks`") 
-    Years = property(GetYears,SetYears,doc="See `GetYears` and `SetYears`") 
+    days = property(GetDays,SetDays,doc="See `GetDays` and `SetDays`") 
+    months = property(GetMonths,SetMonths,doc="See `GetMonths` and `SetMonths`") 
+    totalDays = property(GetTotalDays,doc="See `GetTotalDays`") 
+    weeks = property(GetWeeks,SetWeeks,doc="See `GetWeeks` and `SetWeeks`") 
+    years = property(GetYears,SetYears,doc="See `GetYears` and `SetYears`") 
 _misc_.DateSpan_swigregister(DateSpan)
 
 def DateSpan_Days(*args, **kwargs):
diff --git a/wxPython/src/mac/_windows.py b/wxPython/src/mac/_windows.py
index c566783951..0a5731a5ec 100644
--- a/wxPython/src/mac/_windows.py
+++ b/wxPython/src/mac/_windows.py
@@ -2285,9 +2285,10 @@ def GetColourFromUser(*args, **kwargs):
         String caption=EmptyString) -> Colour
     """
   return _windows_.GetColourFromUser(*args, **kwargs)
+DD_CHANGE_DIR = _windows_.DD_CHANGE_DIR
+DD_DIR_MUST_EXIST = _windows_.DD_DIR_MUST_EXIST
 DD_NEW_DIR_BUTTON = _windows_.DD_NEW_DIR_BUTTON
 DD_DEFAULT_STYLE = _windows_.DD_DEFAULT_STYLE
-DD_CHANGE_DIR = _windows_.DD_CHANGE_DIR
 class DirDialog(Dialog):
     """
     wx.DirDialog allows the user to select a directory by browising the
diff --git a/wxPython/src/mac/_windows_wrap.cpp b/wxPython/src/mac/_windows_wrap.cpp
index 301920c5e6..a63a0eedd2 100644
--- a/wxPython/src/mac/_windows_wrap.cpp
+++ b/wxPython/src/mac/_windows_wrap.cpp
@@ -34835,9 +34835,10 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_addvarlink(SWIG_globals(),(char*)"FileSelectorDefaultWildcardStr",FileSelectorDefaultWildcardStr_get, FileSelectorDefaultWildcardStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"GetTextFromUserPromptStr",GetTextFromUserPromptStr_get, GetTextFromUserPromptStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"MessageBoxCaptionStr",MessageBoxCaptionStr_get, MessageBoxCaptionStr_set);
+  SWIG_Python_SetConstant(d, "DD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxDD_CHANGE_DIR)));
+  SWIG_Python_SetConstant(d, "DD_DIR_MUST_EXIST",SWIG_From_int(static_cast< int >(wxDD_DIR_MUST_EXIST)));
   SWIG_Python_SetConstant(d, "DD_NEW_DIR_BUTTON",SWIG_From_int(static_cast< int >(wxDD_NEW_DIR_BUTTON)));
   SWIG_Python_SetConstant(d, "DD_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxDD_DEFAULT_STYLE)));
-  SWIG_Python_SetConstant(d, "DD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxDD_CHANGE_DIR)));
   SWIG_Python_SetConstant(d, "OPEN",SWIG_From_int(static_cast< int >(wxOPEN)));
   SWIG_Python_SetConstant(d, "SAVE",SWIG_From_int(static_cast< int >(wxSAVE)));
   SWIG_Python_SetConstant(d, "OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxOVERWRITE_PROMPT)));
diff --git a/wxPython/src/mac/aui.py b/wxPython/src/mac/aui.py
index 6e572081bf..0bb10cbacb 100644
--- a/wxPython/src/mac/aui.py
+++ b/wxPython/src/mac/aui.py
@@ -1495,10 +1495,6 @@ class AuiMDIParentFrame(_windows.Frame):
         """GetArtProvider(self) -> AuiTabArt"""
         return _aui.AuiMDIParentFrame_GetArtProvider(*args, **kwargs)
 
-    def GetNotebook(*args, **kwargs):
-        """GetNotebook(self) -> AuiNotebook"""
-        return _aui.AuiMDIParentFrame_GetNotebook(*args, **kwargs)
-
     def GetWindowMenu(*args, **kwargs):
         """GetWindowMenu(self) -> Menu"""
         return _aui.AuiMDIParentFrame_GetWindowMenu(*args, **kwargs)
@@ -1515,18 +1511,10 @@ class AuiMDIParentFrame(_windows.Frame):
         """ProcessEvent(self, Event event) -> bool"""
         return _aui.AuiMDIParentFrame_ProcessEvent(*args, **kwargs)
 
-    def GetActiveChild(*args, **kwargs):
-        """GetActiveChild(self) -> AuiMDIChildFrame"""
-        return _aui.AuiMDIParentFrame_GetActiveChild(*args, **kwargs)
-
     def SetActiveChild(*args, **kwargs):
         """SetActiveChild(self, AuiMDIChildFrame pChildFrame)"""
         return _aui.AuiMDIParentFrame_SetActiveChild(*args, **kwargs)
 
-    def GetClientWindow(*args, **kwargs):
-        """GetClientWindow(self) -> AuiMDIClientWindow"""
-        return _aui.AuiMDIParentFrame_GetClientWindow(*args, **kwargs)
-
     def OnCreateClient(*args, **kwargs):
         """OnCreateClient(self) -> AuiMDIClientWindow"""
         return _aui.AuiMDIParentFrame_OnCreateClient(*args, **kwargs)
@@ -1551,6 +1539,18 @@ class AuiMDIParentFrame(_windows.Frame):
         """ActivatePrevious(self)"""
         return _aui.AuiMDIParentFrame_ActivatePrevious(*args, **kwargs)
 
+    def GetNotebook(*args, **kwargs):
+        """GetNotebook(self) -> AuiNotebook"""
+        return _aui.AuiMDIParentFrame_GetNotebook(*args, **kwargs)
+
+    def GetActiveChild(*args, **kwargs):
+        """GetActiveChild(self) -> AuiMDIChildFrame"""
+        return _aui.AuiMDIParentFrame_GetActiveChild(*args, **kwargs)
+
+    def GetClientWindow(*args, **kwargs):
+        """GetClientWindow(self) -> AuiMDIClientWindow"""
+        return _aui.AuiMDIParentFrame_GetClientWindow(*args, **kwargs)
+
 _aui.AuiMDIParentFrame_swigregister(AuiMDIParentFrame)
 
 def PreAuiMDIParentFrame(*args, **kwargs):
@@ -1719,8 +1719,22 @@ class PyAuiDockArt(AuiDefaultDockArt):
     methods to the Python methods implemented in the derived class.
     """
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """
+        __init__(self) -> PyAuiDockArt
+
+        This version of the `AuiDockArt` class has been instrumented to be
+        subclassable in Python and to reflect all calls to the C++ base class
+        methods to the Python methods implemented in the derived class.
+        """
+        _aui.PyAuiDockArt_swiginit(self,_aui.new_PyAuiDockArt(*args, **kwargs))
+        PyAuiDockArt._setCallbackInfo(self, self, PyAuiDockArt)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
+        return _aui.PyAuiDockArt__setCallbackInfo(*args, **kwargs)
+
 _aui.PyAuiDockArt_swigregister(PyAuiDockArt)
 
 class PyAuiTabArt(AuiDefaultTabArt):
@@ -1730,8 +1744,22 @@ class PyAuiTabArt(AuiDefaultTabArt):
     methods to the Python methods implemented in the derived class.
     """
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """
+        __init__(self) -> PyAuiTabArt
+
+        This version of the `TabArt` class has been instrumented to be
+        subclassable in Python and to reflect all calls to the C++ base class
+        methods to the Python methods implemented in the derived class.
+        """
+        _aui.PyAuiTabArt_swiginit(self,_aui.new_PyAuiTabArt(*args, **kwargs))
+        PyAuiTabArt._setCallbackInfo(self, self, PyAuiTabArt)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
+        return _aui.PyAuiTabArt__setCallbackInfo(*args, **kwargs)
+
 _aui.PyAuiTabArt_swigregister(PyAuiTabArt)
 
 
diff --git a/wxPython/src/mac/aui_wrap.cpp b/wxPython/src/mac/aui_wrap.cpp
index bd580c6670..ead0b722ba 100644
--- a/wxPython/src/mac/aui_wrap.cpp
+++ b/wxPython/src/mac/aui_wrap.cpp
@@ -2925,10 +2925,20 @@ SWIG_From_size_t  (size_t value)
   return SWIG_From_unsigned_SS_long  (static_cast< unsigned long >(value));
 }
 
+SWIGINTERN wxAuiNotebook *wxAuiMDIParentFrame__GetNotebook(wxAuiMDIParentFrame const *self){
+        return self->GetNotebook();
+    }
+SWIGINTERN wxAuiMDIChildFrame *wxAuiMDIParentFrame__GetActiveChild(wxAuiMDIParentFrame const *self){
+        return self->GetActiveChild();
+    }
+SWIGINTERN wxAuiMDIClientWindow *wxAuiMDIParentFrame__GetClientWindow(wxAuiMDIParentFrame const *self){
+        return self->GetClientWindow();
+    }
 
 // A wxDocArt class that knows how to forward virtuals to Python methods
 class wxPyAuiDockArt :  public wxAuiDefaultDockArt
 {
+public:
     wxPyAuiDockArt() : wxAuiDefaultDockArt() {}
 
     DEC_PYCALLBACK_INT_INT(GetMetric);
@@ -3097,6 +3107,7 @@ IMP_PYCALLBACK__INTCOLOUR(wxPyAuiDockArt, wxAuiDefaultDockArt, SetColour);
 // A wxTabArt class that knows how to forward virtuals to Python methods
 class wxPyAuiTabArt :  public wxAuiDefaultTabArt
 {
+public:
     wxPyAuiTabArt() : wxAuiDefaultTabArt() {}
 
     
@@ -3284,7 +3295,6 @@ class wxPyAuiTabArt :  public wxAuiDefaultTabArt
     DEC_PYCALLBACK__FONT(SetNormalFont);
     DEC_PYCALLBACK__FONT(SetSelectedFont);
     DEC_PYCALLBACK__FONT(SetMeasuringFont);
-//    DEC_PYCALLBACK_INT_WIN(GetBestTabCtrlSize);
 
     PYPRIVATE;
 };
@@ -3293,7 +3303,6 @@ class wxPyAuiTabArt :  public wxAuiDefaultTabArt
 IMP_PYCALLBACK__FONT(wxPyAuiTabArt, wxAuiDefaultTabArt, SetNormalFont);
 IMP_PYCALLBACK__FONT(wxPyAuiTabArt, wxAuiDefaultTabArt, SetSelectedFont);
 IMP_PYCALLBACK__FONT(wxPyAuiTabArt, wxAuiDefaultTabArt, SetMeasuringFont);
-//IMP_PYCALLBACK_INT_WIN(wxPyAuiTabArt, wxAuiDefaultTabArt, GetBestTabCtrlSize);
 
 #ifdef __cplusplus
 extern "C" {
@@ -16360,34 +16369,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetNotebook(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
-  wxAuiNotebook *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiMDIParentFrame, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetNotebook" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxAuiNotebook *)((wxAuiMDIParentFrame const *)arg1)->GetNotebook();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAuiNotebook, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetWindowMenu(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
@@ -16538,34 +16519,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetActiveChild(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
-  wxAuiMDIChildFrame *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiMDIParentFrame, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetActiveChild" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxAuiMDIChildFrame *)((wxAuiMDIParentFrame const *)arg1)->GetActiveChild();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAuiMDIChildFrame, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_SetActiveChild(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
@@ -16604,34 +16557,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetClientWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
-  wxAuiMDIClientWindow *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiMDIParentFrame, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetClientWindow" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxAuiMDIClientWindow *)((wxAuiMDIParentFrame const *)arg1)->GetClientWindow();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAuiMDIClientWindow, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_OnCreateClient(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
@@ -16808,6 +16733,96 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetNotebook(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
+  wxAuiNotebook *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiMDIParentFrame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetNotebook" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxAuiNotebook *)wxAuiMDIParentFrame__GetNotebook((wxAuiMDIParentFrame const *)arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetActiveChild(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
+  wxAuiMDIChildFrame *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiMDIParentFrame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetActiveChild" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxAuiMDIChildFrame *)wxAuiMDIParentFrame__GetActiveChild((wxAuiMDIParentFrame const *)arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetClientWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
+  wxAuiMDIClientWindow *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiMDIParentFrame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetClientWindow" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxAuiMDIClientWindow *)wxAuiMDIParentFrame__GetClientWindow((wxAuiMDIParentFrame const *)arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *AuiMDIParentFrame_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -18143,6 +18158,59 @@ SWIGINTERN PyObject *AuiMDIClientWindow_swiginit(PyObject *SWIGUNUSEDPARM(self),
   return SWIG_Python_InitShadowInstance(args);
 }
 
+SWIGINTERN PyObject *_wrap_new_PyAuiDockArt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyAuiDockArt *result = 0 ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"new_PyAuiDockArt",0,0,0)) SWIG_fail;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxPyAuiDockArt *)new wxPyAuiDockArt();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyAuiDockArt, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PyAuiDockArt__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyAuiDockArt *arg1 = (wxPyAuiDockArt *) 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;
+  PyObject *arg3 = (PyObject *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "self",(char *) "_class", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyAuiDockArt__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyAuiDockArt, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyAuiDockArt__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyAuiDockArt *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyAuiDockArt * >(argp1);
+  arg2 = obj1;
+  arg3 = obj2;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->_setCallbackInfo(arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *PyAuiDockArt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -18150,6 +18218,63 @@ SWIGINTERN PyObject *PyAuiDockArt_swigregister(PyObject *SWIGUNUSEDPARM(self), P
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *PyAuiDockArt_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_PyAuiTabArt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyAuiTabArt *result = 0 ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"new_PyAuiTabArt",0,0,0)) SWIG_fail;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxPyAuiTabArt *)new wxPyAuiTabArt();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyAuiTabArt, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PyAuiTabArt__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyAuiTabArt *arg1 = (wxPyAuiTabArt *) 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;
+  PyObject *arg3 = (PyObject *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "self",(char *) "_class", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyAuiTabArt__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyAuiTabArt, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyAuiTabArt__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyAuiTabArt *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyAuiTabArt * >(argp1);
+  arg2 = obj1;
+  arg3 = obj2;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->_setCallbackInfo(arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *PyAuiTabArt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -18157,6 +18282,10 @@ SWIGINTERN PyObject *PyAuiTabArt_swigregister(PyObject *SWIGUNUSEDPARM(self), Py
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *PyAuiTabArt_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 static PyMethodDef SwigMethods[] = {
 	 { (char *)"new_AuiPaneInfo", (PyCFunction)_wrap_new_AuiPaneInfo, METH_NOARGS, NULL},
 	 { (char *)"delete_AuiPaneInfo", (PyCFunction)_wrap_delete_AuiPaneInfo, METH_O, NULL},
@@ -18538,20 +18667,20 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"AuiMDIParentFrame_Create", (PyCFunction) _wrap_AuiMDIParentFrame_Create, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"AuiMDIParentFrame_SetArtProvider", (PyCFunction) _wrap_AuiMDIParentFrame_SetArtProvider, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"AuiMDIParentFrame_GetArtProvider", (PyCFunction)_wrap_AuiMDIParentFrame_GetArtProvider, METH_O, NULL},
-	 { (char *)"AuiMDIParentFrame_GetNotebook", (PyCFunction)_wrap_AuiMDIParentFrame_GetNotebook, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_GetWindowMenu", (PyCFunction)_wrap_AuiMDIParentFrame_GetWindowMenu, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_SetWindowMenu", (PyCFunction) _wrap_AuiMDIParentFrame_SetWindowMenu, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"AuiMDIParentFrame_SetChildMenuBar", (PyCFunction) _wrap_AuiMDIParentFrame_SetChildMenuBar, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"AuiMDIParentFrame_ProcessEvent", (PyCFunction) _wrap_AuiMDIParentFrame_ProcessEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"AuiMDIParentFrame_GetActiveChild", (PyCFunction)_wrap_AuiMDIParentFrame_GetActiveChild, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_SetActiveChild", (PyCFunction) _wrap_AuiMDIParentFrame_SetActiveChild, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"AuiMDIParentFrame_GetClientWindow", (PyCFunction)_wrap_AuiMDIParentFrame_GetClientWindow, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_OnCreateClient", (PyCFunction)_wrap_AuiMDIParentFrame_OnCreateClient, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_Cascade", (PyCFunction)_wrap_AuiMDIParentFrame_Cascade, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_Tile", (PyCFunction) _wrap_AuiMDIParentFrame_Tile, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"AuiMDIParentFrame_ArrangeIcons", (PyCFunction)_wrap_AuiMDIParentFrame_ArrangeIcons, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_ActivateNext", (PyCFunction)_wrap_AuiMDIParentFrame_ActivateNext, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_ActivatePrevious", (PyCFunction)_wrap_AuiMDIParentFrame_ActivatePrevious, METH_O, NULL},
+	 { (char *)"AuiMDIParentFrame_GetNotebook", (PyCFunction)_wrap_AuiMDIParentFrame_GetNotebook, METH_O, NULL},
+	 { (char *)"AuiMDIParentFrame_GetActiveChild", (PyCFunction)_wrap_AuiMDIParentFrame_GetActiveChild, METH_O, NULL},
+	 { (char *)"AuiMDIParentFrame_GetClientWindow", (PyCFunction)_wrap_AuiMDIParentFrame_GetClientWindow, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_swigregister", AuiMDIParentFrame_swigregister, METH_VARARGS, NULL},
 	 { (char *)"AuiMDIParentFrame_swiginit", AuiMDIParentFrame_swiginit, METH_VARARGS, NULL},
 	 { (char *)"new_PreAuiMDIChildFrame", (PyCFunction)_wrap_new_PreAuiMDIChildFrame, METH_NOARGS, NULL},
@@ -18589,8 +18718,14 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"AuiMDIClientWindow_SetSelection", (PyCFunction) _wrap_AuiMDIClientWindow_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"AuiMDIClientWindow_swigregister", AuiMDIClientWindow_swigregister, METH_VARARGS, NULL},
 	 { (char *)"AuiMDIClientWindow_swiginit", AuiMDIClientWindow_swiginit, METH_VARARGS, NULL},
+	 { (char *)"new_PyAuiDockArt", (PyCFunction)_wrap_new_PyAuiDockArt, METH_NOARGS, NULL},
+	 { (char *)"PyAuiDockArt__setCallbackInfo", (PyCFunction) _wrap_PyAuiDockArt__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"PyAuiDockArt_swigregister", PyAuiDockArt_swigregister, METH_VARARGS, NULL},
+	 { (char *)"PyAuiDockArt_swiginit", PyAuiDockArt_swiginit, METH_VARARGS, NULL},
+	 { (char *)"new_PyAuiTabArt", (PyCFunction)_wrap_new_PyAuiTabArt, METH_NOARGS, NULL},
+	 { (char *)"PyAuiTabArt__setCallbackInfo", (PyCFunction) _wrap_PyAuiTabArt__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"PyAuiTabArt_swigregister", PyAuiTabArt_swigregister, METH_VARARGS, NULL},
+	 { (char *)"PyAuiTabArt_swiginit", PyAuiTabArt_swiginit, METH_VARARGS, NULL},
 	 { NULL, NULL, 0, NULL }
 };
 
diff --git a/wxPython/src/mac/grid.py b/wxPython/src/mac/grid.py
index 4c0838bf04..2c4c942c79 100644
--- a/wxPython/src/mac/grid.py
+++ b/wxPython/src/mac/grid.py
@@ -1137,7 +1137,7 @@ class GridCellCoords(object):
     def __str__(self):                   return str(self.Get())
     def __repr__(self):                  return 'wxGridCellCoords'+str(self.Get())
     def __len__(self):                   return len(self.Get())
-    def __getitem__(self, index):        return self.asTuple()[index]
+    def __getitem__(self, index):        return self.Get()[index]
     def __setitem__(self, index, val):
         if index == 0: self.SetRow(val)
         elif index == 1: self.SetCol(val)
diff --git a/wxPython/src/mac/grid_wrap.cpp b/wxPython/src/mac/grid_wrap.cpp
index 10eec34265..55d62582ad 100644
--- a/wxPython/src/mac/grid_wrap.cpp
+++ b/wxPython/src/mac/grid_wrap.cpp
@@ -3445,7 +3445,7 @@ public:
     void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
         bool found;
         wxPyBlock_t blocked = wxPyBeginBlockThreads();
-        if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)"))) {
+        if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground"))) {
             PyObject* ao = wxPyMake_wxGridCellAttr(attr,false);
             PyObject* ro = wxPyConstructObject((void*)&rectCell, wxT("wxRect"), 0);
 
diff --git a/wxPython/src/msw/_controls.py b/wxPython/src/msw/_controls.py
index c9408dd9c5..eb1ed041fc 100644
--- a/wxPython/src/msw/_controls.py
+++ b/wxPython/src/msw/_controls.py
@@ -579,7 +579,7 @@ class ComboBox(Choice):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
-        __init__(Window parent, int id, String value=EmptyString,
+        __init__(Window parent, int id=-1, String value=EmptyString,
             Point pos=DefaultPosition, Size size=DefaultSize,
             List choices=EmptyList, long style=0, Validator validator=DefaultValidator,
             String name=ComboBoxNameStr) -> ComboBox
@@ -591,7 +591,7 @@ class ComboBox(Choice):
 
     def Create(*args, **kwargs):
         """
-        Create(Window parent, int id, String value=EmptyString,
+        Create(Window parent, int id=-1, String value=EmptyString,
             Point pos=DefaultPosition, Size size=DefaultSize,
             List choices=EmptyList, long style=0, Validator validator=DefaultValidator,
             String name=ChoiceNameStr) -> bool
@@ -3981,6 +3981,14 @@ class ToolBar(ToolBarBase):
         """
         return _controls_.ToolBar_Create(*args, **kwargs)
 
+    def SetToolNormalBitmap(*args, **kwargs):
+        """SetToolNormalBitmap(self, int id, Bitmap bitmap)"""
+        return _controls_.ToolBar_SetToolNormalBitmap(*args, **kwargs)
+
+    def SetToolDisabledBitmap(*args, **kwargs):
+        """SetToolDisabledBitmap(self, int id, Bitmap bitmap)"""
+        return _controls_.ToolBar_SetToolDisabledBitmap(*args, **kwargs)
+
     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
diff --git a/wxPython/src/msw/_controls_wrap.cpp b/wxPython/src/msw/_controls_wrap.cpp
index 0b2dc3130a..937a0a2e62 100644
--- a/wxPython/src/msw/_controls_wrap.cpp
+++ b/wxPython/src/msw/_controls_wrap.cpp
@@ -26127,6 +26127,106 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_ToolBar_SetToolNormalBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxToolBar *arg1 = (wxToolBar *) 0 ;
+  int arg2 ;
+  wxBitmap *arg3 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "id",(char *) "bitmap", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBar_SetToolNormalBitmap",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxToolBar, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ToolBar_SetToolNormalBitmap" "', expected argument " "1"" of type '" "wxToolBar *""'"); 
+  }
+  arg1 = reinterpret_cast< wxToolBar * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ToolBar_SetToolNormalBitmap" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxBitmap,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ToolBar_SetToolNormalBitmap" "', expected argument " "3"" of type '" "wxBitmap const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ToolBar_SetToolNormalBitmap" "', expected argument " "3"" of type '" "wxBitmap const &""'"); 
+  }
+  arg3 = reinterpret_cast< wxBitmap * >(argp3);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetToolNormalBitmap(arg2,(wxBitmap const &)*arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ToolBar_SetToolDisabledBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxToolBar *arg1 = (wxToolBar *) 0 ;
+  int arg2 ;
+  wxBitmap *arg3 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "id",(char *) "bitmap", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBar_SetToolDisabledBitmap",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxToolBar, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ToolBar_SetToolDisabledBitmap" "', expected argument " "1"" of type '" "wxToolBar *""'"); 
+  }
+  arg1 = reinterpret_cast< wxToolBar * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ToolBar_SetToolDisabledBitmap" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxBitmap,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ToolBar_SetToolDisabledBitmap" "', expected argument " "3"" of type '" "wxBitmap const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ToolBar_SetToolDisabledBitmap" "', expected argument " "3"" of type '" "wxBitmap const &""'"); 
+  }
+  arg3 = reinterpret_cast< wxBitmap * >(argp3);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetToolDisabledBitmap(arg2,(wxBitmap const &)*arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_ToolBar_GetClassDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ;
@@ -47635,6 +47735,8 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"new_ToolBar", (PyCFunction) _wrap_new_ToolBar, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"new_PreToolBar", (PyCFunction)_wrap_new_PreToolBar, METH_NOARGS, NULL},
 	 { (char *)"ToolBar_Create", (PyCFunction) _wrap_ToolBar_Create, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"ToolBar_SetToolNormalBitmap", (PyCFunction) _wrap_ToolBar_SetToolNormalBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"ToolBar_SetToolDisabledBitmap", (PyCFunction) _wrap_ToolBar_SetToolDisabledBitmap, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"ToolBar_GetClassDefaultAttributes", (PyCFunction) _wrap_ToolBar_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"ToolBar_swigregister", ToolBar_swigregister, METH_VARARGS, NULL},
 	 { (char *)"ToolBar_swiginit", ToolBar_swiginit, METH_VARARGS, NULL},
diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py
index eb333a3f63..35b0a07eed 100644
--- a/wxPython/src/msw/_core.py
+++ b/wxPython/src/msw/_core.py
@@ -4580,7 +4580,7 @@ class ScrollEvent(CommandEvent):
     """
     A scroll event holds information about events sent from stand-alone
     scrollbars and sliders. Note that scrolled windows do not send
-    instnaces of this event class, but send the `wx.ScrollWinEvent`
+    instances of this event class, but send the `wx.ScrollWinEvent`
     instead.
     """
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -8113,9 +8113,21 @@ class VisualAttributes(object):
         _core_.VisualAttributes_swiginit(self,_core_.new_VisualAttributes(*args, **kwargs))
     __swig_destroy__ = _core_.delete_VisualAttributes
     __del__ = lambda self : None;
-    font = property(_core_.VisualAttributes_font_get, _core_.VisualAttributes_font_set)
-    colFg = property(_core_.VisualAttributes_colFg_get, _core_.VisualAttributes_colFg_set)
-    colBg = property(_core_.VisualAttributes_colBg_get, _core_.VisualAttributes_colBg_set)
+    def _get_font(*args, **kwargs):
+        """_get_font(self) -> Font"""
+        return _core_.VisualAttributes__get_font(*args, **kwargs)
+
+    def _get_colFg(*args, **kwargs):
+        """_get_colFg(self) -> Colour"""
+        return _core_.VisualAttributes__get_colFg(*args, **kwargs)
+
+    def _get_colBg(*args, **kwargs):
+        """_get_colBg(self) -> Colour"""
+        return _core_.VisualAttributes__get_colBg(*args, **kwargs)
+
+    font = property(_get_font) 
+    colFg = property(_get_colFg) 
+    colBg = property(_get_colBg) 
 _core_.VisualAttributes_swigregister(VisualAttributes)
 NullAcceleratorTable = cvar.NullAcceleratorTable
 PanelNameStr = cvar.PanelNameStr
@@ -9097,6 +9109,14 @@ class Window(EvtHandler):
         """
         return _core_.Window_GetGrandParent(*args, **kwargs)
 
+    def GetTopLevelParent(*args, **kwargs):
+        """
+        GetTopLevelParent(self) -> Window
+
+        Returns the first frame or dialog in this window's parental hierarchy.
+        """
+        return _core_.Window_GetTopLevelParent(*args, **kwargs)
+
     def IsTopLevel(*args, **kwargs):
         """
         IsTopLevel(self) -> bool
@@ -10359,9 +10379,15 @@ class Window(EvtHandler):
         self.thisown = pre.thisown
         pre.thisown = 0
         if hasattr(self, '_setOORInfo'):
-            self._setOORInfo(self)
+            try:
+                self._setOORInfo(self)
+            except TypeError:
+                pass
         if hasattr(self, '_setCallbackInfo'):
-            self._setCallbackInfo(self, pre.__class__)
+            try:
+                self._setCallbackInfo(self, pre.__class__)
+            except TypeError:
+                pass
 
     def SendSizeEvent(self):
         self.GetEventHandler().ProcessEvent(wx.SizeEvent((-1,-1)))
@@ -10391,6 +10417,7 @@ class Window(EvtHandler):
     Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") 
     ForegroundColour = property(GetForegroundColour,SetForegroundColour,doc="See `GetForegroundColour` and `SetForegroundColour`") 
     GrandParent = property(GetGrandParent,doc="See `GetGrandParent`") 
+    TopLevelParent = property(GetTopLevelParent,doc="See `GetTopLevelParent`") 
     Handle = property(GetHandle,doc="See `GetHandle`") 
     HelpText = property(GetHelpText,SetHelpText,doc="See `GetHelpText` and `SetHelpText`") 
     Id = property(GetId,SetId,doc="See `GetId` and `SetId`") 
@@ -11034,7 +11061,6 @@ class MenuBar(Window):
             self.Append(m, l)
 
     Frame = property(GetFrame,doc="See `GetFrame`") 
-    Menu = property(GetMenu,doc="See `GetMenu`") 
     MenuCount = property(GetMenuCount,doc="See `GetMenuCount`") 
     Menus = property(GetMenus,SetMenus,doc="See `GetMenus` and `SetMenus`") 
 _core_.MenuBar_swigregister(MenuBar)
@@ -11569,6 +11595,222 @@ _core_.ControlWithItems_swigregister(ControlWithItems)
 
 #---------------------------------------------------------------------------
 
+class SizerFlags(object):
+    """
+    Normally, when you add an item to a sizer via `wx.Sizer.Add`, you have
+    to specify a lot of flags and parameters which can be unwieldy. This
+    is where wx.SizerFlags comes in: it allows you to specify all
+    parameters using the named methods instead. For example, instead of::
+
+        sizer.Add(ctrl, 0, wx.EXPAND | wx.ALL, 10)
+
+    you can now write::
+
+        sizer.AddF(ctrl, wx.SizerFlags().Expand().Border(wx.ALL, 10))
+
+    This is more readable and also allows you to create wx.SizerFlags
+    objects which can be reused for several sizer items.::
+
+        flagsExpand = wx.SizerFlags(1)
+        flagsExpand.Expand().Border(wx.ALL, 10)
+        sizer.AddF(ctrl1, flagsExpand)
+        sizer.AddF(ctrl2, flagsExpand)
+
+    Note that by specification, all methods of wx.SizerFlags return the
+    wx.SizerFlags object itself allowing chaining multiple method calls
+    like in the examples above.
+    """
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """
+        __init__(self, int proportion=0) -> SizerFlags
+
+        Constructs the flags object with the specified proportion.
+        """
+        _core_.SizerFlags_swiginit(self,_core_.new_SizerFlags(*args, **kwargs))
+    __swig_destroy__ = _core_.delete_SizerFlags
+    __del__ = lambda self : None;
+    def Proportion(*args, **kwargs):
+        """
+        Proportion(self, int proportion) -> SizerFlags
+
+        Sets the item's proportion value.
+        """
+        return _core_.SizerFlags_Proportion(*args, **kwargs)
+
+    def Align(*args, **kwargs):
+        """
+        Align(self, int alignment) -> SizerFlags
+
+        Sets the item's alignment
+        """
+        return _core_.SizerFlags_Align(*args, **kwargs)
+
+    def Expand(*args, **kwargs):
+        """
+        Expand(self) -> SizerFlags
+
+        Sets the wx.EXPAND flag, which will cause the item to be expanded to
+        fill as much space as it is given by the sizer.
+        """
+        return _core_.SizerFlags_Expand(*args, **kwargs)
+
+    def Centre(*args, **kwargs):
+        """
+        Centre(self) -> SizerFlags
+
+        Same as `Center` for those with an alternate dialect of English.
+        """
+        return _core_.SizerFlags_Centre(*args, **kwargs)
+
+    def Center(*args, **kwargs):
+        """
+        Center(self) -> SizerFlags
+
+        Sets the centering alignment flags.
+        """
+        return _core_.SizerFlags_Center(*args, **kwargs)
+
+    def Left(*args, **kwargs):
+        """
+        Left(self) -> SizerFlags
+
+        Aligns the object to the left, a shortcut for calling
+        Align(wx.ALIGN_LEFT)
+        """
+        return _core_.SizerFlags_Left(*args, **kwargs)
+
+    def Right(*args, **kwargs):
+        """
+        Right(self) -> SizerFlags
+
+        Aligns the object to the right, a shortcut for calling
+        Align(wx.ALIGN_RIGHT)
+        """
+        return _core_.SizerFlags_Right(*args, **kwargs)
+
+    def Top(*args, **kwargs):
+        """
+        Top(self) -> SizerFlags
+
+        Aligns the object to the top of the available space, a shortcut for
+        calling Align(wx.ALIGN_TOP)
+        """
+        return _core_.SizerFlags_Top(*args, **kwargs)
+
+    def Bottom(*args, **kwargs):
+        """
+        Bottom(self) -> SizerFlags
+
+        Aligns the object to the bottom of the available space, a shortcut for
+        calling Align(wx.ALIGN_BOTTOM)
+        """
+        return _core_.SizerFlags_Bottom(*args, **kwargs)
+
+    def Shaped(*args, **kwargs):
+        """
+        Shaped(self) -> SizerFlags
+
+        Sets the wx.SHAPED flag.
+        """
+        return _core_.SizerFlags_Shaped(*args, **kwargs)
+
+    def FixedMinSize(*args, **kwargs):
+        """
+        FixedMinSize(self) -> SizerFlags
+
+        Sets the wx.FIXED_MINSIZE flag.
+        """
+        return _core_.SizerFlags_FixedMinSize(*args, **kwargs)
+
+    def Border(*args, **kwargs):
+        """
+        Border(self, int direction=ALL, int borderInPixels=-1) -> SizerFlags
+
+        Sets the border of the item in the direction(s) or sides given by the
+        direction parameter.  If the borderInPixels value is not given then
+        the default border size (see `GetDefaultBorder`) will be used.
+        """
+        return _core_.SizerFlags_Border(*args, **kwargs)
+
+    def DoubleBorder(*args, **kwargs):
+        """
+        DoubleBorder(self, int direction=ALL) -> SizerFlags
+
+        Sets the border in the given direction to twice the default border
+        size.
+        """
+        return _core_.SizerFlags_DoubleBorder(*args, **kwargs)
+
+    def TripleBorder(*args, **kwargs):
+        """
+        TripleBorder(self, int direction=ALL) -> SizerFlags
+
+        Sets the border in the given direction to three times the default
+        border size.
+        """
+        return _core_.SizerFlags_TripleBorder(*args, **kwargs)
+
+    def HorzBorder(*args, **kwargs):
+        """
+        HorzBorder(self) -> SizerFlags
+
+        Sets the left and right borders to the default border size.
+        """
+        return _core_.SizerFlags_HorzBorder(*args, **kwargs)
+
+    def DoubleHorzBorder(*args, **kwargs):
+        """
+        DoubleHorzBorder(self) -> SizerFlags
+
+        Sets the left and right borders to twice the default border size.
+        """
+        return _core_.SizerFlags_DoubleHorzBorder(*args, **kwargs)
+
+    def GetDefaultBorder(*args, **kwargs):
+        """
+        GetDefaultBorder() -> int
+
+        Returns the default border size used by the other border methods
+        """
+        return _core_.SizerFlags_GetDefaultBorder(*args, **kwargs)
+
+    GetDefaultBorder = staticmethod(GetDefaultBorder)
+    def GetProportion(*args, **kwargs):
+        """
+        GetProportion(self) -> int
+
+        Returns the proportion value to be used in the sizer item.
+        """
+        return _core_.SizerFlags_GetProportion(*args, **kwargs)
+
+    def GetFlags(*args, **kwargs):
+        """
+        GetFlags(self) -> int
+
+        Returns the flags value to be used in the sizer item.
+        """
+        return _core_.SizerFlags_GetFlags(*args, **kwargs)
+
+    def GetBorderInPixels(*args, **kwargs):
+        """
+        GetBorderInPixels(self) -> int
+
+        Returns the border value in pixels to be used in the sizer item.
+        """
+        return _core_.SizerFlags_GetBorderInPixels(*args, **kwargs)
+
+_core_.SizerFlags_swigregister(SizerFlags)
+
+def SizerFlags_GetDefaultBorder(*args):
+  """
+    SizerFlags_GetDefaultBorder() -> int
+
+    Returns the default border size used by the other border methods
+    """
+  return _core_.SizerFlags_GetDefaultBorder(*args)
+
 class SizerItem(Object):
     """
     The wx.SizerItem class is used to track the position, size and other
@@ -11964,6 +12206,15 @@ class Sizer(Object):
         """
         return _core_.Sizer_Add(*args, **kwargs)
 
+    def AddF(*args, **kwargs):
+        """
+        AddF(self, item, wx.SizerFlags flags) -> wx.SizerItem
+
+        Similar to `Add` but uses the `wx.SizerFlags` convenience class for
+        setting the various flags, options and borders.
+        """
+        return _core_.Sizer_AddF(*args, **kwargs)
+
     def Insert(*args, **kwargs):
         """
         Insert(self, int before, item, int proportion=0, int flag=0, int border=0,
@@ -11974,6 +12225,15 @@ class Sizer(Object):
         """
         return _core_.Sizer_Insert(*args, **kwargs)
 
+    def InsertF(*args, **kwargs):
+        """
+        InsertF(self, int before, item, wx.SizerFlags flags) -> wx.SizerItem
+
+        Similar to `Insert`, but uses the `wx.SizerFlags` convenience class
+        for setting the various flags, options and borders.
+        """
+        return _core_.Sizer_InsertF(*args, **kwargs)
+
     def Prepend(*args, **kwargs):
         """
         Prepend(self, item, int proportion=0, int flag=0, int border=0,
@@ -11984,6 +12244,15 @@ class Sizer(Object):
         """
         return _core_.Sizer_Prepend(*args, **kwargs)
 
+    def PrependF(*args, **kwargs):
+        """
+        PrependF(self, item, wx.SizerFlags flags) -> wx.SizerItem
+
+        Similar to `Prepend` but uses the `wx.SizerFlags` convenience class
+        for setting the various flags, options and borders.
+        """
+        return _core_.Sizer_PrependF(*args, **kwargs)
+
     def Remove(*args, **kwargs):
         """
         Remove(self, item) -> bool
@@ -12011,7 +12280,7 @@ class Sizer(Object):
 
     def GetItem(*args, **kwargs):
         """
-        GetItem(self, item) -> wx.SizerItem
+        GetItem(self, item, recursive=False) -> wx.SizerItem
 
         Returns the `wx.SizerItem` which holds the *item* given.  The *item*
         parameter can be either a window, a sizer, or the zero-based index of
@@ -12051,9 +12320,9 @@ class Sizer(Object):
         """
         if isinstance(olditem, wx.Window):
             return self._ReplaceWin(olditem, item, recursive)
-        elif isinstnace(olditem, wx.Sizer):
+        elif isinstance(olditem, wx.Sizer):
             return self._ReplaceSizer(olditem, item, recursive)
-        elif isinstnace(olditem, int):
+        elif isinstance(olditem, int):
             return self._ReplaceItem(olditem, item)
         else:
             raise TypeError("Expected Window, Sizer, or integer for first parameter.")
diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp
index 54783f1237..a8660e410d 100644
--- a/wxPython/src/msw/_core_wrap.cpp
+++ b/wxPython/src/msw/_core_wrap.cpp
@@ -2582,24 +2582,25 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_wxSize swig_types[116]
 #define SWIGTYPE_p_wxSizeEvent swig_types[117]
 #define SWIGTYPE_p_wxSizer swig_types[118]
-#define SWIGTYPE_p_wxSizerItem swig_types[119]
-#define SWIGTYPE_p_wxStaticBox swig_types[120]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[121]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[122]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[123]
-#define SWIGTYPE_p_wxTGAHandler swig_types[124]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[125]
-#define SWIGTYPE_p_wxToolTip swig_types[126]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[127]
-#define SWIGTYPE_p_wxValidator swig_types[128]
-#define SWIGTYPE_p_wxVisualAttributes swig_types[129]
-#define SWIGTYPE_p_wxWindow swig_types[130]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[131]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[132]
-#define SWIGTYPE_p_wxXPMHandler swig_types[133]
-#define SWIGTYPE_p_wxZipFSHandler swig_types[134]
-static swig_type_info *swig_types[136];
-static swig_module_info swig_module = {swig_types, 135, 0, 0, 0, 0};
+#define SWIGTYPE_p_wxSizerFlags swig_types[119]
+#define SWIGTYPE_p_wxSizerItem swig_types[120]
+#define SWIGTYPE_p_wxStaticBox swig_types[121]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[122]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[123]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[124]
+#define SWIGTYPE_p_wxTGAHandler swig_types[125]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[126]
+#define SWIGTYPE_p_wxToolTip swig_types[127]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[128]
+#define SWIGTYPE_p_wxValidator swig_types[129]
+#define SWIGTYPE_p_wxVisualAttributes swig_types[130]
+#define SWIGTYPE_p_wxWindow swig_types[131]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[132]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[133]
+#define SWIGTYPE_p_wxXPMHandler swig_types[134]
+#define SWIGTYPE_p_wxZipFSHandler swig_types[135]
+static swig_type_info *swig_types[137];
+static swig_module_info swig_module = {swig_types, 136, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -3879,10 +3880,16 @@ public:
  static const wxString wxPyPanelNameStr(wxPanelNameStr); 
 SWIGINTERN wxVisualAttributes *new_wxVisualAttributes(){ return new wxVisualAttributes; }
 SWIGINTERN void delete_wxVisualAttributes(wxVisualAttributes *self){ delete self; }
+SWIGINTERN wxFont wxVisualAttributes__get_font(wxVisualAttributes *self){ return self->font; }
+SWIGINTERN wxColour wxVisualAttributes__get_colFg(wxVisualAttributes *self){ return self->colFg; }
+SWIGINTERN wxColour wxVisualAttributes__get_colBg(wxVisualAttributes *self){ return self->colBg; }
 SWIGINTERN PyObject *wxWindow_GetChildren(wxWindow *self){
             wxWindowList& list = self->GetChildren();
             return wxPy_ConvertList(&list);
         }
+SWIGINTERN wxWindow *wxWindow_GetTopLevelParent(wxWindow *self){
+            return wxGetTopLevelParent(self);
+        }
 SWIGINTERN void wxWindow_SetDoubleBuffered(wxWindow *self,bool on){}
 SWIGINTERN bool wxWindow_RegisterHotKey(wxWindow *self,int hotkeyId,int modifiers,int keycode){
         #if wxUSE_HOTKEY
@@ -4005,6 +4012,12 @@ SWIGINTERN void wxItemContainer_SetClientData(wxItemContainer *self,int n,PyObje
         }
 
 
+SWIGINTERN wxSizerFlags &wxSizerFlags_Border(wxSizerFlags *self,int direction=wxALL,int borderInPixels=-1){
+            if (borderInPixels == -1)
+                return self->Border(direction);
+            else
+                return self->Border(direction, borderInPixels);
+        }
 SWIGINTERN wxSizerItem *new_wxSizerItem(wxWindow *window,int proportion,int flag,int border,PyObject *userData=NULL){
             wxPyUserData* data = NULL;
             if ( userData ) {
@@ -4148,6 +4161,27 @@ SWIGINTERN wxSizerItem *wxSizer_Add(wxSizer *self,PyObject *item,int proportion=
             else
                 return NULL;
         }
+SWIGINTERN wxSizerItem *wxSizer_AddF(wxSizer *self,PyObject *item,wxSizerFlags &flags){
+            
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
+            if ( info.sizer )
+                PyObject_SetAttrString(item,"thisown",Py_False);
+            wxPyEndBlockThreads(blocked);
+
+            // Now call the real Add method if a valid item type was found
+            if ( info.window )
+                return self->Add(info.window, flags);
+            else if ( info.sizer )
+                return self->Add(info.sizer, flags);
+            else if (info.gotSize)
+                return self->Add(info.size.GetWidth(), info.size.GetHeight(),
+                                 flags.GetProportion(),
+                                 flags.GetFlags(),
+                                 flags.GetBorderInPixels());
+            else
+                return NULL;
+        }
 SWIGINTERN wxSizerItem *wxSizer_Insert(wxSizer *self,int before,PyObject *item,int proportion=0,int flag=0,int border=0,PyObject *userData=NULL){
 
             wxPyUserData* data = NULL;
@@ -4170,6 +4204,27 @@ SWIGINTERN wxSizerItem *wxSizer_Insert(wxSizer *self,int before,PyObject *item,i
             else
                 return NULL;
         }
+SWIGINTERN wxSizerItem *wxSizer_InsertF(wxSizer *self,int before,PyObject *item,wxSizerFlags &flags){
+
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
+            if ( info.sizer )
+                PyObject_SetAttrString(item,"thisown",Py_False);
+            wxPyEndBlockThreads(blocked);
+
+            // Now call the real Insert method if a valid item type was found
+            if ( info.window )
+                return self->Insert(before, info.window, flags);
+            else if ( info.sizer )
+                return self->Insert(before, info.sizer, flags);
+            else if (info.gotSize)
+                return self->Insert(before, info.size.GetWidth(), info.size.GetHeight(),
+                                    flags.GetProportion(),
+                                    flags.GetFlags(),
+                                    flags.GetBorderInPixels());
+            else
+                return NULL;
+        }
 SWIGINTERN wxSizerItem *wxSizer_Prepend(wxSizer *self,PyObject *item,int proportion=0,int flag=0,int border=0,PyObject *userData=NULL){
 
             wxPyUserData* data = NULL;
@@ -4192,6 +4247,27 @@ SWIGINTERN wxSizerItem *wxSizer_Prepend(wxSizer *self,PyObject *item,int proport
             else
                 return NULL;
         }
+SWIGINTERN wxSizerItem *wxSizer_PrependF(wxSizer *self,PyObject *item,wxSizerFlags &flags){
+            
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
+            if ( info.sizer )
+                PyObject_SetAttrString(item,"thisown",Py_False);
+            wxPyEndBlockThreads(blocked);
+
+            // Now call the real Add method if a valid item type was found
+            if ( info.window )
+                return self->Prepend(info.window, flags);
+            else if ( info.sizer )
+                return self->Prepend(info.sizer, flags);
+            else if (info.gotSize)
+                return self->Prepend(info.size.GetWidth(), info.size.GetHeight(),
+                                     flags.GetProportion(),
+                                     flags.GetFlags(),
+                                     flags.GetBorderInPixels());
+            else
+                return NULL;
+        }
 SWIGINTERN bool wxSizer_Remove(wxSizer *self,PyObject *item){
             wxPyBlock_t blocked = wxPyBeginBlockThreads();
             wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
@@ -4218,14 +4294,14 @@ SWIGINTERN bool wxSizer_Detach(wxSizer *self,PyObject *item){
             else
                 return false;
         }
-SWIGINTERN wxSizerItem *wxSizer_GetItem(wxSizer *self,PyObject *item){
+SWIGINTERN wxSizerItem *wxSizer_GetItem(wxSizer *self,PyObject *item,bool recursive=false){
             wxPyBlock_t blocked = wxPyBeginBlockThreads();
             wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
             wxPyEndBlockThreads(blocked);
             if ( info.window )
-                return self->GetItem(info.window);
+                return self->GetItem(info.window, recursive);
             else if ( info.sizer )
-                return self->GetItem(info.sizer);
+                return self->GetItem(info.sizer, recursive);
             else if ( info.gotPos )
                 return self->GetItem(info.pos);
             else
@@ -7258,7 +7334,7 @@ SWIGINTERN PyObject *_wrap_Rect_Inflate(PyObject *SWIGUNUSEDPARM(self), PyObject
   wxRect *arg1 = (wxRect *) 0 ;
   int arg2 ;
   int arg3 ;
-  wxRect *result = 0 ;
+  wxRect result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -7289,13 +7365,10 @@ SWIGINTERN PyObject *_wrap_Rect_Inflate(PyObject *SWIGUNUSEDPARM(self), PyObject
   } 
   arg3 = static_cast< int >(val3);
   {
-    {
-      wxRect &_result_ref = (arg1)->Inflate(arg2,arg3);
-      result = (wxRect *) &_result_ref;
-    }
+    result = (arg1)->Inflate(arg2,arg3);
     if (PyErr_Occurred()) SWIG_fail;
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxRect, 0 |  0 );
+  resultobj = SWIG_NewPointerObj((new wxRect(static_cast< const wxRect& >(result))), SWIGTYPE_p_wxRect, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -32497,40 +32570,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_VisualAttributes_font_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_VisualAttributes__get_font(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-  wxFont *arg2 = (wxFont *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject *swig_obj[2] ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"VisualAttributes_font_set",2,2,swig_obj)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_font_set" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
-  }
-  arg1 = reinterpret_cast< wxVisualAttributes * >(argp1);
-  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxFont, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VisualAttributes_font_set" "', expected argument " "2"" of type '" "wxFont *""'"); 
-  }
-  arg2 = reinterpret_cast< wxFont * >(argp2);
-  if (arg1) (arg1)->font = *arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_VisualAttributes_font_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-  wxFont *result = 0 ;
+  wxFont result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
@@ -32539,51 +32582,26 @@ SWIGINTERN PyObject *_wrap_VisualAttributes_font_get(PyObject *SWIGUNUSEDPARM(se
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_font_get" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes__get_font" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
   }
   arg1 = reinterpret_cast< wxVisualAttributes * >(argp1);
-  result = (wxFont *)& ((arg1)->font);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, 0 |  0 );
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = wxVisualAttributes__get_font(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxFont(static_cast< const wxFont& >(result))), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_VisualAttributes_colFg_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_VisualAttributes__get_colFg(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-  wxColour *arg2 = (wxColour *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject *swig_obj[2] ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"VisualAttributes_colFg_set",2,2,swig_obj)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colFg_set" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
-  }
-  arg1 = reinterpret_cast< wxVisualAttributes * >(argp1);
-  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxColour, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VisualAttributes_colFg_set" "', expected argument " "2"" of type '" "wxColour *""'"); 
-  }
-  arg2 = reinterpret_cast< wxColour * >(argp2);
-  if (arg1) (arg1)->colFg = *arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_VisualAttributes_colFg_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-  wxColour *result = 0 ;
+  wxColour result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
@@ -32592,51 +32610,26 @@ SWIGINTERN PyObject *_wrap_VisualAttributes_colFg_get(PyObject *SWIGUNUSEDPARM(s
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colFg_get" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes__get_colFg" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
   }
   arg1 = reinterpret_cast< wxVisualAttributes * >(argp1);
-  result = (wxColour *)& ((arg1)->colFg);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 |  0 );
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = wxVisualAttributes__get_colFg(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_VisualAttributes_colBg_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_VisualAttributes__get_colBg(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-  wxColour *arg2 = (wxColour *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  PyObject *swig_obj[2] ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"VisualAttributes_colBg_set",2,2,swig_obj)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colBg_set" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
-  }
-  arg1 = reinterpret_cast< wxVisualAttributes * >(argp1);
-  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxColour, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VisualAttributes_colBg_set" "', expected argument " "2"" of type '" "wxColour *""'"); 
-  }
-  arg2 = reinterpret_cast< wxColour * >(argp2);
-  if (arg1) (arg1)->colBg = *arg2;
-  
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_VisualAttributes_colBg_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
-  wxColour *result = 0 ;
+  wxColour result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
@@ -32645,11 +32638,16 @@ SWIGINTERN PyObject *_wrap_VisualAttributes_colBg_get(PyObject *SWIGUNUSEDPARM(s
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colBg_get" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes__get_colBg" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); 
   }
   arg1 = reinterpret_cast< wxVisualAttributes * >(argp1);
-  result = (wxColour *)& ((arg1)->colBg);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 |  0 );
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = wxVisualAttributes__get_colBg(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -36385,6 +36383,36 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_Window_GetTopLevelParent(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxWindow *arg1 = (wxWindow *) 0 ;
+  wxWindow *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_GetTopLevelParent" "', expected argument " "1"" of type '" "wxWindow *""'"); 
+  }
+  arg1 = reinterpret_cast< wxWindow * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxWindow *)wxWindow_GetTopLevelParent(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_Window_IsTopLevel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;
@@ -48419,6 +48447,779 @@ SWIGINTERN PyObject *ControlWithItems_swigregister(PyObject *SWIGUNUSEDPARM(self
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *_wrap_new_SizerFlags(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  int arg1 = (int) 0 ;
+  wxSizerFlags *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "proportion", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_SizerFlags",kwnames,&obj0)) SWIG_fail;
+  if (obj0) {
+    ecode1 = SWIG_AsVal_int(obj0, &val1);
+    if (!SWIG_IsOK(ecode1)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SizerFlags" "', expected argument " "1"" of type '" "int""'");
+    } 
+    arg1 = static_cast< int >(val1);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxSizerFlags *)new wxSizerFlags(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerFlags, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_SizerFlags(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SizerFlags" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    delete arg1;
+    
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Proportion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int arg2 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "proportion", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerFlags_Proportion",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Proportion" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_Proportion" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Proportion(arg2);
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = obj0; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Align(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int arg2 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "alignment", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerFlags_Align",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Align" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_Align" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Align(arg2);
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = obj0; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Expand(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Expand" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Expand();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Centre(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Centre" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Centre();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Center(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Center" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Center();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Left(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Left" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Left();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Right(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Right" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Right();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Top(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Top" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Top();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Bottom(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Bottom" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Bottom();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Shaped(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Shaped" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->Shaped();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_FixedMinSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_FixedMinSize" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->FixedMinSize();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_Border(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int arg2 = (int) wxALL ;
+  int arg3 = (int) -1 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "direction",(char *) "borderInPixels", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:SizerFlags_Border",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_Border" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  if (obj1) {
+    ecode2 = SWIG_AsVal_int(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_Border" "', expected argument " "2"" of type '" "int""'");
+    } 
+    arg2 = static_cast< int >(val2);
+  }
+  if (obj2) {
+    ecode3 = SWIG_AsVal_int(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SizerFlags_Border" "', expected argument " "3"" of type '" "int""'");
+    } 
+    arg3 = static_cast< int >(val3);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = wxSizerFlags_Border(arg1,arg2,arg3);
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = obj0; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_DoubleBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int arg2 = (int) wxALL ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "direction", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:SizerFlags_DoubleBorder",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_DoubleBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  if (obj1) {
+    ecode2 = SWIG_AsVal_int(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_DoubleBorder" "', expected argument " "2"" of type '" "int""'");
+    } 
+    arg2 = static_cast< int >(val2);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->DoubleBorder(arg2);
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = obj0; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_TripleBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int arg2 = (int) wxALL ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "direction", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:SizerFlags_TripleBorder",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_TripleBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  if (obj1) {
+    ecode2 = SWIG_AsVal_int(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SizerFlags_TripleBorder" "', expected argument " "2"" of type '" "int""'");
+    } 
+    arg2 = static_cast< int >(val2);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->TripleBorder(arg2);
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = obj0; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_HorzBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_HorzBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->HorzBorder();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_DoubleHorzBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  wxSizerFlags *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_DoubleHorzBorder" "', expected argument " "1"" of type '" "wxSizerFlags *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    {
+      wxSizerFlags &_result_ref = (arg1)->DoubleHorzBorder();
+      result = (wxSizerFlags *) &_result_ref;
+    }
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = swig_obj[0]; Py_INCREF(resultobj); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_GetDefaultBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int result;
+  
+  if (!SWIG_Python_UnpackTuple(args,"SizerFlags_GetDefaultBorder",0,0,0)) SWIG_fail;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)wxSizerFlags::GetDefaultBorder();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_GetProportion(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_GetProportion" "', expected argument " "1"" of type '" "wxSizerFlags const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxSizerFlags const *)arg1)->GetProportion();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_GetFlags(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_GetFlags" "', expected argument " "1"" of type '" "wxSizerFlags const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxSizerFlags const *)arg1)->GetFlags();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SizerFlags_GetBorderInPixels(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizerFlags *arg1 = (wxSizerFlags *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizerFlags, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SizerFlags_GetBorderInPixels" "', expected argument " "1"" of type '" "wxSizerFlags const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizerFlags * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxSizerFlags const *)arg1)->GetBorderInPixels();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *SizerFlags_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxSizerFlags, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *SizerFlags_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 SWIGINTERN PyObject *_wrap_new_SizerItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxSizerItem *result = 0 ;
@@ -49875,6 +50676,51 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_Sizer_AddF(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizer *arg1 = (wxSizer *) 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;
+  wxSizerFlags *arg3 = 0 ;
+  wxSizerItem *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "item",(char *) "flags", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Sizer_AddF",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_AddF" "', expected argument " "1"" of type '" "wxSizer *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizer * >(argp1);
+  arg2 = obj1;
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxSizerFlags,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Sizer_AddF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Sizer_AddF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); 
+  }
+  arg3 = reinterpret_cast< wxSizerFlags * >(argp3);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxSizerItem *)wxSizer_AddF(arg1,arg2,*arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerItem, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_Sizer_Insert(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSizer *arg1 = (wxSizer *) 0 ;
@@ -49955,6 +50801,60 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_Sizer_InsertF(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizer *arg1 = (wxSizer *) 0 ;
+  int arg2 ;
+  PyObject *arg3 = (PyObject *) 0 ;
+  wxSizerFlags *arg4 = 0 ;
+  wxSizerItem *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "before",(char *) "item",(char *) "flags", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Sizer_InsertF",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_InsertF" "', expected argument " "1"" of type '" "wxSizer *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizer * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Sizer_InsertF" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  arg3 = obj2;
+  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_wxSizerFlags,  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "Sizer_InsertF" "', expected argument " "4"" of type '" "wxSizerFlags &""'"); 
+  }
+  if (!argp4) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Sizer_InsertF" "', expected argument " "4"" of type '" "wxSizerFlags &""'"); 
+  }
+  arg4 = reinterpret_cast< wxSizerFlags * >(argp4);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxSizerItem *)wxSizer_InsertF(arg1,arg2,arg3,*arg4);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerItem, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_Sizer_Prepend(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSizer *arg1 = (wxSizer *) 0 ;
@@ -50026,6 +50926,51 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_Sizer_PrependF(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizer *arg1 = (wxSizer *) 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;
+  wxSizerFlags *arg3 = 0 ;
+  wxSizerItem *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "item",(char *) "flags", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Sizer_PrependF",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_PrependF" "', expected argument " "1"" of type '" "wxSizer *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizer * >(argp1);
+  arg2 = obj1;
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxSizerFlags,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Sizer_PrependF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Sizer_PrependF" "', expected argument " "3"" of type '" "wxSizerFlags &""'"); 
+  }
+  arg3 = reinterpret_cast< wxSizerFlags * >(argp3);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxSizerItem *)wxSizer_PrependF(arg1,arg2,*arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxSizerItem, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_Sizer_Remove(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSizer *arg1 = (wxSizer *) 0 ;
@@ -50100,25 +51045,36 @@ SWIGINTERN PyObject *_wrap_Sizer_GetItem(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject *resultobj = 0;
   wxSizer *arg1 = (wxSizer *) 0 ;
   PyObject *arg2 = (PyObject *) 0 ;
+  bool arg3 = (bool) false ;
   wxSizerItem *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   char *  kwnames[] = {
-    (char *) "self",(char *) "item", NULL 
+    (char *) "self",(char *) "item",(char *) "recursive", NULL 
   };
   
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_GetItem",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Sizer_GetItem",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_GetItem" "', expected argument " "1"" of type '" "wxSizer *""'"); 
   }
   arg1 = reinterpret_cast< wxSizer * >(argp1);
   arg2 = obj1;
+  if (obj2) {
+    ecode3 = SWIG_AsVal_bool(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Sizer_GetItem" "', expected argument " "3"" of type '" "bool""'");
+    } 
+    arg3 = static_cast< bool >(val3);
+  }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxSizerItem *)wxSizer_GetItem(arg1,arg2);
+    result = (wxSizerItem *)wxSizer_GetItem(arg1,arg2,arg3);
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
@@ -57366,12 +58322,9 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"GetAccelFromString", (PyCFunction) _wrap_GetAccelFromString, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"new_VisualAttributes", (PyCFunction)_wrap_new_VisualAttributes, METH_NOARGS, NULL},
 	 { (char *)"delete_VisualAttributes", (PyCFunction)_wrap_delete_VisualAttributes, METH_O, NULL},
-	 { (char *)"VisualAttributes_font_set", _wrap_VisualAttributes_font_set, METH_VARARGS, NULL},
-	 { (char *)"VisualAttributes_font_get", (PyCFunction)_wrap_VisualAttributes_font_get, METH_O, NULL},
-	 { (char *)"VisualAttributes_colFg_set", _wrap_VisualAttributes_colFg_set, METH_VARARGS, NULL},
-	 { (char *)"VisualAttributes_colFg_get", (PyCFunction)_wrap_VisualAttributes_colFg_get, METH_O, NULL},
-	 { (char *)"VisualAttributes_colBg_set", _wrap_VisualAttributes_colBg_set, METH_VARARGS, NULL},
-	 { (char *)"VisualAttributes_colBg_get", (PyCFunction)_wrap_VisualAttributes_colBg_get, METH_O, NULL},
+	 { (char *)"VisualAttributes__get_font", (PyCFunction)_wrap_VisualAttributes__get_font, METH_O, NULL},
+	 { (char *)"VisualAttributes__get_colFg", (PyCFunction)_wrap_VisualAttributes__get_colFg, METH_O, NULL},
+	 { (char *)"VisualAttributes__get_colBg", (PyCFunction)_wrap_VisualAttributes__get_colBg, METH_O, NULL},
 	 { (char *)"VisualAttributes_swigregister", VisualAttributes_swigregister, METH_VARARGS, NULL},
 	 { (char *)"VisualAttributes_swiginit", VisualAttributes_swiginit, METH_VARARGS, NULL},
 	 { (char *)"new_Window", (PyCFunction) _wrap_new_Window, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -57474,6 +58427,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"Window_GetChildren", (PyCFunction)_wrap_Window_GetChildren, METH_O, NULL},
 	 { (char *)"Window_GetParent", (PyCFunction)_wrap_Window_GetParent, METH_O, NULL},
 	 { (char *)"Window_GetGrandParent", (PyCFunction)_wrap_Window_GetGrandParent, METH_O, NULL},
+	 { (char *)"Window_GetTopLevelParent", (PyCFunction)_wrap_Window_GetTopLevelParent, METH_O, NULL},
 	 { (char *)"Window_IsTopLevel", (PyCFunction)_wrap_Window_IsTopLevel, METH_O, NULL},
 	 { (char *)"Window_Reparent", (PyCFunction) _wrap_Window_Reparent, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Window_AddChild", (PyCFunction) _wrap_Window_AddChild, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -57782,6 +58736,30 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"ItemContainer_Select", (PyCFunction) _wrap_ItemContainer_Select, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"ItemContainer_swigregister", ItemContainer_swigregister, METH_VARARGS, NULL},
 	 { (char *)"ControlWithItems_swigregister", ControlWithItems_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_SizerFlags", (PyCFunction) _wrap_new_SizerFlags, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"delete_SizerFlags", (PyCFunction)_wrap_delete_SizerFlags, METH_O, NULL},
+	 { (char *)"SizerFlags_Proportion", (PyCFunction) _wrap_SizerFlags_Proportion, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"SizerFlags_Align", (PyCFunction) _wrap_SizerFlags_Align, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"SizerFlags_Expand", (PyCFunction)_wrap_SizerFlags_Expand, METH_O, NULL},
+	 { (char *)"SizerFlags_Centre", (PyCFunction)_wrap_SizerFlags_Centre, METH_O, NULL},
+	 { (char *)"SizerFlags_Center", (PyCFunction)_wrap_SizerFlags_Center, METH_O, NULL},
+	 { (char *)"SizerFlags_Left", (PyCFunction)_wrap_SizerFlags_Left, METH_O, NULL},
+	 { (char *)"SizerFlags_Right", (PyCFunction)_wrap_SizerFlags_Right, METH_O, NULL},
+	 { (char *)"SizerFlags_Top", (PyCFunction)_wrap_SizerFlags_Top, METH_O, NULL},
+	 { (char *)"SizerFlags_Bottom", (PyCFunction)_wrap_SizerFlags_Bottom, METH_O, NULL},
+	 { (char *)"SizerFlags_Shaped", (PyCFunction)_wrap_SizerFlags_Shaped, METH_O, NULL},
+	 { (char *)"SizerFlags_FixedMinSize", (PyCFunction)_wrap_SizerFlags_FixedMinSize, METH_O, NULL},
+	 { (char *)"SizerFlags_Border", (PyCFunction) _wrap_SizerFlags_Border, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"SizerFlags_DoubleBorder", (PyCFunction) _wrap_SizerFlags_DoubleBorder, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"SizerFlags_TripleBorder", (PyCFunction) _wrap_SizerFlags_TripleBorder, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"SizerFlags_HorzBorder", (PyCFunction)_wrap_SizerFlags_HorzBorder, METH_O, NULL},
+	 { (char *)"SizerFlags_DoubleHorzBorder", (PyCFunction)_wrap_SizerFlags_DoubleHorzBorder, METH_O, NULL},
+	 { (char *)"SizerFlags_GetDefaultBorder", (PyCFunction)_wrap_SizerFlags_GetDefaultBorder, METH_NOARGS, NULL},
+	 { (char *)"SizerFlags_GetProportion", (PyCFunction)_wrap_SizerFlags_GetProportion, METH_O, NULL},
+	 { (char *)"SizerFlags_GetFlags", (PyCFunction)_wrap_SizerFlags_GetFlags, METH_O, NULL},
+	 { (char *)"SizerFlags_GetBorderInPixels", (PyCFunction)_wrap_SizerFlags_GetBorderInPixels, METH_O, NULL},
+	 { (char *)"SizerFlags_swigregister", SizerFlags_swigregister, METH_VARARGS, NULL},
+	 { (char *)"SizerFlags_swiginit", SizerFlags_swiginit, METH_VARARGS, NULL},
 	 { (char *)"new_SizerItem", (PyCFunction)_wrap_new_SizerItem, METH_NOARGS, NULL},
 	 { (char *)"delete_SizerItem", (PyCFunction)_wrap_delete_SizerItem, METH_O, NULL},
 	 { (char *)"new_SizerItemWindow", (PyCFunction) _wrap_new_SizerItemWindow, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -57825,8 +58803,11 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"delete_Sizer", (PyCFunction)_wrap_delete_Sizer, METH_O, NULL},
 	 { (char *)"Sizer__setOORInfo", (PyCFunction) _wrap_Sizer__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Sizer_Add", (PyCFunction) _wrap_Sizer_Add, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"Sizer_AddF", (PyCFunction) _wrap_Sizer_AddF, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Sizer_Insert", (PyCFunction) _wrap_Sizer_Insert, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"Sizer_InsertF", (PyCFunction) _wrap_Sizer_InsertF, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Sizer_Prepend", (PyCFunction) _wrap_Sizer_Prepend, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"Sizer_PrependF", (PyCFunction) _wrap_Sizer_PrependF, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Sizer_Remove", (PyCFunction) _wrap_Sizer_Remove, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Sizer_Detach", (PyCFunction) _wrap_Sizer_Detach, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Sizer_GetItem", (PyCFunction) _wrap_Sizer_GetItem, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -58012,36 +58993,6 @@ static PyMethodDef SwigMethods[] = {
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
-static void *_p_wxGBSizerItemTo_p_wxSizerItem(void *x) {
-    return (void *)((wxSizerItem *)  ((wxGBSizerItem *) x));
-}
-static void *_p_wxBoxSizerTo_p_wxSizer(void *x) {
-    return (void *)((wxSizer *)  ((wxBoxSizer *) x));
-}
-static void *_p_wxStaticBoxSizerTo_p_wxSizer(void *x) {
-    return (void *)((wxSizer *) (wxBoxSizer *) ((wxStaticBoxSizer *) x));
-}
-static void *_p_wxStdDialogButtonSizerTo_p_wxSizer(void *x) {
-    return (void *)((wxSizer *) (wxBoxSizer *) ((wxStdDialogButtonSizer *) x));
-}
-static void *_p_wxGridBagSizerTo_p_wxSizer(void *x) {
-    return (void *)((wxSizer *) (wxGridSizer *)(wxFlexGridSizer *) ((wxGridBagSizer *) x));
-}
-static void *_p_wxGridSizerTo_p_wxSizer(void *x) {
-    return (void *)((wxSizer *)  ((wxGridSizer *) x));
-}
-static void *_p_wxFlexGridSizerTo_p_wxSizer(void *x) {
-    return (void *)((wxSizer *) (wxGridSizer *) ((wxFlexGridSizer *) x));
-}
-static void *_p_wxPySizerTo_p_wxSizer(void *x) {
-    return (void *)((wxSizer *)  ((wxPySizer *) x));
-}
-static void *_p_wxStaticBoxSizerTo_p_wxBoxSizer(void *x) {
-    return (void *)((wxBoxSizer *)  ((wxStaticBoxSizer *) x));
-}
-static void *_p_wxStdDialogButtonSizerTo_p_wxBoxSizer(void *x) {
-    return (void *)((wxBoxSizer *)  ((wxStdDialogButtonSizer *) x));
-}
 static void *_p_wxContextMenuEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *) (wxCommandEvent *) ((wxContextMenuEvent *) x));
 }
@@ -58156,113 +59107,8 @@ static void *_p_wxKeyEventTo_p_wxEvent(void *x) {
 static void *_p_wxScrollWinEventTo_p_wxEvent(void *x) {
     return (void *)((wxEvent *)  ((wxScrollWinEvent *) x));
 }
-static void *_p_wxGridBagSizerTo_p_wxGridSizer(void *x) {
-    return (void *)((wxGridSizer *) (wxFlexGridSizer *) ((wxGridBagSizer *) x));
-}
-static void *_p_wxFlexGridSizerTo_p_wxGridSizer(void *x) {
-    return (void *)((wxGridSizer *)  ((wxFlexGridSizer *) x));
-}
-static void *_p_wxGridBagSizerTo_p_wxFlexGridSizer(void *x) {
-    return (void *)((wxFlexGridSizer *)  ((wxGridBagSizer *) x));
-}
-static void *_p_wxControlWithItemsTo_p_wxItemContainer(void *x) {
-    return (void *)((wxItemContainer *)  ((wxControlWithItems *) x));
-}
-static void *_p_wxControlWithItemsTo_p_wxControl(void *x) {
-    return (void *)((wxControl *)  ((wxControlWithItems *) x));
-}
-static void *_p_wxControlTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *) (wxWindow *) ((wxControl *) x));
-}
-static void *_p_wxWindowTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *)  ((wxWindow *) x));
-}
-static void *_p_wxControlWithItemsTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxControlWithItems *) x));
-}
-static void *_p_wxPyAppTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *)  ((wxPyApp *) x));
-}
-static void *_p_wxValidatorTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *)  ((wxValidator *) x));
-}
-static void *_p_wxPyValidatorTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *) (wxValidator *) ((wxPyValidator *) x));
-}
-static void *_p_wxMenuBarTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *) (wxWindow *) ((wxMenuBar *) x));
-}
-static void *_p_wxMenuTo_p_wxEvtHandler(void *x) {
-    return (void *)((wxEvtHandler *)  ((wxMenu *) x));
-}
-static void *_p_wxANIHandlerTo_p_wxCURHandler(void *x) {
-    return (void *)((wxCURHandler *)  ((wxANIHandler *) x));
-}
-static void *_p_wxCURHandlerTo_p_wxICOHandler(void *x) {
-    return (void *)((wxICOHandler *)  ((wxCURHandler *) x));
-}
-static void *_p_wxANIHandlerTo_p_wxICOHandler(void *x) {
-    return (void *)((wxICOHandler *) (wxCURHandler *) ((wxANIHandler *) x));
-}
-static void *_p_wxICOHandlerTo_p_wxBMPHandler(void *x) {
-    return (void *)((wxBMPHandler *)  ((wxICOHandler *) x));
-}
-static void *_p_wxCURHandlerTo_p_wxBMPHandler(void *x) {
-    return (void *)((wxBMPHandler *) (wxICOHandler *) ((wxCURHandler *) x));
-}
-static void *_p_wxANIHandlerTo_p_wxBMPHandler(void *x) {
-    return (void *)((wxBMPHandler *) (wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x));
-}
-static void *_p_wxPyImageHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxPyImageHandler *) x));
-}
-static void *_p_wxBMPHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxBMPHandler *) x));
-}
-static void *_p_wxICOHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *) (wxBMPHandler *) ((wxICOHandler *) x));
-}
-static void *_p_wxCURHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *) ((wxCURHandler *) x));
-}
-static void *_p_wxANIHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x));
-}
-static void *_p_wxPNGHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxPNGHandler *) x));
-}
-static void *_p_wxGIFHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxGIFHandler *) x));
-}
-static void *_p_wxPCXHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxPCXHandler *) x));
-}
-static void *_p_wxJPEGHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxJPEGHandler *) x));
-}
-static void *_p_wxPNMHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxPNMHandler *) x));
-}
-static void *_p_wxXPMHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxXPMHandler *) x));
-}
-static void *_p_wxTIFFHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxTIFFHandler *) x));
-}
-static void *_p_wxTGAHandlerTo_p_wxImageHandler(void *x) {
-    return (void *)((wxImageHandler *)  ((wxTGAHandler *) x));
-}
-static void *_p_wxPyFileSystemHandlerTo_p_wxFileSystemHandler(void *x) {
-    return (void *)((wxFileSystemHandler *)  ((wxPyFileSystemHandler *) x));
-}
-static void *_p_wxInternetFSHandlerTo_p_wxFileSystemHandler(void *x) {
-    return (void *)((wxFileSystemHandler *)  ((wxInternetFSHandler *) x));
-}
-static void *_p_wxZipFSHandlerTo_p_wxFileSystemHandler(void *x) {
-    return (void *)((wxFileSystemHandler *)  ((wxZipFSHandler *) x));
-}
-static void *_p_wxMemoryFSHandlerTo_p_wxFileSystemHandler(void *x) {
-    return (void *)((wxFileSystemHandler *)  ((wxMemoryFSHandler *) x));
+static void *_p_wxPyValidatorTo_p_wxValidator(void *x) {
+    return (void *)((wxValidator *)  ((wxPyValidator *) x));
 }
 static void *_p_wxLayoutConstraintsTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxLayoutConstraints *) x));
@@ -58501,6 +59347,144 @@ static void *_p_wxPyValidatorTo_p_wxObject(void *x) {
 static void *_p_wxValidatorTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *) ((wxValidator *) x));
 }
+static void *_p_wxGridBagSizerTo_p_wxFlexGridSizer(void *x) {
+    return (void *)((wxFlexGridSizer *)  ((wxGridBagSizer *) x));
+}
+static void *_p_wxGridBagSizerTo_p_wxGridSizer(void *x) {
+    return (void *)((wxGridSizer *) (wxFlexGridSizer *) ((wxGridBagSizer *) x));
+}
+static void *_p_wxFlexGridSizerTo_p_wxGridSizer(void *x) {
+    return (void *)((wxGridSizer *)  ((wxFlexGridSizer *) x));
+}
+static void *_p_wxControlWithItemsTo_p_wxControl(void *x) {
+    return (void *)((wxControl *)  ((wxControlWithItems *) x));
+}
+static void *_p_wxControlWithItemsTo_p_wxItemContainer(void *x) {
+    return (void *)((wxItemContainer *)  ((wxControlWithItems *) x));
+}
+static void *_p_wxStaticBoxSizerTo_p_wxBoxSizer(void *x) {
+    return (void *)((wxBoxSizer *)  ((wxStaticBoxSizer *) x));
+}
+static void *_p_wxStdDialogButtonSizerTo_p_wxBoxSizer(void *x) {
+    return (void *)((wxBoxSizer *)  ((wxStdDialogButtonSizer *) x));
+}
+static void *_p_wxBoxSizerTo_p_wxSizer(void *x) {
+    return (void *)((wxSizer *)  ((wxBoxSizer *) x));
+}
+static void *_p_wxStaticBoxSizerTo_p_wxSizer(void *x) {
+    return (void *)((wxSizer *) (wxBoxSizer *) ((wxStaticBoxSizer *) x));
+}
+static void *_p_wxStdDialogButtonSizerTo_p_wxSizer(void *x) {
+    return (void *)((wxSizer *) (wxBoxSizer *) ((wxStdDialogButtonSizer *) x));
+}
+static void *_p_wxGridBagSizerTo_p_wxSizer(void *x) {
+    return (void *)((wxSizer *) (wxGridSizer *)(wxFlexGridSizer *) ((wxGridBagSizer *) x));
+}
+static void *_p_wxGridSizerTo_p_wxSizer(void *x) {
+    return (void *)((wxSizer *)  ((wxGridSizer *) x));
+}
+static void *_p_wxFlexGridSizerTo_p_wxSizer(void *x) {
+    return (void *)((wxSizer *) (wxGridSizer *) ((wxFlexGridSizer *) x));
+}
+static void *_p_wxPySizerTo_p_wxSizer(void *x) {
+    return (void *)((wxSizer *)  ((wxPySizer *) x));
+}
+static void *_p_wxGBSizerItemTo_p_wxSizerItem(void *x) {
+    return (void *)((wxSizerItem *)  ((wxGBSizerItem *) x));
+}
+static void *_p_wxPyFileSystemHandlerTo_p_wxFileSystemHandler(void *x) {
+    return (void *)((wxFileSystemHandler *)  ((wxPyFileSystemHandler *) x));
+}
+static void *_p_wxInternetFSHandlerTo_p_wxFileSystemHandler(void *x) {
+    return (void *)((wxFileSystemHandler *)  ((wxInternetFSHandler *) x));
+}
+static void *_p_wxZipFSHandlerTo_p_wxFileSystemHandler(void *x) {
+    return (void *)((wxFileSystemHandler *)  ((wxZipFSHandler *) x));
+}
+static void *_p_wxMemoryFSHandlerTo_p_wxFileSystemHandler(void *x) {
+    return (void *)((wxFileSystemHandler *)  ((wxMemoryFSHandler *) x));
+}
+static void *_p_wxPyImageHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxPyImageHandler *) x));
+}
+static void *_p_wxBMPHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxBMPHandler *) x));
+}
+static void *_p_wxICOHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *) (wxBMPHandler *) ((wxICOHandler *) x));
+}
+static void *_p_wxCURHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *) ((wxCURHandler *) x));
+}
+static void *_p_wxANIHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *) (wxBMPHandler *)(wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x));
+}
+static void *_p_wxPNGHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxPNGHandler *) x));
+}
+static void *_p_wxGIFHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxGIFHandler *) x));
+}
+static void *_p_wxPCXHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxPCXHandler *) x));
+}
+static void *_p_wxJPEGHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxJPEGHandler *) x));
+}
+static void *_p_wxPNMHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxPNMHandler *) x));
+}
+static void *_p_wxXPMHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxXPMHandler *) x));
+}
+static void *_p_wxTIFFHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxTIFFHandler *) x));
+}
+static void *_p_wxTGAHandlerTo_p_wxImageHandler(void *x) {
+    return (void *)((wxImageHandler *)  ((wxTGAHandler *) x));
+}
+static void *_p_wxICOHandlerTo_p_wxBMPHandler(void *x) {
+    return (void *)((wxBMPHandler *)  ((wxICOHandler *) x));
+}
+static void *_p_wxCURHandlerTo_p_wxBMPHandler(void *x) {
+    return (void *)((wxBMPHandler *) (wxICOHandler *) ((wxCURHandler *) x));
+}
+static void *_p_wxANIHandlerTo_p_wxBMPHandler(void *x) {
+    return (void *)((wxBMPHandler *) (wxICOHandler *)(wxCURHandler *) ((wxANIHandler *) x));
+}
+static void *_p_wxCURHandlerTo_p_wxICOHandler(void *x) {
+    return (void *)((wxICOHandler *)  ((wxCURHandler *) x));
+}
+static void *_p_wxANIHandlerTo_p_wxICOHandler(void *x) {
+    return (void *)((wxICOHandler *) (wxCURHandler *) ((wxANIHandler *) x));
+}
+static void *_p_wxANIHandlerTo_p_wxCURHandler(void *x) {
+    return (void *)((wxCURHandler *)  ((wxANIHandler *) x));
+}
+static void *_p_wxControlTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *) (wxWindow *) ((wxControl *) x));
+}
+static void *_p_wxWindowTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *)  ((wxWindow *) x));
+}
+static void *_p_wxControlWithItemsTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxControlWithItems *) x));
+}
+static void *_p_wxPyAppTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *)  ((wxPyApp *) x));
+}
+static void *_p_wxValidatorTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *)  ((wxValidator *) x));
+}
+static void *_p_wxPyValidatorTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *) (wxValidator *) ((wxPyValidator *) x));
+}
+static void *_p_wxMenuBarTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *) (wxWindow *) ((wxMenuBar *) x));
+}
+static void *_p_wxMenuTo_p_wxEvtHandler(void *x) {
+    return (void *)((wxEvtHandler *)  ((wxMenu *) x));
+}
 static void *_p_wxControlTo_p_wxWindow(void *x) {
     return (void *)((wxWindow *)  ((wxControl *) x));
 }
@@ -58540,9 +59524,6 @@ static void *_p_wxNotifyEventTo_p_wxCommandEvent(void *x) {
 static void *_p_wxPyCommandEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxPyCommandEvent *) x));
 }
-static void *_p_wxPyValidatorTo_p_wxValidator(void *x) {
-    return (void *)((wxValidator *)  ((wxPyValidator *) x));
-}
 static swig_type_info _swigt__p_buffer = {"_p_buffer", "buffer *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_form_ops_t = {"_p_form_ops_t", "enum form_ops_t *|form_ops_t *", 0, 0, (void*)0, 0};
@@ -58662,6 +59643,7 @@ static swig_type_info _swigt__p_wxShowEvent = {"_p_wxShowEvent", "wxShowEvent *"
 static swig_type_info _swigt__p_wxSize = {"_p_wxSize", "wxSize *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxSizeEvent = {"_p_wxSizeEvent", "wxSizeEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxSizer = {"_p_wxSizer", "wxSizer *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_wxSizerFlags = {"_p_wxSizerFlags", "wxSizerFlags *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxSizerItem = {"_p_wxSizerItem", "wxSizerItem *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxStaticBox = {"_p_wxStaticBox", "wxStaticBox *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxStaticBoxSizer = {"_p_wxStaticBoxSizer", "wxStaticBoxSizer *", 0, 0, (void*)0, 0};
@@ -58799,6 +59781,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxSize,
   &_swigt__p_wxSizeEvent,
   &_swigt__p_wxSizer,
+  &_swigt__p_wxSizerFlags,
   &_swigt__p_wxSizerItem,
   &_swigt__p_wxStaticBox,
   &_swigt__p_wxStaticBoxSizer,
@@ -58936,6 +59919,7 @@ static swig_cast_info _swigc__p_wxShowEvent[] = {  {&_swigt__p_wxShowEvent, 0, 0
 static swig_cast_info _swigc__p_wxSize[] = {  {&_swigt__p_wxSize, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSizeEvent[] = {  {&_swigt__p_wxSizeEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSizer[] = {  {&_swigt__p_wxSizer, 0, 0, 0},  {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxSizer, 0, 0},  {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxSizer, 0, 0},  {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxSizer, 0, 0},  {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxSizer, 0, 0},  {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxSizer, 0, 0},  {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxSizer, 0, 0},  {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxSizer, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxSizerFlags[] = {  {&_swigt__p_wxSizerFlags, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSizerItem[] = {  {&_swigt__p_wxSizerItem, 0, 0, 0},  {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxSizerItem, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxStaticBox[] = {  {&_swigt__p_wxStaticBox, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxStaticBoxSizer[] = {  {&_swigt__p_wxStaticBoxSizer, 0, 0, 0},{0, 0, 0, 0}};
@@ -59073,6 +60057,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxSize,
   _swigc__p_wxSizeEvent,
   _swigc__p_wxSizer,
+  _swigc__p_wxSizerFlags,
   _swigc__p_wxSizerItem,
   _swigc__p_wxStaticBox,
   _swigc__p_wxStaticBoxSizer,
diff --git a/wxPython/src/msw/_gdi.py b/wxPython/src/msw/_gdi.py
index ce3d8648f9..84c56180f4 100644
--- a/wxPython/src/msw/_gdi.py
+++ b/wxPython/src/msw/_gdi.py
@@ -698,7 +698,7 @@ class Bitmap(GDIObject):
         CopyFromBuffer(self, buffer data)
 
         Copy data from a RGB buffer object to replace the bitmap pixel data.
-        See `wxBitmapFromBuffer` for more .
+        See `wx.BitmapFromBuffer` for more .
         """
         return _gdi_.Bitmap_CopyFromBuffer(*args, **kwargs)
 
@@ -707,7 +707,7 @@ class Bitmap(GDIObject):
         CopyFromBufferRGBA(self, buffer data)
 
         Copy data from a RGBA buffer object to replace the bitmap pixel data.
-        See `wxBitmapFromBufferRGBA` for more .
+        See `wx.BitmapFromBufferRGBA` for more .
         """
         return _gdi_.Bitmap_CopyFromBufferRGBA(*args, **kwargs)
 
@@ -5190,22 +5190,13 @@ _gdi_.GraphicsFont_swigregister(GraphicsFont)
 class GraphicsMatrix(GraphicsObject):
     """
     A wx.GraphicsMatrix is a native representation of an affine
-    matrix. The contents are specific an private to the respective
+    matrix. The contents are specific and private to the respective
     renderer. The only way to get a valid instance is via a CreateMatrix
     call on the graphics context or the renderer instance.
     """
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
-    def __init__(self, *args, **kwargs): 
-        """
-        __init__(self) -> GraphicsMatrix
-
-        A wx.GraphicsMatrix is a native representation of an affine
-        matrix. The contents are specific an private to the respective
-        renderer. The only way to get a valid instance is via a CreateMatrix
-        call on the graphics context or the renderer instance.
-        """
-        _gdi_.GraphicsMatrix_swiginit(self,_gdi_.new_GraphicsMatrix(*args, **kwargs))
     __swig_destroy__ = _gdi_.delete_GraphicsMatrix
     __del__ = lambda self : None;
     def Concat(*args, **kwargs):
@@ -5316,10 +5307,8 @@ _gdi_.GraphicsMatrix_swigregister(GraphicsMatrix)
 class GraphicsPath(GraphicsObject):
     """Proxy of C++ GraphicsPath class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
-    def __init__(self, *args, **kwargs): 
-        """__init__(self) -> GraphicsPath"""
-        _gdi_.GraphicsPath_swiginit(self,_gdi_.new_GraphicsPath(*args, **kwargs))
     __swig_destroy__ = _gdi_.delete_GraphicsPath
     __del__ = lambda self : None;
     def MoveToPoint(*args):
@@ -5527,7 +5516,8 @@ class GraphicsContext(GraphicsObject):
 
         Creates a wx.GraphicsContext from a native context. This native
         context must be eg a CGContextRef for Core Graphics, a Graphics
-        pointer for GDIPlus or a cairo_t pointer for Cairo.
+        pointer for GDIPlus or a cairo_t pointer for Cairo.  NOTE: For
+        wxPython we still need a way to make this value usable.
         """
         return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs)
 
@@ -5536,7 +5526,8 @@ class GraphicsContext(GraphicsObject):
         """
         CreateFromNativeWindow(void window) -> GraphicsContext
 
-        Creates a wx.GraphicsContext from a native window.
+        Creates a wx.GraphicsContext from a native window.  NOTE: For wxPython
+        we still need a way to make this value usable.
         """
         return _gdi_.GraphicsContext_CreateFromNativeWindow(*args, **kwargs)
 
@@ -5855,7 +5846,7 @@ class GraphicsContext(GraphicsObject):
 
     def StrokeLineSegements(*args, **kwargs):
         """
-        StrokeLineSegements(self, PyObject beginPoints, PyObject endPoints)
+        StrokeLineSegments(self, List beginPoints, List endPoints)
 
         Stroke disconnected lines from begin to end points
         """
@@ -5936,7 +5927,8 @@ def GraphicsContext_CreateFromNative(*args, **kwargs):
 
     Creates a wx.GraphicsContext from a native context. This native
     context must be eg a CGContextRef for Core Graphics, a Graphics
-    pointer for GDIPlus or a cairo_t pointer for Cairo.
+    pointer for GDIPlus or a cairo_t pointer for Cairo.  NOTE: For
+    wxPython we still need a way to make this value usable.
     """
   return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs)
 
@@ -5944,7 +5936,8 @@ def GraphicsContext_CreateFromNativeWindow(*args, **kwargs):
   """
     GraphicsContext_CreateFromNativeWindow(void window) -> GraphicsContext
 
-    Creates a wx.GraphicsContext from a native window.
+    Creates a wx.GraphicsContext from a native window.  NOTE: For wxPython
+    we still need a way to make this value usable.
     """
   return _gdi_.GraphicsContext_CreateFromNativeWindow(*args, **kwargs)
 
diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp
index 7bb46350f9..098b384382 100644
--- a/wxPython/src/msw/_gdi_wrap.cpp
+++ b/wxPython/src/msw/_gdi_wrap.cpp
@@ -26419,22 +26419,6 @@ SWIGINTERN PyObject *GraphicsFont_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObj
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_new_GraphicsMatrix(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxGraphicsMatrix *result = 0 ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"new_GraphicsMatrix",0,0,0)) SWIG_fail;
-  {
-    result = (wxGraphicsMatrix *)new wxGraphicsMatrix();
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsMatrix, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_delete_GraphicsMatrix(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxGraphicsMatrix *arg1 = (wxGraphicsMatrix *) 0 ;
@@ -27066,29 +27050,6 @@ SWIGINTERN PyObject *GraphicsMatrix_swigregister(PyObject *SWIGUNUSEDPARM(self),
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *GraphicsMatrix_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_new_GraphicsPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxGraphicsPath *result = 0 ;
-  
-  if (!SWIG_Python_UnpackTuple(args,"new_GraphicsPath",0,0,0)) SWIG_fail;
-  {
-    if (!wxPyCheckForApp()) SWIG_fail;
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxGraphicsPath *)new wxGraphicsPath();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsPath, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_delete_GraphicsPath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;
@@ -28333,10 +28294,6 @@ SWIGINTERN PyObject *GraphicsPath_swigregister(PyObject *SWIGUNUSEDPARM(self), P
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *GraphicsPath_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
 SWIGINTERN int NullGraphicsPen_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable NullGraphicsPen is read-only.");
   return 1;
@@ -40034,7 +39991,6 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"delete_GraphicsFont", (PyCFunction)_wrap_delete_GraphicsFont, METH_O, NULL},
 	 { (char *)"GraphicsFont_swigregister", GraphicsFont_swigregister, METH_VARARGS, NULL},
 	 { (char *)"GraphicsFont_swiginit", GraphicsFont_swiginit, METH_VARARGS, NULL},
-	 { (char *)"new_GraphicsMatrix", (PyCFunction)_wrap_new_GraphicsMatrix, METH_NOARGS, NULL},
 	 { (char *)"delete_GraphicsMatrix", (PyCFunction)_wrap_delete_GraphicsMatrix, METH_O, NULL},
 	 { (char *)"GraphicsMatrix_Concat", (PyCFunction) _wrap_GraphicsMatrix_Concat, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"GraphicsMatrix_Set", (PyCFunction) _wrap_GraphicsMatrix_Set, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -40049,8 +40005,6 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"GraphicsMatrix_TransformDistance", (PyCFunction) _wrap_GraphicsMatrix_TransformDistance, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"GraphicsMatrix_GetNativeMatrix", (PyCFunction)_wrap_GraphicsMatrix_GetNativeMatrix, METH_O, NULL},
 	 { (char *)"GraphicsMatrix_swigregister", GraphicsMatrix_swigregister, METH_VARARGS, NULL},
-	 { (char *)"GraphicsMatrix_swiginit", GraphicsMatrix_swiginit, METH_VARARGS, NULL},
-	 { (char *)"new_GraphicsPath", (PyCFunction)_wrap_new_GraphicsPath, METH_NOARGS, NULL},
 	 { (char *)"delete_GraphicsPath", (PyCFunction)_wrap_delete_GraphicsPath, METH_O, NULL},
 	 { (char *)"GraphicsPath_MoveToPoint", _wrap_GraphicsPath_MoveToPoint, METH_VARARGS, NULL},
 	 { (char *)"GraphicsPath_AddLineToPoint", _wrap_GraphicsPath_AddLineToPoint, METH_VARARGS, NULL},
@@ -40071,7 +40025,6 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"GraphicsPath_GetBox", (PyCFunction)_wrap_GraphicsPath_GetBox, METH_O, NULL},
 	 { (char *)"GraphicsPath_Contains", _wrap_GraphicsPath_Contains, METH_VARARGS, NULL},
 	 { (char *)"GraphicsPath_swigregister", GraphicsPath_swigregister, METH_VARARGS, NULL},
-	 { (char *)"GraphicsPath_swiginit", GraphicsPath_swiginit, METH_VARARGS, NULL},
 	 { (char *)"delete_GraphicsContext", (PyCFunction)_wrap_delete_GraphicsContext, METH_O, NULL},
 	 { (char *)"GraphicsContext_Create", _wrap_GraphicsContext_Create, METH_VARARGS, NULL},
 	 { (char *)"GraphicsContext_CreateMeasuringContext", (PyCFunction)_wrap_GraphicsContext_CreateMeasuringContext, METH_NOARGS, NULL},
diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py
index 6ac360873b..1bd6383b80 100644
--- a/wxPython/src/msw/_misc.py
+++ b/wxPython/src/msw/_misc.py
@@ -4362,12 +4362,12 @@ class TimeSpan(object):
     def __str__(self):
         return self.Format().encode(wx.GetDefaultPyEncoding())
 
-    Days = property(GetDays,doc="See `GetDays`") 
-    Hours = property(GetHours,doc="See `GetHours`") 
-    Milliseconds = property(GetMilliseconds,doc="See `GetMilliseconds`") 
-    Minutes = property(GetMinutes,doc="See `GetMinutes`") 
-    Seconds = property(GetSeconds,doc="See `GetSeconds`") 
-    Weeks = property(GetWeeks,doc="See `GetWeeks`") 
+    days = property(GetDays,doc="See `GetDays`") 
+    hours = property(GetHours,doc="See `GetHours`") 
+    milliseconds = property(GetMilliseconds,doc="See `GetMilliseconds`") 
+    minutes = property(GetMinutes,doc="See `GetMinutes`") 
+    seconds = property(GetSeconds,doc="See `GetSeconds`") 
+    weeks = property(GetWeeks,doc="See `GetWeeks`") 
 _misc_.TimeSpan_swigregister(TimeSpan)
 
 def TimeSpan_Milliseconds(*args, **kwargs):
@@ -4559,11 +4559,11 @@ class DateSpan(object):
         """__ne__(self, DateSpan other) -> bool"""
         return _misc_.DateSpan___ne__(*args, **kwargs)
 
-    Days = property(GetDays,SetDays,doc="See `GetDays` and `SetDays`") 
-    Months = property(GetMonths,SetMonths,doc="See `GetMonths` and `SetMonths`") 
-    TotalDays = property(GetTotalDays,doc="See `GetTotalDays`") 
-    Weeks = property(GetWeeks,SetWeeks,doc="See `GetWeeks` and `SetWeeks`") 
-    Years = property(GetYears,SetYears,doc="See `GetYears` and `SetYears`") 
+    days = property(GetDays,SetDays,doc="See `GetDays` and `SetDays`") 
+    months = property(GetMonths,SetMonths,doc="See `GetMonths` and `SetMonths`") 
+    totalDays = property(GetTotalDays,doc="See `GetTotalDays`") 
+    weeks = property(GetWeeks,SetWeeks,doc="See `GetWeeks` and `SetWeeks`") 
+    years = property(GetYears,SetYears,doc="See `GetYears` and `SetYears`") 
 _misc_.DateSpan_swigregister(DateSpan)
 
 def DateSpan_Days(*args, **kwargs):
diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py
index 353b8cd112..319bed1370 100644
--- a/wxPython/src/msw/_windows.py
+++ b/wxPython/src/msw/_windows.py
@@ -2313,9 +2313,10 @@ def GetColourFromUser(*args, **kwargs):
         String caption=EmptyString) -> Colour
     """
   return _windows_.GetColourFromUser(*args, **kwargs)
+DD_CHANGE_DIR = _windows_.DD_CHANGE_DIR
+DD_DIR_MUST_EXIST = _windows_.DD_DIR_MUST_EXIST
 DD_NEW_DIR_BUTTON = _windows_.DD_NEW_DIR_BUTTON
 DD_DEFAULT_STYLE = _windows_.DD_DEFAULT_STYLE
-DD_CHANGE_DIR = _windows_.DD_CHANGE_DIR
 class DirDialog(Dialog):
     """
     wx.DirDialog allows the user to select a directory by browising the
diff --git a/wxPython/src/msw/_windows_wrap.cpp b/wxPython/src/msw/_windows_wrap.cpp
index fa0f21ca61..7de227bc30 100644
--- a/wxPython/src/msw/_windows_wrap.cpp
+++ b/wxPython/src/msw/_windows_wrap.cpp
@@ -35110,9 +35110,10 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_addvarlink(SWIG_globals(),(char*)"FileSelectorDefaultWildcardStr",FileSelectorDefaultWildcardStr_get, FileSelectorDefaultWildcardStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"GetTextFromUserPromptStr",GetTextFromUserPromptStr_get, GetTextFromUserPromptStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"MessageBoxCaptionStr",MessageBoxCaptionStr_get, MessageBoxCaptionStr_set);
+  SWIG_Python_SetConstant(d, "DD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxDD_CHANGE_DIR)));
+  SWIG_Python_SetConstant(d, "DD_DIR_MUST_EXIST",SWIG_From_int(static_cast< int >(wxDD_DIR_MUST_EXIST)));
   SWIG_Python_SetConstant(d, "DD_NEW_DIR_BUTTON",SWIG_From_int(static_cast< int >(wxDD_NEW_DIR_BUTTON)));
   SWIG_Python_SetConstant(d, "DD_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxDD_DEFAULT_STYLE)));
-  SWIG_Python_SetConstant(d, "DD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxDD_CHANGE_DIR)));
   SWIG_Python_SetConstant(d, "OPEN",SWIG_From_int(static_cast< int >(wxOPEN)));
   SWIG_Python_SetConstant(d, "SAVE",SWIG_From_int(static_cast< int >(wxSAVE)));
   SWIG_Python_SetConstant(d, "OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxOVERWRITE_PROMPT)));
diff --git a/wxPython/src/msw/aui.py b/wxPython/src/msw/aui.py
index 6e572081bf..0bb10cbacb 100644
--- a/wxPython/src/msw/aui.py
+++ b/wxPython/src/msw/aui.py
@@ -1495,10 +1495,6 @@ class AuiMDIParentFrame(_windows.Frame):
         """GetArtProvider(self) -> AuiTabArt"""
         return _aui.AuiMDIParentFrame_GetArtProvider(*args, **kwargs)
 
-    def GetNotebook(*args, **kwargs):
-        """GetNotebook(self) -> AuiNotebook"""
-        return _aui.AuiMDIParentFrame_GetNotebook(*args, **kwargs)
-
     def GetWindowMenu(*args, **kwargs):
         """GetWindowMenu(self) -> Menu"""
         return _aui.AuiMDIParentFrame_GetWindowMenu(*args, **kwargs)
@@ -1515,18 +1511,10 @@ class AuiMDIParentFrame(_windows.Frame):
         """ProcessEvent(self, Event event) -> bool"""
         return _aui.AuiMDIParentFrame_ProcessEvent(*args, **kwargs)
 
-    def GetActiveChild(*args, **kwargs):
-        """GetActiveChild(self) -> AuiMDIChildFrame"""
-        return _aui.AuiMDIParentFrame_GetActiveChild(*args, **kwargs)
-
     def SetActiveChild(*args, **kwargs):
         """SetActiveChild(self, AuiMDIChildFrame pChildFrame)"""
         return _aui.AuiMDIParentFrame_SetActiveChild(*args, **kwargs)
 
-    def GetClientWindow(*args, **kwargs):
-        """GetClientWindow(self) -> AuiMDIClientWindow"""
-        return _aui.AuiMDIParentFrame_GetClientWindow(*args, **kwargs)
-
     def OnCreateClient(*args, **kwargs):
         """OnCreateClient(self) -> AuiMDIClientWindow"""
         return _aui.AuiMDIParentFrame_OnCreateClient(*args, **kwargs)
@@ -1551,6 +1539,18 @@ class AuiMDIParentFrame(_windows.Frame):
         """ActivatePrevious(self)"""
         return _aui.AuiMDIParentFrame_ActivatePrevious(*args, **kwargs)
 
+    def GetNotebook(*args, **kwargs):
+        """GetNotebook(self) -> AuiNotebook"""
+        return _aui.AuiMDIParentFrame_GetNotebook(*args, **kwargs)
+
+    def GetActiveChild(*args, **kwargs):
+        """GetActiveChild(self) -> AuiMDIChildFrame"""
+        return _aui.AuiMDIParentFrame_GetActiveChild(*args, **kwargs)
+
+    def GetClientWindow(*args, **kwargs):
+        """GetClientWindow(self) -> AuiMDIClientWindow"""
+        return _aui.AuiMDIParentFrame_GetClientWindow(*args, **kwargs)
+
 _aui.AuiMDIParentFrame_swigregister(AuiMDIParentFrame)
 
 def PreAuiMDIParentFrame(*args, **kwargs):
@@ -1719,8 +1719,22 @@ class PyAuiDockArt(AuiDefaultDockArt):
     methods to the Python methods implemented in the derived class.
     """
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """
+        __init__(self) -> PyAuiDockArt
+
+        This version of the `AuiDockArt` class has been instrumented to be
+        subclassable in Python and to reflect all calls to the C++ base class
+        methods to the Python methods implemented in the derived class.
+        """
+        _aui.PyAuiDockArt_swiginit(self,_aui.new_PyAuiDockArt(*args, **kwargs))
+        PyAuiDockArt._setCallbackInfo(self, self, PyAuiDockArt)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
+        return _aui.PyAuiDockArt__setCallbackInfo(*args, **kwargs)
+
 _aui.PyAuiDockArt_swigregister(PyAuiDockArt)
 
 class PyAuiTabArt(AuiDefaultTabArt):
@@ -1730,8 +1744,22 @@ class PyAuiTabArt(AuiDefaultTabArt):
     methods to the Python methods implemented in the derived class.
     """
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """
+        __init__(self) -> PyAuiTabArt
+
+        This version of the `TabArt` class has been instrumented to be
+        subclassable in Python and to reflect all calls to the C++ base class
+        methods to the Python methods implemented in the derived class.
+        """
+        _aui.PyAuiTabArt_swiginit(self,_aui.new_PyAuiTabArt(*args, **kwargs))
+        PyAuiTabArt._setCallbackInfo(self, self, PyAuiTabArt)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
+        return _aui.PyAuiTabArt__setCallbackInfo(*args, **kwargs)
+
 _aui.PyAuiTabArt_swigregister(PyAuiTabArt)
 
 
diff --git a/wxPython/src/msw/aui_wrap.cpp b/wxPython/src/msw/aui_wrap.cpp
index 7e14284be8..e5ff53d0de 100644
--- a/wxPython/src/msw/aui_wrap.cpp
+++ b/wxPython/src/msw/aui_wrap.cpp
@@ -2925,10 +2925,20 @@ SWIG_From_size_t  (size_t value)
   return SWIG_From_unsigned_SS_long  (static_cast< unsigned long >(value));
 }
 
+SWIGINTERN wxAuiNotebook *wxAuiMDIParentFrame__GetNotebook(wxAuiMDIParentFrame const *self){
+        return self->GetNotebook();
+    }
+SWIGINTERN wxAuiMDIChildFrame *wxAuiMDIParentFrame__GetActiveChild(wxAuiMDIParentFrame const *self){
+        return self->GetActiveChild();
+    }
+SWIGINTERN wxAuiMDIClientWindow *wxAuiMDIParentFrame__GetClientWindow(wxAuiMDIParentFrame const *self){
+        return self->GetClientWindow();
+    }
 
 // A wxDocArt class that knows how to forward virtuals to Python methods
 class wxPyAuiDockArt :  public wxAuiDefaultDockArt
 {
+public:
     wxPyAuiDockArt() : wxAuiDefaultDockArt() {}
 
     DEC_PYCALLBACK_INT_INT(GetMetric);
@@ -3097,6 +3107,7 @@ IMP_PYCALLBACK__INTCOLOUR(wxPyAuiDockArt, wxAuiDefaultDockArt, SetColour);
 // A wxTabArt class that knows how to forward virtuals to Python methods
 class wxPyAuiTabArt :  public wxAuiDefaultTabArt
 {
+public:
     wxPyAuiTabArt() : wxAuiDefaultTabArt() {}
 
     
@@ -3284,7 +3295,6 @@ class wxPyAuiTabArt :  public wxAuiDefaultTabArt
     DEC_PYCALLBACK__FONT(SetNormalFont);
     DEC_PYCALLBACK__FONT(SetSelectedFont);
     DEC_PYCALLBACK__FONT(SetMeasuringFont);
-//    DEC_PYCALLBACK_INT_WIN(GetBestTabCtrlSize);
 
     PYPRIVATE;
 };
@@ -3293,7 +3303,6 @@ class wxPyAuiTabArt :  public wxAuiDefaultTabArt
 IMP_PYCALLBACK__FONT(wxPyAuiTabArt, wxAuiDefaultTabArt, SetNormalFont);
 IMP_PYCALLBACK__FONT(wxPyAuiTabArt, wxAuiDefaultTabArt, SetSelectedFont);
 IMP_PYCALLBACK__FONT(wxPyAuiTabArt, wxAuiDefaultTabArt, SetMeasuringFont);
-//IMP_PYCALLBACK_INT_WIN(wxPyAuiTabArt, wxAuiDefaultTabArt, GetBestTabCtrlSize);
 
 #ifdef __cplusplus
 extern "C" {
@@ -16360,34 +16369,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetNotebook(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
-  wxAuiNotebook *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiMDIParentFrame, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetNotebook" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxAuiNotebook *)((wxAuiMDIParentFrame const *)arg1)->GetNotebook();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAuiNotebook, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetWindowMenu(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
@@ -16538,34 +16519,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetActiveChild(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
-  wxAuiMDIChildFrame *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiMDIParentFrame, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetActiveChild" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxAuiMDIChildFrame *)((wxAuiMDIParentFrame const *)arg1)->GetActiveChild();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAuiMDIChildFrame, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_SetActiveChild(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
@@ -16604,34 +16557,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetClientWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
-  wxAuiMDIClientWindow *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiMDIParentFrame, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetClientWindow" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxAuiMDIClientWindow *)((wxAuiMDIParentFrame const *)arg1)->GetClientWindow();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAuiMDIClientWindow, 0 |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_OnCreateClient(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
@@ -16808,6 +16733,96 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetNotebook(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
+  wxAuiNotebook *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiMDIParentFrame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetNotebook" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxAuiNotebook *)wxAuiMDIParentFrame__GetNotebook((wxAuiMDIParentFrame const *)arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetActiveChild(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
+  wxAuiMDIChildFrame *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiMDIParentFrame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetActiveChild" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxAuiMDIChildFrame *)wxAuiMDIParentFrame__GetActiveChild((wxAuiMDIParentFrame const *)arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AuiMDIParentFrame_GetClientWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAuiMDIParentFrame *arg1 = (wxAuiMDIParentFrame *) 0 ;
+  wxAuiMDIClientWindow *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiMDIParentFrame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiMDIParentFrame_GetClientWindow" "', expected argument " "1"" of type '" "wxAuiMDIParentFrame const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAuiMDIParentFrame * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxAuiMDIClientWindow *)wxAuiMDIParentFrame__GetClientWindow((wxAuiMDIParentFrame const *)arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *AuiMDIParentFrame_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -18143,6 +18158,59 @@ SWIGINTERN PyObject *AuiMDIClientWindow_swiginit(PyObject *SWIGUNUSEDPARM(self),
   return SWIG_Python_InitShadowInstance(args);
 }
 
+SWIGINTERN PyObject *_wrap_new_PyAuiDockArt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyAuiDockArt *result = 0 ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"new_PyAuiDockArt",0,0,0)) SWIG_fail;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxPyAuiDockArt *)new wxPyAuiDockArt();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyAuiDockArt, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PyAuiDockArt__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyAuiDockArt *arg1 = (wxPyAuiDockArt *) 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;
+  PyObject *arg3 = (PyObject *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "self",(char *) "_class", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyAuiDockArt__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyAuiDockArt, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyAuiDockArt__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyAuiDockArt *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyAuiDockArt * >(argp1);
+  arg2 = obj1;
+  arg3 = obj2;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->_setCallbackInfo(arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *PyAuiDockArt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -18150,6 +18218,63 @@ SWIGINTERN PyObject *PyAuiDockArt_swigregister(PyObject *SWIGUNUSEDPARM(self), P
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *PyAuiDockArt_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_PyAuiTabArt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyAuiTabArt *result = 0 ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"new_PyAuiTabArt",0,0,0)) SWIG_fail;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxPyAuiTabArt *)new wxPyAuiTabArt();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyAuiTabArt, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PyAuiTabArt__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyAuiTabArt *arg1 = (wxPyAuiTabArt *) 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;
+  PyObject *arg3 = (PyObject *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "self",(char *) "_class", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyAuiTabArt__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyAuiTabArt, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyAuiTabArt__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyAuiTabArt *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyAuiTabArt * >(argp1);
+  arg2 = obj1;
+  arg3 = obj2;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->_setCallbackInfo(arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *PyAuiTabArt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -18157,6 +18282,10 @@ SWIGINTERN PyObject *PyAuiTabArt_swigregister(PyObject *SWIGUNUSEDPARM(self), Py
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *PyAuiTabArt_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
 static PyMethodDef SwigMethods[] = {
 	 { (char *)"new_AuiPaneInfo", (PyCFunction)_wrap_new_AuiPaneInfo, METH_NOARGS, NULL},
 	 { (char *)"delete_AuiPaneInfo", (PyCFunction)_wrap_delete_AuiPaneInfo, METH_O, NULL},
@@ -18538,20 +18667,20 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"AuiMDIParentFrame_Create", (PyCFunction) _wrap_AuiMDIParentFrame_Create, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"AuiMDIParentFrame_SetArtProvider", (PyCFunction) _wrap_AuiMDIParentFrame_SetArtProvider, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"AuiMDIParentFrame_GetArtProvider", (PyCFunction)_wrap_AuiMDIParentFrame_GetArtProvider, METH_O, NULL},
-	 { (char *)"AuiMDIParentFrame_GetNotebook", (PyCFunction)_wrap_AuiMDIParentFrame_GetNotebook, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_GetWindowMenu", (PyCFunction)_wrap_AuiMDIParentFrame_GetWindowMenu, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_SetWindowMenu", (PyCFunction) _wrap_AuiMDIParentFrame_SetWindowMenu, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"AuiMDIParentFrame_SetChildMenuBar", (PyCFunction) _wrap_AuiMDIParentFrame_SetChildMenuBar, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"AuiMDIParentFrame_ProcessEvent", (PyCFunction) _wrap_AuiMDIParentFrame_ProcessEvent, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"AuiMDIParentFrame_GetActiveChild", (PyCFunction)_wrap_AuiMDIParentFrame_GetActiveChild, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_SetActiveChild", (PyCFunction) _wrap_AuiMDIParentFrame_SetActiveChild, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"AuiMDIParentFrame_GetClientWindow", (PyCFunction)_wrap_AuiMDIParentFrame_GetClientWindow, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_OnCreateClient", (PyCFunction)_wrap_AuiMDIParentFrame_OnCreateClient, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_Cascade", (PyCFunction)_wrap_AuiMDIParentFrame_Cascade, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_Tile", (PyCFunction) _wrap_AuiMDIParentFrame_Tile, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"AuiMDIParentFrame_ArrangeIcons", (PyCFunction)_wrap_AuiMDIParentFrame_ArrangeIcons, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_ActivateNext", (PyCFunction)_wrap_AuiMDIParentFrame_ActivateNext, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_ActivatePrevious", (PyCFunction)_wrap_AuiMDIParentFrame_ActivatePrevious, METH_O, NULL},
+	 { (char *)"AuiMDIParentFrame_GetNotebook", (PyCFunction)_wrap_AuiMDIParentFrame_GetNotebook, METH_O, NULL},
+	 { (char *)"AuiMDIParentFrame_GetActiveChild", (PyCFunction)_wrap_AuiMDIParentFrame_GetActiveChild, METH_O, NULL},
+	 { (char *)"AuiMDIParentFrame_GetClientWindow", (PyCFunction)_wrap_AuiMDIParentFrame_GetClientWindow, METH_O, NULL},
 	 { (char *)"AuiMDIParentFrame_swigregister", AuiMDIParentFrame_swigregister, METH_VARARGS, NULL},
 	 { (char *)"AuiMDIParentFrame_swiginit", AuiMDIParentFrame_swiginit, METH_VARARGS, NULL},
 	 { (char *)"new_PreAuiMDIChildFrame", (PyCFunction)_wrap_new_PreAuiMDIChildFrame, METH_NOARGS, NULL},
@@ -18589,8 +18718,14 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"AuiMDIClientWindow_SetSelection", (PyCFunction) _wrap_AuiMDIClientWindow_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"AuiMDIClientWindow_swigregister", AuiMDIClientWindow_swigregister, METH_VARARGS, NULL},
 	 { (char *)"AuiMDIClientWindow_swiginit", AuiMDIClientWindow_swiginit, METH_VARARGS, NULL},
+	 { (char *)"new_PyAuiDockArt", (PyCFunction)_wrap_new_PyAuiDockArt, METH_NOARGS, NULL},
+	 { (char *)"PyAuiDockArt__setCallbackInfo", (PyCFunction) _wrap_PyAuiDockArt__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"PyAuiDockArt_swigregister", PyAuiDockArt_swigregister, METH_VARARGS, NULL},
+	 { (char *)"PyAuiDockArt_swiginit", PyAuiDockArt_swiginit, METH_VARARGS, NULL},
+	 { (char *)"new_PyAuiTabArt", (PyCFunction)_wrap_new_PyAuiTabArt, METH_NOARGS, NULL},
+	 { (char *)"PyAuiTabArt__setCallbackInfo", (PyCFunction) _wrap_PyAuiTabArt__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"PyAuiTabArt_swigregister", PyAuiTabArt_swigregister, METH_VARARGS, NULL},
+	 { (char *)"PyAuiTabArt_swiginit", PyAuiTabArt_swiginit, METH_VARARGS, NULL},
 	 { NULL, NULL, 0, NULL }
 };
 
diff --git a/wxPython/src/msw/grid.py b/wxPython/src/msw/grid.py
index 4c0838bf04..2c4c942c79 100644
--- a/wxPython/src/msw/grid.py
+++ b/wxPython/src/msw/grid.py
@@ -1137,7 +1137,7 @@ class GridCellCoords(object):
     def __str__(self):                   return str(self.Get())
     def __repr__(self):                  return 'wxGridCellCoords'+str(self.Get())
     def __len__(self):                   return len(self.Get())
-    def __getitem__(self, index):        return self.asTuple()[index]
+    def __getitem__(self, index):        return self.Get()[index]
     def __setitem__(self, index, val):
         if index == 0: self.SetRow(val)
         elif index == 1: self.SetCol(val)
diff --git a/wxPython/src/msw/grid_wrap.cpp b/wxPython/src/msw/grid_wrap.cpp
index ff699cb5ce..474fc5f701 100644
--- a/wxPython/src/msw/grid_wrap.cpp
+++ b/wxPython/src/msw/grid_wrap.cpp
@@ -3445,7 +3445,7 @@ public:
     void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
         bool found;
         wxPyBlock_t blocked = wxPyBeginBlockThreads();
-        if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)"))) {
+        if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground"))) {
             PyObject* ao = wxPyMake_wxGridCellAttr(attr,false);
             PyObject* ro = wxPyConstructObject((void*)&rectCell, wxT("wxRect"), 0);
 
diff --git a/wxPython/tests/TreeMixinTest.py b/wxPython/tests/TreeMixinTest.py
new file mode 100644
index 0000000000..1153f0243f
--- /dev/null
+++ b/wxPython/tests/TreeMixinTest.py
@@ -0,0 +1,745 @@
+import wx, wx.gizmos, wx.lib.customtreectrl, unittest, treemixin
+
+
+# VirtualTree tests
+
+class TreeCtrl(object):
+    def __init__(self, *args, **kwargs):
+        self.children = {}
+        self.font = {}
+        self.colour = {}
+        self.bgcolour = {}
+        self.image = {}
+        self.type = {}
+        self.checked = {}
+        super(TreeCtrl, self).__init__(*args, **kwargs)
+
+    def OnGetItemFont(self, index):
+        return self.font.get(index, wx.NullFont)
+
+    def PrepareItemFont(self, index, font):
+        self.font[index] = font
+
+    def OnGetItemTextColour(self, index):
+        return self.colour.get(index, wx.NullColour)
+
+    def PrepareItemColour(self, index, colour):
+        self.colour[index] = colour
+
+    def OnGetItemBackgroundColour(self, index):
+        return self.bgcolour.get(index, wx.NullColour)
+
+    def PrepareItemBackgroundColour(self, index, colour):
+        self.bgcolour[index] = colour
+
+    def OnGetItemImage(self, index, which):
+        return self.image.get(index, -1)
+
+    def PrepareImage(self, index, imageIndex):
+        self.image[index] = imageIndex
+
+    def OnGetItemType(self, index):
+        return self.type.get(index, 0)
+
+    def PrepareType(self, index, itemType):
+        self.type[index] = itemType
+
+    def OnGetItemChecked(self, index):
+        return self.checked.get(index, False)
+           
+    def PrepareChecked(self, index, checked):
+        self.checked[index] = checked
+
+
+class VirtualTreeCtrl(TreeCtrl, treemixin.VirtualTree, 
+        wx.lib.customtreectrl.CustomTreeCtrl):
+
+    def OnGetItemText(self, indices):
+        return 'item %s'%'.'.join([str(index) for index in indices])
+
+    def OnGetChildrenCount(self, index=None):
+        index = index or ()
+        return self.children.get(index, 0)
+
+    def PrepareChildrenCount(self, index, childrenCount):
+        self.children[index] = childrenCount 
+
+
+
+class VirtualTreeCtrlTest_NoRootItems(unittest.TestCase):
+    def setUp(self):
+        self.frame = wx.Frame(None)
+        self.tree = VirtualTreeCtrl(self.frame)
+        self.tree.RefreshItems()
+
+    def testNoRootItems(self):
+        self.assertEqual(0, self.tree.GetCount())
+
+    def testAddTwoRootItems(self):
+        self.tree.PrepareChildrenCount((), 2)
+        self.tree.RefreshItems()
+        self.assertEqual(2, self.tree.GetCount())
+
+    def testAddOneRootItemAndOneChild(self):
+        self.tree.PrepareChildrenCount((), 1)
+        self.tree.PrepareChildrenCount((0,), 1)
+        self.tree.RefreshItems()
+        self.tree.ExpandAll()
+        self.assertEqual(2, self.tree.GetCount())
+
+    def testAddOneRootItemAndTwoChildren(self):
+        self.tree.PrepareChildrenCount((), 1)
+        self.tree.PrepareChildrenCount((0,), 2)
+        self.tree.RefreshItems()
+        self.tree.ExpandAll()
+        self.assertEqual(3, self.tree.GetCount())
+
+
+
+class VirtualTreeCtrlTest_OneRoot(unittest.TestCase):
+    def setUp(self):
+        self.frame = wx.Frame(None)
+        self.tree = VirtualTreeCtrl(self.frame)
+        self.tree.PrepareChildrenCount((), 1)
+        self.tree.RefreshItems()
+
+    def testOneRoot(self):
+        self.assertEqual(1, self.tree.GetCount())
+
+    def testDeleteRootItem(self):
+        self.tree.PrepareChildrenCount((), 0)
+        self.tree.RefreshItems()
+        self.assertEqual(0, self.tree.GetCount())
+
+    def testAddOneChild(self):
+        self.tree.PrepareChildrenCount((0,), 1)
+        self.tree.RefreshItems()
+        self.tree.ExpandAll()
+        self.assertEqual(2, self.tree.GetCount())
+
+    def testAddTwoChildren(self):
+        self.tree.PrepareChildrenCount((0,), 2)
+        self.tree.RefreshItems()
+        self.tree.ExpandAll()
+        self.assertEqual(3, self.tree.GetCount())
+
+    def testChangeFont(self):
+        self.tree.PrepareItemFont((0,), wx.SMALL_FONT)
+        self.tree.RefreshItems()
+        item, cookie = self.tree.GetFirstChild(self.tree.GetRootItem())
+        self.assertEqual(wx.SMALL_FONT, self.tree.GetItemFont(item))
+
+    def testChangeColour(self):
+        self.tree.PrepareItemColour((0,), wx.RED)
+        self.tree.RefreshItems()
+        item, cookie = self.tree.GetFirstChild(self.tree.GetRootItem())
+        self.assertEqual(wx.RED, self.tree.GetItemTextColour(item))
+
+    def testChangeBackgroundColour(self):
+        self.tree.PrepareItemBackgroundColour((0,), wx.RED)
+        self.tree.RefreshItems()
+        item, cookie = self.tree.GetFirstChild(self.tree.GetRootItem())
+        self.assertEqual(wx.RED, self.tree.GetItemBackgroundColour(item))
+
+    def testChangeImage(self):
+        self.tree.PrepareImage((0,), 0)
+        self.tree.RefreshItems()
+        item, cookie = self.tree.GetFirstChild(self.tree.GetRootItem())
+        self.assertEqual(0, self.tree.GetItemImage(item))
+
+    def testChangeType(self):
+        self.tree.PrepareType((0,), 2)
+        self.tree.PrepareChecked((0,), True)
+        self.tree.RefreshItems()
+        item, cookie = self.tree.GetFirstChild(self.tree.GetRootItem())
+        self.failUnless(self.tree.IsItemChecked(item))
+
+    def testChangeTypeAndAddChildren(self):
+        self.tree.PrepareType((0,), 1)
+        self.tree.PrepareChildrenCount((0,), 1)
+        self.tree.RefreshItems()
+        item, cookie = self.tree.GetFirstChild(self.tree.GetRootItem())
+        self.failUnless(self.tree.ItemHasChildren(item))
+
+    def testRefreshItem(self):
+        self.tree.PrepareItemColour((0,), wx.RED)
+        self.tree.RefreshItem((0,))
+        item, cookie = self.tree.GetFirstChild(self.tree.GetRootItem())
+        self.assertEqual(wx.RED, self.tree.GetItemTextColour(item))
+
+    def testRefreshItemThatHasNoCorrespondingNodeInTheTree(self):
+        # The item to refresh might be in a collapsed branch of the tree
+        # and not present yet.
+        self.tree.PrepareChildrenCount((0,), 1)
+        self.tree.RefreshItem((0,0))
+        item, cookie = self.tree.GetFirstChild(self.tree.GetRootItem())
+        self.failIf(self.tree.ItemHasChildren(item))
+        
+
+# TreeAPIHarmonizer tests
+
+class TreeAPIHarmonizerTestCase(unittest.TestCase):
+    style = wx.TR_DEFAULT_STYLE
+
+    def setUp(self):
+        self.frame = wx.Frame(None)
+        class HarmonizedTreeCtrl(treemixin.TreeAPIHarmonizer, self.TreeClass):
+            pass
+        self.tree = HarmonizedTreeCtrl(self.frame, style=self.style)
+        self.eventsReceived = []
+        self.populateTree()
+
+    def populateTree(self):
+        self.root = self.tree.AddRoot('Root')
+        self.item = self.tree.AppendItem(self.root, 'Item')
+        self.items = [self.root, self.item]
+
+    def onEvent(self, event):
+        self.eventsReceived.append(event)
+
+
+class TreeAPIHarmonizerCommonTests(object):
+    ''' Tests that should succeed for all tree controls and all styles. '''
+
+    def testGetItemType(self):
+        self.assertEqual(0, self.tree.GetItemType(self.item))
+
+    def testGetItemImage_DefaultIcon(self):
+        self.assertEqual(-1, self.tree.GetItemImage(self.item))
+
+    def testGetItemImage_SelectedIcon(self):
+        self.assertEqual(-1, 
+            self.tree.GetItemImage(self.item, wx.TreeItemIcon_Selected))
+
+    def testGetItemImage_DefaultIcon_OtherColumn(self):
+        self.assertEqual(-1, self.tree.GetItemImage(self.item, column=1))
+
+    def testGetItemImage_SelectedIcon_OtherColumn(self):
+        self.assertEqual(-1, 
+            self.tree.GetItemImage(self.item, wx.TreeItemIcon_Selected, 1))
+
+    def testSetItemImage_DefaultIcon(self):
+        self.tree.SetItemImage(self.item, -1)
+        self.assertEqual(-1, self.tree.GetItemImage(self.item))
+
+    def testSetItemImage_SelectedIcon(self):
+        self.tree.SetItemImage(self.item, -1, wx.TreeItemIcon_Selected)
+        self.assertEqual(-1, 
+            self.tree.GetItemImage(self.item, wx.TreeItemIcon_Selected))
+
+    def testSetItemImage_DefaultIcon_OtherColumn(self):
+        self.tree.SetItemImage(self.item, -1, column=1)
+        self.assertEqual(-1, self.tree.GetItemImage(self.item, column=1))
+
+    def testSetItemImage_SelectedIcon_OtherColumn(self):
+        self.tree.SetItemImage(self.item, -1, wx.TreeItemIcon_Selected, 1)
+        self.assertEqual(-1, 
+            self.tree.GetItemImage(self.item, wx.TreeItemIcon_Selected, 1))
+
+    def testExpandAll(self):
+        self.tree.ExpandAll()
+
+    def testExpandAllChildren(self):
+        self.tree.AppendItem(self.item, 'child')
+        self.tree.ExpandAllChildren(self.item)
+        self.failUnless(self.tree.IsExpanded(self.item))
+
+    def testGetFirstVisibleItem(self):
+        self.tree.DeleteAllItems()
+        self.failIf(self.tree.GetFirstVisibleItem())
+
+
+class TreeAPIHarmonizerNoTreeListCtrlCommonTests(object):
+    ''' Tests that should succeed for all tree controls, except the 
+        TreeListCtrl, and all styles. '''
+
+    def testGetMainWindow(self):
+        self.assertEqual(self.tree, self.tree.GetMainWindow())
+
+    def testGetColumnCount(self):
+        self.assertEqual(0, self.tree.GetColumnCount())
+
+
+class TreeAPIHarmonizerSingleSelectionTests(object):
+    ''' Tests that should succeed for all tree controls when in single 
+        selection mode (which is the default selection mode). '''
+
+    def testUnselectAll(self):
+        self.tree.SelectItem(self.item)
+        self.tree.UnselectAll()
+        self.assertEqual([], self.tree.GetSelections())
+
+    def testGetSelections_NoSelection(self):
+        self.tree.UnselectAll()
+        self.assertEqual([], self.tree.GetSelections())
+
+    def testGetSelections_OneSelectedItem(self):
+        self.tree.UnselectAll()
+        self.tree.SelectItem(self.item)
+        self.assertEqual([self.item], self.tree.GetSelections())
+
+
+class TreeAPIHarmonizerMultipleSelectionTests(object):
+    ''' Tests that should succeed for all tree controls when in multiple 
+        selection mode. '''
+
+    style = wx.TR_DEFAULT_STYLE | wx.TR_MULTIPLE
+    
+    def testUnselectAll(self):
+        self.tree.SelectItem(self.item)
+        self.tree.UnselectAll()
+        self.assertEqual([], self.tree.GetSelections())
+
+    def testGetSelections_NoSelection(self):
+        self.tree.UnselectAll()
+        self.assertEqual([], self.tree.GetSelections())
+
+    def testGetSelections_OneSelectedItem(self):
+        self.tree.UnselectAll()
+        self.tree.SelectItem(self.item)
+        self.assertEqual([self.item], self.tree.GetSelections())
+
+    def testGetSelections_TwoSelectedItems(self):
+        item2 = self.tree.AppendItem(self.root, 'item 2')
+        self.tree.ExpandAll()
+        self.tree.UnselectAll()
+        self.tree.SelectItem(item2)
+        self.tree.SelectItem(self.item)
+        self.assertEqual([self.item, item2], self.tree.GetSelections())
+
+
+class TreeAPIHarmonizerVisibleRootTests(object):
+    ''' Tests that should succeed for all tree controls when the root item
+        is not hidden. '''
+
+    def testGetCount(self):
+        self.assertEqual(len(self.items), self.tree.GetCount())
+
+    def testSelectRoot(self):
+        self.tree.SelectItem(self.root)
+        self.assertEqual([self.root], self.tree.GetSelections())
+
+
+class TreeAPIHarmonizerHiddenRootTests(object):
+    ''' Tests that should succeed for all tree controls when the root item
+        is hidden. '''
+
+    style = wx.TR_DEFAULT_STYLE | wx.TR_HIDE_ROOT
+
+    def testGetCount(self):
+        self.assertEqual(len(self.items) - 1, self.tree.GetCount())
+
+    def testSelectRoot(self):
+        self.tree.SelectItem(self.root)
+        self.assertEqual([], self.tree.GetSelections())
+
+
+class TreeAPIHarmonizerWithTreeCtrlTestCase(TreeAPIHarmonizerTestCase):
+    TreeClass = wx.TreeCtrl
+
+
+class TreeAPIHarmonizerWithTreeCtrlCommonTests( \
+        TreeAPIHarmonizerCommonTests,
+        TreeAPIHarmonizerNoTreeListCtrlCommonTests):
+    pass
+
+
+class TreeAPIHarmonizerWithTreeCtrl_SingleSelection( \
+        TreeAPIHarmonizerWithTreeCtrlCommonTests, 
+        TreeAPIHarmonizerSingleSelectionTests,
+        TreeAPIHarmonizerWithTreeCtrlTestCase):
+    pass
+
+
+class TreeAPIHarmonizerWithTreeCtrl_MultipleSelection( \
+        TreeAPIHarmonizerWithTreeCtrlCommonTests, 
+        TreeAPIHarmonizerMultipleSelectionTests, 
+        TreeAPIHarmonizerWithTreeCtrlTestCase):
+    pass
+
+
+class TreeAPIHarmonizerWithTreeCtrl_VisibleRoot( \
+        TreeAPIHarmonizerWithTreeCtrlCommonTests, 
+        TreeAPIHarmonizerVisibleRootTests,
+        TreeAPIHarmonizerWithTreeCtrlTestCase):
+    pass
+
+
+class TreeAPIHarmonizerWithTreeCtrl_HiddenRoot( \
+        TreeAPIHarmonizerWithTreeCtrlCommonTests, 
+        TreeAPIHarmonizerHiddenRootTests,
+        TreeAPIHarmonizerWithTreeCtrlTestCase):
+    pass
+
+
+class TreeAPIHarmonizerWithTreeListCtrlTestCase(TreeAPIHarmonizerTestCase):
+    TreeClass = wx.gizmos.TreeListCtrl
+
+    def populateTree(self):
+        self.tree.AddColumn('Column')
+        super(TreeAPIHarmonizerWithTreeListCtrlTestCase, self).populateTree()
+
+
+class TreeAPIHarmonizerWithTreeListCtrlCommonTests( \
+        TreeAPIHarmonizerCommonTests):
+
+    def testGetColumnCount(self):
+        self.assertEqual(1, self.tree.GetColumnCount())
+
+    def testGetMainWindow(self):
+        self.assertNotEqual(self.tree, self.tree.GetMainWindow())
+
+
+class TreeAPIHarmonizerWithTreeListCtrl_SingleSelection( \
+        TreeAPIHarmonizerWithTreeListCtrlCommonTests, 
+        TreeAPIHarmonizerSingleSelectionTests,
+        TreeAPIHarmonizerWithTreeListCtrlTestCase):
+    pass
+
+
+class TreeAPIHarmonizerWithTreeListCtrl_MultipleSelection( \
+        TreeAPIHarmonizerWithTreeListCtrlCommonTests, 
+        TreeAPIHarmonizerMultipleSelectionTests,
+        TreeAPIHarmonizerWithTreeListCtrlTestCase):
+
+    def testGetSelections_TwoSelectedItems(self):
+        ''' Override TreeAPIHarmonizerMultipleSelectionTests.-
+            testGetSelections_TwoSelectedItems, because 
+            TreeListCtrl.SelectItem needs an extra parameter. '''
+        self.tree.UnselectAll()
+        item2 = self.tree.AppendItem(self.root, 'item 2')
+        self.tree.SelectItem(self.item)
+        self.tree.SelectItem(item2, unselect_others=False)
+        self.assertEqual([self.item, item2], self.tree.GetSelections())
+
+
+class TreeAPIHarmonizerWithTreeListCtrl_VisibleRoot( \
+        TreeAPIHarmonizerWithTreeListCtrlCommonTests, 
+        TreeAPIHarmonizerVisibleRootTests,
+        TreeAPIHarmonizerWithTreeListCtrlTestCase):
+    pass
+
+
+class TreeAPIHarmonizerWithTreeListCtrl_HiddenRoot( \
+        TreeAPIHarmonizerWithTreeListCtrlCommonTests, 
+        TreeAPIHarmonizerHiddenRootTests,
+        TreeAPIHarmonizerWithTreeListCtrlTestCase):
+    pass
+
+
+class TreeAPIHarmonizerWithCustomTreeCtrlTestCase(TreeAPIHarmonizerTestCase):
+    TreeClass = wx.lib.customtreectrl.CustomTreeCtrl
+
+
+class TreeAPIHarmonizerWithCustomTreeCtrlCommonTests( \
+        TreeAPIHarmonizerCommonTests, 
+        TreeAPIHarmonizerNoTreeListCtrlCommonTests):
+
+    def testGetCheckItemType(self):
+        item = self.tree.AppendItem(self.root, 'item', ct_type=1)
+        self.assertEqual(1, self.tree.GetItemType(item))
+
+    def testGetRadioItemType(self):
+        item = self.tree.AppendItem(self.root, 'item', ct_type=2)
+        self.assertEqual(2, self.tree.GetItemType(item))
+        
+
+
+class TreeAPIHarmonizerWithCustomTreeCtrl_SingleSelection( \
+        TreeAPIHarmonizerWithCustomTreeCtrlCommonTests, 
+        TreeAPIHarmonizerSingleSelectionTests,
+        TreeAPIHarmonizerWithCustomTreeCtrlTestCase):
+    pass
+
+
+class TreeAPIHarmonizerWithCustomTreeCtrl_MultipleSelection( \
+        TreeAPIHarmonizerWithCustomTreeCtrlCommonTests, 
+        TreeAPIHarmonizerMultipleSelectionTests,
+        TreeAPIHarmonizerWithCustomTreeCtrlTestCase):
+    pass
+
+
+class TreeAPIHarmonizerWithCustomTreeCtrl_VisibleRoot( \
+        TreeAPIHarmonizerWithCustomTreeCtrlCommonTests, 
+        TreeAPIHarmonizerVisibleRootTests,
+        TreeAPIHarmonizerWithCustomTreeCtrlTestCase):
+    pass
+
+
+class TreeAPIHarmonizerWithCustomTreeCtrl_HiddenRoot( \
+        TreeAPIHarmonizerWithCustomTreeCtrlCommonTests, 
+        TreeAPIHarmonizerHiddenRootTests,
+        TreeAPIHarmonizerWithCustomTreeCtrlTestCase):
+    pass
+
+
+# TreeHelper tests
+
+class TreeHelperTestCase(unittest.TestCase):
+    style = wx.TR_DEFAULT_STYLE
+
+    def setUp(self):
+        self.frame = wx.Frame(None)
+        class HelperTreeCtrl(treemixin.TreeHelper, 
+                             treemixin.TreeAPIHarmonizer, self.TreeClass):
+            pass
+        self.tree = HelperTreeCtrl(self.frame, style=self.style)
+        self.populateTree()
+
+    def populateTree(self):
+        self.root = self.tree.AddRoot('Root')
+        self.item = self.tree.AppendItem(self.root, 'Item')
+        self.child = self.tree.AppendItem(self.item, 'Child')
+
+
+class TreeHelperCommonTests(object):
+    def testGetItemChildren_EmptyTree(self):
+        self.tree.DeleteAllItems()
+        self.assertEqual([], self.tree.GetItemChildren())
+
+    def testGetItemChildren_NoParent(self):
+        self.assertEqual([self.item], self.tree.GetItemChildren())
+
+    def testGetItemChildren_RootItem(self):
+        self.assertEqual([self.item], self.tree.GetItemChildren(self.root))
+
+    def testGetItemChildren_RegularItem(self):
+        self.assertEqual([self.child], self.tree.GetItemChildren(self.item))
+
+    def testGetItemChildren_ItemWithoutChildren(self):
+        self.assertEqual([], self.tree.GetItemChildren(self.child))
+
+    def testGetItemChildren_NoParent_Recursively(self):
+        self.assertEqual([self.item, self.child], 
+                         self.tree.GetItemChildren(recursively=True))
+
+    def testGetItemChildren_RootItem_Recursively(self):
+        self.assertEqual([self.item, self.child], 
+                         self.tree.GetItemChildren(self.root, True))
+
+    def testGetItemChildren_RegularItem_Recursively(self):
+        self.assertEqual([self.child], 
+                         self.tree.GetItemChildren(self.item, True))
+
+    def testGetItemChildren_ItemWithoutChildren_Recursively(self):
+        self.assertEqual([], self.tree.GetItemChildren(self.child, True))
+
+    def testGetItemByIndex_RootItem(self):
+        self.assertEqual(self.root, self.tree.GetItemByIndex(()))
+    
+    def testGetItemByIndex_RegularItem(self):
+        self.assertEqual(self.item, self.tree.GetItemByIndex((0,)))
+
+    def testGetItemByIndex_Child(self):
+        self.assertEqual(self.child, self.tree.GetItemByIndex((0,0)))
+
+    def testGetIndexOfItemRootItem(self):
+        self.assertEqual((), self.tree.GetIndexOfItem(self.root))
+
+    def testGetIndexOfItemRegularItem(self):
+        self.assertEqual((0,), self.tree.GetIndexOfItem(self.item))
+
+    def testGetIndexOfItemChild(self):
+        self.assertEqual((0,0), self.tree.GetIndexOfItem(self.child))
+
+
+class TreeHelperWithTreeCtrlTestCase(TreeHelperCommonTests, 
+        TreeHelperTestCase):
+    TreeClass = wx.TreeCtrl
+
+
+class TreeHelperWithTreeListCtrlTestCase(TreeHelperCommonTests, 
+        TreeHelperTestCase):
+    TreeClass = wx.gizmos.TreeListCtrl
+
+    def populateTree(self):
+        self.tree.AddColumn('Column')
+        super(TreeHelperWithTreeListCtrlTestCase, self).populateTree()
+
+
+class TreeHelperWithCustomTreeCtrlTestCase(TreeHelperCommonTests, 
+        TreeHelperTestCase):
+    TreeClass = wx.lib.customtreectrl.CustomTreeCtrl
+
+
+# ExpansionState tests
+
+class ExpansionStateTreeCtrl(treemixin.ExpansionState, wx.TreeCtrl):
+    pass
+
+
+class GetExpansionStateTestCase(unittest.TestCase):
+    def setUp(self):
+        self.frame = wx.Frame(None)
+        self.tree = ExpansionStateTreeCtrl(self.frame)
+
+    def testEmptyTree(self):
+        self.assertEqual([], self.tree.GetExpansionState())
+        
+    def testRoot(self):
+        self.tree.AddRoot('Root item')
+        self.assertEqual([], self.tree.GetExpansionState())
+
+    def testRoot_Child(self):
+        root = self.tree.AddRoot('Root item')
+        child = self.tree.AppendItem(root, 'Child')
+        self.assertEqual([], self.tree.GetExpansionState())
+        
+    def testExpandedRoot_Child(self):
+        root = self.tree.AddRoot('Root item')
+        child = self.tree.AppendItem(root, 'Child')
+        self.tree.Expand(root)
+        self.assertEqual([()], self.tree.GetExpansionState())
+
+    def testExpandedRoot_Child_Child(self):
+        root = self.tree.AddRoot('Root item')
+        child = self.tree.AppendItem(root, 'Child')
+        grandChild = self.tree.AppendItem(child, 'Grandchild')
+        self.tree.Expand(root)
+        # Property should work too:
+        self.assertEqual([()], self.tree.ExpansionState) 
+
+    def testRoot_ExpandedChild_Child(self):
+        root = self.tree.AddRoot('Root item')
+        child = self.tree.AppendItem(root, 'Child')
+        grandChild = self.tree.AppendItem(child, 'Grandchild')
+        self.tree.Expand(child)
+        self.assertEqual([], self.tree.GetExpansionState())
+
+    def testExpandedRoot_ExpandedChild_Child(self):
+        root = self.tree.AddRoot('Root item')
+        child = self.tree.AppendItem(root, 'Child')
+        grandChild = self.tree.AppendItem(child, 'Grandchild')
+        self.tree.Expand(child)
+        self.tree.Expand(root)
+        self.assertEqual([(), (0,)], self.tree.GetExpansionState())
+
+    def testExpandedRoot_ExpandedChild_ExpandedChild(self):
+        root = self.tree.AddRoot('Root item')
+        child = self.tree.AppendItem(root, 'Child')
+        grandChild = self.tree.AppendItem(child, 'Grandchild')
+        grandGrandChild = self.tree.AppendItem(grandChild, 'Grandgrandchild')
+        self.tree.Expand(root)
+        self.tree.Expand(child)
+        self.tree.Expand(grandChild)
+        self.assertEqual([(), (0,), (0,0)], self.tree.GetExpansionState())
+
+
+class SetExpansionStateTestCase(unittest.TestCase):
+    def setUp(self):
+        self.frame = wx.Frame(None)
+        self.tree = ExpansionStateTreeCtrl(self.frame)
+
+    def testEmptyTree(self):
+        self.tree.SetExpansionState([])
+
+    def testRoot(self):
+        root = self.tree.AddRoot('Root item')
+        self.tree.SetExpansionState([])
+        self.failIf(self.tree.IsExpanded(root))
+    
+    def testRoot_Child(self):
+        root = self.tree.AddRoot('Root item')
+        child = self.tree.AppendItem(root, 'Child')
+        self.tree.SetExpansionState([])
+        self.failIf(self.tree.IsExpanded(root))
+
+    def testExpandedRoot_Child(self):
+        root = self.tree.AddRoot('Root item')
+        child = self.tree.AppendItem(root, 'Child')
+        self.tree.ExpansionState = [()] # Property should work too
+        self.failUnless(self.tree.IsExpanded(root))
+
+    def testExpandedRoot_Child_Child(self):
+        root = self.tree.AddRoot('Root item')
+        child = self.tree.AppendItem(root, 'Child')
+        grandChild = self.tree.AppendItem(child, 'Grandchild')
+        self.tree.SetExpansionState([()])
+        self.failIf(self.tree.IsExpanded(child))
+
+    def testExpandedRoot_ExpandedChild_Child(self):
+        root = self.tree.AddRoot('Root item')
+        child = self.tree.AppendItem(root, 'Child')
+        grandChild = self.tree.AppendItem(child, 'Grandchild')
+        self.tree.SetExpansionState([(), (0,)])
+        self.failUnless(self.tree.IsExpanded(child))
+
+    def testRoot_ExpandedChild_Child(self):
+        root = self.tree.AddRoot('Root item')
+        child = self.tree.AppendItem(root, 'Child')
+        grandChild = self.tree.AppendItem(child, 'Grandchild')
+        self.tree.SetExpansionState([(0,)])
+        self.failIf(self.tree.IsExpanded(child))
+
+    def testExpandedRoot_ExpandedChild_ExpandedChild(self):
+        root = self.tree.AddRoot('Root item')
+        child = self.tree.AppendItem(root, 'Child')
+        grandChild = self.tree.AppendItem(child, 'Grandchild')
+        grandGrandChild = self.tree.AppendItem(grandChild, 'Grandgrandchild')
+        self.tree.SetExpansionState([(), (0,), (0,0)])
+        self.failUnless(self.tree.IsExpanded(grandChild))
+
+
+# Tests of the tree controls without any mixin, to document behaviour that
+# already works, and works the same, for all tree control widgets
+
+class VanillaTreeTestCase(unittest.TestCase):
+    style = wx.TR_DEFAULT_STYLE
+
+    def setUp(self):
+        self.frame = wx.Frame(None)
+        self.tree = self.TreeClass(self.frame, style=self.style)
+        self.eventsReceived = []
+        self.populateTree()
+
+    def populateTree(self):
+        self.root = self.tree.AddRoot('Root')
+        self.item = self.tree.AppendItem(self.root, 'Item')
+        self.items = [self.root, self.item]
+
+    def onEvent(self, event):
+        self.eventsReceived.append(event)
+
+
+class VanillaTreeCommonTests(object):
+    ''' Tests that should succeed for all tree controls and all styles. '''
+
+    def testSetItemHasChildren(self):
+        self.tree.SetItemHasChildren(self.item, True)
+        self.failUnless(self.tree.ItemHasChildren(self.item))
+
+    def testExpandItemWithPlus(self):
+        self.tree.Bind(wx.EVT_TREE_ITEM_EXPANDING, self.onEvent)
+        self.tree.SetItemHasChildren(self.item, True)
+        self.tree.Expand(self.item)
+        self.assertEqual(1, len(self.eventsReceived))
+
+
+
+class VanillaTreeCtrlTestCase(VanillaTreeCommonTests, VanillaTreeTestCase):
+    TreeClass = wx.TreeCtrl
+
+
+class VanillaTreeListCtrlTestCase(VanillaTreeCommonTests, VanillaTreeTestCase):
+    TreeClass = wx.gizmos.TreeListCtrl
+
+    def populateTree(self):
+        self.tree.AddColumn('Column 0')
+        super(VanillaTreeListCtrlTestCase, self).populateTree()
+
+
+class VanillaCustomTreeCtrlTestCase(VanillaTreeCommonTests, 
+        VanillaTreeTestCase):
+    TreeClass = wx.lib.customtreectrl.CustomTreeCtrl
+
+
+class VanillaTreeItemIdTestCase(unittest.TestCase):
+    def testTreeItemIdIsFalseDefault(self):
+        self.failIf(wx.TreeItemId())
+
+
+if __name__ == '__main__':
+    app = wx.App(False)
+    unittest.main()
+
+
diff --git a/wxPython/tests/test_borders.py b/wxPython/tests/test_borders.py
new file mode 100644
index 0000000000..2fdc754dff
--- /dev/null
+++ b/wxPython/tests/test_borders.py
@@ -0,0 +1,49 @@
+import wx
+
+styles = [
+    ('wx.BORDER_DEFAULT', wx.BORDER_DEFAULT),
+    ('wx.BORDER_THEME', wx.BORDER_THEME),
+    ('wx.BORDER_NONE',    wx.BORDER_NONE),
+    ('wx.BORDER_STATIC',  wx.BORDER_STATIC),
+    ('wx.BORDER_SIMPLE',  wx.BORDER_SIMPLE),
+    ('wx.BORDER_RAISED',  wx.BORDER_RAISED),
+    ('wx.BORDER_SUNKEN',  wx.BORDER_SUNKEN),
+    ('wx.BORDER_DOUBLE',  wx.BORDER_DOUBLE),   
+    ]
+
+class TestPanel(wx.Panel):
+    def __init__(self, *args, **kw):
+        wx.Panel.__init__(self, *args, **kw)
+        fgs = wx.FlexGridSizer(cols=3, hgap=10, vgap=10)
+        
+        for name, bdr in styles:
+            txt = wx.TextCtrl(self, size=(100,-1), style=bdr )#| wx.TE_RICH | wx.TE_MULTILINE)
+            label = wx.StaticText(self, -1, name)
+            ctrl = wx.Control(self, -1, style=bdr)
+            ctrl.SetMinSize(txt.GetSize())
+            ctrl.SetBackgroundColour("white")
+            #txt.SetBackgroundColour("pink")
+            fgs.Add(label)
+            fgs.Add(ctrl)
+            fgs.Add(txt)
+
+
+        box = wx.BoxSizer()
+        box.Add(fgs, 0, wx.ALL, 10)
+        self.SetSizer(box)
+        self.Fit()
+        
+
+import wx.lib.mixins.inspection
+class TestApp(wx.App, wx.lib.mixins.inspection.InspectionMixin):
+    pass
+
+app = TestApp(False)
+app.Init()
+frm = wx.Frame(None, title="border styles")
+pnl = TestPanel(frm)
+frm.Fit()
+frm.Show()
+app.MainLoop()
+
+
diff --git a/wxPython/tests/test_buttonKeyHandler.py b/wxPython/tests/test_buttonKeyHandler.py
new file mode 100644
index 0000000000..19071da84c
--- /dev/null
+++ b/wxPython/tests/test_buttonKeyHandler.py
@@ -0,0 +1,33 @@
+import wx
+
+BIND_HANDLERS = False
+SKIP_EVENT    = True
+
+def OnKeyDown(evt):
+    print "OnKeyDown", evt.KeyCode
+    if SKIP_EVENT:
+        evt.Skip()
+
+def OnKeyUp(evt):
+    print "OnKeyUp", evt.KeyCode
+    if SKIP_EVENT:
+        evt.Skip()
+
+def OnChar(evt):
+    print "OnChar", evt.KeyCode
+    if SKIP_EVENT:
+        evt.Skip()
+
+
+app = wx.App(False)
+frm = wx.Frame(None, title="test_buttonKeyHandler")
+pnl = wx.Panel(frm)
+
+btn = wx.Button(pnl, label="Focus me and press a key", pos=(20,20))
+if BIND_HANDLERS:
+    btn.Bind(wx.EVT_KEY_DOWN, OnKeyDown)
+    btn.Bind(wx.EVT_KEY_UP, OnKeyUp)
+    btn.Bind(wx.EVT_CHAR, OnChar)
+
+frm.Show()
+app.MainLoop()
diff --git a/wxPython/tests/test_floatOnParent.py b/wxPython/tests/test_floatOnParent.py
new file mode 100644
index 0000000000..6c56190ba3
--- /dev/null
+++ b/wxPython/tests/test_floatOnParent.py
@@ -0,0 +1,27 @@
+import wx
+
+app = wx.App(False)
+
+mf = wx.Frame(None, title="MainFrame")
+p = wx.Panel(mf)
+txt = wx.TextCtrl(p, value="Hello", pos=(10,10))
+mf.Show()
+
+pf = wx.Frame(parent=mf, size=(150,150), #title="popup frame",
+              style=0
+              #| wx.DEFAULT_FRAME_STYLE
+              | wx.FRAME_NO_TASKBAR
+              #| wx.FRAME_TOOL_WINDOW | wx.CAPTION | wx.TINY_CAPTION_VERT
+              | wx.FRAME_FLOAT_ON_PARENT
+              #| wx.STAY_ON_TOP
+              | wx.POPUP_WINDOW
+              | wx.NO_BORDER
+              )
+#pf.MacSetMetalAppearance(True)
+p = wx.Panel(pf)
+p.SetBackgroundColour("pink")
+pf.Show()
+pf.Move(mf.GetPosition() + (50,50))
+mf.Raise()
+
+app.MainLoop()
diff --git a/wxPython/tests/test_gcDrawBitmap.py b/wxPython/tests/test_gcDrawBitmap.py
new file mode 100644
index 0000000000..90bcfc2624
--- /dev/null
+++ b/wxPython/tests/test_gcDrawBitmap.py
@@ -0,0 +1,200 @@
+import wx
+import math
+
+##import os; print "PID:", os.getpid(); raw_input("Press Enter...")
+
+class TestPanel(wx.Panel):
+    def __init__(self, *args, **kw):
+        wx.Panel.__init__(self, *args, **kw)
+        self.Bind(wx.EVT_PAINT, self.OnPaint)
+
+        self.SetBackgroundColour("white")
+
+        # maskless image
+        self.bmp1 = getTest2Bitmap()
+
+        # give this one a mask
+        self.bmp2 = getTest2Bitmap()
+        self.bmp2.SetMaskColour("blue")
+
+        # now make one in which the opaque pixels from #2 are made
+        # partially transparent
+        bmp = getTest2Bitmap()
+        bmp.SetMaskColour("blue")
+        img = bmp.ConvertToImage()
+        img.InitAlpha()
+        self.bmp3 = img.ConvertToBitmap()
+        pixelData = wx.AlphaPixelData(self.bmp3)
+        if not pixelData:
+            raise RuntimeError("Failed to gain raw access to bitmap data.")
+        for pixel in pixelData:
+            red, green, blue, alpha = pixel.Get()
+            if alpha == 255:
+                pixel.Set(red, green, blue, 128)
+
+        ##self.bmp3 = wx.Bitmap("bitmaps/toucan.png")
+        
+
+    def OnPaint(self, evt):
+        gc = wx.GraphicsContext.Create(wx.PaintDC(self))
+
+        # draw some lines to use as a background
+        gc.SetPen(wx.Pen("navy", 1))
+        x = y = 0
+        sz = self.GetSize()
+        while x < sz.width*2 or y < sz.height*2:
+            gc.StrokeLine(x,0, 0,y)
+            x += 20
+            y += 20
+            
+
+        for bmp in [self.bmp1, self.bmp2, self.bmp3]:
+            # draw the plain bitmap
+            gc.DrawBitmap(bmp, 20,20,
+                          bmp.GetWidth(), bmp.GetHeight())
+
+            # translate and scale by using the w, and h parameters
+            gc.Translate(100, 0)
+            gc.DrawBitmap(bmp, 20,20,
+                          bmp.GetWidth()*1.5, bmp.GetHeight()*1.5)
+
+            # translate and scale using Scale()
+            gc.Translate(125, 0)
+            gc.PushState()
+            gc.Scale(0.75, 0.75)
+            gc.DrawBitmap(bmp, 20,20,
+                          bmp.GetWidth(), bmp.GetHeight())
+            gc.PopState()
+
+            # translate and rotate
+            gc.Translate(125, 0)
+            gc.PushState()
+            gc.Rotate(math.radians(45))
+            gc.DrawBitmap(bmp, 20,20,
+                          bmp.GetWidth(), bmp.GetHeight())
+            gc.PopState()
+
+            # move back to the left side, and down a row
+            gc.Translate(-350, 150)
+            
+
+def main():
+    app = wx.App(False)
+    frm = wx.Frame(None, size=(500,500))
+    pnl = TestPanel(frm)
+    frm.Show()
+    app.MainLoop()
+
+
+
+#----------------------------------------------------------------------
+from wx import ImageFromStream, BitmapFromImage
+from wx import EmptyIcon
+import cStringIO
+
+
+def getTest2Data():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00@\x00\x00\x00@\x08\x02\x00\
+\x00\x00%\x0b\xe6\x89\x00\x00\x00\x03sBIT\x08\x08\x08\xdb\xe1O\xe0\x00\x00\
+\x08\xeeIDATh\x81\xd5\x9aKl\x1b\xd7\x15\x86\xbf\xcb\xe1\xf0\xa1\xa1(\x91\x92\
+(\xc9\x96T\xd9q,Ar\xdc\xbarb\xa0F\xd1\xb8\x81\xd3\xa0\xb0\x03gS\x04\xf0>\xd3\
+\x14\x857Aw\x0e\x8a\x00\xc9*\xe821h\x04\xe8&\x01\xb2k\x10\x07E\xd0\x00u\xb2p\
+\x16\x85\x1f\x01\x92\xc8\xae\xe3\x1a\xb2\xe5\xca\xa2%\xd3\xa6D\x89\xb4\x863\
+\xb7\x8b\xa1\xa8!9\x1c\x0ei\xcaA\xff\x15E\xce=\xf7\xff\xcf9\xf71\xe7H\x80\
+\xe4\xff\x19\xc1N\x19\x923\xa2\xa5\xe7\xc5\xa5\xce8NT"\xe0\xcd\xa0~\xbeV\x19\
+\xfb\xb7\xdc\xdap\x9f\x02\xca\xb8\xe8\xf8|\xf0q\xe6\xad\xe3\xd1\xae\x8c\xb2\
+\x00\xbf\xec\xc5k[\x7f\xca\xb3\xe5\x0f\x9dS\xd2\x86\x0c\x7f\x02l\xc7;\xd9;a+\
+\xa9\x96aJ\x0c\x89\xe9\xe0\xa3]\xf1\xcdI\xb4 \xa3\x99\x00o\xeaNl\x06d\xed\
+\x00&\xe4M\xb2&k\x16\xa6\xe4\x17\xd7\x00\xbe\x16/\xdb\x0f(\x044\x82I\xc21T\
+\x05\xa1 T\x02\n\x81-;\x07\xc1w4<\x05\\l\xe6\xf5\xcd_M\xac"\xe6\n\xc6\xb0\
+\xfc\xd0c\xb27\xc5\x01@%\x90 <J,I8\x8c\xa2\x11\xec#\x12G\x8d\xa0\x94eljp\xa1\
+[\xa7\xaa\xb1\x80F\xec\xeb\xa8+\xf2\x03\x0f\xd2\x8dpJL\xc7P#(\t\xc2\xe3t\x8f\
+\xa2\r\xd2U\x96!?\xf0^WN\x19\r\x04x\xfb^\xbc\xf68\xd4\x9dxE\x8ck\x04\x87\xe8\
+\x1aE\xdbM\xbc"C\x93\x7f\xf5\xa9\xa1\xdd\x83L\x9eU\xda\x1cY\x85\xbf\xc99\xe0\
+\xb8\x18[d}\x9e5[\xc6\x18\xb1\x9f\x82!Q}l\x8d\x02dk\xee\xdf6\x1c\x17c=\x84\
+\x86\xe8\x1a\'\xf6G\xf9\xf5\xc2~\x06T/\rv\x10\x02\r\x7f\x7f\xe28\'o\xdf\xa3\
+\xf0o\x1e^b\x19\x98-\xb2d`4\xdb\x8a\xea\x04\xfcH\xee\xb7\xf1\x0f\xf9\xdfuJ\
+\x8b\xac\x03\x17\xd7\x9bh\xb0\x13\xc7\xf7\x1a\xa8fo\x9a\x18\x06\x96E \x80\
+\xaa\xa2tbA\xd86\xcf\xad-\xfcV\x1b\x06f\x0b\xe5\xef\xa7\xf0\xca%\x7f\x02\xaa\
+\xd9\x1b\x06\x0f\x1e\xb0\xb4D\xb1\x88\xa618HO\x0f\x81\xc7KF\xcbbe\x85L\x86\
+\xb55\xde\xfb\xee.\x90)\x81\x0f\r>\x048\xd8\x0b\x91\xb6?|\xf5\x95>;\xcb\xca\
+\n##\xcc\xcc\x10\x8d\x12\x89\xb4I\xbdb\xf3\xda5\xfd\xf2e\xee\xdc!\x1e\xe7\
+\xfe}\xd6M\xee\xd1\\C3\x01n\xec\x81\xd9Y.]\xa2X\xa4T\xe2\xe9\xa7\xb1\xac\xaa\
+Av2\x98f\xad1E\xf1\xca\xb7\xc9\xc9\xf4;\xef\xe8W\xaf\x96}\x91\xfe\x17\x7f8\
+\xc4R\x89\xd9\x02\x02\x14AP\xd0\x1f$P\xad\xc1S@\xe3U{\xef\x1e\xcb\xcbHI\xa1\
+\x80a 7\xd7\x99iR,\xb2\xb2\xc2\xfd\xfb\xac\xadUiP\x144\x8d\xbe>\xe2q"\x11w\
+\x19\x85\x02\xab\xab\xe4\xf3\xdc\xbb\xc7\xea*\x7f\xcfp|\x88\xa5\x12\xd7\x8ah\
+\x01\x92\nZ\x00\xadz`\x9b\x07\x99\xab\x83\x9d!r\xe2\xf4i\x1dPU\x12\t\xc6\xc7\
+\x19\x1bcx\x98D\x02Uuy\xd8\x0e\xa6m_J,\xc9\x06,\x97\x98\xdb\xe0\'\x1b\xa4T\
+\xa2\x81\xaa 4\x16\xd0\xca\xa6\x19\x8b\xb9S\xb7\xf1\xf6\xdbi\xe0\xc4\t]\xd3\
+\xb8u\x8b\xf1q\xa6\xa7\x99\x98``\xc0]\x83\x13\xe7W9\xd2\xcd#\x8bE\x83\x9b\
+\x8f\x18\r\x11\xaf\x0eB\x07\xde\x89\x0f\x1f\xf6b_\xc1\'\x9f\xa4\x8f\x1e\xd5s\
+\xb9rv\x01\xc1 \xfd\xfd\xbe\xa60!g2o0\xbf\xc1`u\x10\x1al~\xbe\xddo{\xd7\'\
+\xbe\xf8"](\xb0\xb8\xc8\xb5k|\xff=w\xefR(4\x1fu~\x15Kn\x05!cP\xb0\xc0y\x95\
+\xe8T\x81\xa0\x82\x13\'\xf4\x93\'u\xd7\x9fT\x15\xc3`y\x99\xb99n\xdffe\xc5\
+\xafMg\x10V,\xacM\xcan\x11h%\xfb\xed\x05Z\xc1\x993\xfa[o\xe9\x07\x0ep\xe8\
+\x10\x9f~\xaa_\xb9R+\xe3\xf3\xcf\xd3\xaa\xca\xc6\x06\x8b\x8b\xdc\xbcI&\xe3k\
+\x96J\x102\x06\xb76\xc8\x96\xd8\xd8\x14\xd0\x815p\xe1\x82\xbe\x7f?\xe1p\xf9x\
+\xce\xe7\x81\xad\x1d\xd30tU\xadJ\xb3\xde^\xb2Yr9\xe6\xe7\x99\x9foa"\x13\xf2\
+\x16\xd9\x12y\x8b\xca\xc1S\x8e\xc0\xe3\x16g\x04\xaaJ_\x1fO=\xc5\xbe}\xec\xdb\
+\xc7\x9e=\xa4Rh\x1a\xc1 RV\xc5\xe1\xe3\x8f\xd3\x8a\xc2\xa3Gd2\xdc\xba\xd5\
+\xc2,\x96\xa4$)J\x1eY\x94\\# .\xd9\'R\x9b\x15+E\xf1{\xab\xb3\x05\xe4\xf3d\
+\xb3\xadMa\xcar\xb9 o\x02\x16\xce+\xd8f\x10:So\xeb8\xce\xaf\x02\x94$\x0fL\
+\xeel\xb0\xf3\xdb\xef`\x83\x1f\xeb\x85\xc64Q\x14b1\x92\xc9\x16\x07n.\x03\xc8\
+\x83\xc5\x93\x11Ps\xc5x\xf5U\xbdT"\x18$\x91`d\xa45S\x96\xc4\x94\xfc\xf9\xeei\
+0\xedr\xc4\xb6\x0b\xa8\xbf =|\x88e\x11\n\x91H00\xf0\xb8\xf6\xb7W\x80\xeb\xf5\
+\xce0PU\x92I\x86\x86H$Z\xb6y.w\xdc\xf9g\xc7\xfa\x035ht3}\xe1\x05]U\x19\x18`b\
+\x82\xc9I\xbfw!\x1b_\xe6\x9f\xaf\xffr[\x044b\xff\xe2\x8bz(D\x7f?\x93\x93\xcc\
+\xcc01\xd1N\x04j\xd0y\x01\x8d\xd8\xbf\xf4\x92\xde\xdb\xcb\x8e\x1d\xec\xda\
+\xd5\xc2u\xba):,\xc0\x95}%m\xf6\xeee\xdf>v\xed\xf2z\xa1i\x86\x00(\xa0\x82b\
+\x1fY\x9d\x14\xe0\xcd~j\x8a\x99\x19&\'I&\x1b\xbeR\xfa\x80\x021HB\xcc\xde\x81\
+j\x05\x08!\xa5l~\x18G\xa3\xc4b\xe5\x0f\xaa\x8ah0\xe2\xd81]\x08\xfa\xfa\xcaI?\
+5\xd5$m<\xcc\n\xf1<\xd8\x84\x130\x02\t\x08\xb9\x08\xf0\x89\xf1\xf1\xad\x0f\
+\xf1x\xf9F"\xa5\xee\x0c\xc2\xbb\xef\xeaw\xee\x10\x0e3:\xea7\xe9]\xcdV\xa36\
+\x02[M\xbe\n\xbc#`Y<|\xc8\xc2B\xf9\x1e\x96L\xb2c\x07\xbd\xbd[\x93\t\x91^_\
+\xd7\x17\x16\xf8\xe1\x072\x19\xe2q\xc6\xc6\x18\x19!\x99\xf4bo\x9ad\xb3,,\x90\
+\xcb\x95\x0f\xe9\xa1\xa1\xaaz\xd9\x91n\xbe\xcc\xff\x1a\xe2p\x00~\x03\xcf@\
+\x17m\x1cdB\x10\x8d\x12\x8f\xa3ih\x1a\xf18\xd1hU\xac76\xf4\x95\x15r9L\x93X\
+\x8c\xbe>R\xa9\xe6K\xd6.%I\x89\xa61<\xcc\xce\x9dtw\xd7F\xe0h\xf7?k\xdc\x8fk\
+\ny,\x03;C2\x19}n\x8e\xeb\xd7\x01\xf6\xee%\x12!\x1cF\x88\xaaE\xfc\xfe\xfb\
+\xfa\xe2"\x81\x00\xbbw\x93J\xd5V\xbe\\m\xde\xb8\xc1\xf5\xebH\xc9\x9e=\x84\
+\xc3D\xa3[\xcf\x1c\xe9& \x08\x07xc\xf0\xc3\xbfd~\x07I{\x01\xb8\x0b\xf0\x9e\t\
+\x18\x1cL\x9f9\xa3\x7f\xf3\r@\xa9D\x7f\xbf\x1d\x87\xaa-\xe8\xf2e\x96\x97\xcb\
+kqr\xb2\xa1\x80z\x9bv.\xb1Y\xb3\xa8\x04A\x81\x1e\x85Q\x15\x18\x85x%\x02n)\
+\x94\x16M\x1b\x9d\xd9,\xd9,KK\xe5\x12Z=\xbf\xe5eVW)\x14(\x95\xbc\xdc\xef\xc4\
+\xeb\xaf\xa7\xedep\xe3\x067n\xf0\xe0\x01\x86\x01\x0e\xf7\x0f\xa9\xec\x0e\xb3\
+\xb0\xff\x00lE\xa7A\x04\xd2Mv\xd2d\x92\x9e\x1e\x8aE\x82A\xf7\xba\xb4\x9d\x00\
+\xfd\xfd\xa4R.\xd9\xdc\x08==H\x89\xa2\xd4\xee\xcb\x15\xf7\xdb\x85-\xa7\xdf\
+\xeb\x04lR\xaf_\t\xce]rj\n(W\xa7\xeb\xf7\xbb\x8f>\xd2\xe7\xe6(\x95H\xa5\x98\
+\x9a\xa2\xbf\x9fP\xc8\x9d\xb1\xd3\xa6]\xf1\xcefI&\xd9\xbb\xb7\xbc\xeek\xdcoW\
+\xb5\x9ch\xbc\x06\xdc\x82`\xbf\x9e\xdb\xfd\x81\xbe\xber\x7f \x95"\x14*\xffdY\
+\xe4rd2\xec\xd9\x83\x94\xc4b\x0c\x0c\x90HxE\xa0\xc6f\xa1@4\xba5* \x08\t\xfa\
+\x83\x8c\x87\x18\x0b\x11\x0f\xd4V\xa7\xeb\xce\x81j\xde\xb2A\xb7\xc9\xa3C\xe3\
+\xac\xad{\xd7\xd3\x9b\xda|!NH0\x10d:\xcas\x1a\xd3\x91ry\xddYCi\xb2\x0b\x89\
+\xb3\xee\x1a<\n\x10\xfek\x13\xde\x03+\xec\xa7\xa2\xcct1\x11&Q\xd7\x1c\xc0\
+\xcfA&\xb6\xbd\xb5\xe7\x02\'\xfb\x83]LE\x1a\xb6\x98|\xed\x0eOX\x837\xfb\x9a\
+\x1a\x9c\xdf\xab\xc4\x13\xd3\xe0\xdf\xf76Z\xb8\x0b=\x01\rB\x1c\xed\n0\xa42\
+\xed\x8f=\xad^\xe6\xb6U\x83\x10\xc7 \xf5Y\xee\x8d\x99.\x9e\xd3\xdc\xd9\xd7\
+\xd7p[\xbf\x8d\x9e\xed\xbc\x8c\xe3\xbd\x08q\x12&\xe0Y\xf8\xd5/cL\xfb\xf0\xbd\
+\x8d6_h\xc4Y\xb0\x90\xbfoo\xf4\x16^I\xa0\x05\x98\x88\xf0Y\xeeY\xd8\r\xa30\
+\xf8\xb3\xab\xf9\xd2\xcfc\x8a\xbf"m\x93\x83\xac9\xda\x95q*EL!"H\x04\x19\x0f\
+\xf1\xf2\x7f\xae\xc0 \xc4!\x02\x8a\xeb\x7f\x90\xb9\xf6\x00\\\xde\xc8Z\xd6\
+\x00X`@\x11\xf9\'\xaf\xa7\xde\x1c\x06P\x05\x89 \xa3!\x92\n\xe1\x00Z\x80gf\
+\x17*\xd4+\x0f\xd7kp\x15\xd0\xa1\xaaD\x00\xc2\xa0"\xde\x03\x0bN\xe5 \x0fYX\
+\x83\xaa~\xf2\x85\x89\xc3\x8a(w\xadw~\x9b\x03\xc5Q&\xf1B\xa3\x16L\x87"P\x0f\
+\xbd\x04F\r{\x07|\x91v\x06\xa1\x15\x01<\xb6\x06\xbd\x93mO9#<:`\xdbP\x9d\xee(\
+{\x9a\xf5\xef\x1a\x08h\x9bD\xa7\xd97\xc5\xff\x00n\xb9j)\xe8*\xac\xf1\x00\x00\
+\x00\x00IEND\xaeB`\x82' 
+
+def getTest2Bitmap():
+    return BitmapFromImage(getTest2Image())
+
+def getTest2Image():
+    stream = cStringIO.StringIO(getTest2Data())
+    return ImageFromStream(stream)
+
+#----------------------------------------------------------------------
+
+if __name__ == '__main__':
+    main()
diff --git a/wxPython/tests/test_gcMemDC.py b/wxPython/tests/test_gcMemDC.py
new file mode 100644
index 0000000000..3b6457547d
--- /dev/null
+++ b/wxPython/tests/test_gcMemDC.py
@@ -0,0 +1,35 @@
+"""
+Tests using a memory dc (or a buffered dc) as the target of a
+wx.GraphicsContext.
+"""
+
+import wx
+#import os; print "PID:", os.getpid(); raw_input("Press Enter...")
+
+
+class TestPanel(wx.Panel):
+    def __init__(self, *args, **kw):
+        wx.Panel.__init__(self, *args, **kw)
+        self.Bind(wx.EVT_PAINT, self.OnPaint)
+        self.Bind(wx.EVT_SIZE, self.OnSize)
+
+    def OnSize(self, evt):
+        self.Refresh()
+
+    def OnPaint(self, evt):
+        #dc = wx.PaintDC(self)
+        dc = wx.BufferedPaintDC(self)
+        gcdc = wx.GCDC(dc)
+
+        sz = self.GetSize()
+        gcdc.SetBackground(wx.Brush(self.GetBackgroundColour()))
+        gcdc.Clear()
+        gcdc.DrawLine(0, 0, sz.width, sz.height)
+        gcdc.DrawLine(sz.width, 0, 0, sz.height)
+
+
+app = wx.App(False)
+frm = wx.Frame(None, title="GC/MemoryDC")
+pnl = TestPanel(frm)
+frm.Show()
+app.MainLoop()
diff --git a/wxPython/tests/test_gcText.py b/wxPython/tests/test_gcText.py
new file mode 100644
index 0000000000..2508b8c6b6
--- /dev/null
+++ b/wxPython/tests/test_gcText.py
@@ -0,0 +1,77 @@
+
+import wx
+
+#----------------------------------------------------------------------
+
+
+class TestPanel(wx.Panel):
+    def __init__(self, parent):
+        wx.Panel.__init__(self, parent, -1)
+        self.Bind(wx.EVT_PAINT, self.OnPaint)
+
+
+    def OnPaint(self, evt):
+        dc = wx.PaintDC(self)
+        try:
+            gc = wx.GraphicsContext.Create(dc)
+        except NotImplementedError:
+            dc.DrawText("This build of wxPython does not support the wx.GraphicsContext "
+                        "family of classes.",
+                        25, 25)
+            return
+
+        font = wx.SystemSettings.GetFont(wx.SYS_DEFAULT_GUI_FONT)
+        font.SetWeight(wx.BOLD)
+        gc.SetFont(font)
+
+        gc.Translate(10, 10)
+        self.DrawText(gc, 'normal')
+
+        gc.Translate(0, 25)
+        gc.PushState()
+        gc.Scale(2, 2)
+        self.DrawText(gc, 'scaled')
+        gc.PopState()
+        
+        gc.Translate(0, 35)
+        self.DrawText(gc, '\nnewline')
+
+    def DrawText(self, gc, txt):
+        txt = "This is a test: " + txt
+        w,h,d,e = gc.GetFullTextExtent(txt)
+        ##print w,h,d,e
+
+        gc.DrawText(txt, 0, 0)
+
+        pen = wx.Pen("red", 1)
+        gc.SetPen(pen)
+
+        path = gc.CreatePath()       
+        path.MoveToPoint(-1, -1)
+        self.MakeCrosshair(path)
+        gc.StrokePath(path)
+
+        path = gc.CreatePath()       
+        path.MoveToPoint(w+1, h+1)
+        self.MakeCrosshair(path)
+        gc.StrokePath(path)
+
+        
+        
+
+    def MakeCrosshair(self, path):
+        x, y = path.GetCurrentPoint()
+        path.MoveToPoint(x-5, y)
+        path.AddLineToPoint(x+5,y)
+        path.MoveToPoint(x, y-5)
+        path.AddLineToPoint(x, y+5)
+        path.MoveToPoint(x,y)
+        
+
+
+
+app = wx.App(False)
+frm = wx.Frame(None, title="Testing GC Text")
+pnl = TestPanel(frm)
+frm.Show()
+app.MainLoop()
diff --git a/wxPython/tests/test_gcdcDrawEllipticArc.py b/wxPython/tests/test_gcdcDrawEllipticArc.py
new file mode 100644
index 0000000000..b66151c1dd
--- /dev/null
+++ b/wxPython/tests/test_gcdcDrawEllipticArc.py
@@ -0,0 +1,41 @@
+import wx
+
+class Canvas(wx.Panel):
+    def __init__(self, parent):
+        wx.Panel.__init__(self, parent)
+        self.Bind (wx.EVT_PAINT, self.OnPaint)
+        self.bkg_brush = wx.Brush((190,190,255))
+        self.v_pos = 100
+       
+    def OnPaint(self, evt):
+        dc = wx.PaintDC(self)
+        dc = wx.GCDC(dc)
+        dc.SetBackground(self.bkg_brush)
+        dc.Clear()
+        dc.DrawEllipticArc(100, 200, 200, 200-self.v_pos, 90,270)
+        dc.DrawLine(100, 100, 100, 300)
+
+       
+class MyFrame(wx.Frame):
+    def __init__(self):
+        wx.Frame.__init__(self, None, title="DrawEllipticArc")
+        self.SetSize((640,480))
+        self.canvas = Canvas(self)
+        self.slider = wx.Slider(self, minValue=0, maxValue=100)
+        box = wx.BoxSizer(wx.VERTICAL)
+        box.Add(self.canvas, 1, wx.EXPAND)
+        box.Add(self.slider, 0, wx.EXPAND)
+        self.SetSizer(box)
+        self.Show()
+        self.CenterOnScreen()
+        self.slider.Bind (wx.EVT_SLIDER, self.OnSlide)
+       
+    def OnSlide(self, evt):
+        self.canvas.v_pos = 100+self.slider.GetValue()
+        self.canvas.Refresh(False)
+
+       
+if __name__ == "__main__":
+    app = wx.App(0)
+    frame = MyFrame()
+    app.MainLoop()
diff --git a/wxPython/tests/test_gcdcDrawRect.py b/wxPython/tests/test_gcdcDrawRect.py
new file mode 100644
index 0000000000..5ed24758e5
--- /dev/null
+++ b/wxPython/tests/test_gcdcDrawRect.py
@@ -0,0 +1,44 @@
+
+import wx
+
+CLIP = True
+
+class TestPanel(wx.Panel):
+    def __init__(self, parent, *args):
+        wx.Panel.__init__(self, parent, *args)
+        self.Bind(wx.EVT_PAINT, self.OnPaint)
+
+    def OnPaint(self, evt):
+        pdc = wx.PaintDC(self)
+        gcdc = wx.GCDC(pdc)
+
+        for dc, y in [(gcdc, 10), (pdc, 40)]:
+            r = wx.Rect(10, y, 100, 20)
+
+            dc.SetPen(wx.Pen("red", 1))
+            dc.SetBrush(wx.Brush("light blue"))
+
+            if CLIP: dc.SetClippingRect(r)
+            dc.DrawRectangleRect(r)
+            dc.DestroyClippingRegion()
+
+            r.Offset((120, 0))
+            if CLIP: dc.SetClippingRect(r)
+            dc.DrawRoundedRectangleRect(r, 8)
+            dc.DestroyClippingRegion()
+
+
+            r.Offset((120, 0))
+            if CLIP: dc.SetClippingRect(r)
+            dc.DrawEllipseRect(r)
+            dc.DestroyClippingRegion()
+
+
+app = wx.App(False)
+frm = wx.Frame(None, title="wxGCDC Drawing Rectangles")
+pnl = TestPanel(frm)
+frm.Show()
+app.MainLoop()
+
+
+        
diff --git a/wxPython/tests/test_griddrag.py b/wxPython/tests/test_griddrag.py
new file mode 100644
index 0000000000..6a01296812
--- /dev/null
+++ b/wxPython/tests/test_griddrag.py
@@ -0,0 +1,49 @@
+import wx
+import wx.grid
+##import os; print os.getpid(); raw_input("press enter...")
+
+class TestFrame(wx.Frame):
+    def __init__(self, *args, **kw):
+        wx.Frame.__init__(self, *args, **kw)
+        self.grid = wx.grid.Grid(self)
+        self.grid.CreateGrid(10,10)
+        self.grid.EnableDragCell(True)
+        self.grid.Bind(wx.grid.EVT_GRID_CELL_BEGIN_DRAG, self.OnBeginDrag)
+        #self.grid.GetGridWindow().Bind(wx.EVT_MOTION, self.OnMouseDrag)
+        
+
+    def OnBeginDrag(self, evt):
+        print "OnBeginDrag"
+
+        # The grid window has the mouse captured when this event is sent??
+        if self.grid.GetGridWindow().HasCapture():
+            print "Releasing capture"
+            self.grid.GetGridWindow().ReleaseMouse()
+        
+        src = wx.DropSource(self.grid)
+        data = wx.TextDataObject("This is a test")
+        src.SetData(data)
+        result = src.DoDragDrop()
+        print "result = %d" % result
+
+
+    def OnMouseDrag(self, evt):
+        if not evt.Dragging():
+            evt.Skip()
+            return        
+        print "OnMouseDrag"
+        src = wx.DropSource(self.grid)
+        data = wx.TextDataObject("This is a test")
+        src.SetData(data)
+        result = src.DoDragDrop()
+        print "result = %d" % result
+            
+
+from wx.lib.mixins.inspection import InspectableApp
+
+app = InspectableApp(False)
+app.Init()
+frm = TestFrame(None, title="EVT_GRID_CELL_BEGIN_DRAG")
+frm.Show()
+app.MainLoop()
+
diff --git a/wxPython/tests/test_logWindow.py b/wxPython/tests/test_logWindow.py
new file mode 100755
index 0000000000..88cda7f592
--- /dev/null
+++ b/wxPython/tests/test_logWindow.py
@@ -0,0 +1,47 @@
+import wx
+print wx.VERSION
+
+
+class Frame(wx.Frame):
+    def __init__(self, *args, **kw):
+        wx.Frame.__init__(self, *args, **kw)
+        self.log = wx.LogWindow(self, "Program Log", False, False)
+
+        pnl = wx.Panel(self)
+        btn1 = wx.Button(pnl, -1, "Toggle Log")
+        btn2 = wx.Button(pnl, -1, "Log Message")
+        btn3 = wx.Button(pnl, -1, "Close")
+
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        sizer.Add(btn1, 0, wx.ALL, 10)
+        sizer.Add(btn2, 0, wx.ALL, 10)
+        sizer.Add(btn3, 0, wx.ALL, 10)
+        pnl.SetSizer(sizer)
+
+        self.Bind(wx.EVT_BUTTON, self.OnToggleLog,  btn1)
+        self.Bind(wx.EVT_BUTTON, self.OnLogMessage, btn2)
+        self.Bind(wx.EVT_BUTTON, self.OnDoClose,    btn3)
+        self.Bind(wx.EVT_CLOSE, self.OnClose)
+
+        
+    def OnClose(self, evt):
+        self.log.this.disown()
+        wx.Log.SetActiveTarget(None)
+        self.Destroy()
+            
+        
+    def OnToggleLog(self, evt):
+        self.log.Show(not self.log.GetFrame().IsShown())
+    
+    def OnLogMessage(self, evt):
+        wx.LogMessage("This is a test message")
+    
+    def OnDoClose(self, evt):
+        self.Close()
+
+
+app = wx.App(False)
+frm = Frame(None, title="Testing wx.LogWindow")
+frm.Show()
+app.MainLoop()
+    
diff --git a/wxPython/tests/test_mediaCtrl.py b/wxPython/tests/test_mediaCtrl.py
new file mode 100644
index 0000000000..d79607919a
--- /dev/null
+++ b/wxPython/tests/test_mediaCtrl.py
@@ -0,0 +1,120 @@
+import wx
+import wx.media
+from wx.lib.mixins.inspection import InspectableApp
+
+import os; print os.getpid(); raw_input("press enter...")
+
+class TestFrame(wx.Frame):
+    def __init__(self, *args, **kw):
+        wx.Frame.__init__(self, *args, **kw)
+        self.CreateStatusBar()
+        pnl = wx.Panel(self)
+        
+        self.mc = wx.media.MediaCtrl(pnl, size=(-1,200))
+        #self.fn = "/home/robind/smb4k/BEAST/MyVideos/SageTV/48HoursMystery-6199728-0.mpg"
+
+        self.Bind(wx.media.EVT_MEDIA_PLAY, self.OnMediaPlay, self.mc)
+        self.Bind(wx.media.EVT_MEDIA_PAUSE, self.OnMediaPause, self.mc)
+        self.Bind(wx.media.EVT_MEDIA_STOP, self.OnMediaStop, self.mc)
+        self.Bind(wx.media.EVT_MEDIA_FINISHED, self.OnMediaFinished, self.mc)
+        self.Bind(wx.media.EVT_MEDIA_LOADED, self.OnMediaLoaded, self.mc)
+
+        selectBtn = wx.Button(pnl, -1, "Select")
+        loadBtn = wx.Button(pnl, -1, "Load")
+        playBtn = wx.Button(pnl, -1, "Play")
+        pauseBtn= wx.Button(pnl, -1, "Pause")
+        stopBtn = wx.Button(pnl, -1, "Stop")
+
+        self.Bind(wx.EVT_BUTTON, self.OnBtnSelect, selectBtn)
+        self.Bind(wx.EVT_BUTTON, self.OnBtnLoad, loadBtn)
+        self.Bind(wx.EVT_BUTTON, self.OnBtnPlay, playBtn)
+        self.Bind(wx.EVT_BUTTON, self.OnBtnPause, pauseBtn)
+        self.Bind(wx.EVT_BUTTON, self.OnBtnStop, stopBtn)
+        
+
+        vbox = wx.BoxSizer(wx.VERTICAL)
+        vbox.AddF(self.mc, wx.SizerFlags(1).Expand().Border(wx.ALL, 5))
+        hbox = wx.BoxSizer(wx.HORIZONTAL)
+        hbox.AddF(selectBtn, wx.SizerFlags().Border())
+        hbox.AddF(loadBtn, wx.SizerFlags().Border())
+        hbox.AddF(playBtn, wx.SizerFlags().Border())
+        hbox.AddF(pauseBtn, wx.SizerFlags().Border())
+        hbox.AddF(stopBtn, wx.SizerFlags().Border())
+        vbox.Add(hbox)        
+        pnl.SetSizer(vbox)
+
+        sizer = wx.BoxSizer()
+        sizer.AddF(pnl, wx.SizerFlags(1).Expand())
+        self.SetSizer(sizer)
+        wx.CallLater(200, self.SetClientSize, pnl.GetBestSize())
+
+        self.timer = wx.Timer(self)
+        self.Bind(wx.EVT_TIMER, self.OnShowStatus)
+        self.timer.Start(500)
+        
+
+    def OnBtnSelect(self, evt):
+        name = wx.FileSelector("Choose media file")
+        if name:
+            self.fn = name
+
+    def OnBtnLoad(self, evt):
+        print "Loading %s..." % self.fn
+        print "Load:", self.mc.Load(self.fn)
+        
+    def OnBtnPlay(self, evt):
+        print "Play:", self.mc.Play()
+        
+    def OnBtnPause(self, evt):
+        print "Pause:", self.mc.Pause()
+        
+    def OnBtnStop(self, evt):
+        print "Stop:", self.mc.Stop()
+        
+
+    def OnShowStatus(self, evt):
+        current = self.mc.Tell()
+        length = self.mc.Length()
+
+        dl_current = self.mc.GetDownloadProgress()
+        dl_length = self.mc.GetDownloadTotal()
+
+        cw,ch = self.mc.GetSize()
+        bw,bh = self.mc.GetBestSize()
+
+        vol = self.mc.GetVolume()
+        
+        stateMap = { wx.media.MEDIASTATE_PLAYING : "Playing",
+                     wx.media.MEDIASTATE_PAUSED  : "Paused",
+                     wx.media.MEDIASTATE_STOPPED : "Stopped", }
+        state = stateMap.get(self.mc.GetState(), "Other")
+
+        st = "Size:%d,%d  BSize:%d,%d  Pos:%d/%d  DL:%d/%d  V:%d  %s" % (
+            cw,ch, bw,bh, current, length, dl_current, dl_length, vol*100, state)
+        
+        self.SetStatusText(st)
+
+        
+
+    def OnMediaPlay(self, evt):
+        print "OnMediaPlay"
+
+    def OnMediaPause(self, evt):
+        print "OnMediaPause"
+
+    def OnMediaStop(self, evt):
+        print "OnMediaStop"
+
+    def OnMediaFinished(self, evt):
+        print "OnMediaFinished"
+
+    def OnMediaLoaded(self, evt):
+        print "OnMediaLoaded"
+
+        
+
+app = InspectableApp(False)
+frm = TestFrame(None, title="simple wxMediaCtrl test")
+frm.Show()
+app.MainLoop()
+
diff --git a/wxPython/tests/test_scaleText.py b/wxPython/tests/test_scaleText.py
new file mode 100644
index 0000000000..1c55829295
--- /dev/null
+++ b/wxPython/tests/test_scaleText.py
@@ -0,0 +1,71 @@
+import wx
+
+METHOD = 1
+SCALE  = 0.5
+
+class TestPanel(wx.Panel):
+    """
+    Shows some ways to scale text down
+    """
+    def __init__(self, *args, **kw):
+        wx.Panel.__init__(self, *args, **kw)
+        self.Bind(wx.EVT_PAINT, self.OnPaint)
+
+    def OnPaint(self, evt):
+        pdc = wx.PaintDC(self)
+        font = wx.FFont(28, wx.SWISS)
+        pdc.SetFont(font)
+        txt = "Here is some text"
+        
+        # draw the original unscaled text
+        pdc.DrawText(txt, 10, 10)
+
+        if METHOD == 0:
+            # Create a new font that is scaled
+            points = font.GetPointSize() * SCALE
+            font.SetPointSize(points)
+            pdc.SetFont(font)
+            pdc.DrawText(txt, 10, 100)
+
+        if METHOD == 1:
+            # Draw to a bitmap and scale that
+            w,h = pdc.GetTextExtent(txt)
+            bmp = wx.EmptyBitmap(w, h)
+            mdc = wx.MemoryDC(bmp)
+            mdc.SetBackground(wx.Brush(self.GetBackgroundColour()))
+            mdc.Clear()
+            mdc.SetFont(font)
+            mdc.DrawText(txt, 0,0)
+            del mdc
+
+            image = bmp.ConvertToImage()
+            image = image.Scale(w*SCALE, h*SCALE, wx.IMAGE_QUALITY_HIGH)
+            bmp = wx.BitmapFromImage(image)
+            bmp.SetMaskColour(self.GetBackgroundColour())
+            
+            pdc.DrawBitmap(bmp, 10,100)
+            
+
+        elif METHOD == 2:
+            # Just scale the DC and draw the text again
+            pdc.SetUserScale(SCALE, SCALE)
+            pdc.DrawText(txt, 10/SCALE, 100/SCALE)
+            
+
+        elif METHOD == 3:
+            # Use a GraphicsContext for scaling.  Since it uses a
+            # floating point coordinate system, it can be more
+            # accurate.
+            gc = wx.GraphicsContext.Create(pdc)
+            gc.Scale(SCALE, SCALE)
+            gc.SetFont(font)
+            gc.DrawText(txt, 10/SCALE, 100/SCALE)
+            
+
+
+app = wx.App()
+frm = wx.Frame(None, title="test_scaleText")
+pnl = TestPanel(frm)
+frm.Show()
+app.MainLoop()
+
diff --git a/wxPython/wx/lib/buttonpanel.py b/wxPython/wx/lib/buttonpanel.py
index 7df01da87d..703474a94b 100644
--- a/wxPython/wx/lib/buttonpanel.py
+++ b/wxPython/wx/lib/buttonpanel.py
@@ -1584,7 +1584,7 @@ class ButtonPanel(wx.PyPanel):
 
     def OnPaint(self, event):
         """ Handles the wx.EVT_PAINT event for ButtonPanel. """
-        
+
         dc = wx.BufferedPaintDC(self) 
         rect = self.GetClientRect()
 
@@ -1744,7 +1744,7 @@ class ButtonPanel(wx.PyPanel):
         
     def OnMouseMove(self, event):
         """ Handles the wx.EVT_MOTION event for ButtonPanel. """
-        
+
         # Check to see if we are hovering a button
         tabId, flags = self.HitTest(event.GetPosition())
 
@@ -1765,7 +1765,8 @@ class ButtonPanel(wx.PyPanel):
             self.RepaintOldSelection()
         
         if btn.GetRect().Contains(event.GetPosition()):
-            btn.SetStatus("Hover")
+            if btn.GetStatus() != "Pressed":
+                btn.SetStatus("Hover")
         else:
             btn.SetStatus("Normal")
 
@@ -1808,21 +1809,21 @@ class ButtonPanel(wx.PyPanel):
                 btn.SetFocus(False)
                 
         if hit.GetStatus() == "Pressed": 
-            # Fire a button click event 
-            btnEvent = wx.CommandEvent(wx.wxEVT_COMMAND_BUTTON_CLICKED, hit.GetId())
-            self.GetEventHandler().ProcessEvent(btnEvent) 
-
             hit.SetToggled(not hit.GetToggled())
             
             # Update the button status to be hovered 
             hit.SetStatus("Hover")
             hit.SetFocus()
             self._currentButton = tabId
+
+            # Fire a button click event 
+            btnEvent = wx.CommandEvent(wx.wxEVT_COMMAND_BUTTON_CLICKED, hit.GetId())
+            self.GetEventHandler().ProcessEvent(btnEvent) 
             
 
     def OnMouseLeave(self, event):
         """ Handles the wx.EVT_LEAVE_WINDOW event for ButtonPanel. """
-        
+
         # Reset all buttons statuses
         for btn in self._vButtons:
             if not btn.IsEnabled():
diff --git a/wxPython/wx/lib/buttons.py b/wxPython/wx/lib/buttons.py
index a7290cbbde..53c908a53f 100644
--- a/wxPython/wx/lib/buttons.py
+++ b/wxPython/wx/lib/buttons.py
@@ -589,6 +589,8 @@ class ThemedGenButton(GenButton):
             state = 0
         else:
             state = wx.CONTROL_PRESSED
+        if not self.IsEnabled():
+            state = wx.CONTROL_DISABLED
         wx.RendererNative.Get().DrawPushButton(self, dc, rect, state)
  
 class ThemedGenBitmapButton(ThemedGenButton, GenBitmapButton):
diff --git a/wxPython/wx/lib/customtreectrl.py b/wxPython/wx/lib/customtreectrl.py
index 76f3501711..817fa01b54 100644
--- a/wxPython/wx/lib/customtreectrl.py
+++ b/wxPython/wx/lib/customtreectrl.py
@@ -3,7 +3,7 @@
 # Inspired By And Heavily Based On wxGenericTreeCtrl.
 #
 # Andrea Gavana, @ 17 May 2006
-# Latest Revision: 26 May 2006, 22.30 CET
+# Latest Revision: 16 Apr 2007, 11.00 CET
 #
 #
 # TODO List
@@ -134,8 +134,8 @@ CustomTreeCtrl has been tested on the following platforms:
   * Mac OS (Thanks to John Jackson).
 
 
-Latest Revision: Andrea Gavana @ 26 May 2006, 22.30 CET
-Version 0.8
+Latest Revision: Andrea Gavana @ 16 Apr 2007, 11.00 CET
+Version 1.0
 
 """
 
@@ -1164,28 +1164,7 @@ class GenericTreeItem:
         self._wnd = wnd             # are we holding a window?
 
         if wnd:
-            if wnd.GetSizer():      # the window is a complex one hold by a sizer
-                size = wnd.GetBestSize()
-            else:                   # simple window, without sizers
-                size = wnd.GetSize()
-
-            # We have to bind the wx.EVT_SET_FOCUS for the associated window
-            # No other solution to handle the focus changing from an item in
-            # CustomTreeCtrl and the window associated to an item
-            # Do better strategies exist?
-            self._wnd.Bind(wx.EVT_SET_FOCUS, self.OnSetFocus)
-            
-            self._height = size.GetHeight() + 2
-            self._width = size.GetWidth()
-            self._windowsize = size
-            
-            # We don't show the window if the item is collapsed
-            if self._isCollapsed:
-                self._wnd.Show(False)
-
-            # The window is enabled only if the item is enabled                
-            self._wnd.Enable(self._enabled)
-            self._windowenabled = self._enabled
+            self.SetWindow(wnd)
         
 
     def IsOk(self):
@@ -1310,6 +1289,29 @@ class GenericTreeItem:
 
         self._wnd = wnd
 
+        if wnd.GetSizer():      # the window is a complex one hold by a sizer
+            size = wnd.GetBestSize()
+        else:                   # simple window, without sizers
+            size = wnd.GetSize()
+
+        # We have to bind the wx.EVT_SET_FOCUS for the associated window
+        # No other solution to handle the focus changing from an item in
+        # CustomTreeCtrl and the window associated to an item
+        # Do better strategies exist?
+        self._wnd.Bind(wx.EVT_SET_FOCUS, self.OnSetFocus)
+        
+        self._height = size.GetHeight() + 2
+        self._width = size.GetWidth()
+        self._windowsize = size
+        
+        # We don't show the window if the item is collapsed
+        if self._isCollapsed:
+            self._wnd.Show(False)
+
+        # The window is enabled only if the item is enabled                
+        self._wnd.Enable(self._enabled)
+        self._windowenabled = self._enabled
+
 
     def GetWindow(self):
         """Returns the window associated to the item."""
@@ -1317,6 +1319,14 @@ class GenericTreeItem:
         return self._wnd        
 
 
+    def DeleteWindow(self):
+        """Deletes the window associated to the item (if any)."""
+
+        if self._wnd:
+            self._wnd.Destroy()
+            self._wnd = None
+        
+
     def GetWindowEnabled(self):
         """Returns whether the associated window is enabled or not."""
 
@@ -1736,7 +1746,7 @@ def EventFlagsToSelType(style, shiftDown=False, ctrlDown=False):
 class CustomTreeCtrl(wx.PyScrolledWindow):
 
     def __init__(self, parent, id=wx.ID_ANY, pos=wx.DefaultPosition, size=wx.DefaultSize,
-                 style=0, ctstyle=TR_DEFAULT_STYLE, validator=wx.DefaultValidator,
+                 style=TR_DEFAULT_STYLE, ctstyle=0, validator=wx.DefaultValidator,
                  name="CustomTreeCtrl"):
         """
         Default class constructor.
@@ -1749,9 +1759,8 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
 
         size: window size. If the default size (-1, -1) is specified then the window is sized appropriately.
 
-        style: the underlying wx.ScrolledWindow style
+        style: the underlying wx.ScrolledWindow style + CustomTreeCtrl window style. This can be one of:
         
-        ctstyle: CustomTreeCtrl window style. This can be one of:
             TR_NO_BUTTONS
             TR_HAS_BUTTONS                          # draw collapsed/expanded btns
             TR_NO_LINES                             # don't draw lines at all
@@ -1769,10 +1778,14 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
             TR_AUTO_CHECK_PARENT                    # only meaningful for checkboxes
             TR_AUTO_TOGGLE_CHILD                    # only meaningful for checkboxes
 
+        ctstyle: kept for backward compatibility.
+        
         validator: window validator.
 
         name: window name.
         """
+
+        style = style | ctstyle
         
         self._current = self._key_current = self._anchor = self._select_me = None
         self._hasFocus = False
@@ -1790,7 +1803,9 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
         btnshadow = wx.SystemSettings_GetColour(wx.SYS_COLOUR_BTNSHADOW)
         self._hilightUnfocusedBrush = wx.Brush(btnshadow)
         r, g, b = btnshadow.Red(), btnshadow.Green(), btnshadow.Blue()
-        backcolour = ((r >> 1) - 20, (g >> 1) - 20, (b >> 1) - 20)
+        backcolour = (max((r >> 1) - 20, 0),
+                      max((g >> 1) - 20, 0),
+                      max((b >> 1) - 20, 0))
         backcolour = wx.Colour(backcolour[0], backcolour[1], backcolour[2])
         self._hilightUnfocusedBrush2 = wx.Brush(backcolour)
 
@@ -1871,14 +1886,14 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
         self._itemWithWindow = []
         
         if wx.Platform == "__WXMAC__":
-            ctstyle &= ~TR_LINES_AT_ROOT
-            ctstyle |= TR_NO_LINES
+            style &= ~TR_LINES_AT_ROOT
+            style |= TR_NO_LINES
             
             platform, major, minor = wx.GetOsVersion()
             if major < 10:
-                ctstyle |= TR_ROW_LINES
+                style |= TR_ROW_LINES
 
-        self._windowStyle = ctstyle
+        self._windowStyle = style
 
         # Create the default check image list        
         self.SetImageListCheck(13, 13)
@@ -2050,7 +2065,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
             self.RefreshLine(item)
                 
 
-    def IsEnabled(self, item):
+    def IsItemEnabled(self, item):
         """Returns whether an item is enabled or disabled."""
 
         if not item:
@@ -2368,7 +2383,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
         return item.GetText()
     
 
-    def GetItemImage(self, item, which):
+    def GetItemImage(self, item, which=TreeItemIcon_Normal):
         """Returns the item image."""
 
         if not item:
@@ -3303,7 +3318,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
         event = TreeEvent(wxEVT_TREE_DELETE_ITEM, self.GetId())
         event._item = item
         event.SetEventObject(self)
-        self.ProcessEvent(event)
+        self.GetEventHandler().ProcessEvent(event)
 
 
     def IsDescendantOf(self, parent, item):
@@ -3448,7 +3463,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
         event._item = item
         event.SetEventObject(self)
 
-        if self.ProcessEvent(event) and not event.IsAllowed():
+        if self.GetEventHandler().ProcessEvent(event) and not event.IsAllowed():
             # cancelled by program
             return
     
@@ -3462,11 +3477,11 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
             self.HideWindows()
             
         event.SetEventType(wxEVT_TREE_ITEM_EXPANDED)
-        self.ProcessEvent(event)
+        self.GetEventHandler().ProcessEvent(event)
 
 
-    def ExpandAll(self, item):
-        """Expands all the items."""
+    def ExpandAllChildren(self, item):
+        """Expands all the items children of the input item."""
 
         if not item:
             raise Exception("\nERROR: Invalid Tree Item. ")
@@ -3479,10 +3494,17 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
         child, cookie = self.GetFirstChild(item)
         
         while child:
-            self.ExpandAll(child)
+            self.ExpandAllChildren(child)
             child, cookie = self.GetNextChild(item, cookie)
         
 
+    def ExpandAll(self):
+        """Expands all CustomTreeCtrl items."""
+
+        if self._anchor:
+            self.ExpandAllChildren(self._anchor)
+            
+
     def Collapse(self, item):
         """
         Collapse an item, sending a EVT_TREE_ITEM_COLLAPSING and
@@ -3501,7 +3523,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
         event = TreeEvent(wxEVT_TREE_ITEM_COLLAPSING, self.GetId())
         event._item = item
         event.SetEventObject(self)
-        if self.ProcessEvent(event) and not event.IsAllowed():
+        if self.GetEventHandler().ProcessEvent(event) and not event.IsAllowed():
             # cancelled by program
             return
     
@@ -3515,7 +3537,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
             self.HideWindows()
             
         event.SetEventType(wxEVT_TREE_ITEM_COLLAPSED)
-        self.ProcessEvent(event)
+        self.GetEventHandler().ProcessEvent(event)
 
 
     def CollapseAndReset(self, item):
@@ -3576,7 +3598,8 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
         # the tree might not have the root item at all
         if rootItem:
             self.UnselectAllChildren(rootItem)
-        
+
+        self.Unselect()        
 
     # Recursive function !
     # To stop we must have crt_item<last_item
@@ -3956,21 +3979,22 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
         self._imageListNormal = imageList
         self._ownsImageListNormal = False
         self._dirty = True
+        
         # Don't do any drawing if we're setting the list to NULL,
         # since we may be in the process of deleting the tree control.
         if imageList:
             self.CalculateLineHeight()
 
-        # We gray out the image list to use the grayed icons with disabled items
-        self._grayedImageList = wx.ImageList(16, 16, True, 0)
-        
-        for ii in xrange(imageList.GetImageCount()):
-            
-            bmp = imageList.GetBitmap(ii)
-            image = wx.ImageFromBitmap(bmp)
-            image = GrayOut(image)
-            newbmp = wx.BitmapFromImage(image)
-            self._grayedImageList.Add(newbmp)
+            # We gray out the image list to use the grayed icons with disabled items
+            sz = imageList.GetSize(0)
+            self._grayedImageList = wx.ImageList(sz[0], sz[1], True, 0)
+
+            for ii in xrange(imageList.GetImageCount()):
+                bmp = imageList.GetBitmap(ii)
+                image = wx.ImageFromBitmap(bmp)
+                image = GrayOut(image)
+                newbmp = wx.BitmapFromImage(image)
+                self._grayedImageList.Add(newbmp)
         
 
     def SetStateImageList(self, imageList):
@@ -4188,6 +4212,8 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
         r2, g2, b2 = int(bottom.Red()), int(bottom.Green()), int(bottom.Blue())
 
         flrect = float(filRect.height)
+        if flrect < 1:
+            flrect = self._lineHeight
 
         rstep = float((r2 - r1)) / flrect
         gstep = float((g2 - g1)) / flrect
@@ -4230,7 +4256,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
                 dc.SetTextForeground(self.GetHyperTextVisitedColour())
             else:
                 dc.SetTextForeground(self.GetHyperTextNewColour())
-
+                    
         text_w, text_h, dummy = dc.GetMultiLineTextExtent(item.GetText())
 
         image = item.GetCurrentImage()
@@ -4302,7 +4328,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
                         wx.RendererNative.Get().DrawItemSelectionRect(self, dc, itemrect, flags) 
                     else:
                         dc.DrawRectangleRect(itemrect)
-
+                
         else:
 
             if item.IsSelected():
@@ -4400,6 +4426,10 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
         if wnd:
             wndx = wcheck + image_w + item.GetX() + text_w + 4
             xa, ya = self.CalcScrolledPosition((0, item.GetY()))
+            wndx += xa
+            if item.GetHeight() > item.GetWindowSize()[1]:
+                ya += (item.GetHeight() - item.GetWindowSize()[1])/2
+                
             if not wnd.IsShown():
                 wnd.Show()
             if wnd.GetPosition() != (wndx, ya):
@@ -4438,7 +4468,10 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
                     # draw line down to last child
                     origY += self.GetLineHeight(children[0])>>1
                     oldY += self.GetLineHeight(children[n-1])>>1
+                    oldPen = dc.GetPen()
+                    dc.SetPen(self._dottedPen)
                     dc.DrawLine(3, origY, 3, oldY)
+                    dc.SetPen(oldPen)
                 
             return y
         
@@ -4724,11 +4757,11 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
         keyCode = event.GetKeyCode()
 
         if keyCode in [ord("+"), wx.WXK_ADD]:       # "+"
-            if self._current.HasPlus() and not self.IsExpanded(self._current) and self.IsEnabled(self._current):
+            if self._current.HasPlus() and not self.IsExpanded(self._current) and self.IsItemEnabled(self._current):
                 self.Expand(self._current)
                 
         elif keyCode in [ord("*"), wx.WXK_MULTIPLY]:  # "*"
-            if not self.IsExpanded(self._current) and self.IsEnabled(self._current):
+            if not self.IsExpanded(self._current) and self.IsItemEnabled(self._current):
                 # expand all
                 self.ExpandAll(self._current)
 
@@ -4748,7 +4781,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
                 
         elif keyCode in [wx.WXK_RETURN, wx.WXK_SPACE]:
 
-            if not self.IsEnabled(self._current):
+            if not self.IsItemEnabled(self._current):
                 event.Skip()
                 return
             
@@ -4781,7 +4814,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
                 if prev:
                     current = self._key_current
                     # TODO: Huh?  If we get here, we'd better be the first child of our parent.  How else could it be?
-                    if current == self.GetFirstChild(prev)[0] and self.IsEnabled(prev):
+                    if current == self.GetFirstChild(prev)[0] and self.IsItemEnabled(prev):
                         # otherwise we return to where we came from
                         self.DoSelectItem(prev, unselect_others, extended_select)
                         self._key_current = prev
@@ -4797,13 +4830,13 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
                         current = prev
                 
                 # Try to get the previous siblings and see if they are active
-                while prev and not self.IsEnabled(prev):
+                while prev and not self.IsItemEnabled(prev):
                     prev = self.GetPrevSibling(prev)
 
                 if not prev:
                     # No previous siblings active: go to the parent and up
                     prev = self.GetItemParent(current)
-                    while prev and not self.IsEnabled(prev):
+                    while prev and not self.IsItemEnabled(prev):
                         prev = self.GetItemParent(prev)
                         
                 if prev:
@@ -4821,7 +4854,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
             if self.IsExpanded(self._current):
                 self.Collapse(self._current)
             else:
-                if prev and self.IsEnabled(prev):
+                if prev and self.IsItemEnabled(prev):
                     self.DoSelectItem(prev, unselect_others, extended_select)
                 
         elif keyCode == wx.WXK_RIGHT:
@@ -4829,7 +4862,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
             # also expand the item if it wasn't expanded yet
             if self.IsExpanded(self._current) and self.HasChildren(self._current):
                 child, cookie = self.GetFirstChild(self._key_current)
-                if self.IsEnabled(child):
+                if self.IsItemEnabled(child):
                     self.DoSelectItem(child, unselect_others, extended_select)
                     self._key_current = child
             else:
@@ -4855,11 +4888,11 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
                         current = self.GetItemParent(current)
                         if current:
                             next = self.GetNextSibling(current)
-                            if not next or not self.IsEnabled(next):
+                            if not next or not self.IsItemEnabled(next):
                                 next = None
 
                 else:
-                    while next and not self.IsEnabled(next):
+                    while next and not self.IsItemEnabled(next):
                         next = self.GetNext(next)
                     
                 if next:
@@ -4884,7 +4917,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
 
                 last = lastChild
             
-            if last and self.IsEnabled(last):
+            if last and self.IsItemEnabled(last):
             
                 self.DoSelectItem(last, unselect_others, extended_select)
                 
@@ -4901,7 +4934,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
                 if not prev:
                     return
 
-            if self.IsEnabled(prev):
+            if self.IsItemEnabled(prev):
                 self.DoSelectItem(prev, unselect_others, extended_select)
         
         else:
@@ -4918,7 +4951,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
                     # no such item
                     return
 
-                if self.IsEnabled(id):                
+                if self.IsItemEnabled(id):                
                     self.SelectItem(id)
                 self._findPrefix += ch
 
@@ -4950,7 +4983,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
 
             while 1:
                 child = sibling(item)
-                if (child and self.IsEnabled(child)) or not child:
+                if (child and self.IsItemEnabled(child)) or not child:
                     break
                 item = child
 
@@ -4958,10 +4991,10 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
             # Tha's not a radiobutton... but some of its children can be
             # inactive
             child, cookie = self.GetFirstChild(item)
-            while child and not self.IsEnabled(child):
+            while child and not self.IsItemEnabled(child):
                 child, cookie = self.GetNextChild(item, cookie)
                 
-        if child and self.IsEnabled(child):
+        if child and self.IsItemEnabled(child):
             return child
             
         return None
@@ -5015,7 +5048,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
             flags = TREE_HITTEST_NOWHERE
             return None, flags
 
-        if not self.IsEnabled(hit):
+        if not self.IsItemEnabled(hit):
             return None, flags
 
         return hit, flags
@@ -5534,6 +5567,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
             item.SetHeight(total_h)
         else:
             item.SetWidth(item.GetWindowSize()[0]+image_w+text_w+wcheck+2)
+            item.SetHeight(max(total_h, item.GetWindowSize()[1]))
 
 
     def CalculateLevel(self, item, dc, level, y):
@@ -5731,4 +5765,6 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
         attr.font  = wx.SystemSettings_GetFont(wx.SYS_DEFAULT_GUI_FONT)
         return attr
 
+    GetClassDefaultAttributes = classmethod(GetClassDefaultAttributes)
 
+    
diff --git a/wxPython/wx/lib/dialogs.py b/wxPython/wx/lib/dialogs.py
index a13f777da9..217b1d9e81 100644
--- a/wxPython/wx/lib/dialogs.py
+++ b/wxPython/wx/lib/dialogs.py
@@ -34,8 +34,8 @@ class ScrolledMessageDialog(wx.Dialog):
         if x == -1 and y == -1:
             self.CenterOnScreen(wx.BOTH)
 
-        text = wx.TextCtrl(self, -1, msg, 
-                           style=wx.TE_MULTILINE | wx.TE_READONLY)
+        self.text = text = wx.TextCtrl(self, -1, msg, 
+                                       style=wx.TE_MULTILINE | wx.TE_READONLY)
 
         ok = wx.Button(self, wx.ID_OK, "OK")
         ok.SetDefault()
diff --git a/wxPython/wx/lib/docview.py b/wxPython/wx/lib/docview.py
index 83423dbf1b..92206c1020 100644
--- a/wxPython/wx/lib/docview.py
+++ b/wxPython/wx/lib/docview.py
@@ -1920,8 +1920,8 @@ class DocManager(wx.EvtHandler):
                 newDoc.SetDocumentName(temp.GetDocumentName())
                 newDoc.SetDocumentTemplate(temp)
                 if not newDoc.OnOpenDocument(path):
-                    newDoc.DeleteAllViews()  # Implicitly deleted by DeleteAllViews
                     frame = newDoc.GetFirstView().GetFrame()
+                    newDoc.DeleteAllViews()  # Implicitly deleted by DeleteAllViews
                     if frame:
                         frame.Destroy() # DeleteAllViews doesn't get rid of the frame, so we'll explicitly destroy it.
                     return None
diff --git a/wxPython/wx/lib/filebrowsebutton.py b/wxPython/wx/lib/filebrowsebutton.py
index e2e829da02..8031732077 100644
--- a/wxPython/wx/lib/filebrowsebutton.py
+++ b/wxPython/wx/lib/filebrowsebutton.py
@@ -351,8 +351,8 @@ class DirBrowseButton(FileBrowseButton):
     def OnBrowse(self, ev = None):
         style=0
 
-        if self.newDirectory:
-          style|=wx.DD_NEW_DIR_BUTTON
+        if not self.newDirectory:
+          style |= wx.DD_DIR_MUST_EXIST
 
         dialog = self.dialogClass(self,
                                   message = self.dialogTitle,
diff --git a/wxPython/wx/lib/flatnotebook.py b/wxPython/wx/lib/flatnotebook.py
index 309214c282..7b259ad4f7 100644
--- a/wxPython/wx/lib/flatnotebook.py
+++ b/wxPython/wx/lib/flatnotebook.py
@@ -11,7 +11,7 @@
 # Python Code By:
 #
 # Andrea Gavana, @ 02 Oct 2006
-# Latest Revision: 12 Oct 2006, 20.00 GMT
+# Latest Revision: 16 Apr 2007, 11.00 GMT
 #
 #
 # For All Kind Of Problems, Requests Of Enhancements And Bug Reports, Please
@@ -37,7 +37,7 @@ Some features:
   - The scrolling is done for bulks of tabs (so, the scrolling is faster and better)
   - The buttons area is never overdrawn by tabs (unlike many other implementations I saw)
   - It is a generic control
-  - Currently there are 4 differnt styles - VC8, VC 71, Standard and Fancy
+  - Currently there are 5 differnt styles - VC8, VC 71, Standard, Fancy and Firefox 2;
   - Mouse middle click can be used to close tabs
   - A function to add right click menu for tabs (simple as SetRightClickMenu)
   - All styles has bottom style as well (they can be drawn in the bottom of screen)
@@ -58,7 +58,7 @@ License And Version:
 
 FlatNotebook Is Freeware And Distributed Under The wxPython License. 
 
-Latest Revision: Andrea Gavana @ 12 Oct 2006, 20.00 GMT
+Latest Revision: Andrea Gavana @ 16 Apr 2007, 11.00 GMT
 
 Version 2.0.
 
@@ -123,6 +123,10 @@ FNB_NODRAG = 128
 FNB_VC8 = 256
 """Use Visual Studio 2005 (VC8) style for tabs"""
 
+# Firefox 2 tabs style
+FNB_FF2 = 131072
+"""Use Firefox 2 style for tabs"""
+
 # Place 'X' on a tab
 FNB_X_ON_TAB = 512
 """Place 'X' close button on the active tab"""
@@ -198,8 +202,8 @@ FNB_DEFAULT_STYLE = FNB_MOUSE_MIDDLE_CLOSES_TABS | FNB_HIDE_ON_SINGLE_TAB
 # wxEVT_FLATNOTEBOOK_PAGE_CLOSED: Event Fired When A Page Is Closed.
 # wxEVT_FLATNOTEBOOK_PAGE_CONTEXT_MENU: Event Fired When A Menu Pops-up In A Tab.
 
-wxEVT_FLATNOTEBOOK_PAGE_CHANGED = wx.NewEventType()
-wxEVT_FLATNOTEBOOK_PAGE_CHANGING = wx.NewEventType()
+wxEVT_FLATNOTEBOOK_PAGE_CHANGED = wx.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED
+wxEVT_FLATNOTEBOOK_PAGE_CHANGING = wx.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
 wxEVT_FLATNOTEBOOK_PAGE_CLOSING = wx.NewEventType()
 wxEVT_FLATNOTEBOOK_PAGE_CLOSED = wx.NewEventType()
 wxEVT_FLATNOTEBOOK_PAGE_CONTEXT_MENU = wx.NewEventType()
@@ -208,10 +212,10 @@ wxEVT_FLATNOTEBOOK_PAGE_CONTEXT_MENU = wx.NewEventType()
 #        FlatNotebookEvent
 #-----------------------------------#
 
-EVT_FLATNOTEBOOK_PAGE_CHANGED = wx.PyEventBinder(wxEVT_FLATNOTEBOOK_PAGE_CHANGED, 1)
+EVT_FLATNOTEBOOK_PAGE_CHANGED = wx.EVT_NOTEBOOK_PAGE_CHANGED
 """Notify client objects when the active page in L{FlatNotebook} 
 has changed."""
-EVT_FLATNOTEBOOK_PAGE_CHANGING = wx.PyEventBinder(wxEVT_FLATNOTEBOOK_PAGE_CHANGING, 1)
+EVT_FLATNOTEBOOK_PAGE_CHANGING = wx.EVT_NOTEBOOK_PAGE_CHANGING
 """Notify client objects when the active page in L{FlatNotebook} 
 is about to change."""
 EVT_FLATNOTEBOOK_PAGE_CLOSING = wx.PyEventBinder(wxEVT_FLATNOTEBOOK_PAGE_CLOSING, 1)
@@ -716,6 +720,61 @@ def PaintStraightGradientBox(dc, rect, startColor, endColor, vertical=True):
     dc.SetBrush(savedBrush)
 
 
+
+# -----------------------------------------------------------------------------
+# Util functions
+# -----------------------------------------------------------------------------
+
+def DrawButton(dc, rect, focus, upperTabs):
+
+    # Define the rounded rectangle base on the given rect
+    # we need an array of 9 points for it
+    regPts = [wx.Point() for indx in xrange(9)]
+
+    if focus:
+        if upperTabs:
+            leftPt = wx.Point(rect.x, rect.y + (rect.height / 10)*8)
+            rightPt = wx.Point(rect.x + rect.width - 2, rect.y + (rect.height / 10)*8)
+        else:
+            leftPt = wx.Point(rect.x, rect.y + (rect.height / 10)*5)
+            rightPt = wx.Point(rect.x + rect.width - 2, rect.y + (rect.height / 10)*5)
+    else:
+        leftPt = wx.Point(rect.x, rect.y + (rect.height / 2))
+        rightPt = wx.Point(rect.x + rect.width - 2, rect.y + (rect.height / 2))
+
+    # Define the top region
+    top = wx.RectPP(rect.GetTopLeft(), rightPt)
+    bottom = wx.RectPP(leftPt, rect.GetBottomRight())
+
+    topStartColor = wx.WHITE
+
+    if not focus:
+        topStartColor = LightColour(wx.SystemSettings_GetColour(wx.SYS_COLOUR_3DFACE), 50)
+
+    topEndColor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_3DFACE)
+    bottomStartColor = topEndColor
+    bottomEndColor = topEndColor
+
+    # Incase we use bottom tabs, switch the colors
+    if upperTabs:
+        if focus:
+            PaintStraightGradientBox(dc, top, topStartColor, topEndColor)
+            PaintStraightGradientBox(dc, bottom, bottomStartColor, bottomEndColor)
+        else:
+            PaintStraightGradientBox(dc, top, topEndColor , topStartColor)
+            PaintStraightGradientBox(dc, bottom, bottomStartColor, bottomEndColor)
+
+    else:
+        if focus:
+            PaintStraightGradientBox(dc, bottom, topEndColor, bottomEndColor)
+            PaintStraightGradientBox(dc, top,topStartColor,  topStartColor)
+        else:
+            PaintStraightGradientBox(dc, bottom, bottomStartColor, bottomEndColor)
+            PaintStraightGradientBox(dc, top, topEndColor, topStartColor)
+    
+    dc.SetBrush(wx.TRANSPARENT_BRUSH)
+
+
 # ---------------------------------------------------------------------------- #
 # Class FNBDropSource
 # Gives Some Custom UI Feedback during the DnD Operations
@@ -1148,7 +1207,7 @@ class TabNavigatorWindow(wx.Dialog):
     def OnItemSelected(self, event):
         """Handles the wx.EVT_LISTBOX_DCLICK event for the wx.ListBox inside L{TabNavigatorWindow}. """
 
-    	self.CloseDialog()
+        self.CloseDialog()
 
 
     def CloseDialog(self):
@@ -1481,7 +1540,7 @@ class FNBRenderer:
         return bmp
 
 
-    def DrawTabsLine(self, pageContainer, dc):
+    def DrawTabsLine(self, pageContainer, dc, selTabX1=-1, selTabX2=-1):
         """ Draws a line over the tabs. """
 
         pc = pageContainer
@@ -1489,38 +1548,70 @@ class FNBRenderer:
         clntRect = pc.GetClientRect()
         clientRect3 = wx.Rect(0, 0, clntRect.width, clntRect.height)
 
-        if pc.HasFlag(FNB_BOTTOM):
-        
-            clientRect = wx.Rect(0, 2, clntRect.width, clntRect.height - 2)
-            clientRect2 = wx.Rect(0, 1, clntRect.width, clntRect.height - 1)
-        
+        if pc.HasFlag(FNB_FF2):
+            if not pc.HasFlag(FNB_BOTTOM):
+                fillColor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_3DFACE)
+            else:
+                fillColor = wx.WHITE
+
+            dc.SetPen(wx.Pen(fillColor))
+
+            if pc.HasFlag(FNB_BOTTOM):
+
+                dc.DrawLine(1, 0, clntRect.width-1, 0)
+                dc.DrawLine(1, 1, clntRect.width-1, 1)
+
+                dc.SetPen(wx.Pen(wx.SystemSettings_GetColour(wx.SYS_COLOUR_BTNSHADOW)))
+                dc.DrawLine(1, 2, clntRect.width-1, 2)
+
+                dc.SetPen(wx.Pen(fillColor))
+                dc.DrawLine(selTabX1 + 2, 2, selTabX2 - 1, 2)
+                
+            else:
+                
+                dc.DrawLine(1, clntRect.height, clntRect.width-1, clntRect.height)
+                dc.DrawLine(1, clntRect.height-1, clntRect.width-1, clntRect.height-1)
+
+                dc.SetPen(wx.Pen(wx.SystemSettings_GetColour(wx.SYS_COLOUR_BTNSHADOW)))
+                dc.DrawLine(1, clntRect.height-2, clntRect.width-1, clntRect.height-2)
+
+                dc.SetPen(wx.Pen(wx.SystemSettings_GetColour(wx.SYS_COLOUR_3DFACE)))
+                dc.DrawLine(selTabX1 + 2, clntRect.height-2, selTabX2-1, clntRect.height-2)
+
         else:
-        
-            clientRect = wx.Rect(0, 0, clntRect.width, clntRect.height - 2)
-            clientRect2 = wx.Rect(0, 0, clntRect.width, clntRect.height - 1)
-        
-        dc.SetBrush(wx.TRANSPARENT_BRUSH)
-        dc.SetPen(wx.Pen(pc.GetSingleLineBorderColour()))
-        dc.DrawRectangleRect(clientRect2)
-        dc.DrawRectangleRect(clientRect3)
-
-        dc.SetPen(wx.Pen(wx.SystemSettings_GetColour(wx.SYS_COLOUR_BTNSHADOW)))
-        dc.DrawRectangleRect(clientRect)
-
-        if not pc.HasFlag(FNB_TABS_BORDER_SIMPLE):
-        
-            dc.SetPen(wx.Pen((pc.HasFlag(FNB_VC71) and [wx.Colour(247, 243, 233)] or [pc._tabAreaColor])[0]))
-            dc.DrawLine(0, 0, 0, clientRect.height+1)
             
             if pc.HasFlag(FNB_BOTTOM):
             
-                dc.DrawLine(0, clientRect.height+1, clientRect.width, clientRect.height+1)
+                clientRect = wx.Rect(0, 2, clntRect.width, clntRect.height - 2)
+                clientRect2 = wx.Rect(0, 1, clntRect.width, clntRect.height - 1)
             
             else:
+            
+                clientRect = wx.Rect(0, 0, clntRect.width, clntRect.height - 2)
+                clientRect2 = wx.Rect(0, 0, clntRect.width, clntRect.height - 1)
+            
+            dc.SetBrush(wx.TRANSPARENT_BRUSH)
+            dc.SetPen(wx.Pen(pc.GetSingleLineBorderColour()))
+            dc.DrawRectangleRect(clientRect2)
+            dc.DrawRectangleRect(clientRect3)
+
+            dc.SetPen(wx.Pen(wx.SystemSettings_GetColour(wx.SYS_COLOUR_BTNSHADOW)))
+            dc.DrawRectangleRect(clientRect)
+
+            if not pc.HasFlag(FNB_TABS_BORDER_SIMPLE):
+            
+                dc.SetPen(wx.Pen((pc.HasFlag(FNB_VC71) and [wx.Colour(247, 243, 233)] or [pc._tabAreaColor])[0]))
+                dc.DrawLine(0, 0, 0, clientRect.height+1)
                 
-                dc.DrawLine(0, 0, clientRect.width, 0)
+                if pc.HasFlag(FNB_BOTTOM):
                 
-            dc.DrawLine(clientRect.width - 1, 0, clientRect.width - 1, clientRect.height+1)
+                    dc.DrawLine(0, clientRect.height+1, clientRect.width, clientRect.height+1)
+                
+                else:
+                    
+                    dc.DrawLine(0, 0, clientRect.width, 0)
+                    
+                dc.DrawLine(clientRect.width - 1, 0, clientRect.width - 1, clientRect.height+1)
 
 
     def CalcTabWidth(self, pageContainer, tabIdx, tabHeight):
@@ -1650,7 +1741,12 @@ class FNBRenderer:
         else:
             colr = (pc.HasFlag(FNB_VC71) and [wx.Colour(247, 243, 233)] or [pc.GetBackgroundColour()])[0]
             dc.SetPen(wx.Pen(colr))
-        
+
+        if pc.HasFlag(FNB_FF2):
+            lightFactor = (pc.HasFlag(FNB_BACKGROUND_GRADIENT) and [70] or [0])[0]
+            PaintStraightGradientBox(dc, pc.GetClientRect(), pc._tabAreaColor, LightColour(pc._tabAreaColor, lightFactor))
+            dc.SetBrush(wx.TRANSPARENT_BRUSH)
+
         dc.DrawRectangle(0, 0, size.x, size.y)
 
         # Take 3 bitmaps for the background for the buttons
@@ -1683,7 +1779,9 @@ class FNBRenderer:
         # We always draw the bottom/upper line of the tabs
         # regradless the style
         dc.SetPen(borderPen)
-        self.DrawTabsLine(pc, dc)
+
+        if not pc.HasFlag(FNB_FF2):
+            self.DrawTabsLine(pc, dc)
 
         # Restore the pen
         dc.SetPen(borderPen)
@@ -1727,10 +1825,13 @@ class FNBRenderer:
         #----------------------------------------------------------
         # Go over and draw the visible tabs
         #----------------------------------------------------------
+        x1 = x2 = -1
         for i in xrange(pc._nFrom, len(pc._pagesInfoVec)):
         
             dc.SetPen(borderPen)
-            dc.SetBrush((i==pc.GetSelection() and [selBrush] or [noselBrush])[0])
+
+            if not pc.HasFlag(FNB_FF2):
+                dc.SetBrush((i==pc.GetSelection() and [selBrush] or [noselBrush])[0])
 
             # Now set the font to the correct font
             dc.SetFont((i==pc.GetSelection() and [boldFont] or [normalFont])[0])
@@ -1759,6 +1860,10 @@ class FNBRenderer:
             # Draw the tab (border, text, image & 'x' on tab)
             self.DrawTab(pc, dc, posx, i, tabWidth, tabHeight, pc._nTabXButtonStatus)
 
+            if pc.GetSelection() == i:
+                x1 = posx
+                x2 = posx + tabWidth + 2
+
             # Restore the text forground
             dc.SetTextForeground(pc._activeTextColor)
 
@@ -1781,6 +1886,9 @@ class FNBRenderer:
         self.DrawX(pc, dc)
         self.DrawDropDownArrow(pc, dc)
 
+        if pc.HasFlag(FNB_FF2):
+            self.DrawTabsLine(pc, dc, x1, x2)
+
 
     def DrawDragHint(self, pc, tabIdx):
         """
@@ -1846,16 +1954,12 @@ class FNBRendererMgr:
         self._renderers.update({FNB_VC71: FNBRendererVC71()})
         self._renderers.update({FNB_FANCY_TABS: FNBRendererFancy()})
         self._renderers.update({FNB_VC8: FNBRendererVC8()})
+        self._renderers.update({FNB_FF2: FNBRendererFirefox2()})
 
 
     def GetRenderer(self, style):
         """ Returns the current renderer based on the style selected. """
 
-        # since we dont have a style for default tabs, we 
-        # test for all others - FIXME: add style for default tabs
-        if not style & FNB_VC71 and not style & FNB_VC8 and not style & FNB_FANCY_TABS:
-            return self._renderers[-1]
-
         if style & FNB_VC71:
             return self._renderers[FNB_VC71]
 
@@ -1865,6 +1969,9 @@ class FNBRendererMgr:
         if style & FNB_VC8:
             return self._renderers[FNB_VC8]
 
+        if style & FNB_FF2:
+            return self._renderers[FNB_FF2]
+
         # the default is to return the default renderer
         return self._renderers[-1]
 
@@ -1992,6 +2099,106 @@ class FNBRendererDefault(FNBRenderer):
             self.DrawTabX(pc, dc, x_rect, tabIdx, btnStatus)            
         
 
+#------------------------------------------
+# Firefox2 renderer 
+#------------------------------------------
+class FNBRendererFirefox2(FNBRenderer):
+    """
+    This class handles the drawing of tabs using the I{Firefox 2} renderer.
+    """
+    
+    def __init__(self):
+        """ Default class constructor. """
+
+        FNBRenderer.__init__(self)
+
+        
+    def DrawTab(self, pageContainer, dc, posx, tabIdx, tabWidth, tabHeight, btnStatus):
+        """ Draws a tab using the I{Firefox 2} style. """
+
+        borderPen = wx.Pen(wx.SystemSettings_GetColour(wx.SYS_COLOUR_BTNSHADOW))
+        pc = pageContainer
+
+        tabPoints = [wx.Point() for indx in xrange(7)]
+        tabPoints[0].x = posx + 2
+        tabPoints[0].y = (pc.HasFlag(FNB_BOTTOM) and [2] or [tabHeight - 2])[0]
+
+        tabPoints[1].x = tabPoints[0].x
+        tabPoints[1].y = (pc.HasFlag(FNB_BOTTOM) and [tabHeight - (VERTICAL_BORDER_PADDING+2)] or [(VERTICAL_BORDER_PADDING+2)])[0]
+
+        tabPoints[2].x = tabPoints[1].x+2
+        tabPoints[2].y = (pc.HasFlag(FNB_BOTTOM) and [tabHeight - VERTICAL_BORDER_PADDING] or [VERTICAL_BORDER_PADDING])[0]
+
+        tabPoints[3].x = posx + tabWidth - 2
+        tabPoints[3].y = (pc.HasFlag(FNB_BOTTOM) and [tabHeight - VERTICAL_BORDER_PADDING] or [VERTICAL_BORDER_PADDING])[0]
+
+        tabPoints[4].x = tabPoints[3].x + 2
+        tabPoints[4].y = (pc.HasFlag(FNB_BOTTOM) and [tabHeight - (VERTICAL_BORDER_PADDING+2)] or [(VERTICAL_BORDER_PADDING+2)])[0]
+
+        tabPoints[5].x = tabPoints[4].x
+        tabPoints[5].y = (pc.HasFlag(FNB_BOTTOM) and [2] or [tabHeight - 2])[0]
+
+        tabPoints[6].x = tabPoints[0].x
+        tabPoints[6].y = tabPoints[0].y
+
+        #------------------------------------
+        # Paint the tab with gradient
+        #------------------------------------
+        rr = wx.RectPP(tabPoints[2], tabPoints[5])
+        DrawButton(dc, rr, pc.GetSelection() == tabIdx , not pc.HasFlag(FNB_BOTTOM))
+
+        dc.SetBrush(wx.TRANSPARENT_BRUSH)
+        dc.SetPen(borderPen)
+
+        # Draw the tab as rounded rectangle
+        dc.DrawPolygon(tabPoints)
+
+        # -----------------------------------
+        # Text and image drawing
+        # -----------------------------------
+
+        # The width of the images are 16 pixels
+        padding = pc.GetParent().GetPadding()
+        shapePoints = int(tabHeight*math.tan(float(pc._pagesInfoVec[tabIdx].GetTabAngle())/180.0*math.pi))
+        hasImage = pc._pagesInfoVec[tabIdx].GetImageIndex() != -1
+        imageYCoord = (pc.HasFlag(FNB_BOTTOM) and [6] or [8])[0]
+
+        if hasImage:
+            textOffset = 2*padding + 16 + shapePoints/2 
+        else:
+            textOffset = padding + shapePoints/2
+            
+        textOffset += 2
+
+        if tabIdx != pc.GetSelection():
+        
+            # Set the text background to be like the vertical lines
+            dc.SetTextForeground(pc._pParent.GetNonActiveTabTextColour())
+
+        if hasImage:
+            imageXOffset = textOffset - 16 - padding
+            pc._ImageList.Draw(pc._pagesInfoVec[tabIdx].GetImageIndex(), dc,
+                               posx + imageXOffset, imageYCoord,
+                               wx.IMAGELIST_DRAW_TRANSPARENT, True)
+        
+        dc.DrawText(pc.GetPageText(tabIdx), posx + textOffset, imageYCoord)
+
+        # draw 'x' on tab (if enabled)
+        if pc.HasFlag(FNB_X_ON_TAB) and tabIdx == pc.GetSelection():
+        
+            textWidth, textHeight = dc.GetTextExtent(pc.GetPageText(tabIdx))
+            tabCloseButtonXCoord = posx + textOffset + textWidth + 1
+
+            # take a bitmap from the position of the 'x' button (the x on tab button)
+            # this bitmap will be used later to delete old buttons
+            tabCloseButtonYCoord = imageYCoord
+            x_rect = wx.Rect(tabCloseButtonXCoord, tabCloseButtonYCoord, 16, 16)
+            self._tabXBgBmp = self._GetBitmap(dc, x_rect, self._tabXBgBmp)
+
+            # Draw the tab
+            self.DrawTabX(pc, dc, x_rect, tabIdx, btnStatus)
+        
+
 #------------------------------------------------------------------
 # Visual studio 7.1 
 #------------------------------------------------------------------
@@ -2955,14 +3162,17 @@ class FlatNotebook(wx.Panel):
 
 
     def SetImageList(self, imageList):
-        """
-        Sets the image list for the page control. It does not take ownership
-        of the image list, you must delete it yourself.
-        """
+        """ Sets the image list for the page control. """
 
         self._pages.SetImageList(imageList)
 
 
+    def AssignImageList(self, imageList):
+        """ Assigns the image list for the page control. """
+
+        self._pages.AssignImageList(imageList)
+
+
     def GetImageList(self):
         """ Returns the associated image list. """
         
@@ -3542,7 +3752,7 @@ class PageContainer(wx.Panel):
         self._colorFrom = wx.WHITE
         self._activeTabColor = wx.WHITE
         self._activeTextColor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_BTNTEXT)
-        self._nonActiveTextColor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_BTNSHADOW)
+        self._nonActiveTextColor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_BTNTEXT)
         self._tabAreaColor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_BTNFACE)
 
         self._nFrom = 0
@@ -3755,6 +3965,47 @@ class PageContainer(wx.Panel):
                     self.FireEvent(tabIdx)
 
 
+    def RotateLeft(self):
+
+        if self._nFrom == 0:
+            return
+
+        # Make sure that the button was pressed before
+        if self._nLeftButtonStatus != FNB_BTN_PRESSED:
+            return
+
+        self._nLeftButtonStatus = FNB_BTN_HOVER
+
+        # We scroll left with bulks of 5
+        scrollLeft = self.GetNumTabsCanScrollLeft()
+
+        self._nFrom -= scrollLeft
+        if self._nFrom < 0:
+            self._nFrom = 0
+
+        self.Refresh()
+
+
+    def RotateRight(self):
+
+        if self._nFrom >= len(self._pagesInfoVec) - 1:
+            return
+
+        # Make sure that the button was pressed before
+        if self._nRightButtonStatus != FNB_BTN_PRESSED:
+            return
+
+        self._nRightButtonStatus = FNB_BTN_HOVER
+
+        # Check if the right most tab is visible, if it is
+        # don't rotate right anymore
+        if self._pagesInfoVec[len(self._pagesInfoVec)-1].GetPosition() != wx.Point(-1, -1):
+            return
+
+        self._nFrom += 1
+        self.Refresh()
+
+
     def OnLeftUp(self, event):
         """ Handles the wx.EVT_LEFT_UP events for L{PageContainer}. """
 
@@ -3764,49 +4015,10 @@ class PageContainer(wx.Panel):
         where, tabIdx = self.HitTest(event.GetPosition())
         
         if where == FNB_LEFT_ARROW:
-            
-            if self._nFrom == 0:
-                return
-
-            # Make sure that the button was pressed before
-            if self._nLeftButtonStatus != FNB_BTN_PRESSED:
-                return
-
-            self._nLeftButtonStatus = FNB_BTN_HOVER
-
-            # We scroll left with bulks of 5
-            scrollLeft = self.GetNumTabsCanScrollLeft()
-
-            self._nFrom -= scrollLeft
-            if self._nFrom < 0:
-                self._nFrom = 0
-
-            self.Refresh()
+            self.RotateLeft()
             
         elif where == FNB_RIGHT_ARROW:
-            
-            if self._nFrom >= len(self._pagesInfoVec) - 1:
-                return
-
-            # Make sure that the button was pressed before
-            if self._nRightButtonStatus != FNB_BTN_PRESSED:
-                return
-
-            self._nRightButtonStatus = FNB_BTN_HOVER
-
-            # Check if the right most tab is visible, if it is
-            # don't rotate right anymore
-            if self._pagesInfoVec[-1].GetPosition() != wx.Point(-1, -1):
-                return
-
-            lastVisibleTab = self.GetLastVisibleTab()
-            if lastVisibleTab < 0:
-                # Probably the screen is too small for displaying even a single
-                # tab, in this case we do nothing
-                return
-
-            self._nFrom += self.GetNumOfVisibleTabs()
-            self.Refresh()
+            self.RotateRight()
             
         elif where == FNB_X:
             
@@ -3843,6 +4055,8 @@ class PageContainer(wx.Panel):
 
             self.PopupTabsMenu()
 
+        event.Skip()
+        
 
     def HitTest(self, pt):
         """
@@ -4182,66 +4396,10 @@ class PageContainer(wx.Panel):
     def GetNumTabsCanScrollLeft(self):
         """ Returns the number of tabs than can be scrolled left. """
 
-        # Reserved area for the buttons (<>x)
-        rect = self.GetClientRect()
-        clientWidth = rect.width
-        posx = self._pParent._nPadding
-        numTabs = 0
-        pom = 0
-        
-        # In case we have error prevent crash
-        if self._nFrom < 0:
-            return 0
+        if self._nFrom - 1 >= 0:
+            return 1
 
-        dc = wx.ClientDC(self)
-
-        style = self.GetParent().GetWindowStyleFlag()
-        render = self._mgr.GetRenderer(style)
-        
-        for ii in xrange(self._nFrom, -1, -1):
-
-            boldFont = wx.SystemSettings_GetFont(wx.SYS_DEFAULT_GUI_FONT)        
-            boldFont.SetWeight(wx.FONTWEIGHT_BOLD)
-            dc.SetFont(boldFont)
-
-            height = dc.GetCharHeight()
-
-            tabHeight = height + FNB_HEIGHT_SPACER # We use 6 pixels as padding
-            if style & FNB_VC71:
-                tabHeight = (style & FNB_BOTTOM and [tabHeight - 4] or [tabHeight])[0]
-            elif style & FNB_FANCY_TABS:
-                tabHeight = (style & FNB_BOTTOM and [tabHeight - 3] or [tabHeight])[0]
-
-            width, pom = dc.GetTextExtent(self.GetPageText(ii))
-            if style != FNB_VC71:
-                shapePoints = int(tabHeight*math.tan(float(self._pagesInfoVec[ii].GetTabAngle())/180.0*math.pi))
-            else:
-                shapePoints = 0
-
-            tabWidth = 2*self._pParent._nPadding + width
-            
-            if not (style & FNB_VC71):
-                # Default style
-                tabWidth += 2*shapePoints
-
-            hasImage = self._ImageList != None and self._pagesInfoVec[ii].GetImageIndex() != -1
-
-            # For VC71 style, we only add the icon size (16 pixels)
-            if hasImage:
-            
-                if not self.IsDefaultTabs():
-                    tabWidth += 16 + self._pParent._nPadding
-                else:
-                    # Default style
-                    tabWidth += 16 + self._pParent._nPadding + shapePoints/2
-            
-            if posx + tabWidth + render.GetButtonsAreaLength(self) >= clientWidth:
-                break
-
-            numTabs = numTabs + 1
-            posx += tabWidth
-        
-        return numTabs
+        return 0
 
 
     def IsDefaultTabs(self):
@@ -4381,7 +4539,7 @@ class PageContainer(wx.Panel):
                            
         elif self.GetParent().GetWindowStyleFlag() & FNB_ALLOW_FOREIGN_DND:
         
-            if wx.Platform in ["__WXMSW__", "__WXGTK__"]:
+            if wx.Platform in ["__WXMSW__", "__WXGTK__", "__WXMAC__"]:
                 if nTabPage >= 0:
                 
                     window = oldNotebook.GetPage(nTabPage)
@@ -4550,10 +4708,16 @@ class PageContainer(wx.Panel):
     def OnLeftDClick(self, event):
         """ Handles the wx.EVT_LEFT_DCLICK event for L{PageContainer}. """
 
-        if self.HasFlag(FNB_DCLICK_CLOSES_TABS):
+        where, tabIdx = self.HitTest(event.GetPosition())
+        
+        if where == FNB_RIGHT_ARROW:
+            self.RotateRight()
+
+        elif where == FNB_LEFT_ARROW:
+            self.RotateLeft()
+
+        elif self.HasFlag(FNB_DCLICK_CLOSES_TABS):
         
-            where, tabIdx = self.HitTest(event.GetPosition())
-            
             if where == FNB_TAB:
                 self.DeletePage(tabIdx)
         
@@ -4623,6 +4787,12 @@ class PageContainer(wx.Panel):
         self._ImageList = imglist
 
 
+    def AssignImageList(self, imglist):
+        """ Assigns the image list for the page control. """
+
+        self._ImageList = imglist
+
+
     def GetImageList(self):
         """ Returns the image list for the page control. """
 
@@ -4663,3 +4833,4 @@ class PageContainer(wx.Panel):
         where, tabIdx = self.HitTest(client_pt)
         self._mgr.GetRenderer(self.GetParent().GetWindowStyleFlag()).DrawDragHint(self, tabIdx)
 
+
diff --git a/wxPython/wx/lib/floatcanvas/FloatCanvas.py b/wxPython/wx/lib/floatcanvas/FloatCanvas.py
index 5a9b74186c..c8a473240c 100644
--- a/wxPython/wx/lib/floatcanvas/FloatCanvas.py
+++ b/wxPython/wx/lib/floatcanvas/FloatCanvas.py
@@ -1,82 +1,64 @@
+
 from __future__ import division
 
 try:
-    from Numeric import array,asarray,Float,cos, sin, pi,sum,minimum,maximum,Int32,zeros, ones, concatenate, sqrt, argmin, power, absolute, matrixmultiply, transpose, sometrue, arange, hypot
+    import numpy as N
 except ImportError:
-    try:
-        from numarray import array, asarray, Float, cos, sin, pi, sum, minimum, maximum, Int32, zeros, concatenate, matrixmultiply, transpose, sometrue, arange, hypot
-    except ImportError:
-        raise ImportError("I could not import either Numeric or numarray")
-
-from time import clock, sleep
-
-import Resources # A file with icons, etc for FloatCanvas
+    raise ImportError("I could not import numpy")
 
+from time import clock
 import wx
 
-import types
-import os        
+from Utilities import BBox
+
 
 ## A global variable to hold the Pixels per inch that wxWindows thinks is in use
 ## This is used for scaling fonts.
 ## This can't be computed on module __init__, because a wx.App might not have initialized yet.
-global ScreenPPI
+global FontScale
 
-## a custom Exceptions:
+## Custom Exceptions:
 
 class FloatCanvasError(Exception):
     pass
 
 ## Create all the mouse events
-# I don't see a need for these two, but maybe some day!
-#EVT_FC_ENTER_WINDOW = wx.NewEventType()
-#EVT_FC_LEAVE_WINDOW = wx.NewEventType()
-EVT_FC_LEFT_DOWN = wx.NewEventType() 
+EVT_FC_ENTER_WINDOW = wx.NewEventType()
+EVT_FC_LEAVE_WINDOW = wx.NewEventType()
+EVT_FC_LEFT_DOWN = wx.NewEventType()
 EVT_FC_LEFT_UP  = wx.NewEventType()
-EVT_FC_LEFT_DCLICK = wx.NewEventType() 
-EVT_FC_MIDDLE_DOWN = wx.NewEventType() 
-EVT_FC_MIDDLE_UP = wx.NewEventType() 
-EVT_FC_MIDDLE_DCLICK = wx.NewEventType() 
-EVT_FC_RIGHT_DOWN = wx.NewEventType() 
-EVT_FC_RIGHT_UP = wx.NewEventType() 
-EVT_FC_RIGHT_DCLICK = wx.NewEventType() 
-EVT_FC_MOTION = wx.NewEventType() 
-EVT_FC_MOUSEWHEEL = wx.NewEventType() 
+EVT_FC_LEFT_DCLICK = wx.NewEventType()
+EVT_FC_MIDDLE_DOWN = wx.NewEventType()
+EVT_FC_MIDDLE_UP = wx.NewEventType()
+EVT_FC_MIDDLE_DCLICK = wx.NewEventType()
+EVT_FC_RIGHT_DOWN = wx.NewEventType()
+EVT_FC_RIGHT_UP = wx.NewEventType()
+EVT_FC_RIGHT_DCLICK = wx.NewEventType()
+EVT_FC_MOTION = wx.NewEventType()
+EVT_FC_MOUSEWHEEL = wx.NewEventType()
 ## these two are for the hit-test stuff, I never make them real Events
+## fixme: could I use the PyEventBinder for the Object events too?
 EVT_FC_ENTER_OBJECT = wx.NewEventType()
 EVT_FC_LEAVE_OBJECT = wx.NewEventType()
 
-##Create all mouse event binding functions
-#def EVT_ENTER_WINDOW( window, function ):
-#    window.Connect( -1, -1, EVT_FC_ENTER_WINDOW, function ) 
-#def EVT_LEAVE_WINDOW( window, function ):
-#    window.Connect( -1, -1,EVT_FC_LEAVE_WINDOW , function ) 
-def EVT_LEFT_DOWN( window, function ):  
-    window.Connect( -1, -1,EVT_FC_LEFT_DOWN , function )
-def EVT_LEFT_UP( window, function ):
-    window.Connect( -1, -1,EVT_FC_LEFT_UP , function )
-def EVT_LEFT_DCLICK  ( window, function ):
-    window.Connect( -1, -1,EVT_FC_LEFT_DCLICK , function )
-def EVT_MIDDLE_DOWN  ( window, function ):
-    window.Connect( -1, -1,EVT_FC_MIDDLE_DOWN , function )
-def EVT_MIDDLE_UP  ( window, function ):
-    window.Connect( -1, -1,EVT_FC_MIDDLE_UP , function )
-def EVT_MIDDLE_DCLICK  ( window, function ):
-    window.Connect( -1, -1,EVT_FC_MIDDLE_DCLICK , function )
-def EVT_RIGHT_DOWN  ( window, function ):
-    window.Connect( -1, -1,EVT_FC_RIGHT_DOWN , function )
-def EVT_RIGHT_UP( window, function ):
-    window.Connect( -1, -1,EVT_FC_RIGHT_UP , function )
-def EVT_RIGHT_DCLICK( window, function ):
-    window.Connect( -1, -1,EVT_FC_RIGHT_DCLICK , function )
-def EVT_MOTION( window, function ):
-    window.Connect( -1, -1,EVT_FC_MOTION , function )
-def EVT_MOUSEWHEEL( window, function ):
-    window.Connect( -1, -1,EVT_FC_MOUSEWHEEL , function )
+##Create all mouse event binding objects
+EVT_LEFT_DOWN = wx.PyEventBinder(EVT_FC_LEFT_DOWN)
+EVT_LEFT_UP = wx.PyEventBinder(EVT_FC_LEFT_UP)
+EVT_LEFT_DCLICK = wx.PyEventBinder(EVT_FC_LEFT_DCLICK)
+EVT_MIDDLE_DOWN = wx.PyEventBinder(EVT_FC_MIDDLE_DOWN)
+EVT_MIDDLE_UP = wx.PyEventBinder(EVT_FC_MIDDLE_UP)
+EVT_MIDDLE_DCLICK = wx.PyEventBinder(EVT_FC_MIDDLE_DCLICK)
+EVT_RIGHT_DOWN = wx.PyEventBinder(EVT_FC_RIGHT_DOWN)
+EVT_RIGHT_UP = wx.PyEventBinder(EVT_FC_RIGHT_UP)
+EVT_RIGHT_DCLICK = wx.PyEventBinder(EVT_FC_RIGHT_DCLICK)
+EVT_MOTION = wx.PyEventBinder(EVT_FC_MOTION)
+EVT_ENTER_WINDOW = wx.PyEventBinder(EVT_FC_ENTER_WINDOW)
+EVT_LEAVE_WINDOW = wx.PyEventBinder(EVT_FC_LEAVE_WINDOW)
+EVT_MOUSEWHEEL = wx.PyEventBinder(EVT_FC_MOUSEWHEEL)
 
 class _MouseEvent(wx.PyCommandEvent):
 
-    """
+    """!
 
     This event class takes a regular wxWindows mouse event as a parameter,
     and wraps it so that there is access to all the original methods. This
@@ -99,24 +81,20 @@ class _MouseEvent(wx.PyCommandEvent):
         self.SetEventType( EventType )
         self._NativeEvent = NativeEvent
         self.Coords = Coords
-    
-# I don't think this is used.
-#    def SetCoords(self,Coords):
-#        self.Coords = Coords
-        
+
     def GetCoords(self):
         return self.Coords
 
     def __getattr__(self, name):
-        #return eval(self.NativeEvent.__getattr__(name) )
         return getattr(self._NativeEvent, name)
 
 def _cycleidxs(indexcount, maxvalue, step):
 
-    """
+    """!
     Utility function used by _colorGenerator
 
     """
+    
     if indexcount == 0:
         yield ()
     else:
@@ -126,97 +104,50 @@ def _cycleidxs(indexcount, maxvalue, step):
 
 def _colorGenerator():
 
-    """
+    """!
 
-    Generates a seris of unique colors used to do hit-tests with the HIt
+    Generates a series of unique colors used to do hit-tests with the Hit
     Test bitmap
-
     """
-    import sys
-    if sys.platform == 'darwin':
-        depth = 24
-    else:
-        b = wx.EmptyBitmap(1,1)
-        depth = b.GetDepth()
-    if depth == 16:
-        step = 8
-    elif depth >= 24:
+
+    depth = wx.GetDisplayDepth()
+##    ##there have been problems with 16 bbp displays, to I'm disabling this for now.
+##    if depth == 16:
+##        print "Warning: There have been problems with hit-testing on 16bbp displays"
+##        step = 8
+    if depth >= 24:
         step = 1
     else:
-        raise "ColorGenerator does not work with depth = %s" % depth
+        msg= ["ColorGenerator does not work with depth = %s" % depth]
+        msg.append("It is required for hit testing -- binding events to mouse")
+        msg.append("actions on objects on the Canvas.")
+        msg.append("Please set your display to 24bit")
+        msg.append("Alternatively, the code could be adapted to 16 bit if that's required")
+        raise FloatCanvasError(msg)
     return _cycleidxs(indexcount=3, maxvalue=256, step=step)
 
-
-#### I don't know if the Set objects are useful, beyond the pointset
-#### object. The problem is that when zoomed in, the BB is checked to see
-#### whether to draw the object.  A Set object can defeat this. One day
-#### I plan to write some custon C++ code to draw sets of objects
-
-##class ObjectSetMixin:
-##    """
-##    A mix-in class for draw objects that are sets of objects
-
-##    It contains methods for setting lists of pens and brushes
-
-##    """
-##    def SetPens(self,LineColors,LineStyles,LineWidths):
-##        """
-##        This method used when an object could have a list of pens, rather than just one
-##        It is used for LineSet, and perhaps others in the future.
-
-##        fixme: this should be in a mixin
-
-##        fixme: this is really kludgy, there has got to be a better way!
-
-##        """
-
-##        length = 1
-##        if type(LineColors) == types.ListType:
-##            length = len(LineColors)
-##        else:
-##            LineColors = [LineColors]
-
-##        if type(LineStyles) == types.ListType:
-##            length = len(LineStyles)
-##        else:
-##            LineStyles = [LineStyles]
-
-##        if type(LineWidths) == types.ListType:
-##            length = len(LineWidths)
-##        else:
-##            LineWidths = [LineWidths]
-
-##        if length > 1:
-##            if len(LineColors) == 1:
-##                LineColors = LineColors*length
-##            if len(LineStyles) == 1:
-##                LineStyles = LineStyles*length
-##            if len(LineWidths) == 1:
-##                LineWidths = LineWidths*length
-
-##        self.Pens = []
-##        for (LineColor,LineStyle,LineWidth) in zip(LineColors,LineStyles,LineWidths):
-##            if LineColor is None or LineStyle is None:
-##                self.Pens.append(wx.TRANSPARENT_PEN)
-##                # what's this for?> self.LineStyle = 'Transparent'
-##            if not self.PenList.has_key((LineColor,LineStyle,LineWidth)):
-##                Pen = wx.Pen(LineColor,LineWidth,self.LineStyleList[LineStyle])
-##                self.Pens.append(Pen)
-##            else:
-##                self.Pens.append(self.PenList[(LineColor,LineStyle,LineWidth)])
-##        if length == 1:
-##            self.Pens = self.Pens[0]
-
 class DrawObject:
-    """
+    """!
     This is the base class for all the objects that can be drawn.
 
     One must subclass from this (and an assortment of Mixins) to create
     a new DrawObject.
 
+      \note This class contain a series of static dictionaries:
+
+      * BrushList
+      * PenList
+      * FillStyleList
+      * LineStyleList
+
+      Is this still necessary?
+
     """
 
     def __init__(self, InForeground  = False, IsVisible = True):
+        """! \param InForeground (bool)
+             \param IsVisible (Bool)
+        """
         self.InForeground = InForeground
 
         self._Canvas = None
@@ -235,7 +166,7 @@ class DrawObject:
         self.Pen = None
 
         self.FillStyle = "Solid"
-        
+
         self.Visible = IsVisible
 
     # I pre-define all these as class variables to provide an easier
@@ -287,12 +218,27 @@ class DrawObject:
             "DotDash"    : wx.DOT_DASH,
             }
 
+#    def BBFromPoints(self, Points):
+#        """!
+#        Calculates a Bounding box from a set of points (NX2 array of coordinates)
+#        \param Points (array?) 
+#        """
+#
+#        ## fixme: this could be done with array.min() and vstack() in numpy.
+#        ##        This could use the Utilities.BBox module now.
+#        #return N.array( (N.minimum.reduce(Points),
+#        #                 N.maximum.reduce(Points) ),
+#        #                )
+#        return BBox.fromPoints(Points)
+
     def Bind(self, Event, CallBackFun):
         self.CallBackFuncs[Event] = CallBackFun
         self.HitAble = True
         self._Canvas.UseHitTest = True
-        if not self._Canvas._HTdc:
-            self._Canvas.MakeNewHTdc()
+        if self.InForeground and self._Canvas._ForegroundHTBitmap is None:
+            self._Canvas.MakeNewForegroundHTBitmap()
+        elif self._Canvas._HTBitmap is None:
+            self._Canvas.MakeNewHTBitmap()
         if not self.HitColor:
             if not self._Canvas.HitColorGenerator:
                 self._Canvas.HitColorGenerator = _colorGenerator()
@@ -343,6 +289,21 @@ class DrawObject:
         else:
             self.HitPen = self.PenList.setdefault( (HitColor, "solid", self.HitLineWidth),  wx.Pen(HitColor, self.HitLineWidth, self.LineStyleList["Solid"]) )
 
+    ## Just to make sure that they will always be there
+    ##   the appropriate ones should be overridden in the subclasses
+    def SetColor(self, Color):
+        pass
+    def SetLineColor(self, LineColor):
+        pass
+    def SetLineStyle(self, LineStyle):
+        pass
+    def SetLineWidth(self, LineWidth):
+        pass
+    def SetFillColor(self, FillColor):
+        pass
+    def SetFillStyle(self, FillStyle):
+        pass
+
     def PutInBackground(self):
         if self._Canvas and self.InForeground:
             self._Canvas._ForeDrawList.remove(self)
@@ -358,11 +319,70 @@ class DrawObject:
             self.InForeground = True
 
     def Hide(self):
+        """! \brief Make an object hidden.
+        """
         self.Visible = False
 
     def Show(self):
+        """! \brief Make an object visible on the canvas.
+        """
         self.Visible = True
 
+class Group(DrawObject): 
+    """
+    A group of other FloatCanvas Objects
+    
+    Not all DrawObject methods may apply here. In particular, you can't Bind events to a group.
+    
+    Note that if an object is in more than one group, it will get drawn more than once.
+    
+    """
+
+    def __init__(self, ObjectList=[], InForeground  = False, IsVisible = True):
+        self.ObjectList = list(ObjectList)
+        DrawObject.__init__(self, InForeground, IsVisible)
+        self.CalcBoundingBox()
+
+    def AddObject(self, obj):
+        self.ObjectList.append(obj)
+        self.BoundingBox.Merge(obj.BoundingBox)
+
+    def AddObjects(self, Objects):
+        for o in Objects:
+            self.AddObject(o)
+            
+    def CalcBoundingBox(self):
+        if self.ObjectList:
+            BB = BBox.asBBox(self.ObjectList[0].BoundingBox)
+            for obj in self.ObjectList[1:]:
+                BB.Merge(obj.BoundingBox)
+        else:
+            BB = None
+        self.BoundingBox = BB
+
+    def SetColor(self, Color):
+        for o in self.ObjectList:
+            o.SetColor(Color)
+    def SetLineColor(self, Color):
+        for o in self.ObjectList:
+            o.SetLineColor(Color)
+    def SetLineStyle(self, LineStyle):
+        for o in self.ObjectList:
+            o.SetLineStyle(LineStyle)
+    def SetLineWidth(self, LineWidth):
+        for o in self.ObjectList:
+            o.SetLineWidth(LineWidth)
+    def SetFillColor(self, Color):
+        for o in self.ObjectList:
+            o.SetFillColor(Color)
+    def SetFillStyle(self, FillStyle):
+        for o in self.ObjectList:
+            o.SetFillStyle(FillStyle)
+    def _Draw(self, dc , WorldToPixel, ScaleWorldToPixel = None, HTdc=None):
+        for obj in self.ObjectList:
+            obj._Draw(dc, WorldToPixel, ScaleWorldToPixel, HTdc)
+            
+
 class ColorOnlyMixin:
     """
 
@@ -375,7 +395,7 @@ class ColorOnlyMixin:
         self.SetPen(Color,"Solid",1)
         self.SetBrush(Color,"Solid")
 
-    SetFillColor = SetColor # Just to provide a consistant interface 
+    SetFillColor = SetColor # Just to provide a consistant interface
 
 class LineOnlyMixin:
     """
@@ -388,7 +408,8 @@ class LineOnlyMixin:
     def SetLineColor(self, LineColor):
         self.LineColor = LineColor
         self.SetPen(LineColor,self.LineStyle,self.LineWidth)
-
+    SetColor = SetLineColor# so that it will do somethign reasonable
+    
     def SetLineStyle(self, LineStyle):
         self.LineStyle = LineStyle
         self.SetPen(self.LineColor,LineStyle,self.LineWidth)
@@ -411,7 +432,16 @@ class LineAndFillMixin(LineOnlyMixin):
     def SetFillStyle(self, FillStyle):
         self.FillStyle = FillStyle
         self.SetBrush(self.FillColor,FillStyle)
-    
+
+    def SetUpDraw(self, dc , WorldToPixel, ScaleWorldToPixel, HTdc):
+        dc.SetPen(self.Pen)
+        dc.SetBrush(self.Brush)
+        if HTdc and self.HitAble:
+            HTdc.SetPen(self.HitPen)
+            HTdc.SetBrush(self.HitBrush)
+        return ( WorldToPixel(self.XY),
+                 ScaleWorldToPixel(self.WH) )
+
 class XYObjectMixin:
     """
 
@@ -427,29 +457,28 @@ class XYObjectMixin:
         (dx,dy) pair. Ideally a Numpy array of shape (2,)
 
         """
-        
-        Delta = asarray(Delta, Float)
+
+        Delta = N.asarray(Delta, N.float)
         self.XY += Delta
-        self.BoundingBox = self.BoundingBox + Delta
-        
+        self.BoundingBox += Delta
+
         if self._Canvas:
-            self._Canvas.BoundingBoxDirty = True      
+            self._Canvas.BoundingBoxDirty = True
 
     def CalcBoundingBox(self):
         ## This may get overwritten in some subclasses
-        self.BoundingBox = array( (self.XY, self.XY), Float )
+        self.BoundingBox = N.array( (self.XY, self.XY), N.float )
+        self.BoundingBox = BBox.asBBox((self.XY, self.XY))
 
     def SetPoint(self, xy):
-        xy = array( xy, Float)
+        xy = N.array(xy, N.float)
         xy.shape = (2,)
-        Delta = xy - self.XY
-        
-        self.XY = xy
-        self.BoundingBox = self.BoundingBox + Delta
 
-        #self.CalcBoundingBox()
+        self.XY = xy
+        self.CalcBoundingBox()
+
         if self._Canvas:
-            self._Canvas.BoundingBoxDirty = True     
+            self._Canvas.BoundingBoxDirty = True
 
 class PointsObjectMixin:
     """
@@ -459,29 +488,21 @@ class PointsObjectMixin:
 
     """
 
-
-## This is code for the PointsObjectMixin object, it needs to be adapted and tested.
-## Is the neccesary at all: you can always do:
-##    Object.SetPoints( Object.Points + delta, copy = False)    
-##    def Move(self, Delta ):
-##        """
-
-##        Move(Delta): moves the object by delta, where delta is an (dx,
-##        dy) pair. Ideally a Numpy array of shape (2,)
-
-##        """
+    def Move(self, Delta):
+        """
+        Move(Delta): moves the object by delta, where delta is an (dx,
+        dy) pair. Ideally a Numpy array of shape (2,)
+        """
         
-##        Delta = array(Delta, Float)
-##        self.XY += Delta
-##        self.BoundingBox = self.BoundingBox + Delta##array((self.XY, (self.XY + self.WH)), Float)
-##        if self._Canvas:
-##            self._Canvas.BoundingBoxDirty = True      
+        Delta = N.asarray(Delta, N.float)
+        Delta.shape = (2,)
+        self.Points += Delta
+        self.BoundingBox += Delta
+        if self._Canvas:
+            self._Canvas.BoundingBoxDirty = True
 
     def CalcBoundingBox(self):
-        self.BoundingBox = array(((min(self.Points[:,0]),
-                                   min(self.Points[:,1]) ),
-                                  (max(self.Points[:,0]),
-                                   max(self.Points[:,1]) ) ), Float )
+        self.BoundingBox = BBox.fromPoints(self.Points)
         if self._Canvas:
             self._Canvas.BoundingBoxDirty = True
 
@@ -498,17 +519,17 @@ class PointsObjectMixin:
         Points = Object.Points
         Points += (5,10) # shifts the points 5 in the x dir, and 10 in the y dir.
         Object.SetPoints(Points, False) # Sets the points to the same array as it was
-        
+
         """
         if copy:
-            self.Points = array(Points, Float)
+            self.Points = N.array(Points, N.float)
             self.Points.shape = (-1,2) # Make sure it is a NX2 array, even if there is only one point
         else:
-            self.Points = asarray(Points, Float)
+            self.Points = N.asarray(Points, N.float)
         self.CalcBoundingBox()
 
-     
-class Polygon(DrawObject,PointsObjectMixin,LineAndFillMixin):
+
+class Polygon(PointsObjectMixin, LineAndFillMixin, DrawObject):
 
     """
 
@@ -530,8 +551,8 @@ class Polygon(DrawObject,PointsObjectMixin,LineAndFillMixin):
                  FillColor    = None,
                  FillStyle    = "Solid",
                  InForeground = False):
-        DrawObject.__init__(self,InForeground)
-        self.Points = array(Points,Float) # this DOES need to make a copy
+        DrawObject.__init__(self, InForeground)
+        self.Points = N.array(Points ,N.float) # this DOES need to make a copy
         self.CalcBoundingBox()
 
         self.LineColor = LineColor
@@ -554,41 +575,8 @@ class Polygon(DrawObject,PointsObjectMixin,LineAndFillMixin):
             HTdc.SetPen(self.HitPen)
             HTdc.SetBrush(self.HitBrush)
             HTdc.DrawPolygon(Points)
-            
-##class PolygonSet(DrawObject):
-##    """
-##    The PolygonSet class takes a Geometry.Polygon object.
-##    so that Points[N] = (x1,y1) and Points[N+1] = (x2,y2). N must be an even number!
-    
-##    it creates a set of line segments, from (x1,y1) to (x2,y2)
-    
-##    """
-    
-##    def __init__(self,PolySet,LineColors,LineStyles,LineWidths,FillColors,FillStyles,InForeground = False):
-##        DrawObject.__init__(self, InForeground)
 
-##        ##fixme: there should be some error checking for everything being the right length.
-
-        
-##        self.Points = array(Points,Float)
-##        self.BoundingBox = array(((min(self.Points[:,0]),min(self.Points[:,1])),(max(self.Points[:,0]),max(self.Points[:,1]))),Float)
-
-##        self.LineColors = LineColors
-##        self.LineStyles = LineStyles
-##        self.LineWidths = LineWidths
-##        self.FillColors = FillColors
-##        self.FillStyles = FillStyles
-
-##        self.SetPens(LineColors,LineStyles,LineWidths)
-
-##    #def _Draw(self,dc,WorldToPixel,ScaleWorldToPixel):
-##    def _Draw(self, dc , WorldToPixel, ScaleWorldToPixel, HTdc=None):
-##        Points = WorldToPixel(self.Points)
-##        Points.shape = (-1,4)
-##        dc.DrawLineList(Points,self.Pens)
- 
-
-class Line(DrawObject,PointsObjectMixin,LineOnlyMixin):
+class Line(PointsObjectMixin, LineOnlyMixin, DrawObject,):
     """
 
     The Line class takes a list of 2-tuples, or a NX2 NumPy Float array
@@ -606,7 +594,7 @@ class Line(DrawObject,PointsObjectMixin,LineOnlyMixin):
         DrawObject.__init__(self, InForeground)
 
 
-        self.Points = array(Points,Float)
+        self.Points = N.array(Points,N.float)
         self.CalcBoundingBox()
 
         self.LineColor = LineColor
@@ -617,7 +605,7 @@ class Line(DrawObject,PointsObjectMixin,LineOnlyMixin):
 
         self.HitLineWidth = max(LineWidth,self.MinHitLineWidth)
 
-            
+
     def _Draw(self, dc , WorldToPixel, ScaleWorldToPixel, HTdc=None):
         Points = WorldToPixel(self.Points)
         dc.SetPen(self.Pen)
@@ -626,18 +614,31 @@ class Line(DrawObject,PointsObjectMixin,LineOnlyMixin):
             HTdc.SetPen(self.HitPen)
             HTdc.DrawLines(Points)
 
-class Arrow(DrawObject,XYObjectMixin,LineOnlyMixin):
+class Spline(Line):
+    def __init__(self, *args, **kwargs):
+            Line.__init__(self, *args, **kwargs)
+
+    def _Draw(self, dc , WorldToPixel, ScaleWorldToPixel, HTdc=None):
+        Points = WorldToPixel(self.Points)
+        dc.SetPen(self.Pen)
+        dc.DrawSpline(Points)
+        if HTdc and self.HitAble:
+            HTdc.SetPen(self.HitPen)
+            HTdc.DrawSpline(Points)
+
+
+class Arrow(XYObjectMixin, LineOnlyMixin, DrawObject):
     """
 
     Arrow(XY, # coords of origin of arrow (x,y)
           Length, # length of arrow in pixels
           theta, # angle of arrow in degrees: zero is straight up
-                 # angle is to the right
+                 # +angle is to the right
           LineColor = "Black",
           LineStyle = "Solid",
-          LineWidth    = 1, 
-          ArrowHeadSize = 4,
-          ArrowHeadAngle = 45,
+          LineWidth    = 1,
+          ArrowHeadSize = 4, # size of arrowhead in pixels
+          ArrowHeadAngle = 45, # angle of arrow head in degrees
           InForeground = False):
 
     It will draw an arrow , starting at the point, (X,Y) pointing in
@@ -658,12 +659,12 @@ class Arrow(DrawObject,XYObjectMixin,LineOnlyMixin):
 
         DrawObject.__init__(self, InForeground)
 
-        self.XY = array(XY, Float)
-        self.XY.shape = (2,) # Make sure it is a 1X2 array, even if there is only one point
+        self.XY = N.array(XY, N.float)
+        self.XY.shape = (2,) # Make sure it is a length 2 vector
         self.Length = Length
         self.Direction = float(Direction)
-        self.ArrowHeadSize = ArrowHeadSize 
-        self.ArrowHeadAngle = float(ArrowHeadAngle)        
+        self.ArrowHeadSize = ArrowHeadSize
+        self.ArrowHeadAngle = float(ArrowHeadAngle)
 
         self.CalcArrowPoints()
         self.CalcBoundingBox()
@@ -680,7 +681,7 @@ class Arrow(DrawObject,XYObjectMixin,LineOnlyMixin):
     def SetDirection(self, Direction):
         self.Direction = float(Direction)
         self.CalcArrowPoints()
-        
+
     def SetLength(self, Length):
         self.Length = Length
         self.CalcArrowPoints()
@@ -689,26 +690,37 @@ class Arrow(DrawObject,XYObjectMixin,LineOnlyMixin):
         self.Direction = float(Direction)
         self.Length = Length
         self.CalcArrowPoints()
-        
-    def SetLength(self, Length):
-        self.Length = Length
-        self.CalcArrowPoints()
 
-    ## fixme: cache this?
+##    def CalcArrowPoints(self):
+##        L = self.Length
+##        S = self.ArrowHeadSize
+##        phi = self.ArrowHeadAngle * N.pi / 360
+##        theta = (self.Direction-90.0) * N.pi / 180
+##        ArrowPoints = N.array( ( (0, L, L - S*N.cos(phi),L, L - S*N.cos(phi) ),
+##                               (0, 0, S*N.sin(phi),    0, -S*N.sin(phi)    ) ),
+##                             N.float )
+##        RotationMatrix = N.array( ( ( N.cos(theta), -N.sin(theta) ),
+##                                  ( N.sin(theta), N.cos(theta) ) ),
+##                                N.float
+##                                )
+##        ArrowPoints = N.matrixmultiply(RotationMatrix, ArrowPoints)
+##        self.ArrowPoints = N.transpose(ArrowPoints)
+
     def CalcArrowPoints(self):
         L = self.Length
         S = self.ArrowHeadSize
-        phi = self.ArrowHeadAngle * pi / 360
-        theta = (self.Direction-90.0) * pi / 180
-        ArrowPoints = array( ( (0, L, L - S*cos(phi),L, L - S*cos(phi) ),
-                               (0, 0, S*sin(phi),    0, -S*sin(phi)    ) ),
-                             Float )
-        RotationMatrix = array( ( ( cos(theta), -sin(theta) ),
-                                  ( sin(theta), cos(theta) ) ),
-                                Float
-                                )
-        ArrowPoints = matrixmultiply(RotationMatrix, ArrowPoints)
-        self.ArrowPoints = transpose(ArrowPoints)
+        phi = self.ArrowHeadAngle * N.pi / 360
+        theta = (270 - self.Direction) * N.pi / 180
+        AP = N.array( ( (0,0),
+                        (0,0),
+                        (N.cos(theta - phi), -N.sin(theta - phi) ),
+                        (0,0),
+                        (N.cos(theta + phi), -N.sin(theta + phi) ),
+                        ), N.float )
+        AP *= S
+        shift = (-L*N.cos(theta), L*N.sin(theta) )
+        AP[1:,:] += shift
+        self.ArrowPoints = AP
 
     def _Draw(self, dc , WorldToPixel, ScaleWorldToPixel, HTdc=None):
         dc.SetPen(self.Pen)
@@ -719,38 +731,86 @@ class Arrow(DrawObject,XYObjectMixin,LineOnlyMixin):
             HTdc.SetPen(self.HitPen)
             HTdc.DrawLines(ArrowPoints)
 
-##class LineSet(DrawObject, ObjectSetMixin):
-##    """
-##    The LineSet class takes a list of 2-tuples, or a NX2 NumPy array of point coordinates.
-##    so that Points[N] = (x1,y1) and Points[N+1] = (x2,y2). N must be an even number!
-    
-##    it creates a set of line segments, from (x1,y1) to (x2,y2)
-    
-##    """
-    
-##    def __init__(self,Points,LineColors,LineStyles,LineWidths,InForeground = False):
-##        DrawObject.__init__(self, InForeground)
 
-##        NumLines = len(Points) / 2
-##        ##fixme: there should be some error checking for everything being the right length.
+class ArrowLine(PointsObjectMixin, LineOnlyMixin, DrawObject):
+    """
 
-        
-##        self.Points = array(Points,Float)
-##        self.BoundingBox = array(((min(self.Points[:,0]),min(self.Points[:,1])),(max(self.Points[:,0]),max(self.Points[:,1]))),Float)
+    ArrowLine(Points, # coords of points
+              LineColor = "Black",
+              LineStyle = "Solid",
+              LineWidth    = 1,
+              ArrowHeadSize = 4, # in pixels
+              ArrowHeadAngle = 45,
+              InForeground = False):
 
-##        self.LineColors = LineColors
-##        self.LineStyles = LineStyles
-##        self.LineWidths = LineWidths
+    It will draw a set of arrows from point to point.
 
-##        self.SetPens(LineColors,LineStyles,LineWidths)
+    It takes a list of 2-tuples, or a NX2 NumPy Float array
+    of point coordinates.
 
-##    #def _Draw(self,dc,WorldToPixel,ScaleWorldToPixel):
-##    def _Draw(self, dc , WorldToPixel, ScaleWorldToPixel, HTdc=None):
-##        Points = WorldToPixel(self.Points)
-##        Points.shape = (-1,4)
-##        dc.DrawLineList(Points,self.Pens)
 
-class PointSet(DrawObject,PointsObjectMixin, ColorOnlyMixin):
+    """
+
+    def __init__(self,
+                 Points,
+                 LineColor = "Black",
+                 LineStyle = "Solid",
+                 LineWidth    = 1, # pixels
+                 ArrowHeadSize = 8, # pixels
+                 ArrowHeadAngle = 30, # degrees
+                 InForeground = False):
+
+        DrawObject.__init__(self, InForeground)
+
+        self.Points = N.asarray(Points,N.float)
+        self.Points.shape = (-1,2) # Make sure it is a NX2 array, even if there is only one point
+        self.ArrowHeadSize = ArrowHeadSize
+        self.ArrowHeadAngle = float(ArrowHeadAngle)
+
+        self.CalcArrowPoints()
+        self.CalcBoundingBox()
+
+        self.LineColor = LineColor
+        self.LineStyle = LineStyle
+        self.LineWidth = LineWidth
+
+        self.SetPen(LineColor,LineStyle,LineWidth)
+
+        self.HitLineWidth = max(LineWidth,self.MinHitLineWidth)
+
+    def CalcArrowPoints(self):
+        S = self.ArrowHeadSize
+        phi = self.ArrowHeadAngle * N.pi / 360
+        Points = self.Points
+        n = Points.shape[0]
+        self.ArrowPoints = N.zeros((n-1, 3, 2), N.float)
+        for i in xrange(n-1):
+            dx, dy = self.Points[i] - self.Points[i+1]
+            theta = N.arctan2(dy, dx)
+            AP = N.array( (
+                            (N.cos(theta - phi), -N.sin(theta-phi)),
+                            (0,0),
+                            (N.cos(theta + phi), -N.sin(theta + phi))
+                            ),
+                          N.float )
+            self.ArrowPoints[i,:,:] = AP
+        self.ArrowPoints *= S
+
+    def _Draw(self, dc , WorldToPixel, ScaleWorldToPixel, HTdc=None):
+        Points = WorldToPixel(self.Points)
+        ArrowPoints = Points[1:,N.newaxis,:] + self.ArrowPoints
+        dc.SetPen(self.Pen)
+        dc.DrawLines(Points)
+        for arrow in ArrowPoints:
+                dc.DrawLines(arrow)
+        if HTdc and self.HitAble:
+            HTdc.SetPen(self.HitPen)
+            HTdc.DrawLines(Points)
+            for arrow in ArrowPoints:
+                HTdc.DrawLines(arrow)
+
+
+class PointSet(PointsObjectMixin, ColorOnlyMixin, DrawObject):
     """
 
     The PointSet class takes a list of 2-tuples, or a NX2 NumPy array of
@@ -775,20 +835,20 @@ class PointSet(DrawObject,PointsObjectMixin, ColorOnlyMixin):
     def __init__(self, Points, Color = "Black", Diameter =  1, InForeground = False):
         DrawObject.__init__(self,InForeground)
 
-        self.Points = array(Points,Float)
+        self.Points = N.array(Points,N.float)
         self.Points.shape = (-1,2) # Make sure it is a NX2 array, even if there is only one point
         self.CalcBoundingBox()
         self.Diameter = Diameter
 
-        self.HitLineWidth = self.MinHitLineWidth
+        self.HitLineWidth = min(self.MinHitLineWidth, Diameter)
         self.SetColor(Color)
 
     def SetDiameter(self,Diameter):
             self.Diameter = Diameter
-            
+
     def FindClosestPoint(self, XY):
         """
-        
+
         Returns the index of the closest point to the point, XY, given
         in World coordinates. It's essentially random which you get if
         there are more than one that are the same.
@@ -799,8 +859,8 @@ class PointSet(DrawObject,PointsObjectMixin, ColorOnlyMixin):
 
         """
         d = self.Points - XY
-        return argmin(hypot(d[:,0],d[:,1]))
-    
+        return N.argmin(N.hypot(d[:,0],d[:,1]))
+
 
     def DrawD2(self, dc, Points):
         # A Little optimization for a diameter2 - point
@@ -822,7 +882,7 @@ class PointSet(DrawObject,PointsObjectMixin, ColorOnlyMixin):
             ##fixme: I really should add a DrawCircleList to wxPython
             if len(Points) > 100:
                 xy = Points
-                xywh = concatenate((xy-radius, ones(xy.shape) * self.Diameter ), 1 )
+                xywh = N.concatenate((xy-radius, N.ones(xy.shape) * self.Diameter ), 1 )
                 dc.DrawEllipseList(xywh)
             else:
                 for xy in Points:
@@ -837,15 +897,15 @@ class PointSet(DrawObject,PointsObjectMixin, ColorOnlyMixin):
             else:
                 if len(Points) > 100:
                     xy = Points
-                    xywh = concatenate((xy-radius, ones(xy.shape) * self.Diameter ), 1 )
+                    xywh = N.concatenate((xy-radius, N.ones(xy.shape) * self.Diameter ), 1 )
                     HTdc.DrawEllipseList(xywh)
                 else:
                     for xy in Points:
                         HTdc.DrawCircle(xy[0],xy[1], radius)
 
-class Point(DrawObject,XYObjectMixin,ColorOnlyMixin):
+class Point(XYObjectMixin, ColorOnlyMixin, DrawObject):
     """
-    
+
     The Point class takes a 2-tuple, or a (2,) NumPy array of point
     coordinates.
 
@@ -858,9 +918,9 @@ class Point(DrawObject,XYObjectMixin,ColorOnlyMixin):
     """
     def __init__(self, XY, Color = "Black", Diameter =  1, InForeground = False):
         DrawObject.__init__(self, InForeground)
- 
-        self.XY = array(XY, Float)
-        self.XY.shape = (2,) # Make sure it is a 1X2 array, even if there is only one point
+
+        self.XY = N.array(XY, N.float)
+        self.XY.shape = (2,) # Make sure it is a length 2 vector
         self.CalcBoundingBox()
         self.SetColor(Color)
         self.Diameter = Diameter
@@ -888,9 +948,9 @@ class Point(DrawObject,XYObjectMixin,ColorOnlyMixin):
                 HTdc.SetBrush(self.HitBrush)
                 HTdc.DrawCircle(xy[0],xy[1], radius)
 
-class SquarePoint(DrawObject,XYObjectMixin,ColorOnlyMixin):
+class SquarePoint(XYObjectMixin, ColorOnlyMixin, DrawObject):
     """
-    
+
     The SquarePoint class takes a 2-tuple, or a (2,) NumPy array of point
     coordinates. It produces a square dot, centered on Point
 
@@ -903,9 +963,9 @@ class SquarePoint(DrawObject,XYObjectMixin,ColorOnlyMixin):
     """
     def __init__(self, Point, Color = "Black", Size =  4, InForeground = False):
         DrawObject.__init__(self, InForeground)
- 
-        self.XY = array(Point, Float)
-        self.XY.shape = (2,) # Make sure it is a 1X2 array, even if there is only one point
+
+        self.XY = N.array(Point, N.float)
+        self.XY.shape = (2,) # Make sure it is a length 2 vector
         self.CalcBoundingBox()
         self.SetColor(Color)
         self.Size = Size
@@ -919,7 +979,7 @@ class SquarePoint(DrawObject,XYObjectMixin,ColorOnlyMixin):
         Size = self.Size
         dc.SetPen(self.Pen)
         xc,yc = WorldToPixel(self.XY)
-        
+
         if self.Size <= 1:
             dc.DrawPoint(xc, yc)
         else:
@@ -935,7 +995,7 @@ class SquarePoint(DrawObject,XYObjectMixin,ColorOnlyMixin):
                 HTdc.SetBrush(self.HitBrush)
                 HTdc.DrawRectangle(x, y, Size, Size)
 
-class RectEllipse(DrawObject, XYObjectMixin, LineAndFillMixin):
+class RectEllipse(XYObjectMixin, LineAndFillMixin, DrawObject):
     def __init__(self, XY, WH,
                  LineColor = "Black",
                  LineStyle = "Solid",
@@ -943,14 +1003,10 @@ class RectEllipse(DrawObject, XYObjectMixin, LineAndFillMixin):
                  FillColor    = None,
                  FillStyle    = "Solid",
                  InForeground = False):
-        
+
         DrawObject.__init__(self,InForeground)
 
-        self.XY = array( XY, Float)
-        self.XY.shape = (2,)
-        self.WH = array( WH, Float )
-        self.WH.shape = (2,)
-        self.BoundingBox = array((self.XY, (self.XY + self.WH)), Float)
+        self.SetShape(XY, WH)
         self.LineColor = LineColor
         self.LineStyle = LineStyle
         self.LineWidth = LineWidth
@@ -963,23 +1019,19 @@ class RectEllipse(DrawObject, XYObjectMixin, LineAndFillMixin):
         self.SetBrush(FillColor,FillStyle)
 
     def SetShape(self, XY, WH):
-        self.XY = array( XY, Float)
-        self.WH = array( WH, Float )
+        self.XY = N.array( XY, N.float)
+        self.XY.shape = (2,)
+        self.WH = N.array( WH, N.float)
+        self.WH.shape = (2,)
         self.CalcBoundingBox()
 
 
-    def SetUpDraw(self, dc , WorldToPixel, ScaleWorldToPixel, HTdc):
-        dc.SetPen(self.Pen)
-        dc.SetBrush(self.Brush)
-        if HTdc and self.HitAble:
-            HTdc.SetPen(self.HitPen)
-            HTdc.SetBrush(self.HitBrush)
-        return ( WorldToPixel(self.XY),
-                 ScaleWorldToPixel(self.WH) )
-
     def CalcBoundingBox(self):
-        self.BoundingBox = array((self.XY, (self.XY + self.WH) ), Float)
-        self._Canvas.BoundingBoxDirty = True
+        # you need this in case Width or Height are negative
+        corners = N.array((self.XY, (self.XY + self.WH) ), N.float)
+        self.BoundingBox = BBox.fromPoints(corners)
+        if self._Canvas:
+            self._Canvas.BoundingBoxDirty = True
 
 
 class Rectangle(RectEllipse):
@@ -993,6 +1045,8 @@ class Rectangle(RectEllipse):
         if HTdc and self.HitAble:
             HTdc.DrawRectanglePointSize(XY, WH)
 
+
+
 class Ellipse(RectEllipse):
 
     def _Draw(self, dc , WorldToPixel, ScaleWorldToPixel, HTdc=None):
@@ -1005,9 +1059,9 @@ class Ellipse(RectEllipse):
             HTdc.DrawEllipsePointSize(XY, WH)
 
 class Circle(Ellipse):
-
+    ## fixme: this should probably be use the DC.DrawCircle!
     def __init__(self, XY, Diameter, **kwargs):
-        self.Center = array(XY, Float)
+        self.Center = N.array(XY, N.float)
         Diameter = float(Diameter)
         RectEllipse.__init__(self ,
                              self.Center - Diameter/2.0,
@@ -1020,7 +1074,7 @@ class Circle(Ellipse):
         self.SetShape(XY,
                       (Diameter, Diameter)
                       )
-        
+
 class TextObjectMixin(XYObjectMixin):
     """
 
@@ -1028,29 +1082,31 @@ class TextObjectMixin(XYObjectMixin):
     the Text objects
 
     """
-    
+
     ## I'm caching fonts, because on GTK, getting a new font can take a
     ## while. However, it gets cleared after every full draw as hanging
     ## on to a bunch of large fonts takes a massive amount of memory.
 
     FontList = {}
 
-    LayoutFontSize = 12 # font size used for calculating layout
+    LayoutFontSize = 16 # font size used for calculating layout
 
-    def SetFont(self, Size, Family, Style, Weight, Underline, FaceName):
+    def SetFont(self, Size, Family, Style, Weight, Underlined, FaceName):
         self.Font = self.FontList.setdefault( (Size,
                                                Family,
                                                Style,
                                                Weight,
-                                               Underline,
+                                               Underlined,
                                                FaceName),
-                                               wx.Font(Size,
+                                               #wx.FontFromPixelSize((0.45*Size,Size), # this seemed to give a decent height/width ratio on Windows
+                                               wx.Font(Size, 
                                                        Family,
-                                                       Style, 
+                                                       Style,
                                                        Weight,
-                                                       Underline,
+                                                       Underlined,
                                                        FaceName) )
         return self.Font
+    
 
     def SetColor(self, Color):
         self.Color = Color
@@ -1086,16 +1142,16 @@ class TextObjectMixin(XYObjectMixin):
     ## pad is the extra space around the text
     ## if world = 1, the vertical shift is done in y-up coordinates
     ShiftFunDict = {'tl': lambda x, y, w, h, world=0, pad=0: (x + pad,     y + pad - 2*world*pad),
-                    'tc': lambda x, y, w, h, world=0, pad=0: (x - w/2,     y + pad - 2*world*pad), 
-                    'tr': lambda x, y, w, h, world=0, pad=0: (x - w - pad, y + pad - 2*world*pad), 
-                    'cl': lambda x, y, w, h, world=0, pad=0: (x + pad,     y - h/2 + world*h), 
-                    'cc': lambda x, y, w, h, world=0, pad=0: (x - w/2,     y - h/2 + world*h), 
+                    'tc': lambda x, y, w, h, world=0, pad=0: (x - w/2,     y + pad - 2*world*pad),
+                    'tr': lambda x, y, w, h, world=0, pad=0: (x - w - pad, y + pad - 2*world*pad),
+                    'cl': lambda x, y, w, h, world=0, pad=0: (x + pad,     y - h/2 + world*h),
+                    'cc': lambda x, y, w, h, world=0, pad=0: (x - w/2,     y - h/2 + world*h),
                     'cr': lambda x, y, w, h, world=0, pad=0: (x - w - pad, y - h/2 + world*h),
                     'bl': lambda x, y, w, h, world=0, pad=0: (x + pad,     y - h + 2*world*h - pad + world*2*pad) ,
-                    'bc': lambda x, y, w, h, world=0, pad=0: (x - w/2,     y - h + 2*world*h - pad + world*2*pad) , 
+                    'bc': lambda x, y, w, h, world=0, pad=0: (x - w/2,     y - h + 2*world*h - pad + world*2*pad) ,
                     'br': lambda x, y, w, h, world=0, pad=0: (x - w - pad, y - h + 2*world*h - pad + world*2*pad)}
 
-class Text(DrawObject, TextObjectMixin):
+class Text(TextObjectMixin, DrawObject, ):
     """
     This class creates a text object, placed at the coordinates,
     x,y. the "Position" argument is a two charactor string, indicating
@@ -1113,48 +1169,48 @@ class Text(DrawObject, TextObjectMixin):
     Family:
         Font family, a generic way of referring to fonts without
         specifying actual facename. One of:
-            wx.DEFAULT:  Chooses a default font. 
-            wx.DECORATIVE: A decorative font. 
-            wx.ROMAN: A formal, serif font. 
-            wx.SCRIPT: A handwriting font. 
-            wx.SWISS: A sans-serif font. 
+            wx.DEFAULT:  Chooses a default font.
+            wx.DECORATIVE: A decorative font.
+            wx.ROMAN: A formal, serif font.
+            wx.SCRIPT: A handwriting font.
+            wx.SWISS: A sans-serif font.
             wx.MODERN: A fixed pitch font.
         NOTE: these are only as good as the wxWindows defaults, which aren't so good.
     Style:
         One of wx.NORMAL, wx.SLANT and wx.ITALIC.
     Weight:
         One of wx.NORMAL, wx.LIGHT and wx.BOLD.
-    Underline:
+    Underlined:
         The value can be True or False. At present this may have an an
         effect on Windows only.
 
     Alternatively, you can set the kw arg: Font, to a wx.Font, and the
     above will be ignored.
-    
+
     The size is fixed, and does not scale with the drawing.
 
     The hit-test is done on the entire text extent
 
     """
-    
+
     def __init__(self,String, xy,
-                 Size =  12,
+                 Size =  14,
                  Color = "Black",
                  BackgroundColor = None,
                  Family = wx.MODERN,
                  Style = wx.NORMAL,
                  Weight = wx.NORMAL,
-                 Underline = False,
+                 Underlined = False,
                  Position = 'tl',
                  InForeground = False,
                  Font = None):
-        
+
         DrawObject.__init__(self,InForeground)
 
         self.String = String
-        # Input size in in Pixels, compute points size from PPI info.
+        # Input size in in Pixels, compute points size from FontScaleinfo.
         # fixme: for printing, we'll have to do something a little different
-        self.Size = int(round(72.0 * Size / ScreenPPI))
+        self.Size = Size * FontScale
 
         self.Color = Color
         self.BackgroundColor = BackgroundColor
@@ -1162,17 +1218,17 @@ class Text(DrawObject, TextObjectMixin):
         if not Font:
             FaceName = ''
         else:
-            FaceName           =  Font.GetFaceName()           
+            FaceName           =  Font.GetFaceName()
             Family             =  Font.GetFamily()
-            Size               =  Font.GetPointSize()          
+            Size               =  Font.GetPointSize()
             Style              =  Font.GetStyle()
-            Underlined         =  Font.GetUnderlined()         
+            Underlined         =  Font.GetUnderlined()
             Weight             =  Font.GetWeight()
-        self.SetFont(Size, Family, Style, Weight, Underline, FaceName)
+        self.SetFont(Size, Family, Style, Weight, Underlined, FaceName)
 
-        self.BoundingBox = array((xy, xy),Float)
+        self.BoundingBox = BBox.asBBox((xy, xy))
 
-        self.XY = asarray(xy)
+        self.XY = N.asarray(xy)
         self.XY.shape = (2,)
 
         (self.TextWidth, self.TextHeight) = (None, None)
@@ -1196,7 +1252,7 @@ class Text(DrawObject, TextObjectMixin):
             HTdc.SetBrush(self.HitBrush)
             HTdc.DrawRectanglePointSize(XY, (self.TextWidth, self.TextHeight) )
 
-class ScaledText(DrawObject, TextObjectMixin):
+class ScaledText(TextObjectMixin, DrawObject, ):
     """
     This class creates a text object that is scaled when zoomed.  It is
     placed at the coordinates, x,y. the "Position" argument is a two
@@ -1213,25 +1269,25 @@ class ScaledText(DrawObject, TextObjectMixin):
     Family:
         Font family, a generic way of referring to fonts without
         specifying actual facename. One of:
-            wx.DEFAULT:  Chooses a default font. 
-            wx.DECORATI: A decorative font. 
-            wx.ROMAN: A formal, serif font. 
-            wx.SCRIPT: A handwriting font. 
-            wx.SWISS: A sans-serif font. 
+            wx.DEFAULT:  Chooses a default font.
+            wx.DECORATI: A decorative font.
+            wx.ROMAN: A formal, serif font.
+            wx.SCRIPT: A handwriting font.
+            wx.SWISS: A sans-serif font.
             wx.MODERN: A fixed pitch font.
         NOTE: these are only as good as the wxWindows defaults, which aren't so good.
     Style:
         One of wx.NORMAL, wx.SLANT and wx.ITALIC.
     Weight:
         One of wx.NORMAL, wx.LIGHT and wx.BOLD.
-    Underline:
+    Underlined:
         The value can be True or False. At present this may have an an
         effect on Windows only.
 
     Alternatively, you can set the kw arg: Font, to a wx.Font, and the
     above will be ignored. The size of the font you specify will be
     ignored, but the rest of its attributes will be preserved.
-    
+
     The size will scale as the drawing is zoomed.
 
     Bugs/Limitations:
@@ -1239,7 +1295,7 @@ class ScaledText(DrawObject, TextObjectMixin):
     As fonts are scaled, the do end up a little different, so you don't
     get exactly the same picture as you scale up and doen, but it's
     pretty darn close.
-    
+
     On wxGTK1 on my Linux system, at least, using a font of over about
     3000 pts. brings the system to a halt. It's the Font Server using
     huge amounts of memory. My work around is to max the font size to
@@ -1252,38 +1308,41 @@ class ScaledText(DrawObject, TextObjectMixin):
     optional, but I haven't gotten around to it.
 
     """
-    
-    def __init__(self, String, XY , Size,
+
+    def __init__(self,
+                 String,
+                 XY,
+                 Size,
                  Color = "Black",
                  BackgroundColor = None,
                  Family = wx.MODERN,
                  Style = wx.NORMAL,
                  Weight = wx.NORMAL,
-                 Underline = False,
+                 Underlined = False,
                  Position = 'tl',
                  Font = None,
                  InForeground = False):
-        
+
         DrawObject.__init__(self,InForeground)
 
         self.String = String
-        self.XY = array( XY, Float)
+        self.XY = N.array( XY, N.float)
         self.XY.shape = (2,)
-        self.Size = Size     
+        self.Size = Size
         self.Color = Color
         self.BackgroundColor = BackgroundColor
-        self.Family = Family   
-        self.Style = Style    
-        self.Weight = Weight   
-        self.Underline = Underline
+        self.Family = Family
+        self.Style = Style
+        self.Weight = Weight
+        self.Underlined = Underlined
         if not Font:
             self.FaceName = ''
         else:
-            self.FaceName           =  Font.GetFaceName()           
-            self.Family             =  Font.GetFamily()    
-            self.Style              =  Font.GetStyle()     
-            self.Underlined         =  Font.GetUnderlined()         
-            self.Weight             =  Font.GetWeight()    
+            self.FaceName           =  Font.GetFaceName()
+            self.Family             =  Font.GetFamily()
+            self.Style              =  Font.GetStyle()
+            self.Underlined         =  Font.GetUnderlined()
+            self.Weight             =  Font.GetWeight()
 
         # Experimental max font size value on wxGTK2: this works OK on
         # my system. If it's a lot  larger, there is a crash, with the
@@ -1296,7 +1355,7 @@ class ScaledText(DrawObject, TextObjectMixin):
         # Windows and OS-X seem to be better behaved in this regard.
         # They may not draw it, but they don't crash either!
         self.MaxFontSize = 1000
-        
+
         self.ShiftFun = self.ShiftFunDict[Position]
 
         self.CalcBoundingBox()
@@ -1313,13 +1372,14 @@ class ScaledText(DrawObject, TextObjectMixin):
         dc.SelectObject(bitmap) #wxMac needs a Bitmap selected for GetTextExtent to work.
         DrawingSize = 40 # pts This effectively determines the resolution that the BB is computed to.
         ScaleFactor = float(self.Size) / DrawingSize
-        dc.SetFont(self.SetFont(DrawingSize, self.Family, self.Style, self.Weight, self.Underline, self.FaceName) )
+        self.SetFont(DrawingSize, self.Family, self.Style, self.Weight, self.Underlined, self.FaceName)
+        dc.SetFont(self.Font)
         (w,h) = dc.GetTextExtent(self.String)
         w = w * ScaleFactor
         h = h * ScaleFactor
         x, y = self.ShiftFun(self.XY[0], self.XY[1], w, h, world = 1)
-        self.BoundingBox = array(((x, y-h ),(x + w, y)),Float)
-        
+        self.BoundingBox = BBox.asBBox(((x, y-h ),(x + w, y)))
+
     def _Draw(self, dc , WorldToPixel, ScaleWorldToPixel, HTdc=None):
         (X,Y) = WorldToPixel( (self.XY) )
 
@@ -1329,7 +1389,8 @@ class ScaledText(DrawObject, TextObjectMixin):
         ## If so, limit it. Would it be better just to not draw it?
         ## note that this limit is dependent on how much memory you have, etc.
         Size = min(Size, self.MaxFontSize)
-        dc.SetFont(self.SetFont(Size, self.Family, self.Style, self.Weight, self.Underline, self.FaceName))
+        self.SetFont(Size, self.Family, self.Style, self.Weight, self.Underlined, self.FaceName)
+        dc.SetFont(self.Font)
         dc.SetTextForeground(self.Color)
         if self.BackgroundColor:
             dc.SetBackgroundMode(wx.SOLID)
@@ -1348,7 +1409,7 @@ class ScaledText(DrawObject, TextObjectMixin):
             HTdc.SetBrush(self.HitBrush)
             HTdc.DrawRectanglePointSize(xy, (w, h) )
 
-class ScaledTextBox(DrawObject, TextObjectMixin):
+class ScaledTextBox(TextObjectMixin, DrawObject):
     """
     This class creates a TextBox object that is scaled when zoomed.  It is
     placed at the coordinates, x,y.
@@ -1356,7 +1417,7 @@ class ScaledTextBox(DrawObject, TextObjectMixin):
     If the Width parameter is defined, the text will be wrapped to the width given.
 
     A Box can be drawn around the text, be specifying:
-    LineWidth and/or  FillColor 
+    LineWidth and/or  FillColor
 
     A space(margin) can be put all the way around the text, be specifying:
     the PadSize argument in world coordinates.
@@ -1376,25 +1437,25 @@ class ScaledTextBox(DrawObject, TextObjectMixin):
     Family:
         Font family, a generic way of referring to fonts without
         specifying actual facename. One of:
-            wx.DEFAULT:  Chooses a default font. 
-            wx.DECORATIVE: A decorative font. 
-            wx.ROMAN: A formal, serif font. 
-            wx.SCRIPT: A handwriting font. 
-            wx.SWISS: A sans-serif font. 
+            wx.DEFAULT:  Chooses a default font.
+            wx.DECORATIVE: A decorative font.
+            wx.ROMAN: A formal, serif font.
+            wx.SCRIPT: A handwriting font.
+            wx.SWISS: A sans-serif font.
             wx.MODERN: A fixed pitch font.
         NOTE: these are only as good as the wxWindows defaults, which aren't so good.
     Style:
         One of wx.NORMAL, wx.SLANT and wx.ITALIC.
     Weight:
         One of wx.NORMAL, wx.LIGHT and wx.BOLD.
-    Underline:
+    Underlined:
         The value can be True or False. At present this may have an an
         effect on Windows only.
 
     Alternatively, you can set the kw arg: Font, to a wx.Font, and the
     above will be ignored. The size of the font you specify will be
     ignored, but the rest of its attributes will be preserved.
-    
+
     The size will scale as the drawing is zoomed.
 
     Bugs/Limitations:
@@ -1402,7 +1463,7 @@ class ScaledTextBox(DrawObject, TextObjectMixin):
     As fonts are scaled, they do end up a little different, so you don't
     get exactly the same picture as you scale up and down, but it's
     pretty darn close.
-    
+
     On wxGTK1 on my Linux system, at least, using a font of over about
     1000 pts. brings the system to a halt. It's the Font Server using
     huge amounts of memory. My work around is to max the font size to
@@ -1415,7 +1476,7 @@ class ScaledTextBox(DrawObject, TextObjectMixin):
     optional, but I haven't gotten around to it.
 
     """
-        
+
     def __init__(self, String,
                  Point,
                  Size,
@@ -1429,17 +1490,17 @@ class ScaledTextBox(DrawObject, TextObjectMixin):
                  Family = wx.MODERN,
                  Style = wx.NORMAL,
                  Weight = wx.NORMAL,
-                 Underline = False,
+                 Underlined = False,
                  Position = 'tl',
                  Alignment = "left",
                  Font = None,
                  LineSpacing = 1.0,
                  InForeground = False):
-        
+
         DrawObject.__init__(self,InForeground)
 
-        self.XY = array(Point, Float)
-        self.Size = Size     
+        self.XY = N.array(Point, N.float)
+        self.Size = Size
         self.Color = Color
         self.BackgroundColor = BackgroundColor
         self.LineColor = LineColor
@@ -1450,22 +1511,22 @@ class ScaledTextBox(DrawObject, TextObjectMixin):
             self.PadSize = Size/10.0
         else:
             self.PadSize = float(PadSize)
-        self.Family = Family   
-        self.Style = Style    
-        self.Weight = Weight   
-        self.Underline = Underline
+        self.Family = Family
+        self.Style = Style
+        self.Weight = Weight
+        self.Underlined = Underlined
         self.Alignment = Alignment.lower()
         self.LineSpacing = float(LineSpacing)
         self.Position = Position
-        
+
         if not Font:
             self.FaceName = ''
         else:
-            self.FaceName           =  Font.GetFaceName()           
-            self.Family             =  Font.GetFamily()    
-            self.Style              =  Font.GetStyle()     
-            self.Underlined         =  Font.GetUnderlined()         
-            self.Weight             =  Font.GetWeight()    
+            self.FaceName           =  Font.GetFaceName()
+            self.Family             =  Font.GetFamily()
+            self.Style              =  Font.GetStyle()
+            self.Underlined         =  Font.GetUnderlined()
+            self.Weight             =  Font.GetWeight()
 
         # Experimental max font size value on wxGTK2: this works OK on
         # my system. If it's a lot  larger, there is a crash, with the
@@ -1496,7 +1557,7 @@ class ScaledTextBox(DrawObject, TextObjectMixin):
         DrawingSize = self.LayoutFontSize # pts This effectively determines the resolution that the BB is computed to.
         ScaleFactor = float(self.Size) / DrawingSize
         Width = (self.Width - 2*self.PadSize) / ScaleFactor #Width to wrap to
-        dc.SetFont(self.SetFont(DrawingSize, self.Family, self.Style, self.Weight, self.Underline, self.FaceName) )
+        dc.SetFont(self.SetFont(DrawingSize, self.Family, self.Style, self.Weight, self.Underlined, self.FaceName) )
 
         NewStrings = []
         for s in self.Strings:
@@ -1546,13 +1607,13 @@ class ScaledTextBox(DrawObject, TextObjectMixin):
         DrawingSize = self.LayoutFontSize # pts This effectively determines the resolution that the BB is computed to.
         ScaleFactor = float(self.Size) / DrawingSize
 
-        dc.SetFont(self.SetFont(DrawingSize, self.Family, self.Style, self.Weight, self.Underline, self.FaceName) )
+        dc.SetFont(self.SetFont(DrawingSize, self.Family, self.Style, self.Weight, self.Underlined, self.FaceName) )
 
         TextHeight = dc.GetTextExtent("X")[1]
         SpaceWidth = dc.GetTextExtent(" ")[0]
         LineHeight = TextHeight * self.LineSpacing
 
-        LineWidths = zeros((len(self.Strings),), Float)
+        LineWidths = N.zeros((len(self.Strings),), N.float)
         y = 0
         Words = []
         AllLinePoints = []
@@ -1560,7 +1621,7 @@ class ScaledTextBox(DrawObject, TextObjectMixin):
         for i, s in enumerate(self.Strings):
             LineWidths[i] = 0
             LineWords = s.split(" ")
-            LinePoints = zeros((len(LineWords),2), Float)
+            LinePoints = N.zeros((len(LineWords),2), N.float)
             for j, word in enumerate(LineWords):
                 if j > 0:
                     LineWidths[i] += SpaceWidth
@@ -1570,14 +1631,14 @@ class ScaledTextBox(DrawObject, TextObjectMixin):
                 LineWidths[i] += w
             y -= LineHeight
             AllLinePoints.append(LinePoints)
-        TextWidth = maximum.reduce(LineWidths)
+        TextWidth = N.maximum.reduce(LineWidths)
         self.Words = Words
 
         if self.Width is None:
             BoxWidth = TextWidth * ScaleFactor + 2*self.PadSize
         else: # use the defined Width
             BoxWidth = self.Width
-        Points = zeros((0,2), Float)
+        Points = N.zeros((0,2), N.float)
 
         for i, LinePoints in enumerate(AllLinePoints):
             ## Scale to World Coords.
@@ -1588,10 +1649,10 @@ class ScaledTextBox(DrawObject, TextObjectMixin):
                 LinePoints[:,0] += (BoxWidth - LineWidths[i]*ScaleFactor)/2.0
             elif self.Alignment == 'right':
                 LinePoints[:,0] += (BoxWidth - LineWidths[i]*ScaleFactor-self.PadSize)
-            Points = concatenate((Points, LinePoints))
+            Points = N.concatenate((Points, LinePoints))
 
         BoxHeight = -(Points[-1,1] - (TextHeight * ScaleFactor)) + 2*self.PadSize
-        (x,y) = self.ShiftFun(self.XY[0], self.XY[1], BoxWidth, BoxHeight, world=1)
+        #(x,y) = self.ShiftFun(self.XY[0], self.XY[1], BoxWidth, BoxHeight, world=1)
         Points += (0, -self.PadSize)
         self.Points = Points
         self.BoxWidth = BoxWidth
@@ -1601,14 +1662,14 @@ class ScaledTextBox(DrawObject, TextObjectMixin):
     def CalcBoundingBox(self):
 
         """
-        
+
         Calculates the Bounding Box
 
         """
 
         w, h = self.BoxWidth, self.BoxHeight
         x, y = self.ShiftFun(self.XY[0], self.XY[1], w, h, world=1)
-        self.BoundingBox = array(((x, y-h ),(x + w, y)),Float)
+        self.BoundingBox = BBox.asBBox(((x, y-h ),(x + w, y)))
 
     def GetBoxRect(self):
         wh = (self.BoxWidth, self.BoxHeight)
@@ -1618,9 +1679,9 @@ class ScaledTextBox(DrawObject, TextObjectMixin):
 
     def _Draw(self, dc , WorldToPixel, ScaleWorldToPixel, HTdc=None):
         xy, wh = self.GetBoxRect()
-        
-        Points = self.Points + xy 
-        Points = WorldToPixel(Points) 
+
+        Points = self.Points + xy
+        Points = WorldToPixel(Points)
         xy = WorldToPixel(xy)
         wh = ScaleWorldToPixel(wh) * (1,-1)
 
@@ -1630,8 +1691,8 @@ class ScaledTextBox(DrawObject, TextObjectMixin):
         ## If so, limit it. Would it be better just to not draw it?
         ## note that this limit is dependent on how much memory you have, etc.
         Size = min(Size, self.MaxFontSize)
-        
-        font = self.SetFont(Size, self.Family, self.Style, self.Weight, self.Underline, self.FaceName)
+
+        font = self.SetFont(Size, self.Family, self.Style, self.Weight, self.Underlined, self.FaceName)
         dc.SetFont(font)
         dc.SetTextForeground(self.Color)
         dc.SetBackgroundMode(wx.TRANSPARENT)
@@ -1641,7 +1702,7 @@ class ScaledTextBox(DrawObject, TextObjectMixin):
             dc.SetBrush(self.Brush)
             dc.SetPen(self.Pen)
             dc.DrawRectanglePointSize(xy , wh)
-            
+
         # Draw the Text
         dc.DrawTextList(self.Words, Points)
 
@@ -1651,7 +1712,7 @@ class ScaledTextBox(DrawObject, TextObjectMixin):
             HTdc.SetBrush(self.HitBrush)
             HTdc.DrawRectanglePointSize(xy, wh)
 
-class Bitmap(DrawObject, TextObjectMixin):
+class Bitmap(TextObjectMixin, DrawObject, ):
     """
     This class creates a bitmap object, placed at the coordinates,
     x,y. the "Position" argument is a two charactor string, indicating
@@ -1665,20 +1726,20 @@ class Bitmap(DrawObject, TextObjectMixin):
     The size is fixed, and does not scale with the drawing.
 
     """
-    
+
     def __init__(self,Bitmap,XY,
                  Position = 'tl',
                  InForeground = False):
-        
+
         DrawObject.__init__(self,InForeground)
 
         if type(Bitmap) == wx._gdi.Bitmap:
             self.Bitmap = Bitmap
         elif type(Bitmap) == wx._core.Image:
             self.Bitmap = wx.BitmapFromImage(Bitmap)
-        
+
         # Note the BB is just the point, as the size in World coordinates is not fixed
-        self.BoundingBox = array((XY,XY),Float)
+        self.BoundingBox = BBox.asBBox( (XY,XY) )
 
         self.XY = XY
 
@@ -1694,13 +1755,13 @@ class Bitmap(DrawObject, TextObjectMixin):
             HTdc.SetBrush(self.HitBrush)
             HTdc.DrawRectanglePointSize(XY, (self.Width, self.Height) )
 
-class ScaledBitmap(DrawObject, TextObjectMixin):
+class ScaledBitmap(TextObjectMixin, DrawObject, ):
     """
-    
+
     This class creates a bitmap object, placed at the coordinates, XY,
     of Height, H, in World coorsinates. The width is calculated from the
     aspect ratio of the bitmap.
-    
+
     the "Position" argument is a two charactor string, indicating
     where in relation to the coordinates the bitmap should be oriented.
 
@@ -1712,23 +1773,23 @@ class ScaledBitmap(DrawObject, TextObjectMixin):
     The size scales with the drawing
 
     """
-    
+
     def __init__(self,
                  Bitmap,
                  XY,
                  Height,
                  Position = 'tl',
                  InForeground = False):
-        
+
         DrawObject.__init__(self,InForeground)
 
         if type(Bitmap) == wx._gdi.Bitmap:
             self.Image = Bitmap.ConvertToImage()
         elif type(Bitmap) == wx._core.Image:
             self.Image = Bitmap
-            
+
         self.XY = XY
-        self.Height = Height 
+        self.Height = Height
         (self.bmpWidth, self.bmpHeight) = self.Image.GetWidth(), self.Image.GetHeight()
         self.Width = self.bmpWidth / self.bmpHeight * Height
         self.ShiftFun = self.ShiftFunDict[Position]
@@ -1738,9 +1799,10 @@ class ScaledBitmap(DrawObject, TextObjectMixin):
 
     def CalcBoundingBox(self):
         ## this isn't exact, as fonts don't scale exactly.
-        w,h = self.Width, self.Height
+        w, h = self.Width, self.Height
         x, y = self.ShiftFun(self.XY[0], self.XY[1], w, h, world = 1)
-        self.BoundingBox = array(((x, y-h ),(x + w, y)),Float)
+        self.BoundingBox = BBox.asBBox( ( (x, y-h ), (x + w, y) ) )
+
 
     def _Draw(self, dc , WorldToPixel, ScaleWorldToPixel, HTdc=None):
         XY = WorldToPixel(self.XY)
@@ -1758,10 +1820,258 @@ class ScaledBitmap(DrawObject, TextObjectMixin):
             HTdc.SetBrush(self.HitBrush)
             HTdc.DrawRectanglePointSize(XY, (W, H) )
 
+class ScaledBitmap2(TextObjectMixin, DrawObject, ):
+    """
+
+    An alternative scaled bitmap that only scaled the required amount of
+    the main bitmap when zoomed in: EXPERIMENTAL!
+
+    """
+
+    def __init__(self,
+                 Bitmap,
+                 XY,
+                 Height,
+                 Width=None,
+                 Position = 'tl',
+                 InForeground = False):
+
+        DrawObject.__init__(self,InForeground)
+
+        if type(Bitmap) == wx._gdi.Bitmap:
+            self.Image = Bitmap.ConvertToImage()
+        elif type(Bitmap) == wx._core.Image:
+            self.Image = Bitmap
+
+        self.XY = N.array(XY, N.float)
+        self.Height = Height
+        (self.bmpWidth, self.bmpHeight) = self.Image.GetWidth(), self.Image.GetHeight()
+        self.bmpWH = N.array((self.bmpWidth, self.bmpHeight), N.int32)
+        ## fixme: this should all accommodate different scales for X and Y
+        if Width is None:
+            self.BmpScale = float(self.bmpHeight) / Height
+            self.Width = self.bmpWidth / self.BmpScale
+        self.WH = N.array((self.Width, Height), N.float)
+        ##fixme: should this have a y = -1 to shift to y-up?
+        self.BmpScale = self.bmpWH / self.WH
+
+        print "bmpWH:", self.bmpWH
+        print "Width, Height:", self.WH
+        print "self.BmpScale", self.BmpScale
+        self.ShiftFun = self.ShiftFunDict[Position]
+        self.CalcBoundingBox()
+        self.ScaledBitmap = None # cache of the last existing scaled bitmap
+
+    def CalcBoundingBox(self):
+        ## this isn't exact, as fonts don't scale exactly.
+        w,h = self.Width, self.Height
+        x, y = self.ShiftFun(self.XY[0], self.XY[1], w, h, world = 1)
+        self.BoundingBox = BBox.asBBox( ((x, y-h ), (x + w, y)) )
+
+    def WorldToBitmap(self, Pw):
+        """
+        computes bitmap coords from World coords
+        """
+        delta = Pw - self.XY
+        Pb = delta * self.BmpScale
+        Pb *= (1, -1) ##fixme: this may only works for Yup projection!
+                      ##       and may only work for top left position
+
+        return Pb.astype(N.int_)
+
+    def _DrawEntireBitmap(self, dc , WorldToPixel, ScaleWorldToPixel, HTdc):
+        """
+        this is pretty much the old code
+
+        Scales and Draws the entire bitmap.
+
+        """
+        XY = WorldToPixel(self.XY)
+        H = ScaleWorldToPixel(self.Height)[0]
+        W = H * (self.bmpWidth / self.bmpHeight)
+        if (self.ScaledBitmap is None) or (self.ScaledBitmap[0] != (0, 0, self.bmpWidth, self.bmpHeight, W, H) ):
+        #if True: #fixme: (self.ScaledBitmap is None) or (H <> self.ScaledHeight) :
+            self.ScaledHeight = H
+            print "Scaling to:", W, H
+            Img = self.Image.Scale(W, H)
+            bmp = wx.BitmapFromImage(Img)
+            self.ScaledBitmap = ((0, 0, self.bmpWidth, self.bmpHeight , W, H), bmp)# this defines the cached bitmap
+        else:
+            print "Using Cached bitmap"
+            bmp = self.ScaledBitmap[1]
+        XY = self.ShiftFun(XY[0], XY[1], W, H)
+        dc.DrawBitmapPoint(bmp, XY, True)
+        if HTdc and self.HitAble:
+            HTdc.SetPen(self.HitPen)
+            HTdc.SetBrush(self.HitBrush)
+            HTdc.DrawRectanglePointSize(XY, (W, H) )
+
+    def _DrawSubBitmap(self, dc , WorldToPixel, ScaleWorldToPixel, HTdc):
+        """
+        Subsets just the part of the bitmap that is visible
+        then scales and draws that.
+
+        """
+        BBworld = BBox.asBBox(self._Canvas.ViewPortBB)
+        BBbitmap = BBox.fromPoints(self.WorldToBitmap(BBworld))
+
+        XYs = WorldToPixel(self.XY)
+        # figure out subimage:
+        # fixme: this should be able to be done more succinctly!
+
+        if BBbitmap[0,0] < 0:
+            Xb = 0
+        elif BBbitmap[0,0] >  self.bmpWH[0]: # off the bitmap
+            Xb = 0
+        else:
+            Xb = BBbitmap[0,0]
+            XYs[0] = 0 # draw at origin
+
+        if BBbitmap[0,1] < 0:
+            Yb = 0
+        elif BBbitmap[0,1] >  self.bmpWH[1]: # off the bitmap
+            Yb = 0
+            ShouldDraw = False
+        else:
+            Yb = BBbitmap[0,1]
+            XYs[1] = 0 # draw at origin
+
+        if BBbitmap[1,0] < 0:
+            #off the screen --  This should never happen!
+            Wb = 0
+        elif BBbitmap[1,0] > self.bmpWH[0]:
+            Wb = self.bmpWH[0] - Xb
+        else:
+            Wb = BBbitmap[1,0] - Xb
+
+        if BBbitmap[1,1] < 0:
+            # off the screen --  This should never happen!
+            Hb = 0
+            ShouldDraw = False
+        elif BBbitmap[1,1] > self.bmpWH[1]:
+            Hb = self.bmpWH[1] - Yb
+        else:
+            Hb = BBbitmap[1,1] - Yb
+
+        FullHeight = ScaleWorldToPixel(self.Height)[0]
+        scale = FullHeight / self.bmpWH[1]
+        Ws = int(scale * Wb + 0.5) # add the 0.5 to  round
+        Hs = int(scale * Hb + 0.5)
+        if (self.ScaledBitmap is None) or (self.ScaledBitmap[0] != (Xb, Yb, Wb, Hb, Ws, Ws) ):
+            Img = self.Image.GetSubImage(wx.Rect(Xb, Yb, Wb, Hb))
+            Img.Rescale(Ws, Hs)
+            bmp = wx.BitmapFromImage(Img)
+            self.ScaledBitmap = ((Xb, Yb, Wb, Hb, Ws, Ws), bmp)# this defines the cached bitmap
+            #XY = self.ShiftFun(XY[0], XY[1], W, H)
+            #fixme: get the shiftfun working!
+        else:
+            print "Using cached bitmap"
+            ##fixme: The cached bitmap could be used if the one needed is the same scale, but
+            ##       a subset of the cached one.
+            bmp = self.ScaledBitmap[1]
+        dc.DrawBitmapPoint(bmp, XYs, True)
+
+        if HTdc and self.HitAble:
+            HTdc.SetPen(self.HitPen)
+            HTdc.SetBrush(self.HitBrush)
+            HTdc.DrawRectanglePointSize(XYs, (Ws, Hs) )
+
+    def _Draw(self, dc , WorldToPixel, ScaleWorldToPixel, HTdc=None):
+        BBworld = BBox.asBBox(self._Canvas.ViewPortBB)
+        ## first see if entire bitmap is displayed:
+        if  BBworld.Inside(self.BoundingBox):
+            print "Drawing entire bitmap with old code"
+            self._DrawEntireBitmap(dc , WorldToPixel, ScaleWorldToPixel, HTdc)
+            return None
+        elif BBworld.Overlaps(self.BoundingBox):
+            #BBbitmap = BBox.fromPoints(self.WorldToBitmap(BBworld))
+            print "Drawing a sub-bitmap"
+            self._DrawSubBitmap(dc , WorldToPixel, ScaleWorldToPixel, HTdc)
+        else:
+            print "Not Drawing -- no part of image is showing"
+
+class DotGrid:
+    """
+    An example of a Grid Object -- it is set on teh FloatCAnvas with one of: 
+    
+    FloatCanvas.GridUnder = Grid
+    FloatCanvas.GridOver = Grid
+    
+    It will be drawn every time, regardless of the viewport.
+    
+    In its _Draw method, it computes what to draw, given the ViewPortBB
+    of the Canvas it's being drawn on.
+    
+    """
+    def __init__(self, Spacing, Size = 2, Color = "Black", Cross=False, CrossThickness = 1):
+
+        self.Spacing = N.array(Spacing, N.float)
+        self.Spacing.shape = (2,)
+        self.Size = Size
+        self.Color = Color
+        self.Cross = Cross
+        self.CrossThickness = CrossThickness
+
+    def CalcPoints(self, Canvas):
+        ViewPortBB = Canvas.ViewPortBB
+
+        Spacing = self.Spacing
+
+        minx, miny = N.floor(ViewPortBB[0] / Spacing) * Spacing
+        maxx, maxy = N.ceil(ViewPortBB[1] / Spacing) * Spacing
+
+        ##fixme: this could use vstack or something with numpy
+        x = N.arange(minx, maxx+Spacing[0], Spacing[0]) # making sure to get the last point
+        y = N.arange(miny, maxy+Spacing[1], Spacing[1]) # an extra is OK
+        Points = N.zeros((len(y), len(x), 2), N.float)
+        x.shape = (1,-1)
+        y.shape = (-1,1)
+        Points[:,:,0] += x
+        Points[:,:,1] += y
+        Points.shape = (-1,2)
+
+        return Points
+
+    def _Draw(self, dc, Canvas):
+        Points = self.CalcPoints(Canvas)
+
+        Points = Canvas.WorldToPixel(Points)
+
+        dc.SetPen(wx.Pen(self.Color,self.CrossThickness))
+
+        if self.Cross: # Use cross shaped markers
+            #Horizontal lines
+            LinePoints = N.concatenate((Points + (self.Size,0),Points + (-self.Size,0)),1)
+            dc.DrawLineList(LinePoints)
+            # Vertical Lines
+            LinePoints = N.concatenate((Points + (0,self.Size),Points + (0,-self.Size)),1)
+            dc.DrawLineList(LinePoints)
+            pass
+        else: # use dots
+            ## Note: this code borrowed from Pointset -- itreally shouldn't be repeated here!.
+            if self.Size <= 1:
+                dc.DrawPointList(Points)
+            elif self.Size <= 2:
+                dc.DrawPointList(Points + (0,-1))
+                dc.DrawPointList(Points + (0, 1))
+                dc.DrawPointList(Points + (1, 0))
+                dc.DrawPointList(Points + (-1,0))
+            else:
+                dc.SetBrush(wx.Brush(self.Color))
+                radius = int(round(self.Size/2))
+                ##fixme: I really should add a DrawCircleList to wxPython
+                if len(Points) > 100:
+                    xy = Points
+                    xywh = N.concatenate((xy-radius, N.ones(xy.shape) * self.Size ), 1 )
+                    dc.DrawEllipseList(xywh)
+                else:
+                    for xy in Points:
+                        dc.DrawCircle(xy[0],xy[1], radius)
+
+
 
 #---------------------------------------------------------------------------
 class FloatCanvas(wx.Panel):
-    ## fixme: could this be a wx.Window?
     """
     FloatCanvas.py
 
@@ -1796,7 +2106,7 @@ class FloatCanvas(wx.Panel):
     havn't bothered to add any checks for that yet.
 
     Zooming:
-    I have set no zoom limits. What this means is that if you zoom in really 
+    I have set no zoom limits. What this means is that if you zoom in really
     far, you can get integer overflows, and get wierd results. It
     doesn't seem to actually cause any problems other than wierd output, at
     least when I have run it.
@@ -1823,10 +2133,10 @@ class FloatCanvas(wx.Panel):
     Mouse Events:
 
     At this point, there are a full set of custom mouse events. They are
-    just like the rebulsr mouse events, but include an extra attribute:
+    just like the regular mouse events, but include an extra attribute:
     Event.GetCoords(), that returns the (x,y) position in world
     coordinates, as a length-2 NumPy vector of Floats.
-    
+
     Copyright: Christopher Barker
 
     License: Same as the version of wxPython you are using it with
@@ -1837,8 +2147,8 @@ class FloatCanvas(wx.Panel):
 
     Chris.Barker@noaa.gov
 
-    """ 
-    
+    """
+
     def __init__(self, parent, id = -1,
                  size = wx.DefaultSize,
                  ProjectionFun = None,
@@ -1846,16 +2156,9 @@ class FloatCanvas(wx.Panel):
                  Debug = False):
 
         wx.Panel.__init__( self, parent, id, wx.DefaultPosition, size)
-        
-        global ScreenPPI ## A global variable to hold the Pixels per inch that wxWindows thinks is in use.
-        dc = wx.ScreenDC()
-        ScreenPPI = dc.GetPPI()[1] # Pixel height
-        del dc
 
-        self.HitColorGenerator = None
-        self.UseHitTest = None
-
-        self.NumBetweenBlits = 500
+        self.ComputeFontScale()
+        self.InitAll()
 
         self.BackgroundBrush = wx.Brush(BackgroundColor,wx.SOLID)
 
@@ -1863,22 +2166,55 @@ class FloatCanvas(wx.Panel):
 
         wx.EVT_PAINT(self, self.OnPaint)
         wx.EVT_SIZE(self, self.OnSize)
-        
-        wx.EVT_LEFT_DOWN(self, self.LeftDownEvent ) 
-        wx.EVT_LEFT_UP(self, self.LeftUpEvent ) 
-        wx.EVT_LEFT_DCLICK(self, self.LeftDoubleClickEvent ) 
-        wx.EVT_MIDDLE_DOWN(self, self.MiddleDownEvent ) 
-        wx.EVT_MIDDLE_UP(self, self.MiddleUpEvent ) 
-        wx.EVT_MIDDLE_DCLICK(self, self.MiddleDoubleClickEvent ) 
+
+        wx.EVT_LEFT_DOWN(self, self.LeftDownEvent)
+        wx.EVT_LEFT_UP(self, self.LeftUpEvent)
+        wx.EVT_LEFT_DCLICK(self, self.LeftDoubleClickEvent)
+        wx.EVT_MIDDLE_DOWN(self, self.MiddleDownEvent)
+        wx.EVT_MIDDLE_UP(self, self.MiddleUpEvent)
+        wx.EVT_MIDDLE_DCLICK(self, self.MiddleDoubleClickEvent)
         wx.EVT_RIGHT_DOWN(self, self.RightDownEvent)
-        wx.EVT_RIGHT_UP(self, self.RightUpEvent ) 
-        wx.EVT_RIGHT_DCLICK(self, self.RightDoubleCLickEvent ) 
-        wx.EVT_MOTION(self, self.MotionEvent ) 
-        wx.EVT_MOUSEWHEEL(self, self.WheelEvent ) 
+        wx.EVT_RIGHT_UP(self, self.RightUpEvent)
+        wx.EVT_RIGHT_DCLICK(self, self.RightDoubleCLickEvent)
+        wx.EVT_MOTION(self, self.MotionEvent)
+        wx.EVT_MOUSEWHEEL(self, self.WheelEvent)
 
         ## CHB: I'm leaving these out for now.
-        #wx.EVT_ENTER_WINDOW(self, self. ) 
-        #wx.EVT_LEAVE_WINDOW(self, self. ) 
+        #wx.EVT_ENTER_WINDOW(self, self. )
+        #wx.EVT_LEAVE_WINDOW(self, self. )
+
+        self.SetProjectionFun(ProjectionFun)
+        self.GUIMode = None
+
+        # timer to give a delay when re-sizing so that buffers aren't re-built too many times.
+        self.SizeTimer = wx.PyTimer(self.OnSizeTimer)
+
+        self.InitializePanel()
+        self.MakeNewBuffers()
+
+#        self.CreateCursors()
+
+    def ComputeFontScale(self):
+        ## A global variable to hold the scaling from pixel size to point size.
+        global FontScale
+        dc = wx.ScreenDC()
+        dc.SetFont(wx.Font(16, wx.ROMAN, wx.NORMAL, wx.NORMAL))
+        E = dc.GetTextExtent("X")
+        FontScale = 16/E[1]
+        del dc
+        
+    def InitAll(self):
+        """
+        InitAll() sets everything in the Canvas to default state.
+
+        It can be used to reset the Canvas
+
+        """
+
+        self.HitColorGenerator = None
+        self.UseHitTest = False
+
+        self.NumBetweenBlits = 500
 
         ## create the Hit Test Dicts:
         self.HitDict = None
@@ -1889,95 +2225,54 @@ class FloatCanvas(wx.Panel):
         self._ForegroundBuffer = None
         self.BoundingBox = None
         self.BoundingBoxDirty = False
-        self.ViewPortCenter= array( (0,0), Float)
+        self.MinScale = None
+        self.MaxScale = None
+        self.ViewPortCenter= N.array( (0,0), N.float)
+
+        self.SetProjectionFun(None)
+
+        self.MapProjectionVector = N.array( (1,1), N.float) # No Projection to start!
+        self.TransformVector = N.array( (1,-1), N.float) # default Transformation
 
-        self.SetProjectionFun(ProjectionFun)
-        
-        self.MapProjectionVector = array( (1,1), Float) # No Projection to start!
-        self.TransformVector = array( (1,-1), Float) # default Transformation
-        
         self.Scale = 1
-
-        self.GUIMode = None
-        self.StartRBBox = None
-        self.PrevRBBox = None
-        self.StartMove = None
-        self.PrevMoveXY = None
         self.ObjectUnderMouse = None
-        
-        # called just to make sure everything is initialized
-        # this is a bug on OS-X, maybe it's not required?
-        self.SizeTimer = wx.PyTimer(self.OnSizeTimer) # timer to give a delay when re-sizing so that bufferes aren't re-built too many times.
-        
-        self.InitializePanel()
-        self.MakeNewBuffers()
-        
-        self.InHereNum = 0
 
-        self.CreateCursors()
-        
-    def CreateCursors(self):
+        self.GridUnder = None
+        self.GridOver = None
 
-        ## create all the Cursors, so they don't need to be created each time.
-        ##
-        if "wxMac" in wx.PlatformInfo: # use 16X16 cursors for wxMac
-            self.HandCursor = wx.CursorFromImage(Resources.getHand16Image())
-            self.GrabHandCursor = wx.CursorFromImage(Resources.getGrabHand16Image())
-
-            img = Resources.getMagPlus16Image()
-            img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_X, 6)
-            img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_Y, 6)
-            self.MagPlusCursor = wx.CursorFromImage(img)
-
-            img = Resources.getMagMinus16Image()
-            img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_X, 6)
-            img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_Y, 6)
-            self.MagMinusCursor = wx.CursorFromImage(img)
-        else: # use 24X24 cursors for GTK and Windows
-            self.HandCursor = wx.CursorFromImage(Resources.getHandImage())
-            self.GrabHandCursor = wx.CursorFromImage(Resources.getGrabHandImage())
-
-            img = Resources.getMagPlusImage()
-            img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_X, 9)
-            img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_Y, 9)
-            self.MagPlusCursor = wx.CursorFromImage(img)
-
-            img = Resources.getMagMinusImage()
-            img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_X, 9)
-            img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_Y, 9)
-            self.MagMinusCursor = wx.CursorFromImage(img)
+        self._BackgroundDirty = True
 
     def SetProjectionFun(self,ProjectionFun):
         if ProjectionFun == 'FlatEarth':
-            self.ProjectionFun = self.FlatEarthProjection 
+            self.ProjectionFun = self.FlatEarthProjection
         elif callable(ProjectionFun):
-            self.ProjectionFun = ProjectionFun 
+            self.ProjectionFun = ProjectionFun
         elif ProjectionFun is None:
-            self.ProjectionFun = lambda x=None: array( (1,1), Float)
+            self.ProjectionFun = lambda x=None: N.array( (1,1), N.float)
         else:
-            raise FloatCanvasError('Projectionfun must be either: "FlatEarth", None, or a callable object (function, for instance) that takes the ViewPortCenter and returns a MapProjectionVector')
+            raise FloatCanvasError('Projectionfun must be either:'
+                                   ' "FlatEarth", None, or a callable object '
+                                   '(function, for instance) that takes the '
+                                   'ViewPortCenter and returns a MapProjectionVector')
 
     def FlatEarthProjection(self, CenterPoint):
-        return array((cos(pi*CenterPoint[1]/180),1),Float)
+        MaxLatitude = 75 # these were determined essentially arbitrarily
+        MinLatitude = -75
+        Lat = min(CenterPoint[1],MaxLatitude)
+        Lat = max(Lat,MinLatitude)
+        return N.array((N.cos(N.pi*Lat/180),1),N.float)
 
-    def SetMode(self,Mode):
-        if Mode in ["ZoomIn","ZoomOut","Move","Mouse", None]:
-            if Mode == "Move":
-                self.SetCursor(self.HandCursor)
-            elif Mode == "ZoomIn":
-                self.SetCursor(self.MagPlusCursor) 
-            elif Mode == "ZoomOut":
-                self.SetCursor(self.MagMinusCursor) 
-            else:
-                self.SetCursor(wx.NullCursor)
-                
+    def SetMode(self, Mode):
+            '''
+            Set the GUImode to any of the availble mode.
+            '''
+            # Set mode
             self.GUIMode = Mode
-            
-        else:
-            raise FloatCanvasError('"%s" is Not a valid Mode'%Mode)
+            #self.GUIMode.SetCursor()
+            self.SetCursor(self.GUIMode.Cursor)
 
     def MakeHitDict(self):
-        ##fixme: Should this just be None if nothing has been bound? 
+        ##fixme: Should this just be None if nothing has been bound?
         self.HitDict = {EVT_FC_LEFT_DOWN: {},
                         EVT_FC_LEFT_UP: {},
                         EVT_FC_LEFT_DCLICK: {},
@@ -1989,27 +2284,51 @@ class FloatCanvas(wx.Panel):
                         EVT_FC_RIGHT_DCLICK: {},
                         EVT_FC_ENTER_OBJECT: {},
                         EVT_FC_LEAVE_OBJECT: {},
-                        }        
-            
+                        }
+
     def _RaiseMouseEvent(self, Event, EventType):
         """
         This is called in various other places to raise a Mouse Event
         """
-        #print "in Raise Mouse Event", Event
         pt = self.PixelToWorld( Event.GetPosition() )
         evt = _MouseEvent(EventType, Event, self.GetId(), pt)
-        self.GetEventHandler().ProcessEvent(evt)       
+        self.GetEventHandler().ProcessEvent(evt)
+
+    if wx.__version__ >= "2.8":
+        #print "Using hit test code for 2.8"
+        def GetHitTestColor(self, xy):
+            if self._ForegroundHTBitmap:
+                pdata = wx.AlphaPixelData(self._ForegroundHTBitmap)
+                if not pdata:
+                    pdata = wx.NativePixelData(self._ForegroundHTBitmap)
+                    if not pdata:
+                        raise RuntimeError("Failed to gain raw access to bitmap data.")                
+            else:
+                pdata = wx.AlphaPixelData(self._HTBitmap)
+                if not pdata:
+                    pdata = wx.NativePixelData(self._HTBitmap)
+                    if not pdata:
+                        raise RuntimeError("Failed to gain raw access to bitmap data.")                
+            pacc = pdata.GetPixels()
+            pacc.MoveTo(pdata, xy[0], xy[1])
+            return pacc.Get()[:3]
+    else:
+        #print "using pre-2.8 hit test code"
+        def GetHitTestColor(self,  xy ):
+            dc = wx.MemoryDC()
+            if self._ForegroundHTBitmap:
+                dc.SelectObject(self._ForegroundHTBitmap)
+            else:
+                dc.SelectObject(self._HTBitmap)
+            hitcolor = dc.GetPixelPoint( xy )
+            return hitcolor.Get()
 
     def HitTest(self, event, HitEvent):
         if self.HitDict:
             # check if there are any objects in the dict for this event
             if self.HitDict[ HitEvent ]:
                 xy = event.GetPosition()
-                if self._ForegroundHTdc:
-                    hitcolor = self._ForegroundHTdc.GetPixelPoint( xy )
-                else:
-                    hitcolor = self._HTdc.GetPixelPoint( xy )
-                color = ( hitcolor.Red(), hitcolor.Green(), hitcolor.Blue() )
+                color = self.GetHitTestColor( xy )
                 if color in self.HitDict[ HitEvent ]:
                     Object = self.HitDict[ HitEvent ][color]
                     ## Add the hit coords to the Object
@@ -2021,13 +2340,13 @@ class FloatCanvas(wx.Panel):
 
     def MouseOverTest(self, event):
         ##fixme: Can this be cleaned up?
-        if self.HitDict:
+        if (self.HitDict and
+
+                (self.HitDict[EVT_FC_ENTER_OBJECT ] or
+                 self.HitDict[EVT_FC_LEAVE_OBJECT ]    )
+            ):
             xy = event.GetPosition()
-            if self._ForegroundHTdc:
-                hitcolor = self._ForegroundHTdc.GetPixelPoint( xy )
-            else:
-                hitcolor = self._HTdc.GetPixelPoint( xy )
-            color = ( hitcolor.Red(), hitcolor.Green(), hitcolor.Blue() )
+            color = self.GetHitTestColor( xy )
             OldObject = self.ObjectUnderMouse
             ObjectCallbackCalled = False
             if color in self.HitDict[ EVT_FC_ENTER_OBJECT ]:
@@ -2068,249 +2387,104 @@ class FloatCanvas(wx.Panel):
                     except KeyError:
                         pass # this means the leave event isn't bound for that object
             return ObjectCallbackCalled
-
+        return False
 
     ## fixme: There is a lot of repeated code here
-    ##        Is there a better way?            
-    def LeftDoubleClickEvent(self,event):
-        if self.GUIMode == "Mouse":
-            EventType = EVT_FC_LEFT_DCLICK
-            if not self.HitTest(event, EventType):
-                self._RaiseMouseEvent(event, EventType)
-
-    def MiddleDownEvent(self,event):
-        if self.GUIMode == "Mouse":
-            EventType = EVT_FC_MIDDLE_DOWN
-            if not self.HitTest(event, EventType):
-                self._RaiseMouseEvent(event, EventType)
-
-    def MiddleUpEvent(self,event):
-        if self.GUIMode == "Mouse":
-            EventType = EVT_FC_MIDDLE_UP
-            if not self.HitTest(event, EventType):
-                self._RaiseMouseEvent(event, EventType)
-
-    def MiddleDoubleClickEvent(self,event):
-        if self.GUIMode == "Mouse":
-            EventType = EVT_FC_MIDDLE_DCLICK
-            if not self.HitTest(event, EventType):
-                self._RaiseMouseEvent(event, EventType)
-
-    def RightUpEvent(self,event):
-        if self.GUIMode == "Mouse":
-            EventType = EVT_FC_RIGHT_UP
-            if not self.HitTest(event, EventType):
-                self._RaiseMouseEvent(event, EventType)
-
-    def RightDoubleCLickEvent(self,event):
-        if self.GUIMode == "Mouse":
-            EventType = EVT_FC_RIGHT_DCLICK
-            if not self.HitTest(event, EventType):
-                self._RaiseMouseEvent(event, EventType)
-
-    def WheelEvent(self,event):
-        ##if self.GUIMode == "Mouse":
-        ## Why not always raise this?
-            self._RaiseMouseEvent(event, EVT_FC_MOUSEWHEEL)
-
-
-    def LeftDownEvent(self,event):
+    ##        Is there a better way?
+    def LeftDoubleClickEvent(self, event):
         if self.GUIMode:
-            if self.GUIMode == "ZoomIn":
-                self.StartRBBox = array( event.GetPosition() )
-                self.PrevRBBox = None
-                self.CaptureMouse()
-            elif self.GUIMode == "ZoomOut":
-                Center = self.PixelToWorld( event.GetPosition() )
-                self.Zoom(1/1.5,Center)
-            elif self.GUIMode == "Move":
-                self.SetCursor(self.GrabHandCursor)
-                self.StartMove = array( event.GetPosition() )
-                self.PrevMoveXY = (0,0)
-            elif self.GUIMode == "Mouse":
-                ## check for a hit
-                if not self.HitTest(event, EVT_FC_LEFT_DOWN):
-                   self._RaiseMouseEvent(event,EVT_FC_LEFT_DOWN)
-        else: 
-            pass
+            self.GUIMode.OnLeftDouble(event)
+        event.Skip()
 
-    def LeftUpEvent(self,event):
+    def MiddleDownEvent(self, event):
+        if self.GUIMode:
+            self.GUIMode.OnMiddleDown(event)
+        event.Skip()
+
+    def MiddleUpEvent(self, event):
+        if self.GUIMode:
+            self.GUIMode.OnMiddleUp(event)
+        event.Skip()
+
+    def MiddleDoubleClickEvent(self, event):
+        if self.GUIMode:
+            self.GUIMode.OnMiddleDouble(event)
+        event.Skip()
+
+    def RightDoubleCLickEvent(self, event):
+        if self.GUIMode:
+            self.GUIMode.OnRightDouble(event)
+        event.Skip()
+
+    def WheelEvent(self, event):
+        if self.GUIMode:
+            self.GUIMode.OnWheel(event)
+        event.Skip()
+
+    def LeftDownEvent(self, event):
+        if self.GUIMode:
+            self.GUIMode.OnLeftDown(event)
+        event.Skip()
+
+    def LeftUpEvent(self, event):
         if self.HasCapture():
             self.ReleaseMouse()
         if self.GUIMode:
-            if self.GUIMode == "ZoomIn":
-                if event.LeftUp() and not self.StartRBBox is None:
-                    self.PrevRBBox = None
-                    EndRBBox = event.GetPosition()
-                    StartRBBox = self.StartRBBox
-                    # if mouse has moved less that ten pixels, don't use the box.
-                    if ( abs(StartRBBox[0] - EndRBBox[0]) > 10
-                         and abs(StartRBBox[1] - EndRBBox[1]) > 10 ):
-                        EndRBBox = self.PixelToWorld(EndRBBox)
-                        StartRBBox = self.PixelToWorld(StartRBBox)
-                        BB = array(((min(EndRBBox[0],StartRBBox[0]),
-                                     min(EndRBBox[1],StartRBBox[1])),
-                                    (max(EndRBBox[0],StartRBBox[0]),
-                                     max(EndRBBox[1],StartRBBox[1]))),Float)
-                        self.ZoomToBB(BB)
-                    else:
-                        Center = self.PixelToWorld(StartRBBox)
-                        self.Zoom(1.5,Center)
-                    self.StartRBBox = None
-            elif self.GUIMode == "Move":
-                self.SetCursor(self.HandCursor)
-                if self.StartMove is not None:
-                    StartMove = self.StartMove
-                    EndMove = array((event.GetX(),event.GetY()))
-                    if sum((StartMove-EndMove)**2) > 16:
-                        self.MoveImage(StartMove-EndMove,'Pixel')
-                    self.StartMove = None
-            elif self.GUIMode == "Mouse":
-                EventType = EVT_FC_LEFT_UP
-                if not self.HitTest(event, EventType):
-                   self._RaiseMouseEvent(event, EventType)
-        else:
-            pass
+            self.GUIMode.OnLeftUp(event)
+        event.Skip()
 
-    def MotionEvent(self,event):
+    def MotionEvent(self, event):
         if self.GUIMode:
-            if self.GUIMode == "ZoomIn":
-                if event.Dragging() and event.LeftIsDown() and not (self.StartRBBox is None):
-                    xy0 = self.StartRBBox
-                    xy1 = array( event.GetPosition() )
-                    wh  = abs(xy1 - xy0)
-                    wh[0] = max(wh[0], int(wh[1]*self.AspectRatio))
-                    wh[1] = int(wh[0] / self.AspectRatio)
-                    xy_c = (xy0 + xy1) / 2
-                    dc = wx.ClientDC(self)
-                    dc.BeginDrawing()
-                    dc.SetPen(wx.Pen('WHITE', 2, wx.SHORT_DASH))
-                    dc.SetBrush(wx.TRANSPARENT_BRUSH)
-                    dc.SetLogicalFunction(wx.XOR)
-                    if self.PrevRBBox:
-                        dc.DrawRectanglePointSize(*self.PrevRBBox)
-                    self.PrevRBBox = ( xy_c - wh/2, wh )
-                    dc.DrawRectanglePointSize( *self.PrevRBBox )
-                    dc.EndDrawing()
-            elif self.GUIMode == "Move":
-                if event.Dragging() and event.LeftIsDown() and not self.StartMove is None:
-                    xy1 = array( event.GetPosition() )
-                    wh = self.PanelSize
-                    xy_tl = xy1 - self.StartMove
-                    dc = wx.ClientDC(self)
-                    dc.BeginDrawing()
-                    x1,y1 = self.PrevMoveXY
-                    x2,y2 = xy_tl
-                    w,h = self.PanelSize
-                    ##fixme: This sure could be cleaner!
-                    if x2 > x1 and y2 > y1:
-                        xa = xb = x1
-                        ya = yb = y1
-                        wa = w
-                        ha = y2 - y1
-                        wb = x2-  x1
-                        hb = h
-                    elif x2 > x1 and y2 <= y1:
-                        xa = x1
-                        ya = y1
-                        wa = x2 - x1
-                        ha = h
-                        xb = x1
-                        yb = y2 + h
-                        wb = w
-                        hb = y1 - y2
-                    elif x2 <= x1 and y2 > y1:
-                        xa = x1
-                        ya = y1
-                        wa = w
-                        ha = y2 - y1
-                        xb = x2 + w
-                        yb = y1
-                        wb = x1 - x2
-                        hb = h - y2 + y1 
-                    elif x2 <= x1 and y2 <= y1:
-                        xa = x2 + w
-                        ya = y1
-                        wa = x1 - x2
-                        ha = h
-                        xb = x1
-                        yb = y2 + h
-                        wb = w
-                        hb = y1 - y2
-               
-                    dc.SetPen(wx.TRANSPARENT_PEN)
-                    dc.SetBrush(self.BackgroundBrush)
-                    dc.DrawRectangle(xa, ya, wa, ha)
-                    dc.DrawRectangle(xb, yb, wb, hb)
-                    self.PrevMoveXY = xy_tl
-                    if self._ForeDrawList:
-                    ##if self._ForegroundBuffer:
-                        dc.DrawBitmapPoint(self._ForegroundBuffer,xy_tl)
-                    else:
-                        dc.DrawBitmapPoint(self._Buffer,xy_tl)
-                    dc.EndDrawing()
-            elif self.GUIMode == "Mouse":
-                ## Only do something if there are mouse over events bound
-                if self.HitDict and (self.HitDict[ EVT_FC_ENTER_OBJECT ] or self.HitDict[ EVT_FC_LEAVE_OBJECT ] ):
-                    if not self.MouseOverTest(event):
-                        self._RaiseMouseEvent(event,EVT_FC_MOTION)
-            else:
-                    pass
-            self._RaiseMouseEvent(event,EVT_FC_MOTION)
-        else:
-            pass
+            self.GUIMode.OnMove(event)
+        event.Skip()
 
-    def RightDownEvent(self,event):
+    def RightDownEvent(self, event):
         if self.GUIMode:
-            if self.GUIMode == "ZoomIn":
-                Center = self.PixelToWorld((event.GetX(),event.GetY()))
-                self.Zoom(1/1.5,Center)
-            elif self.GUIMode == "ZoomOut":
-                Center = self.PixelToWorld((event.GetX(),event.GetY()))
-                self.Zoom(1.5,Center)
-            elif self.GUIMode == "Mouse":
-                EventType = EVT_FC_RIGHT_DOWN
-                if not self.HitTest(event, EventType):
-                   self._RaiseMouseEvent(event, EventType)
-        else:
-            pass
-        
+            self.GUIMode.OnRightDown(event)
+        event.Skip()
+
+    def RightUpEvent(self, event):
+        if self.GUIMode:
+            self.GUIMode.OnRightUp(event)
+        event.Skip()
+
     def MakeNewBuffers(self):
         self._BackgroundDirty = True
         # Make new offscreen bitmap:
         self._Buffer = wx.EmptyBitmap(*self.PanelSize)
-        #dc = wx.MemoryDC()
-        #dc.SelectObject(self._Buffer)
-        #dc.Clear()
         if self._ForeDrawList:
             self._ForegroundBuffer = wx.EmptyBitmap(*self.PanelSize)
+            if self.UseHitTest:
+                self.MakeNewHTBitmap()
+            else:
+                self._ForegroundHTBitmap = None
         else:
             self._ForegroundBuffer = None
-        if self.UseHitTest:
-            self.MakeNewHTdc()
-        else:
-            self._HTdc = None
-            self._ForegroundHTdc = None
+            self._ForegroundHTBitmap = None
 
-    def MakeNewHTdc(self):
-        ## Note: While it's considered a "bad idea" to keep a
-        ## MemoryDC around I'm doing it here because a wx.Bitmap
-        ## doesn't have a GetPixel method so a DC is needed to do
-        ## the hit-test. It didn't seem like a good idea to re-create
-        ## a wx.MemoryDC on every single mouse event, so I keep it
-        ## around instead
-        self._HTdc = wx.MemoryDC()
-        self._HTBitmap = wx.EmptyBitmap(*self.PanelSize) 
-        self._HTdc.SelectObject( self._HTBitmap )
-        self._HTdc.SetBackground(wx.BLACK_BRUSH)
-        if self._ForeDrawList:
-            self._ForegroundHTdc = wx.MemoryDC()
-            self._ForegroundHTBitmap = wx.EmptyBitmap(*self.PanelSize) 
-            self._ForegroundHTdc.SelectObject( self._ForegroundHTBitmap )
-            self._ForegroundHTdc.SetBackground(wx.BLACK_BRUSH)
+        if self.UseHitTest:
+            self.MakeNewHTBitmap()
         else:
-           self._ForegroundHTdc = None 
-    
+            self._HTBitmap = None
+            self._ForegroundHTBitmap = None
+
+    def MakeNewHTBitmap(self):
+        """
+        Off screen Bitmap used for Hit tests on background objects
+        
+        """
+        self._HTBitmap = wx.EmptyBitmap(*self.PanelSize)
+
+    def MakeNewForegroundHTBitmap(self):
+        ## Note: the foreground and backround HT bitmaps are in separate functions
+        ##       so that they can be created separate --i.e. when a foreground is
+        ##       added after the backgound is drawn
+        """
+        Off screen Bitmap used for Hit tests on foreground objects
+        
+        """
+        self._ForegroundHTBitmap = wx.EmptyBitmap(*self.PanelSize)
+
     def OnSize(self, event=None):
         self.InitializePanel()
         self.SizeTimer.Start(50, oneShot=True)
@@ -2324,13 +2498,13 @@ class FloatCanvas(wx.Panel):
         if self.PanelSize == (0,0):
             ## OS-X sometimes gives a Size event when the panel is size (0,0)
             self.PanelSize = (2,2)
-        self.PanelSize  = array(self.PanelSize,  Int32)
+        self.PanelSize  = N.array(self.PanelSize,  N.int32)
         self.HalfPanelSize = self.PanelSize / 2 # lrk: added for speed in WorldToPixel
         if self.PanelSize[0] == 0 or self.PanelSize[1] == 0:
             self.AspectRatio = 1.0
         else:
             self.AspectRatio = float(self.PanelSize[0]) / self.PanelSize[1]
-        
+
     def OnPaint(self, event):
         dc = wx.PaintDC(self)
         if self._ForegroundBuffer:
@@ -2340,6 +2514,18 @@ class FloatCanvas(wx.Panel):
 
     def Draw(self, Force=False):
         """
+
+        Canvas.Draw(Force=False)
+
+        Re-draws the canvas.
+
+        Note that the buffer will not be re-drawn unless something has
+        changed. If you change a DrawObject directly, then the canvas
+        will not know anything has changed. In this case, you can force
+        a re-draw by passing int True for the Force flag:
+
+        Canvas.Draw(Force=True)
+
         There is a main buffer set up to double buffer the screen, so
         you can get quick re-draws when the window gets uncovered.
 
@@ -2351,26 +2537,37 @@ class FloatCanvas(wx.Panel):
         changing on the foreground, without having to wait for the
         background to get re-drawn. This can be used to support simple
         animation, for instance.
-        
+
         """
-        if sometrue(self.PanelSize <= 2 ): # it's possible for this to get called before being properly initialized.
+
+        if N.sometrue(self.PanelSize <= 2 ):
+            # it's possible for this to get called before being properly initialized.
             return
         if self.Debug: start = clock()
         ScreenDC =  wx.ClientDC(self)
-        ViewPortWorld = ( self.PixelToWorld((0,0)),
-                          self.PixelToWorld(self.PanelSize) )
-        ViewPortBB = array( ( minimum.reduce(ViewPortWorld),
-                              maximum.reduce(ViewPortWorld) ) )
+        ViewPortWorld = N.array(( self.PixelToWorld((0,0)),
+                                  self.PixelToWorld(self.PanelSize) )
+                                     )
+        self.ViewPortBB = N.array( ( N.minimum.reduce(ViewPortWorld),
+                              N.maximum.reduce(ViewPortWorld) ) )
+        #self.ViewPortWorld = ViewPortWorld
+
         dc = wx.MemoryDC()
         dc.SelectObject(self._Buffer)
         if self._BackgroundDirty or Force:
-            #print "Background is Dirty"
             dc.SetBackground(self.BackgroundBrush)
             dc.Clear()
-            if self._HTdc:
-                self._HTdc.Clear()
-            self._DrawObjects(dc, self._DrawList, ScreenDC, ViewPortBB, self._HTdc)
+            if self._HTBitmap is not None:
+                HTdc = wx.MemoryDC()
+                HTdc.SelectObject(self._HTBitmap)
+                HTdc.Clear()
+            else:
+                HTdc = None
+            if self.GridUnder is not None:
+                self.GridUnder._Draw(dc, self)
+            self._DrawObjects(dc, self._DrawList, ScreenDC, self.ViewPortBB, HTdc)
             self._BackgroundDirty = False
+            del HTdc
 
         if self._ForeDrawList:
             ## If an object was just added to the Foreground, there might not yet be a buffer
@@ -2381,62 +2578,56 @@ class FloatCanvas(wx.Panel):
             dc = wx.MemoryDC() ## I got some strange errors (linewidths wrong) if I didn't make a new DC here
             dc.SelectObject(self._ForegroundBuffer)
             dc.DrawBitmap(self._Buffer,0,0)
-            if self._ForegroundHTdc is None:
-                self._ForegroundHTdc = wx.MemoryDC()
-                self._ForegroundHTdc.SelectObject( wx.EmptyBitmap(
-                                                   self.PanelSize[0],
-                                                   self.PanelSize[1]) )
-            if self._HTdc:
-                ## blit the background HT buffer to the foreground HT buffer
-                self._ForegroundHTdc.Blit(0, 0,
-                                          self.PanelSize[0], self.PanelSize[1],
-                                          self._HTdc, 0, 0)
+            if self._ForegroundHTBitmap is not None:
+                ForegroundHTdc = wx.MemoryDC()
+                ForegroundHTdc.SelectObject( self._ForegroundHTBitmap)
+                ForegroundHTdc.Clear()
+                if self._HTBitmap is not None:
+                    #Draw the background HT buffer to the foreground HT buffer
+                    ForegroundHTdc.DrawBitmap(self._HTBitmap, 0, 0)
+            else:
+                ForegroundHTdc = None
             self._DrawObjects(dc,
                               self._ForeDrawList,
                               ScreenDC,
-                              ViewPortBB,
-                              self._ForegroundHTdc)
+                              self.ViewPortBB,
+                              ForegroundHTdc)
+        if self.GridOver is not None:
+            self.GridOver._Draw(dc, self)
         ScreenDC.Blit(0, 0, self.PanelSize[0],self.PanelSize[1], dc, 0, 0)
-        # If the canvas is in the middle of a zoom or move, the Rubber Band box needs to be re-drawn
-        # This seeems out of place, but it works.
-        if self.PrevRBBox:
-            ScreenDC.SetPen(wx.Pen('WHITE', 2,wx.SHORT_DASH))
-            ScreenDC.SetBrush(wx.TRANSPARENT_BRUSH)
-            ScreenDC.SetLogicalFunction(wx.XOR)
-            ScreenDC.DrawRectanglePointSize(*self.PrevRBBox)
+        # If the canvas is in the middle of a zoom or move,
+        # the Rubber Band box needs to be re-drawn
+        ##fixme: maybe GUIModes should never be None, and rather have a Do-nothing GUI-Mode.
+        if self.GUIMode is not None:
+            self.GUIMode.UpdateScreen()
+
         if self.Debug: print "Drawing took %f seconds of CPU time"%(clock()-start)
 
-        ## Clear the font cache
-        ## IF you don't do this, the X font server starts to take up Massive amounts of memory
-        ## This is mostly a problem with very large fonts, that you get with scaled text when zoomed in.
+        ## Clear the font cache. If you don't do this, the X font server
+        ## starts to take up Massive amounts of memory This is mostly a
+        ## problem with very large fonts, that you get with scaled text
+        ## when zoomed in.
         DrawObject.FontList = {}
 
     def _ShouldRedraw(DrawList, ViewPortBB): # lrk: adapted code from BBCheck
         # lrk: Returns the objects that should be redrawn
 
+        ## fixme: should this check be moved into the object?
+        ##        also: a BB object would make this cleaner too
         BB2 = ViewPortBB
         redrawlist = []
         for Object in DrawList:
             BB1 = Object.BoundingBox
+            ## note: this could use the Utilities.BBCheck function
+            ##       butthis saves a function call
             if (BB1[1,0] > BB2[0,0] and BB1[0,0] < BB2[1,0] and
                  BB1[1,1] > BB2[0,1] and BB1[0,1] < BB2[1,1]):
                 redrawlist.append(Object)
-        return redrawlist       
+        #return redrawlist
+        ##fixme: disabled this!!!!
+        return redrawlist
     _ShouldRedraw = staticmethod(_ShouldRedraw)
 
-
-##    def BBCheck(self, BB1, BB2):
-##        """
-
-##        BBCheck(BB1, BB2) returns True is the Bounding boxes intesect, False otherwise
-
-##        """
-##        if ( (BB1[1,0] > BB2[0,0]) and (BB1[0,0] < BB2[1,0]) and
-##             (BB1[1,1] > BB2[0,1]) and (BB1[0,1] < BB2[1,1]) ):
-##            return True
-##        else:
-##            return False
-
     def MoveImage(self,shift,CoordType):
         """
         move the image in the window.
@@ -2455,44 +2646,46 @@ class FloatCanvas(wx.Panel):
         in Floating point world coordinates
 
         """
-        
-        shift = asarray(shift,Float)
-        #print "shifting by:", shift
+        shift = N.asarray(shift,N.float)
         if CoordType == 'Panel':# convert from panel coordinates
-            shift = shift * array((-1,1),Float) *self.PanelSize/self.TransformVector
+            shift = shift * N.array((-1,1),N.float) *self.PanelSize/self.TransformVector
         elif CoordType == 'Pixel': # convert from pixel coordinates
             shift = shift/self.TransformVector
         elif CoordType == 'World': # No conversion
             pass
         else:
             raise FloatCanvasError('CoordType must be either "Panel", "Pixel", or "World"')
-        
-        self.ViewPortCenter = self.ViewPortCenter + shift 
+
+        self.ViewPortCenter = self.ViewPortCenter + shift
         self.MapProjectionVector = self.ProjectionFun(self.ViewPortCenter)
-        self.TransformVector = array((self.Scale,-self.Scale),Float) * self.MapProjectionVector
+        self.TransformVector = N.array((self.Scale,-self.Scale),N.float) * self.MapProjectionVector
         self._BackgroundDirty = True
         self.Draw()
 
-    def Zoom(self,factor,center = None):
-    
+    def Zoom(self, factor, center = None, centerCoords="world"):
+
         """
         Zoom(factor, center) changes the amount of zoom of the image by factor.
         If factor is greater than one, the image gets larger.
         If factor is less than one, the image gets smaller.
-        
-        Center is a tuple of (x,y) coordinates of the center of the viewport, after zooming.
+
+        center is a tuple of (x,y) coordinates of the center of the viewport, after zooming.
         If center is not given, the center will stay the same.
+
+        centerCoords is a flag indicating whether the center given is in pixel or world 
+        coords. Options are: "world" or "pixel"
         
         """
         self.Scale = self.Scale*factor
         if not center is None:
-            self.ViewPortCenter = array(center,Float)
-        self.MapProjectionVector = self.ProjectionFun(self.ViewPortCenter)
-        self.TransformVector = array((self.Scale,-self.Scale),Float) * self.MapProjectionVector
-        self._BackgroundDirty = True
-        self.Draw()
-        
-    def ZoomToBB(self, NewBB = None, DrawFlag = True):
+            if centerCoords == "pixel":
+                center = self.PixelToWorld( center )
+            else:
+                center = N.array(center,N.float)
+            self.ViewPortCenter = center
+        self.SetToNewScale()
+
+    def ZoomToBB(self, NewBB=None, DrawFlag=True):
 
         """
 
@@ -2501,18 +2694,18 @@ class FloatCanvas(wx.Panel):
 
         """
         
-        if not  NewBB is None:
+        if NewBB is not None:
             BoundingBox = NewBB
         else:
             if self.BoundingBoxDirty:
                 self._ResetBoundingBox()
             BoundingBox = self.BoundingBox
-        if not BoundingBox is None:
-            self.ViewPortCenter = array(((BoundingBox[0,0]+BoundingBox[1,0])/2,
-                                         (BoundingBox[0,1]+BoundingBox[1,1])/2 ),Float)
+        if BoundingBox is not None:
+            self.ViewPortCenter = N.array(((BoundingBox[0,0]+BoundingBox[1,0])/2,
+                                         (BoundingBox[0,1]+BoundingBox[1,1])/2 ),N.float_)
             self.MapProjectionVector = self.ProjectionFun(self.ViewPortCenter)
             # Compute the new Scale
-            BoundingBox = BoundingBox * self.MapProjectionVector
+            BoundingBox = BoundingBox*self.MapProjectionVector # this does need to make a copy!
             try:
                 self.Scale = min(abs(self.PanelSize[0] / (BoundingBox[1,0]-BoundingBox[0,0])),
                                  abs(self.PanelSize[1] / (BoundingBox[1,1]-BoundingBox[0,1])) )*0.95
@@ -2524,23 +2717,33 @@ class FloatCanvas(wx.Panel):
                         self.Scale = (self.PanelSize[1]  / (BoundingBox[1,1]-BoundingBox[0,1]))*0.95
                     except ZeroDivisionError: #zero size! (must be a single point)
                         self.Scale = 1
-                     
-            self.TransformVector = array((self.Scale,-self.Scale),Float)* self.MapProjectionVector
+
             if DrawFlag:
                 self._BackgroundDirty = True
-                self.Draw()
         else:
             # Reset the shifting and scaling to defaults when there is no BB
-            self.ViewPortCenter= array( (0,0), Float)
-            self.MapProjectionVector = array( (1,1), Float) # No Projection to start!
-            self.TransformVector = array( (1,-1), Float) # default Transformation
-            self.Scale = 1
-            
+            self.ViewPortCenter= N.array( (0,0), N.float)
+            self.Scale= 1
+        self.SetToNewScale(DrawFlag=DrawFlag)
+
+    def SetToNewScale(self, DrawFlag=True):
+        Scale = self.Scale
+        if self.MinScale is not None:
+            Scale = max(Scale, self.MinScale)
+        if self.MaxScale is not None:
+            Scale = min(Scale, self.MaxScale)
+        self.MapProjectionVector = self.ProjectionFun(self.ViewPortCenter)
+        self.TransformVector = N.array((Scale,-Scale),N.float) * self.MapProjectionVector
+        self.Scale = Scale
+        self._BackgroundDirty = True
+        if DrawFlag:
+            self.Draw()
+
     def RemoveObjects(self, Objects):
         for Object in Objects:
-            self.RemoveObject(Object, ResetBB = False)
+            self.RemoveObject(Object, ResetBB=False)
         self.BoundingBoxDirty = True
-        
+
     def RemoveObject(self, Object, ResetBB = True):
         ##fixme: Using the list.remove method is kind of slow
         if Object.InForeground:
@@ -2554,7 +2757,15 @@ class FloatCanvas(wx.Panel):
         if ResetBB:
             self.BoundingBoxDirty = True
 
-    def ClearAll(self, ResetBB = True):
+    def ClearAll(self, ResetBB=True):
+        """
+        ClearAll(ResetBB=True)
+
+        Removes all DrawObjects from the Canvas
+
+        If ResetBB is set to False, the original bounding box will remain
+
+        """
         self._DrawList = []
         self._ForeDrawList = []
         self._BackgroundDirty = True
@@ -2565,52 +2776,34 @@ class FloatCanvas(wx.Panel):
         self.MakeNewBuffers()
         self.HitDict = None
 
-##    No longer called
-##    def _AddBoundingBox(self,NewBB):
-##        if self.BoundingBox is None:
-##            self.BoundingBox = NewBB
-##            self.ZoomToBB(NewBB,DrawFlag = False)
-##        else:
-##            self.BoundingBox = array( ( (min(self.BoundingBox[0,0],NewBB[0,0]),
-##                                         min(self.BoundingBox[0,1],NewBB[0,1])),
-##                                        (max(self.BoundingBox[1,0],NewBB[1,0]),
-##                                         max(self.BoundingBox[1,1],NewBB[1,1]))),
-##                                      Float)
-
-    def _getboundingbox(bboxarray): # lrk: added this
-
-        upperleft = minimum.reduce(bboxarray[:,0])
-        lowerright = maximum.reduce(bboxarray[:,1])
-        return array((upperleft, lowerright), Float)
-
-    _getboundingbox = staticmethod(_getboundingbox)
-
     def _ResetBoundingBox(self):
         if self._DrawList or self._ForeDrawList:
-            bboxarray = zeros((len(self._DrawList)+len(self._ForeDrawList), 2, 2),Float) 
-            i = -1 # just in case _DrawList is empty
-            for (i, BB) in enumerate(self._DrawList):
-                bboxarray[i] = BB.BoundingBox
-            for (j, BB) in enumerate(self._ForeDrawList):
-                bboxarray[i+j+1] = BB.BoundingBox
-            self.BoundingBox = self._getboundingbox(bboxarray)
+            bblist = []
+            for (i, obj) in enumerate(self._DrawList):
+                bblist.append(obj.BoundingBox)
+            for (j, obj) in enumerate(self._ForeDrawList):
+                bblist.append(obj.BoundingBox)
+            self.BoundingBox = BBox.fromBBArray(bblist)
         else:
             self.BoundingBox = None
-            self.ViewPortCenter= array( (0,0), Float)
-            self.TransformVector = array( (1,-1), Float)
-            self.MapProjectionVector = array( (1,1), Float)
-            self.Scale = 1        
+            self.ViewPortCenter= N.array( (0,0), N.float)
+            self.TransformVector = N.array( (1,-1), N.float)
+            self.MapProjectionVector = N.array( (1,1), N.float)
+            self.Scale = 1
         self.BoundingBoxDirty = False
 
-    def PixelToWorld(self,Points):
+    def PixelToWorld(self, Points):
         """
         Converts coordinates from Pixel coordinates to world coordinates.
-        
-        Points is a tuple of (x,y) coordinates, or a list of such tuples, or a NX2 Numpy array of x,y coordinates.
-        
+
+        Points is a tuple of (x,y) coordinates, or a list of such tuples,
+        or a NX2 Numpy array of x,y coordinates.
+
         """
-        return  (((asarray(Points,Float) - (self.PanelSize/2))/self.TransformVector) + self.ViewPortCenter)
-        
+        return  (((N.asarray(Points, N.float) -
+                   (self.PanelSize/2))/self.TransformVector) +
+                 self.ViewPortCenter)
+
     def WorldToPixel(self,Coordinates):
         """
         This function will get passed to the drawing functions of the objects,
@@ -2618,8 +2811,8 @@ class FloatCanvas(wx.Panel):
         Coordinates should be a NX2 array of (x,y) coordinates, or
         a 2-tuple, or sequence of 2-tuples.
         """
-        #Note: this can be called by users code for various reasons, so asarray is needed.
-        return  (((asarray(Coordinates,Float) -
+        #Note: this can be called by users code for various reasons, so N.asarray is needed.
+        return  (((N.asarray(Coordinates,N.float) -
                    self.ViewPortCenter)*self.TransformVector)+
                  (self.HalfPanelSize)).astype('i')
 
@@ -2627,24 +2820,24 @@ class FloatCanvas(wx.Panel):
         """
         This function will get passed to the drawing functions of the objects,
         to Change a length from world to pixel coordinates.
-        
+
         Lengths should be a NX2 array of (x,y) coordinates, or
         a 2-tuple, or sequence of 2-tuples.
         """
-        return  ( (asarray(Lengths,Float)*self.TransformVector) ).astype('i')
+        return  ( (N.asarray(Lengths, N.float)*self.TransformVector) ).astype('i')
 
     def ScalePixelToWorld(self,Lengths):
         """
         This function computes a pair of x.y lengths,
         to change then from pixel to world coordinates.
-        
+
         Lengths should be a NX2 array of (x,y) coordinates, or
         a 2-tuple, or sequence of 2-tuples.
         """
 
-        return  (asarray(Lengths,Float) / self.TransformVector)
-    
-    def AddObject(self,obj):
+        return  (N.asarray(Lengths,N.float) / self.TransformVector)
+
+    def AddObject(self, obj):
         # put in a reference to the Canvas, so remove and other stuff can work
         obj._Canvas = self
         if  obj.InForeground:
@@ -2656,11 +2849,15 @@ class FloatCanvas(wx.Panel):
         self.BoundingBoxDirty = True
         return True
 
+    def AddObjects(self, Objects):
+        for Object in Objects:
+            self.AddObject(Object)
+
     def _DrawObjects(self, dc, DrawList, ScreenDC, ViewPortBB, HTdc = None):
         """
         This is a convenience function;
         This function takes the list of objects and draws them to specified
-        device context.  
+        device context.
         """
         dc.SetBackground(self.BackgroundBrush)
         dc.BeginDrawing()
@@ -2679,24 +2876,26 @@ class FloatCanvas(wx.Panel):
 
     def SaveAsImage(self, filename, ImageType=wx.BITMAP_TYPE_PNG):
         """
-        
-        Saves the current image as an image file. The default is in the
-        PNG format. Other formats can be spcified using the wx flags:
 
+        Saves the current image as an image file. The default is in the
+        PNG format. Other formats can be specified using the wx flags:
+
+        wx.BITMAP_TYPE_PNG
+        wx.BITMAP_TYPE_JPG
         wx.BITMAP_TYPE_BMP
         wx.BITMAP_TYPE_XBM
         wx.BITMAP_TYPE_XPM
         etc. (see the wx docs for the complete list)
 
         """
-        
+
         self._Buffer.SaveFile(filename, ImageType)
 
 
 def _makeFloatCanvasAddMethods(): ## lrk's code for doing this in module __init__
     classnames = ["Circle", "Ellipse", "Rectangle", "ScaledText", "Polygon",
-                  "Line", "Text", "PointSet","Point", "Arrow","ScaledTextBox",
-                  "SquarePoint","Bitmap", "ScaledBitmap"]
+                  "Line", "Text", "PointSet","Point", "Arrow", "ArrowLine", "ScaledTextBox",
+                  "SquarePoint","Bitmap", "ScaledBitmap", "Spline", "Group"]
     for classname in classnames:
         klass = globals()[classname]
         def getaddshapemethod(klass=klass):
@@ -2714,6 +2913,6 @@ def _makeFloatCanvasAddMethods(): ## lrk's code for doing this in module __init_
             docstring += ", whose docstring is:\n%s" % klass.__doc__
         FloatCanvas.__dict__[methodname].__doc__ = docstring
 
-_makeFloatCanvasAddMethods()    
+_makeFloatCanvasAddMethods()
 
 
diff --git a/wxPython/wx/lib/floatcanvas/GUIMode.py b/wxPython/wx/lib/floatcanvas/GUIMode.py
new file mode 100644
index 0000000000..08ca47343f
--- /dev/null
+++ b/wxPython/wx/lib/floatcanvas/GUIMode.py
@@ -0,0 +1,347 @@
+"""
+
+Module that holds the GUI modes used by FloatCanvas
+
+
+Note that this can only be imported after a wx.App() has been created.
+
+This approach was inpired by Christian Blouin, who also wrote the initial
+version of the code.
+
+"""
+
+import wx
+## fixme: events should live in their own module, so all of FloatCanvas
+##        wouldn't have to be imported here.
+import FloatCanvas, Resources
+import numpy as N
+
+## create all the Cursors, so they don't need to be created each time.
+if "wxMac" in wx.PlatformInfo: # use 16X16 cursors for wxMac
+    HandCursor = wx.CursorFromImage(Resources.getHand16Image())
+    GrabHandCursor = wx.CursorFromImage(Resources.getGrabHand16Image())
+
+    img = Resources.getMagPlus16Image()
+    img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_X, 6)
+    img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_Y, 6)
+    MagPlusCursor = wx.CursorFromImage(img)
+
+    img = Resources.getMagMinus16Image()
+    img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_X, 6)
+    img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_Y, 6)
+    MagMinusCursor = wx.CursorFromImage(img)
+else: # use 24X24 cursors for GTK and Windows
+    HandCursor = wx.CursorFromImage(Resources.getHandImage())
+    GrabHandCursor = wx.CursorFromImage(Resources.getGrabHandImage())
+
+    img = Resources.getMagPlusImage()
+    img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_X, 9)
+    img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_Y, 9)
+    MagPlusCursor = wx.CursorFromImage(img)
+
+    img = Resources.getMagMinusImage()
+    img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_X, 9)
+    img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_Y, 9)
+    MagMinusCursor = wx.CursorFromImage(img)
+
+
+class GUIBase:
+    """
+    Basic Mouse mode and baseclass for other GUImode.
+
+    This one does nothing with any event
+
+    """
+    def __init__(self, parent):
+        self.parent = parent
+    
+    Cursor = wx.NullCursor
+
+    # Handlers
+    def OnLeftDown(self, event):
+        pass
+    def OnLeftUp(self, event):
+        pass
+    def OnLeftDouble(self, event):
+        pass
+    def OnRightDown(self, event):
+        pass
+    def OnRightUp(self, event):
+        pass
+    def OnRightDouble(self, event):
+        pass
+    def OnMiddleDown(self, event):
+        pass
+    def OnMiddleUp(self, event):
+        pass
+    def OnMiddleDouble(self, event):
+        pass
+    def OnWheel(self, event):
+        pass
+    def OnMove(self, event):
+        pass
+            
+    def UpdateScreen(self):
+        """
+        Update gets called if the screen has been repainted in the middle of a zoom in
+        so the Rubber Band Box can get updated
+        """
+        pass
+
+class GUIMouse(GUIBase):
+    """
+
+    Mouse mode checks for a hit test, and if nothing is hit,
+    raises a FloatCanvas mouse event for each event.
+
+    """
+
+    Cursor = wx.NullCursor
+
+    # Handlers
+    def OnLeftDown(self, event):
+        EventType = FloatCanvas.EVT_FC_LEFT_DOWN
+        if not self.parent.HitTest(event, EventType):
+            self.parent._RaiseMouseEvent(event, EventType)
+
+    def OnLeftUp(self, event):
+        EventType = FloatCanvas.EVT_FC_LEFT_UP
+        if not self.parent.HitTest(event, EventType):
+            self.parent._RaiseMouseEvent(event, EventType)
+
+    def OnLeftDouble(self, event):
+        EventType = FloatCanvas.EVT_FC_LEFT_DCLICK
+        if not self.parent.HitTest(event, EventType):
+                self.parent._RaiseMouseEvent(event, EventType)
+
+    def OnMiddleDown(self, event):
+        EventType = FloatCanvas.EVT_FC_MIDDLE_DOWN
+        if not self.parent.HitTest(event, EventType):
+            self.parent._RaiseMouseEvent(event, EventType)
+
+    def OnMiddleUp(self, event):
+        EventType = FloatCanvas.EVT_FC_MIDDLE_UP
+        if not self.parent.HitTest(event, EventType):
+            self.parent._RaiseMouseEvent(event, EventType)
+
+    def OnMiddleDouble(self, event):
+        EventType = FloatCanvas.EVT_FC_MIDDLE_DCLICK
+        if not self.parent.HitTest(event, EventType):
+            self.parent._RaiseMouseEvent(event, EventType)
+
+    def OnRightDown(self, event):
+        EventType = FloatCanvas.EVT_FC_RIGHT_DOWN
+        if not self.parent.HitTest(event, EventType):
+            self.parent._RaiseMouseEvent(event, EventType)
+
+    def OnRightUp(self, event):
+        EventType = FloatCanvas.EVT_FC_RIGHT_UP
+        if not self.parent.HitTest(event, EventType):
+            self.parent._RaiseMouseEvent(event, EventType)
+
+    def OnRightDouble(self, event):
+        EventType = FloatCanvas.EVT_FC_RIGHT_DCLICK
+        if not self.parent.HitTest(event, EventType):
+            self.parent._RaiseMouseEvent(event, EventType)
+
+    def OnWheel(self, event):
+        EventType = FloatCanvas.EVT_FC_MOUSEWHEEL
+        self.parent._RaiseMouseEvent(event, EventType)
+
+    def OnMove(self, event):
+        ## The Move event always gets raised, even if there is a hit-test
+        self.parent.MouseOverTest(event)
+        self.parent._RaiseMouseEvent(event,FloatCanvas.EVT_FC_MOTION)
+
+
+class GUIMove(GUIBase):
+
+    Cursor = HandCursor
+    GrabCursor = GrabHandCursor
+    def __init__(self, parent):
+        GUIBase.__init__(self, parent)
+        self.StartMove = None
+        self.PrevMoveXY = None
+
+    def OnLeftDown(self, event):
+        self.parent.SetCursor(self.GrabCursor)
+        self.parent.CaptureMouse()
+        self.StartMove = N.array( event.GetPosition() )
+        self.PrevMoveXY = (0,0)
+
+    def OnLeftUp(self, event):
+        if self.StartMove is not None:
+            StartMove = self.StartMove
+            EndMove = N.array(event.GetPosition())
+            DiffMove = StartMove-EndMove
+            if N.sum(DiffMove**2) > 16:
+                self.parent.MoveImage(DiffMove, 'Pixel')
+            self.StartMove = None
+        self.parent.SetCursor(self.Cursor)
+
+    def OnMove(self, event):
+        # Allways raise the Move event.
+        self.parent._RaiseMouseEvent(event,FloatCanvas.EVT_FC_MOTION)
+        if event.Dragging() and event.LeftIsDown() and not self.StartMove is None:
+            xy1 = N.array( event.GetPosition() )
+            wh = self.parent.PanelSize
+            xy_tl = xy1 - self.StartMove
+            dc = wx.ClientDC(self.parent)
+            dc.BeginDrawing()
+            x1,y1 = self.PrevMoveXY
+            x2,y2 = xy_tl
+            w,h = self.parent.PanelSize
+            ##fixme: This sure could be cleaner!
+            if x2 > x1 and y2 > y1:
+                xa = xb = x1
+                ya = yb = y1
+                wa = w
+                ha = y2 - y1
+                wb = x2-  x1
+                hb = h
+            elif x2 > x1 and y2 <= y1:
+                xa = x1
+                ya = y1
+                wa = x2 - x1
+                ha = h
+                xb = x1
+                yb = y2 + h
+                wb = w
+                hb = y1 - y2
+            elif x2 <= x1 and y2 > y1:
+                xa = x1
+                ya = y1
+                wa = w
+                ha = y2 - y1
+                xb = x2 + w
+                yb = y1
+                wb = x1 - x2
+                hb = h - y2 + y1
+            elif x2 <= x1 and y2 <= y1:
+                xa = x2 + w
+                ya = y1
+                wa = x1 - x2
+                ha = h
+                xb = x1
+                yb = y2 + h
+                wb = w
+                hb = y1 - y2
+
+            dc.SetPen(wx.TRANSPARENT_PEN)
+            dc.SetBrush(self.parent.BackgroundBrush)
+            dc.DrawRectangle(xa, ya, wa, ha)
+            dc.DrawRectangle(xb, yb, wb, hb)
+            self.PrevMoveXY = xy_tl
+            if self.parent._ForeDrawList:
+                dc.DrawBitmapPoint(self.parent._ForegroundBuffer,xy_tl)
+            else:
+                dc.DrawBitmapPoint(self.parent._Buffer,xy_tl)
+            dc.EndDrawing()
+
+    def OnWheel(self, event):
+        """
+           By default, zoom in/out by a 0.1 factor per Wheel event.
+        """
+        if event.GetWheelRotation() < 0:
+            self.parent.Zoom(0.9)
+        else:
+            self.parent.Zoom(1.1)
+
+class GUIZoomIn(GUIBase):
+ 
+    Cursor = MagPlusCursor
+ 
+    def __init__(self, parent):
+        GUIBase.__init__(self, parent)
+        self.StartRBBox = None
+        self.PrevRBBox = None
+
+    def OnLeftDown(self, event):
+        self.StartRBBox = N.array( event.GetPosition() )
+        self.PrevRBBox = None
+        self.parent.CaptureMouse()
+
+    def OnLeftUp(self, event):
+        #if self.parent.HasCapture():
+        #        self.parent.ReleaseMouse()
+        if event.LeftUp() and not self.StartRBBox is None:
+            self.PrevRBBox = None
+            EndRBBox = event.GetPosition()
+            StartRBBox = self.StartRBBox
+            # if mouse has moved less that ten pixels, don't use the box.
+            if ( abs(StartRBBox[0] - EndRBBox[0]) > 10
+                    and abs(StartRBBox[1] - EndRBBox[1]) > 10 ):
+                EndRBBox = self.parent.PixelToWorld(EndRBBox)
+                StartRBBox = self.parent.PixelToWorld(StartRBBox)
+                BB = N.array(((min(EndRBBox[0],StartRBBox[0]),
+                                min(EndRBBox[1],StartRBBox[1])),
+                            (max(EndRBBox[0],StartRBBox[0]),
+                                max(EndRBBox[1],StartRBBox[1]))),N.float_)
+                self.parent.ZoomToBB(BB)
+            else:
+                Center = self.parent.PixelToWorld(StartRBBox)
+                self.parent.Zoom(1.5,Center)
+            self.StartRBBox = None
+
+    def OnMove(self, event):
+        # Allways raise the Move event.
+        self.parent._RaiseMouseEvent(event,FloatCanvas.EVT_FC_MOTION)
+        if event.Dragging() and event.LeftIsDown() and not (self.StartRBBox is None):
+            xy0 = self.StartRBBox
+            xy1 = N.array( event.GetPosition() )
+            wh  = abs(xy1 - xy0)
+            wh[0] = max(wh[0], int(wh[1]*self.parent.AspectRatio))
+            wh[1] = int(wh[0] / self.parent.AspectRatio)
+            xy_c = (xy0 + xy1) / 2
+            dc = wx.ClientDC(self.parent)
+            dc.BeginDrawing()
+            dc.SetPen(wx.Pen('WHITE', 2, wx.SHORT_DASH))
+            dc.SetBrush(wx.TRANSPARENT_BRUSH)
+            dc.SetLogicalFunction(wx.XOR)
+            if self.PrevRBBox:
+                dc.DrawRectanglePointSize(*self.PrevRBBox)
+            self.PrevRBBox = ( xy_c - wh/2, wh )
+            dc.DrawRectanglePointSize( *self.PrevRBBox )
+            dc.EndDrawing()
+            
+    def UpdateScreen(self):
+        """
+        Update gets called if the screen has been repainted in the middle of a zoom in
+        so the Rubber Band Box can get updated
+        """
+        if self.PrevRBBox is not None:
+            dc = wx.ClientDC(self.parent)
+            dc.SetPen(wx.Pen('WHITE', 2, wx.SHORT_DASH))
+            dc.SetBrush(wx.TRANSPARENT_BRUSH)
+            dc.SetLogicalFunction(wx.XOR)
+            dc.DrawRectanglePointSize(*self.PrevRBBox)
+
+    def OnRightDown(self, event):
+        self.parent.Zoom(1/1.5, event.GetPosition(), centerCoords="pixel")
+
+    def OnWheel(self, event):
+        if event.GetWheelRotation() < 0:
+            self.parent.Zoom(0.9)
+        else:
+            self.parent.Zoom(1.1)
+
+class GUIZoomOut(GUIBase):
+
+    Cursor = MagMinusCursor
+
+    def OnLeftDown(self, event):
+        self.parent.Zoom(1/1.5, event.GetPosition(), centerCoords="pixel")
+
+    def OnRightDown(self, event):
+        self.parent.Zoom(1.5, event.GetPosition(), centerCoords="pixel")
+
+    def OnWheel(self, event):
+        if event.GetWheelRotation() < 0:
+            self.parent.Zoom(0.9)
+        else:
+            self.parent.Zoom(1.1)
+
+    def OnMove(self, event):
+        # Allways raise the Move event.
+        self.parent._RaiseMouseEvent(event,FloatCanvas.EVT_FC_MOTION)
+
diff --git a/wxPython/wx/lib/floatcanvas/NavCanvas.py b/wxPython/wx/lib/floatcanvas/NavCanvas.py
index 1770a109e8..b2c6d67422 100644
--- a/wxPython/wx/lib/floatcanvas/NavCanvas.py
+++ b/wxPython/wx/lib/floatcanvas/NavCanvas.py
@@ -4,18 +4,9 @@ A Panel that includes the FloatCanvas and Navigation controls
 """
 
 import wx
-
 import FloatCanvas, Resources
 
-ID_ZOOM_IN_BUTTON = wx.NewId()
-ID_ZOOM_OUT_BUTTON = wx.NewId()
-ID_ZOOM_TO_FIT_BUTTON = wx.NewId()
-ID_MOVE_MODE_BUTTON = wx.NewId()
-ID_POINTER_BUTTON = wx.NewId()
 
-
-#---------------------------------------------------------------------------
-    
 class NavCanvas(wx.Panel):
     """
     NavCanvas.py
@@ -23,96 +14,80 @@ class NavCanvas(wx.Panel):
     This is a high level window that encloses the FloatCanvas in a panel
     and adds a Navigation toolbar.
 
-    Copyright: Christopher Barker)
+    """
 
-    License: Same as the version of wxPython you are using it with
-
-    Please let me know if you're using this!!!
-
-    Contact me at:
-
-    Chris.Barker@noaa.gov
-
-    """ 
-    
-    def __init__(self, parent, id = -1,
-                 size = wx.DefaultSize,
-                 **kwargs): # The rest just get passed into FloatCanvas
-
-        wx.Panel.__init__( self, parent, id, wx.DefaultPosition, size)
+    def __init__(self,
+                   parent,
+                   id = wx.ID_ANY,
+                   size = wx.DefaultSize,
+                   **kwargs): # The rest just get passed into FloatCanvas
+        wx.Panel.__init__(self, parent, id, size=size)
 
+        self.BuildToolbar()
         ## Create the vertical sizer for the toolbar and Panel
         box = wx.BoxSizer(wx.VERTICAL)
-        box.Add(self.BuildToolbar(), 0, wx.ALL | wx.ALIGN_LEFT | wx.GROW, 4)
-        
-        self.Canvas = FloatCanvas.FloatCanvas( self, wx.NewId(),
-                                   size = wx.DefaultSize,
-                                   **kwargs)
-        box.Add(self.Canvas,1,wx.GROW)
+        box.Add(self.ToolBar, 0, wx.ALL | wx.ALIGN_LEFT | wx.GROW, 4)
 
-        box.Fit(self)
-        self.SetSizer(box)
+        self.Canvas = FloatCanvas.FloatCanvas(self, **kwargs)
+        box.Add(self.Canvas, 1, wx.GROW)
+
+        self.SetSizerAndFit(box)
+
+
+        import GUIMode # here so that it doesn't get imported before wx.App()
+        self.GUIZoomIn  =  GUIMode.GUIZoomIn(self.Canvas)
+        self.GUIZoomOut =  GUIMode.GUIZoomOut(self.Canvas)
+        self.GUIMove    =  GUIMode.GUIMove(self.Canvas)
+        self.GUIMouse   =  GUIMode.GUIMouse(self.Canvas)
 
         # default to Mouse mode
-        self.ToolBar.ToggleTool(ID_POINTER_BUTTON,1)
-        self.Canvas.SetMode("Mouse")
-        
+        self.ToolBar.ToggleTool(self.PointerTool.GetId(), True)
+        self.Canvas.SetMode(self.GUIMouse)
+
         return None
 
-    def __getattr__(self, name):
-        """
-        Delegate all extra methods to the Canvas
-        """
-        attrib = getattr(self.Canvas, name)
-        ## add the attribute to this module's dict for future calls
-        self.__dict__[name] = attrib
-        return attrib
-
     def BuildToolbar(self):
-        tb = wx.ToolBar(self,-1)
+        tb = wx.ToolBar(self)
         self.ToolBar = tb
-        
         tb.SetToolBitmapSize((24,24))
-        
-        tb.AddTool(ID_POINTER_BUTTON, Resources.getPointerBitmap(), isToggle=True, shortHelpString = "Pointer")
-        wx.EVT_TOOL(self, ID_POINTER_BUTTON, self.SetToolMode)
 
-        tb.AddTool(ID_ZOOM_IN_BUTTON, Resources.getMagPlusBitmap(), isToggle=True, shortHelpString = "Zoom In")
-        wx.EVT_TOOL(self, ID_ZOOM_IN_BUTTON, self.SetToolMode)
-        
-        tb.AddTool(ID_ZOOM_OUT_BUTTON, Resources.getMagMinusBitmap(), isToggle=True, shortHelpString = "Zoom Out")
-        wx.EVT_TOOL(self, ID_ZOOM_OUT_BUTTON, self.SetToolMode)
-        
-        tb.AddTool(ID_MOVE_MODE_BUTTON, Resources.getHandBitmap(), isToggle=True, shortHelpString = "Move")
-        wx.EVT_TOOL(self, ID_MOVE_MODE_BUTTON, self.SetToolMode)
-        
+        self.PointerTool = tb.AddRadioTool(wx.ID_ANY, bitmap=Resources.getPointerBitmap(), shortHelp = "Pointer")
+        self.Bind(wx.EVT_TOOL, lambda evt : self.SetMode(Mode=self.GUIMouse), self.PointerTool)
+
+        self.ZoomInTool = tb.AddRadioTool(wx.ID_ANY, bitmap=Resources.getMagPlusBitmap(), shortHelp = "Zoom In")
+        self.Bind(wx.EVT_TOOL, lambda evt : self.SetMode(Mode=self.GUIZoomIn), self.ZoomInTool)
+    
+        self.ZoomOutTool = tb.AddRadioTool(wx.ID_ANY, bitmap=Resources.getMagMinusBitmap(), shortHelp = "Zoom Out")
+        self.Bind(wx.EVT_TOOL, lambda evt : self.SetMode(Mode=self.GUIZoomOut), self.ZoomOutTool)
+
+        self.MoveTool = tb.AddRadioTool(wx.ID_ANY, bitmap=Resources.getHandBitmap(), shortHelp = "Move")
+        self.Bind(wx.EVT_TOOL, lambda evt : self.SetMode(Mode=self.GUIMove), self.MoveTool)
+
         tb.AddSeparator()
-        
-        tb.AddControl(wx.Button(tb, ID_ZOOM_TO_FIT_BUTTON, "Zoom To Fit",wx.DefaultPosition, wx.DefaultSize))
-        wx.EVT_BUTTON(self, ID_ZOOM_TO_FIT_BUTTON, self.ZoomToFit)
+
+        self.ZoomButton = wx.Button(tb, label="Zoom To Fit")
+        tb.AddControl(self.ZoomButton)
+        self.ZoomButton.Bind(wx.EVT_BUTTON, self.ZoomToFit)
 
         tb.Realize()
-        S = tb.GetSize()
-        tb.SetSizeHints(S[0],S[1])
+        ## fixme: remove this when the bug is fixed!
+        wx.CallAfter(self.HideShowHack) # this required on wxPython 2.8.3 on OS-X
+
         return tb
 
-    def SetToolMode(self,event):
-        for id in [ID_ZOOM_IN_BUTTON,
-                   ID_ZOOM_OUT_BUTTON,
-                   ID_MOVE_MODE_BUTTON,
-                   ID_POINTER_BUTTON]:
-            self.ToolBar.ToggleTool(id,0)
-        self.ToolBar.ToggleTool(event.GetId(),1)
-        if event.GetId() == ID_ZOOM_IN_BUTTON:
-            self.Canvas.SetMode("ZoomIn")
-        elif event.GetId() == ID_ZOOM_OUT_BUTTON:
-            self.Canvas.SetMode("ZoomOut")
-        elif event.GetId() == ID_MOVE_MODE_BUTTON:
-            self.Canvas.SetMode("Move")
-        elif event.GetId() == ID_POINTER_BUTTON:
-            self.Canvas.SetMode("Mouse")
+    def HideShowHack(self):
+        ##fixme: remove this when the bug is fixed!
+        """
+        Hack to hide and show button on toolbar to get around OS-X bug on
+        wxPython2.8 on OS-X
+        """
+        self.ZoomButton.Hide()
+        self.ZoomButton.Show()
 
+    def SetMode(self, Mode):
+        self.Canvas.SetMode(Mode)
 
     def ZoomToFit(self,Event):
         self.Canvas.ZoomToBB()
+        self.Canvas.SetFocus() # Otherwise the focus stays on the Button, and wheel events are lost.
 
diff --git a/wxPython/wx/lib/floatcanvas/Utilities/BBox.py b/wxPython/wx/lib/floatcanvas/Utilities/BBox.py
new file mode 100644
index 0000000000..281553112d
--- /dev/null
+++ b/wxPython/wx/lib/floatcanvas/Utilities/BBox.py
@@ -0,0 +1,170 @@
+"""
+A Bounding Box object and assorted utilities , subclassed from a numpy array
+
+"""
+
+import numpy as N
+
+class BBox(N.ndarray):
+    """
+    A Bounding Box object:
+    
+    Takes Data as an array. Data is any python sequence that can be turned into a 
+    2x2 numpy array of floats:
+
+    [[MinX, MinY ],
+     [MaxX, MaxY ]]
+
+    It is a subclass of numpy.ndarray, so for the most part it can be used as 
+    an array, and arrays that fit the above description can be used in its place.
+    
+    Usually created by the factory functions:
+    
+        asBBox
+        
+        and 
+        
+        fromPoints
+    
+    """
+    def __new__(subtype, data):
+        """
+        Takes Data as an array. Data is any python sequence that can be turned into a 
+        2x2 numpy array of floats:
+
+        [[MinX, MinY ],
+        [MaxX, MaxY ]]
+
+        You don't usually call this directly. BBox objects are created with the factory functions:
+        
+        asBBox
+        
+        and 
+        
+        fromPoints
+
+        """
+        arr = N.array(data, N.float)
+        arr.shape = (2,2)
+        if arr[0,0] > arr[1,0] or arr[0,1] > arr[1,1]:
+            # note: zero sized BB OK.
+            raise ValueError("BBox values not aligned: \n minimum values must be less that maximum values")
+        return N.ndarray.__new__(BBox, shape=arr.shape, dtype=arr.dtype, buffer=arr)
+
+    def Overlaps(self, BB):
+        """
+        Overlap(BB):
+
+        Tests if the given Bounding Box overlaps with this one.
+        Returns True is the Bounding boxes overlap, False otherwise
+        If they are just touching, returns True
+        """
+
+        if ( (self[1,0] >= BB[0,0]) and (self[0,0] <= BB[1,0]) and
+             (self[1,1] >= BB[0,1]) and (self[0,1] <= BB[1,1]) ):
+            return True
+        else:
+            return False
+
+    def Inside(self, BB):
+        """
+        Inside(BB):
+
+        Tests if the given Bounding Box is entirely inside this one.
+
+        Returns True if it is entirely inside, or touching the
+        border.
+
+        Returns False otherwise
+        """
+        if ( (BB[0,0] >= self[0,0]) and (BB[1,0] <= self[1,0]) and
+             (BB[0,1] >= self[0,1]) and (BB[1,1] <= self[1,1]) ):
+            return True
+        else:
+            return False
+    
+    def Merge(self, BB):
+        """
+        Joins this bounding box with the one passed in, maybe making this one bigger
+
+        """ 
+
+        if BB[0,0] < self[0,0]: self[0,0] = BB[0,0]
+        if BB[0,1] < self[0,1]: self[0,1] = BB[0,1]
+        if BB[1,0] > self[1,0]: self[1,0] = BB[1,0]
+        if BB[1,1] > self[1,1]: self[1,1] = BB[1,1]
+    
+    ### This could be used for a make BB from a bunch of BBs
+
+    #~ def _getboundingbox(bboxarray): # lrk: added this
+        #~ # returns the bounding box of a bunch of bounding boxes
+        #~ upperleft = N.minimum.reduce(bboxarray[:,0])
+        #~ lowerright = N.maximum.reduce(bboxarray[:,1])
+        #~ return N.array((upperleft, lowerright), N.float)
+    #~ _getboundingbox = staticmethod(_getboundingbox)
+
+
+    ## Save the ndarray __eq__ for internal use.
+    Array__eq__ = N.ndarray.__eq__
+    def __eq__(self, BB):
+        """
+        __eq__(BB) The equality operator
+
+        A == B if and only if all the entries are the same
+
+        """
+        return N.all(self.Array__eq__(BB))
+        
+
+def asBBox(data):
+    """
+    returns a BBox object.
+
+    If object is a BBox, it is returned unaltered
+
+    If object is a numpy array, a BBox object is returned that shares a
+    view of the data with that array
+
+    """
+
+    if isinstance(data, BBox):
+        return data
+    arr = N.asarray(data, N.float)
+    return N.ndarray.__new__(BBox, shape=arr.shape, dtype=arr.dtype, buffer=arr)
+
+def fromPoints(Points):
+    """
+    fromPoints (Points).
+
+    reruns the bounding box of the set of points in Points. Points can
+    be any python object that can be turned into a numpy NX2 array of Floats.
+
+    If a single point is passed in, a zero-size Bounding Box is returned.
+    
+    """
+    Points = N.asarray(Points, N.float).reshape(-1,2)
+
+    arr = N.vstack( (Points.min(0), Points.max(0)) )
+    return N.ndarray.__new__(BBox, shape=arr.shape, dtype=arr.dtype, buffer=arr)
+
+def fromBBArray(BBarray):
+   """
+   Builds a BBox object from an array of Bounding Boxes. 
+   The resulting Bounding Box encompases all the included BBs.
+   
+   The BBarray is in the shape: (Nx2x2) where BBarray[n] is a 2x2 array that represents a BBox
+   """
+   
+   #upperleft = N.minimum.reduce(BBarray[:,0])
+   #lowerright = N.maximum.reduce(BBarray[:,1])
+
+#   BBarray = N.asarray(BBarray, N.float).reshape(-1,2)
+#   arr = N.vstack( (BBarray.min(0), BBarray.max(0)) )
+   BBarray = N.asarray(BBarray, N.float).reshape(-1,2,2)
+   arr = N.vstack( (BBarray[:,0,:].min(0), BBarray[:,1,:].max(0)) )
+   return asBBox(arr)
+   #return asBBox( (upperleft, lowerright) ) * 2
+   
+   
+   
+   
diff --git a/wxPython/wx/lib/floatcanvas/Utilities/BBoxTest.py b/wxPython/wx/lib/floatcanvas/Utilities/BBoxTest.py
new file mode 100644
index 0000000000..3cca2e95f9
--- /dev/null
+++ b/wxPython/wx/lib/floatcanvas/Utilities/BBoxTest.py
@@ -0,0 +1,354 @@
+
+"""
+Test code for the BBox Object
+
+"""
+
+import unittest
+
+from BBox import *
+
+class testCreator(unittest.TestCase):
+    def testCreates(self):
+        B = BBox(((0,0),(5,5)))
+        self.failUnless(isinstance(B, BBox))
+
+    def testType(self):
+        B = N.array(((0,0),(5,5)))
+        self.failIf(isinstance(B, BBox))
+
+    def testDataType(self):
+        B = BBox(((0,0),(5,5)))
+        self.failUnless(B.dtype == N.float)
+
+    def testShape(self):
+        B = BBox((0,0,5,5))
+        self.failUnless(B.shape == (2,2))
+        
+    def testShape2(self):
+        self.failUnlessRaises(ValueError, BBox, (0,0,5) )
+        
+    def testShape3(self):
+        self.failUnlessRaises(ValueError, BBox, (0,0,5,6,7) )
+
+    def testArrayConstruction(self):
+        A = N.array(((4,5),(10,12)), N.float_)
+        B = BBox(A)
+        self.failUnless(isinstance(B, BBox))
+        
+    def testMinMax(self):
+        self.failUnlessRaises(ValueError, BBox, (0,0,-1,6) )
+
+    def testMinMax2(self):
+        self.failUnlessRaises(ValueError, BBox, (0,0,1,-6) )
+
+    def testMinMax(self):
+        # OK to have a zero-sized BB
+        B = BBox(((0,0),(0,5)))
+        self.failUnless(isinstance(B, BBox))
+
+    def testMinMax2(self):
+        # OK to have a zero-sized BB
+        B = BBox(((10.0,-34),(10.0,-34.0)))
+        self.failUnless(isinstance(B, BBox))
+
+    def testMinMax3(self):
+        # OK to have a tiny BB
+        B = BBox(((0,0),(1e-20,5)))
+        self.failUnless(isinstance(B, BBox))
+
+    def testMinMax4(self):
+        # Should catch tiny difference
+        self.failUnlessRaises(ValueError, BBox, ((0,0), (-1e-20,5)) )
+
+class testAsBBox(unittest.TestCase):
+
+    def testPassThrough(self):
+        B = BBox(((0,0),(5,5)))
+        C = asBBox(B)
+        self.failUnless(B is C)
+
+    def testPassThrough2(self):
+        B = (((0,0),(5,5)))
+        C = asBBox(B)
+        self.failIf(B is C)
+    
+    def testPassArray(self):
+        # Different data type
+        A = N.array( (((0,0),(5,5))) )
+        C = asBBox(A)
+        self.failIf(A is C)
+    
+    def testPassArray2(self):
+        # same data type -- should be a view
+        A = N.array( (((0,0),(5,5))), N.float_ )
+        C = asBBox(A)
+        A[0,0] = -10
+        self.failUnless(C[0,0] == A[0,0])
+    
+class testIntersect(unittest.TestCase):
+
+    def testSame(self):
+        B = BBox(((-23.5, 456),(56, 532.0)))
+        C = BBox(((-23.5, 456),(56, 532.0)))
+        self.failUnless(B.Overlaps(C) )
+    
+    def testUpperLeft(self):
+        B = BBox( ( (5, 10),(15, 25) ) )
+        C = BBox( ( (0, 12),(10, 32.0) ) )
+        self.failUnless(B.Overlaps(C) )
+    
+    def testUpperRight(self):
+        B = BBox( ( (5, 10),(15, 25) ) )
+        C = BBox( ( (12, 12),(25, 32.0) ) )
+        self.failUnless(B.Overlaps(C) )
+    
+    def testLowerRight(self):
+        B = BBox( ( (5, 10),(15, 25) ) )
+        C = BBox( ( (12, 5),(25, 15) ) )
+        self.failUnless(B.Overlaps(C) )
+    
+    def testLowerLeft(self):
+        B = BBox( ( (5, 10),(15, 25) ) )
+        C = BBox( ( (-10, 5),(8.5, 15) ) )
+        self.failUnless(B.Overlaps(C) )
+        
+    def testBelow(self):
+        B = BBox( ( (5, 10),(15, 25) ) )
+        C = BBox( ( (-10, 5),(8.5, 9.2) ) )
+        self.failIf(B.Overlaps(C) )
+        
+    def testAbove(self):
+        B = BBox( ( (5, 10),(15, 25) ) )
+        C = BBox( ( (-10, 25.001),(8.5, 32) ) )
+        self.failIf(B.Overlaps(C) )
+        
+    def testLeft(self):
+        B = BBox( ( (5, 10),(15, 25) ) )
+        C = BBox( ( (4, 8),(4.95, 32) ) )
+        self.failIf(B.Overlaps(C) )
+        
+    def testRight(self):
+        B = BBox( ( (5, 10),(15, 25) ) )
+        C = BBox( ( (17.1, 8),(17.95, 32) ) )
+        self.failIf(B.Overlaps(C) )
+
+    def testInside(self):
+        B = BBox( ( (-15, -25),(-5, -10) ) )
+        C = BBox( ( (-12, -22), (-6, -8) ) )
+        self.failUnless(B.Overlaps(C) )
+        
+    def testOutside(self):
+        B = BBox( ( (-15, -25),(-5, -10) ) )
+        C = BBox( ( (-17, -26), (3, 0) ) )
+        self.failUnless(B.Overlaps(C) )
+    
+    def testTouch(self):
+        B = BBox( ( (5, 10),(15, 25) ) )
+        C = BBox( ( (15, 8),(17.95, 32) ) )
+        self.failUnless(B.Overlaps(C) )
+        
+    def testCorner(self):
+        B = BBox( ( (5, 10),(15, 25) ) )
+        C = BBox( ( (15, 25),(17.95, 32) ) )
+        self.failUnless(B.Overlaps(C) )
+        
+    def testZeroSize(self):
+        B = BBox( ( (5, 10),(15, 25) ) )
+        C = BBox( ( (15, 25),(15, 25) ) )
+        self.failUnless(B.Overlaps(C) )
+        
+    def testZeroSize2(self):
+        B = BBox( ( (5, 10),(5, 10) ) )
+        C = BBox( ( (15, 25),(15, 25) ) )
+        self.failIf(B.Overlaps(C) )
+        
+    def testZeroSize3(self):
+        B = BBox( ( (5, 10),(5, 10) ) )
+        C = BBox( ( (0, 8),(10, 12) ) )
+        self.failUnless(B.Overlaps(C) )
+
+    def testZeroSize4(self):
+        B = BBox( ( (5, 1),(10, 25) ) )
+        C = BBox( ( (8, 8),(8, 8) ) )
+        self.failUnless(B.Overlaps(C) )
+
+
+
+class testEquality(unittest.TestCase):
+    def testSame(self):
+        B = BBox( ( (1.0, 2.0), (5.0, 10.0) ) )
+        C = BBox( ( (1.0, 2.0), (5.0, 10.0) ) )
+        self.failUnless(B == C)
+        
+    def testIdentical(self):
+        B = BBox( ( (1.0, 2.0), (5.0, 10.0) ) )
+        self.failUnless(B == B)
+        
+    def testNotSame(self):
+        B = BBox( ( (1.0, 2.0), (5.0, 10.0) ) )
+        C = BBox( ( (1.0, 2.0), (5.0, 10.1) ) )
+        self.failIf(B == C)
+        
+    def testWithArray(self):
+        B = BBox( ( (1.0, 2.0), (5.0, 10.0) ) )
+        C = N.array( ( (1.0, 2.0), (5.0, 10.0) ) )
+        self.failUnless(B == C)
+        
+    def testWithArray2(self):
+        B = BBox( ( (1.0, 2.0), (5.0, 10.0) ) )
+        C = N.array( ( (1.0, 2.0), (5.0, 10.0) ) )
+        self.failUnless(C == B)
+        
+    def testWithArray2(self):
+        B = BBox( ( (1.0, 2.0), (5.0, 10.0) ) )
+        C = N.array( ( (1.01, 2.0), (5.0, 10.0) ) )
+        self.failIf(C == B)
+        
+class testInside(unittest.TestCase):
+    def testSame(self):
+        B = BBox( ( (1.0, 2.0), (5.0, 10.0) ) )
+        C = BBox( ( (1.0, 2.0), (5.0, 10.0) ) )
+        self.failUnless(B.Inside(C))
+
+    def testPoint(self):
+        B = BBox( ( (1.0, 2.0), (5.0, 10.0) ) )
+        C = BBox( ( (3.0, 4.0), (3.0, 4.0) ) )
+        self.failUnless(B.Inside(C))
+
+    def testPointOutside(self):
+        B = BBox( ( (1.0, 2.0), (5.0, 10.0) ) )
+        C = BBox( ( (-3.0, 4.0), (0.10, 4.0) ) )
+        self.failIf(B.Inside(C))
+
+    def testUpperLeft(self):
+        B = BBox( ( (5, 10),(15, 25) ) )
+        C = BBox( ( (0, 12),(10, 32.0) ) )
+        self.failIf(B.Inside(C) )
+    
+    def testUpperRight(self):
+        B = BBox( ( (5, 10),(15, 25) ) )
+        C = BBox( ( (12, 12),(25, 32.0) ) )
+        self.failIf(B.Inside(C) )
+    
+    def testLowerRight(self):
+        B = BBox( ( (5, 10),(15, 25) ) )
+        C = BBox( ( (12, 5),(25, 15) ) )
+        self.failIf(B.Inside(C) )
+    
+    def testLowerLeft(self):
+        B = BBox( ( (5, 10),(15, 25) ) )
+        C = BBox( ( (-10, 5),(8.5, 15) ) )
+        self.failIf(B.Inside(C) )
+        
+    def testBelow(self):
+        B = BBox( ( (5, 10),(15, 25) ) )
+        C = BBox( ( (-10, 5),(8.5, 9.2) ) )
+        self.failIf(B.Inside(C) )
+        
+    def testAbove(self):
+        B = BBox( ( (5, 10),(15, 25) ) )
+        C = BBox( ( (-10, 25.001),(8.5, 32) ) )
+        self.failIf(B.Inside(C) )
+        
+    def testLeft(self):
+        B = BBox( ( (5, 10),(15, 25) ) )
+        C = BBox( ( (4, 8),(4.95, 32) ) )
+        self.failIf(B.Inside(C) )
+        
+    def testRight(self):
+        B = BBox( ( (5, 10),(15, 25) ) )
+        C = BBox( ( (17.1, 8),(17.95, 32) ) )
+        self.failIf(B.Inside(C) )
+
+class testFromPoints(unittest.TestCase):
+
+    def testCreate(self):
+        Pts = N.array( ((5,2),
+                (3,4),
+                (1,6),
+                ), N.float_ )
+        B = fromPoints(Pts)
+        #B = BBox( ( (1.0, 2.0), (5.0, 10.0) ) )
+        self.failUnless(B[0,0] == 1.0 and
+                        B[0,1] == 2.0 and
+                        B[1,0] == 5.0 and
+                        B[1,1] == 6.0
+                        )
+    def testCreateInts(self):
+        Pts = N.array( ((5,2),
+                (3,4),
+                (1,6),
+                ) )
+        B = fromPoints(Pts)
+        self.failUnless(B[0,0] == 1.0 and
+                        B[0,1] == 2.0 and
+                        B[1,0] == 5.0 and
+                        B[1,1] == 6.0
+                        )
+
+    def testSinglePoint(self):
+        Pts = N.array( (5,2), N.float_ )
+        B = fromPoints(Pts)
+        self.failUnless(B[0,0] == 5.0 and
+                        B[0,1] == 2.0 and
+                        B[1,0] == 5.0 and
+                        B[1,1] == 2.0
+                        )
+
+    def testListTuples(self):
+        Pts = [ (3, 6.5),
+                (13, 43.2),
+                (-4.32, -4),
+                (65, -23),
+                (-0.0001, 23.432),
+                ]
+        B = fromPoints(Pts)       
+        self.failUnless(B[0,0] == -4.32 and
+                        B[0,1] == -23.0 and
+                        B[1,0] == 65.0 and
+                        B[1,1] == 43.2
+                        )
+class testMerge(unittest.TestCase):
+    A = BBox( ((-23.5, 456), (56, 532.0)) )
+    B = BBox( ((-20.3, 460), (54, 465  )) )# B should be completely inside A
+    C = BBox( ((-23.5, 456), (58, 540.0)) )# up and to the right or A
+    D = BBox( ((-26.5, 12), (56, 532.0)) )
+
+    def testInside(self):
+        C = self.A.copy()
+        C.Merge(self.B)
+        self.failUnless(C == self.A)
+
+    def testFullOutside(self):
+        C = self.B.copy()
+        C.Merge(self.A)
+        self.failUnless(C == self.A)
+
+    def testUpRight(self):
+        A = self.A.copy()
+        A.Merge(self.C)
+        self.failUnless(A[0] == self.A[0] and A[1] == self.C[1])
+
+    def testDownLeft(self):
+        A = self.A.copy()
+        A.Merge(self.D)
+        self.failUnless(A[0] == self.D[0] and A[1] == self.A[1])
+
+class testBBarray(unittest.TestCase):
+    BBarray = N.array( ( ((-23.5, 456), (56, 532.0)),
+                         ((-20.3, 460), (54, 465  )),
+                         ((-23.5, 456), (58, 540.0)),
+                         ((-26.5,  12), (56, 532.0)),
+                       ),
+                       dtype=N.float)
+    print BBarray
+    BB = asBBox( ((-26.5,  12.), ( 58. , 540.)) )
+
+    def testJoin(self):
+        BB = fromBBArray(self.BBarray)
+        self.failUnless(BB == self.BB, "Wrong BB was created. It was:\n%s \nit should have been:\n%s"%(BB, self.BB))
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/wxPython/wx/lib/floatcanvas/Utilities/GUI.py b/wxPython/wx/lib/floatcanvas/Utilities/GUI.py
new file mode 100644
index 0000000000..5cf11fd8cf
--- /dev/null
+++ b/wxPython/wx/lib/floatcanvas/Utilities/GUI.py
@@ -0,0 +1,115 @@
+"""
+
+Part of the floatcanvas.Utilities package.
+
+This module contains assorted GUI-related utilities that can be used
+with FloatCanvas
+
+So far, they are:
+
+RubberBandBox: used to draw a RubberBand Box on the screen
+
+"""
+import wx
+from floatcanvas import FloatCanvas
+
+class RubberBandBox:
+    """
+    Class to provide a rubber band box that can be drawn on a Window
+
+    """
+
+    def __init__(self, Canvas, CallBack, Tol=5):
+
+        """
+        To initialize:
+        
+        RubberBandBox(Canvas, CallBack)
+
+        Canvas:  the FloatCanvas you want the Rubber band box to be used on
+
+        CallBack: is the method you want called when the mouse is
+                  released. That method will be called, passing in a rect
+                  parameter, where rect is: (Point, WH) of the rect in
+                  world coords.
+
+        Tol: The tolerance for the smallest rectangle allowed. defaults
+             to 5. In pixels
+
+        Methods:
+        
+        Enable() : Enables the Rubber Band Box (Binds the events)
+        
+        Disable() : Enables the Rubber Band Box (Unbinds the events)
+
+        Attributes:
+
+        CallBack: The callback function, if it's replaced you need to
+                  call Enable() again.
+                  
+        """
+
+        self.Canvas = Canvas
+        self.CallBack = CallBack
+        self.Tol = Tol
+        
+        self.Drawing = False
+        self.RBRect = None
+        self.StartPointWorld = None
+
+        return None
+
+    def Enable(self):
+        """
+        Called when you want the rubber band box to be enabled
+
+        """
+
+        # bind events:
+        self.Canvas.Bind(FloatCanvas.EVT_MOTION, self.OnMove ) 
+        self.Canvas.Bind(FloatCanvas.EVT_LEFT_DOWN, self.OnLeftDown)
+        self.Canvas.Bind(FloatCanvas.EVT_LEFT_UP, self.OnLeftUp ) 
+
+    def Disable(self):
+        """
+        Called when you don't want the rubber band box to be enabled
+
+        """
+
+        # unbind events:
+        self.Canvas.Unbind(FloatCanvas.EVT_MOTION)
+        self.Canvas.Unbind(FloatCanvas.EVT_LEFT_DOWN)
+        self.Canvas.Unbind(FloatCanvas.EVT_LEFT_UP)
+
+    def OnMove(self, event):
+        if self.Drawing:
+            x, y = self.StartPoint
+            Cornerx, Cornery = event.GetPosition()
+            w, h = ( Cornerx - x, Cornery - y)
+            if abs(w) > self.Tol and abs(h) > self.Tol:
+                # draw the RB box
+                dc = wx.ClientDC(self.Canvas)
+                dc.SetPen(wx.Pen('WHITE', 2, wx.SHORT_DASH))
+                dc.SetBrush(wx.TRANSPARENT_BRUSH)
+                dc.SetLogicalFunction(wx.XOR)
+                if self.RBRect:
+                    dc.DrawRectangle(*self.RBRect)
+                self.RBRect = (x, y, w, h )
+                dc.DrawRectangle(*self.RBRect)
+        event.Skip() # skip so that other events can catch these
+
+    def OnLeftDown(self, event):
+        # Start drawing
+        self.Drawing = True
+        self.StartPoint = event.GetPosition()
+        self.StartPointWorld = event.Coords
+    
+    def OnLeftUp(self, event):
+        # Stop Drawing
+        if self.Drawing:
+            self.Drawing = False
+            if self.RBRect:
+                WH = event.Coords - self.StartPointWorld
+                wx.CallAfter(self.CallBack, (self.StartPointWorld, WH))
+        self.RBRect = None
+        self.StartPointWorld = None
diff --git a/wxPython/wx/lib/floatcanvas/Utilities/__init__.py b/wxPython/wx/lib/floatcanvas/Utilities/__init__.py
new file mode 100644
index 0000000000..b3162b3577
--- /dev/null
+++ b/wxPython/wx/lib/floatcanvas/Utilities/__init__.py
@@ -0,0 +1,7 @@
+"""
+__init__ for the floatcanvas Utilities package
+
+"""
+pass
+
+
diff --git a/wxPython/wx/lib/floatcanvas/__init__.py b/wxPython/wx/lib/floatcanvas/__init__.py
index 1c7f9a6d3c..a5cf07264e 100644
--- a/wxPython/wx/lib/floatcanvas/__init__.py
+++ b/wxPython/wx/lib/floatcanvas/__init__.py
@@ -29,8 +29,7 @@ It is double buffered, so re-draws after the window is uncovered by
 something else are very quick.
 
 It relies on NumPy, which is needed for speed (maybe, I haven't profiled
-it). It will also use numarray, if you don't have Numeric, but it is
-slower.
+properly) and convenience. 
 
 Bugs and Limitations: Lots: patches, fixes welcome
 
@@ -93,6 +92,6 @@ Chris.Barker@noaa.gov
 
 """
 
-__version__ = "0.9.10"
+__version__ = "0.9.18a"
 
 
diff --git a/wxPython/wx/lib/mixins/inspect.py b/wxPython/wx/lib/inspection.py
similarity index 79%
rename from wxPython/wx/lib/mixins/inspect.py
rename to wxPython/wx/lib/inspection.py
index ba43aab498..38137ea606 100644
--- a/wxPython/wx/lib/mixins/inspect.py
+++ b/wxPython/wx/lib/inspection.py
@@ -1,98 +1,114 @@
 #----------------------------------------------------------------------------
-# Name:        wx.lib.mixins.inspect
-# Purpose:     A mix-in class that can add PyCrust-based inspection of the
-#              app's widgets and sizers.
+# Name:        wx.lib.inspection
+# Purpose:     A widget inspection tool that allows easy introspection of
+#              all the live widgets and sizers in an application.
 #
 # Author:      Robin Dunn
 #
-# Created:     21-Nov-2006
+# Created:     26-Jan-2007
 # RCS-ID:      $Id$
-# Copyright:   (c) 2006 by Total Control Software
+# Copyright:   (c) 2007 by Total Control Software
 # Licence:     wxWindows license
 #----------------------------------------------------------------------------
 
 # NOTE: This class was originally based on ideas sent to the
-# wxPython-users mail list by Dan Eloff.
+# wxPython-users mail list by Dan Eloff.  See also
+# wx.lib.mixins.inspect for a class that can be mixed-in with wx.App
+# to provide Hot-Key access to the inspection tool.
 
 import wx
 import wx.py
 import wx.stc
+import wx.aui
 import sys
 
+#----------------------------------------------------------------------------
 
-class InspectionMixin(object):
+class InspectionTool:
+    """
+    The InspectionTool is a singleton that manages creating and
+    showing an InspectionFrame.
     """
-    This class is intended to be used as a mix-in with the wx.App
-    class.  When used it will add the ability to popup a
-    InspectionFrame window where the widget under the mouse cursor
-    will be selected in the tree and loaded into the shell's namespace
-    as 'obj'.  The default key sequence to activate the inspector is
-    Ctrl-Alt-I (or Cmd-Alt-I on Mac) but this can be changed via
-    parameters to the `Init` method, or the application can call
-    `ShowInspectionTool` from other event handlers if desired.
 
-    To use this class simply derive a class from wx.App and
-    InspectionMixin and then call the `Init` method from the app's
-    OnInit.
-    """
-    def Init(self, pos=(-1, -1), size=(850,700), config=None, locals=None,
-             alt=True, cmd=True, shift=False, keyCode=ord('I')):
+    # Note: This is the Borg design pattern which ensures that all
+    # instances of this class are actually using the same set of
+    # instance data.  See
+    # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/66531
+    __shared_state = {}
+    def __init__(self):
+        self.__dict__ = self.__shared_state
+        if not hasattr(self, 'initialized'):
+            self.initialized = False
+
+    def Init(self, pos=wx.DefaultPosition, size=wx.Size(850,700),
+             config=None, locals=None, app=None):
         """
-        Make the event binding that will activate the InspectionFrame window.
+        Init is used to set some parameters that will be used later
+        when the inspection tool is shown.  Suitable defaults will be
+        used for all of these parameters if they are not provided.
+
+        :param pos:   The default position to show the frame at
+        :param size:  The default size of the frame
+        :param config: A wx.Config object to be used to store layout
+            and other info to when the inspection frame is closed.
+            This info will be restored the next time the inspection
+            frame is used.
+        :param locals: A dictionary of names to be added to the PyCrust
+            namespace.
+        :param app:  A reference to the wx.App object.
         """
-        self.Bind(wx.EVT_KEY_DOWN, self._OnKeyPress)
-        self._tool = None
+        self._frame = None
         self._pos = pos
         self._size = size
         self._config = config
         self._locals = locals
-        self._alt = alt
-        self._cmd = cmd
-        self._shift = shift
-        self._keyCode = keyCode
-
-
-    def _OnKeyPress(self, evt):
+        self._app = app
+        if not self._app:
+            self._app = wx.GetApp()
+        self.initialized = True
+            
+        
+    def Show(self, selectObj=None, refreshTree=False):
         """
-        Event handler, check for our hot-key.  Normally it is
-        Ctrl-Alt-I but that can be changed by what is passed to the
-        Init method.
+        Creates the inspection frame if it hasn't been already, and
+        raises it if neccessary.  Pass a widget or sizer in selectObj
+        to have that object be preselected in widget tree.  If
+        refreshTree is True then the widget tree will be rebuilt,
+        otherwise if the tree has already been built it will be left
+        alone.
         """
-        if evt.AltDown() == self._alt  and \
-               evt.CmdDown() == self._cmd and \
-               evt.ShiftDown() == self._shift and \
-               evt.GetKeyCode() == self._keyCode:
-            self.ShowInspectionTool()
-        else:
-            evt.Skip()
+        if not self.initialized:
+            self.Init()
 
+        parent = self._app.GetTopWindow()
+        if not selectObj:
+            selectObj = parent
+        if not self._frame:
+            self._frame = InspectionFrame( parent=parent,
+                                           pos=self._pos,
+                                           size=self._size,
+                                           config=self._config,
+                                           locals=self._locals,
+                                           app=self._app)
+        if selectObj:
+            self._frame.SetObj(selectObj)
+        if refreshTree:
+            self._frame.RefreshTree()
+        self._frame.Show()
+        if self._frame.IsIconized():
+            self._frame.Iconize(False)
+        self._frame.Raise()
 
-    def ShowInspectionTool(self):
-        """
-        Show the Inspection tool, creating it if neccesary.
-        """
-        if not self._tool:
-            self._tool = InspectionFrame(parent=self.GetTopWindow(),
-                                         pos=self._pos,
-                                         size=self._size,
-                                         config=self._config,
-                                         locals=self._locals,
-                                         app=self)
-        # get the current widget under the mouse
-        wnd = wx.FindWindowAtPointer()
-        self._tool.SetObj(wnd)
+        
+#----------------------------------------------------------------------------
 
-        self._tool.Show()
-        self._tool.Raise()
-
-
-#---------------------------------------------------------------------------
 
 class InspectionFrame(wx.Frame):
     """
     This class is the frame that holds the wxPython inspection tools.
-    The toolbar and splitter windows are also managed here.  The
-    contents of the splitter windows are handled by other classes.
+    The toolbar and AUI splitters/floating panes are also managed
+    here.  The contents of the tool windows are handled by other
+    classes.
     """
     def __init__(self, wnd=None, locals=None, config=None,
                  app=None, title="wxPython Widget Inspection Tool",
@@ -103,24 +119,33 @@ class InspectionFrame(wx.Frame):
         self.includeSizers = False
         self.started = False
 
+        self.SetIcon(getIconIcon())
         self.MacSetMetalAppearance(True)
         self.MakeToolBar()
+        panel = wx.Panel(self, size=self.GetClientSize())
+        
+        # tell FrameManager to manage this frame        
+        self.mgr = wx.aui.AuiManager(panel,
+                                     wx.aui.AUI_MGR_DEFAULT
+                                     | wx.aui.AUI_MGR_TRANSPARENT_DRAG
+                                     | wx.aui.AUI_MGR_ALLOW_ACTIVE_PANE)
 
-        self.outerSplitter = wx.SplitterWindow(self,style=wx.SP_LIVE_UPDATE)
-        self.innerSplitter = wx.SplitterWindow(self.outerSplitter,style=wx.SP_LIVE_UPDATE)
-        self.tree = InspectionTree(self.outerSplitter)
-        self.info = InspectionInfoPanel(self.innerSplitter)
+        # make the child tools        
+        self.tree = InspectionTree(panel)
+        self.info = InspectionInfoPanel(panel,
+                                        style=wx.NO_BORDER,
+                                        )
 
         if not locals:
             locals = {}
         myIntroText = (
-            "Python %s on %s\nNOTE: The 'obj' variable refers to the selected object."
+            "Python %s on %s\nNOTE: The 'obj' variable refers to the object selected in the tree."
             % (sys.version.split()[0], sys.platform))
-        self.crust = wx.py.crust.Crust(self.innerSplitter, locals=locals,
+        self.crust = wx.py.crust.Crust(panel, locals=locals,
                                        intro=myIntroText,
                                        showInterpIntro=False,
+                                       style=wx.NO_BORDER,
                                        )
-        self.crust.shell.SetMarginWidth(1, 0)
         self.locals = self.crust.shell.interp.locals
         self.crust.shell.interp.introText = ''
         self.locals['obj'] = self.obj = wnd
@@ -128,11 +153,34 @@ class InspectionFrame(wx.Frame):
         self.locals['wx'] = wx
         wx.CallAfter(self._postStartup)
 
-        self.innerSplitter.SplitHorizontally(self.info, self.crust, -225)
-        self.outerSplitter.SplitVertically(self.tree, self.innerSplitter, 280)
-        self.outerSplitter.SetMinimumPaneSize(20)
-        self.innerSplitter.SetMinimumPaneSize(20)
+        # put the chlid tools in AUI panes
+        self.mgr.AddPane(self.info,
+                         wx.aui.AuiPaneInfo().Name("info").Caption("Object Info").
+                         CenterPane().CaptionVisible(True).
+                         CloseButton(False).MaximizeButton(True)
+                         )
+        self.mgr.AddPane(self.tree,
+                         wx.aui.AuiPaneInfo().Name("tree").Caption("Widget Tree").
+                         CaptionVisible(True).Left().Dockable(True).Floatable(True).
+                         BestSize((280,200)).CloseButton(False).MaximizeButton(True)
+                         )
+        self.mgr.AddPane(self.crust,
+                         wx.aui.AuiPaneInfo().Name("crust").Caption("PyCrust").
+                         CaptionVisible(True).Bottom().Dockable(True).Floatable(True).
+                         BestSize((400,200)).CloseButton(False).MaximizeButton(True)
+                         )
 
+        self.mgr.Update()
+
+        if config is None:
+            config = wx.Config('wxpyinspector')
+        self.config = config
+        self.Bind(wx.EVT_CLOSE, self.OnClose)
+        self.LoadSettings(self.config)
+        self.crust.shell.lineNumbers = False
+        self.crust.shell.setDisplayLineNumbers(False)
+        self.crust.shell.SetMarginWidth(1, 0)
+        
 
     def MakeToolBar(self):
         tbar = self.CreateToolBar(wx.TB_HORIZONTAL | wx.TB_FLAT | wx.TB_TEXT | wx.NO_BORDER )
@@ -170,9 +218,16 @@ class InspectionFrame(wx.Frame):
         self.UpdateInfo()
         self.started = True
 
+
+    def OnClose(self, evt):
+        self.SaveSettings(self.config)
+        evt.Skip()
+        
+
     def UpdateInfo(self):
         self.info.Update(self.obj)
 
+
     def SetObj(self, obj):
         if self.obj is obj:
             return
@@ -190,7 +245,8 @@ class InspectionFrame(wx.Frame):
 
     def OnRefreshTree(self, evt):
         self.RefreshTree()
-
+        self.UpdateInfo()
+        
 
     def OnFindWidget(self, evt):
         self.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown)
@@ -198,6 +254,7 @@ class InspectionFrame(wx.Frame):
         self.CaptureMouse()
         self.finding = wx.BusyInfo("Click on any widget in the app...")
 
+
     def OnCaptureLost(self, evt):
         self.Unbind(wx.EVT_LEFT_DOWN)
         self.Unbind(wx.EVT_MOUSE_CAPTURE_LOST)
@@ -231,7 +288,39 @@ class InspectionFrame(wx.Frame):
             evt.Check(self.crust.ToolsShown())
 
 
+    def LoadSettings(self, config):
+        self.crust.LoadSettings(config)
 
+        pos  = wx.Point(config.ReadInt('Window/PosX', -1),
+                        config.ReadInt('Window/PosY', -1))
+                        
+        size = wx.Size(config.ReadInt('Window/Width', -1),
+                       config.ReadInt('Window/Height', -1))
+        self.SetSize(size)
+        self.Move(pos)
+
+        perspective = config.Read('perspective', '')
+        if perspective:
+            self.mgr.LoadPerspective(perspective)
+        self.includeSizers = config.ReadBool('includeSizers', False)
+            
+
+    def SaveSettings(self, config):
+        self.crust.SaveSettings(config)
+
+        if not self.IsIconized() and not self.IsMaximized():
+            w, h = self.GetSize()
+            config.WriteInt('Window/Width', w)
+            config.WriteInt('Window/Height', h)
+            
+            px, py = self.GetPosition()
+            config.WriteInt('Window/PosX', px)
+            config.WriteInt('Window/PosY', py)
+
+        perspective = self.mgr.SavePerspective()
+        config.Write('perspective', perspective)
+        config.WriteBool('includeSizers', self.includeSizers)
+        
 #---------------------------------------------------------------------------
 
 # should inspection frame (and children) be includeed in the tree?
@@ -249,7 +338,10 @@ class InspectionTree(wx.TreeCtrl):
         self.roots = []
         self.built = False
         self.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnSelectionChanged)
-
+        self.toolFrame = wx.GetTopLevelParent(self)
+        if 'wxMac' in wx.PlatformInfo:
+            self.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
+        
 
     def BuildTree(self, startWidget, includeSizers=False):
         if self.GetCount():
@@ -360,8 +452,7 @@ class InspectionTree(wx.TreeCtrl):
 
     def OnSelectionChanged(self, evt):
         obj = self.GetItemPyData(evt.GetItem())
-        toolFrm = wx.GetTopLevelParent(self)
-        toolFrm.SetObj(obj)
+        self.toolFrame.SetObj(obj)
 
 
 #---------------------------------------------------------------------------
@@ -543,6 +634,7 @@ flexmodeFlags = {
 
 #---------------------------------------------------------------------------
 from wx import ImageFromStream, BitmapFromImage
+from wx import EmptyIcon
 import cStringIO
 
 
@@ -778,3 +870,32 @@ def getShowFillingImage():
     return ImageFromStream(stream)
 
 #---------------------------------------------------------------------------
+
+def getIconData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00 \x00\x00\x00 \x08\x06\x00\
+\x00\x00szz\xf4\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\x00\
+\xb8IDATX\x85\xed\x97\xcd\x12\x83 \x0c\x84w\x91\xf7\xd6>x\x9b\x1e,\x07Gl\x93\
+4N8\xb07gH\xf8\xc8\x1fB\x96\x05\x99*\xa9\xbbO\x80\x11\x00\xea\xaf\x05\xf2z\
+\x8a\xc71\xcb\xc2\x10\x80]\x9bq{\xfd\xfa\xf4\x14\xa8\x01DV\x88\xacy\x00w)\
+\x1d@Y\x84\x1am\x87/m\xf7\x04\x02\x00blX\x12\xa8\xde>\x8fR\x05\x80o\x04\xaai\
+rP\xf3\xa6\xb3\x1c\xa8\x08[\x02\xd9\'\'\x1f\xb7\x00\xa4G\x80hg\xbf\x88\x80\
+\xa5\x06>\x8e\xd4\x96\xa4\xe66\xec\x19\xe2|\xdby\xbb)=\x05\xe9\x00\xa1\x93p\
+\x97mr\x0c\x14\x81\x8b\xfe\xb7\xc8\xe3",\x05\xda\x7f\xc0.\xc0\xffg\xf7\x8b\
+\xf3i6\x01\xb2\x01\xde\x86\xde%]y\x9b\xef$\x00\x00\x00\x00IEND\xaeB`\x82'
+
+def getIconBitmap():
+    return BitmapFromImage(getIconImage())
+
+def getIconImage():
+    stream = cStringIO.StringIO(getIconData())
+    return ImageFromStream(stream)
+
+def getIconIcon():
+    icon = EmptyIcon()
+    icon.CopyFromBitmap(getIconBitmap())
+    return icon
+
+#---------------------------------------------------------------------------
+
+
diff --git a/wxPython/wx/lib/masked/combobox.py b/wxPython/wx/lib/masked/combobox.py
index 33ac41ad2d..598d5796d5 100644
--- a/wxPython/wx/lib/masked/combobox.py
+++ b/wxPython/wx/lib/masked/combobox.py
@@ -162,6 +162,8 @@ class BaseMaskedComboBox( wx.ComboBox, MaskedEditMixin ):
             self.Bind(wx.EVT_KEY_DOWN, self._OnKeyDownInComboBox ) ## for special processing of up/down keys
             self.Bind(wx.EVT_KEY_DOWN, self._OnKeyDown )        ## for processing the rest of the control keys
                                                                 ## (next in evt chain)
+            self.Bind(wx.EVT_COMBOBOX, self._OnDropdownSelect)  ## to bring otherwise completely independent base
+                                                                ## ctrl selection into maskededit framework
             self.Bind(wx.EVT_TEXT, self._OnTextChange )         ## color control appropriately & keep
                                                                 ## track of previous value for undo
 
@@ -531,6 +533,18 @@ class BaseMaskedComboBox( wx.ComboBox, MaskedEditMixin ):
             event.Skip()    # let mixin default KeyDown behavior occur
 
 
+    def _OnDropdownSelect(self, event):
+        """
+        This function appears to be necessary because dropdown selection seems to
+        manipulate the contents of the control in an inconsistent way, properly
+        changing the selection index, but *not* the value. (!)  Calling SetSelection()
+        on a selection event for the same selection would seem like a nop, but it seems to
+        fix the problem.
+        """
+        self.SetSelection(event.GetSelection())
+        event.Skip()
+
+
     def _OnSelectChoice(self, event):
         """
         This function appears to be necessary, because the processing done
@@ -659,6 +673,10 @@ class PreMaskedComboBox( BaseMaskedComboBox, MaskedEditAccessorsMixin ):
 __i = 0
 ## CHANGELOG:
 ## ====================
+##  Version 1.4
+##  1. Added handler for EVT_COMBOBOX to address apparently inconsistent behavior
+##     of control when the dropdown control is used to do a selection.
+##
 ##  Version 1.3
 ##  1. Made definition of "hack" GetMark conditional on base class not
 ##     implementing it properly, to allow for migration in wx code base
diff --git a/wxPython/wx/lib/masked/maskededit.py b/wxPython/wx/lib/masked/maskededit.py
index 77776d7737..b2b77840e3 100644
--- a/wxPython/wx/lib/masked/maskededit.py
+++ b/wxPython/wx/lib/masked/maskededit.py
@@ -1,12 +1,12 @@
 #----------------------------------------------------------------------------
 # Name:         maskededit.py
-# Authors:      Jeff Childers, Will Sadkin
-# Email:        jchilders_98@yahoo.com, wsadkin@parlancecorp.com
+# Authors:      Will Sadkin, Jeff Childers
+# Email:        wsadkin@parlancecorp.com, jchilders_98@yahoo.com
 # Created:      02/11/2003
 # Copyright:    (c) 2003 by Jeff Childers, Will Sadkin, 2003
-# Portions:     (c) 2002 by Will Sadkin, 2002-2006
+# Portions:     (c) 2002 by Will Sadkin, 2002-2007
 # RCS-ID:       $Id$
-# License:      wxWindows license
+# License:      wxWidgets license
 #----------------------------------------------------------------------------
 # NOTE:
 #   MaskedEdit controls are based on a suggestion made on [wxPython-Users] by
@@ -27,7 +27,7 @@
 #
 #----------------------------------------------------------------------------
 #
-# 03/30/2004 - Will Sadkin (wsadkin@nameconnector.com)
+# 03/30/2004 - Will Sadkin (wsadkin@parlancecorp.com)
 #
 # o Split out TextCtrl, ComboBox and IpAddrCtrl into their own files,
 # o Reorganized code into masked package
@@ -337,7 +337,18 @@ to individual fields:
         raiseOnInvalidPaste    False by default; normally a bad paste simply is ignored with a bell;
                                if True, this will cause a ValueError exception to be thrown,
                                with the .value attribute of the exception containing the bad value.
-        =====================  ==================================================================
+
+        stopFieldChangeIfInvalid
+                               False by default; tries to prevent navigation out of a field if its
+                               current value is invalid.  Can be used to create a hybrid of validation
+                               settings, allowing intermediate invalid values in a field without
+                               sacrificing ability to limit values as with validRequired.
+                               NOTE: It is possible to end up with an invalid value when using
+                                 this option if focus is switched to some other control via mousing.
+                                 To avoid this, consider deriving a class that defines _LostFocus()
+                                 function that returns the control to a valid value when the focus
+                                 shifts.  (AFAICT, The change in focus is unpreventable.)
+        =====================  =================================================================
 
 
 Coloring Behavior
@@ -841,11 +852,15 @@ WXK_CTRL_Z = (ord('Z')+1) - ord('A')
 
 nav = (
     wx.WXK_BACK, wx.WXK_LEFT, wx.WXK_RIGHT, wx.WXK_UP, wx.WXK_DOWN, wx.WXK_TAB,
-    wx.WXK_HOME, wx.WXK_END, wx.WXK_RETURN, wx.WXK_PRIOR, wx.WXK_NEXT
+    wx.WXK_HOME, wx.WXK_END, wx.WXK_RETURN, wx.WXK_PRIOR, wx.WXK_NEXT,
+    wx.WXK_NUMPAD_LEFT, wx.WXK_NUMPAD_RIGHT, wx.WXK_NUMPAD_UP, wx.WXK_NUMPAD_DOWN,
+    wx.WXK_NUMPAD_HOME, wx.WXK_NUMPAD_END, wx.WXK_NUMPAD_ENTER, wx.WXK_NUMPAD_PRIOR, wx.WXK_NUMPAD_NEXT
     )
 
 control = (
-    wx.WXK_BACK, wx.WXK_DELETE, wx.WXK_INSERT, WXK_CTRL_A, WXK_CTRL_C, WXK_CTRL_S, WXK_CTRL_V,
+    wx.WXK_BACK, wx.WXK_DELETE, wx.WXK_INSERT,
+    wx.WXK_NUMPAD_DELETE, wx.WXK_NUMPAD_INSERT,
+    WXK_CTRL_A, WXK_CTRL_C, WXK_CTRL_S, WXK_CTRL_V,
     WXK_CTRL_X, WXK_CTRL_Z
     )
 
@@ -1323,12 +1338,14 @@ class Field:
               'emptyInvalid':  False,           ## Set to True to make EMPTY = INVALID
               'description': "",                ## primarily for autoformats, but could be useful elsewhere
               'raiseOnInvalidPaste': False,     ## if True, paste into field will cause ValueError
+              'stopFieldChangeIfInvalid': False,## if True, disallow field navigation out of invalid field
               }
 
     # This list contains all parameters that when set at the control level should
     # propagate down to each field:
     propagating_params = ('fillChar', 'groupChar', 'decimalChar','useParensForNegatives',
-                          'compareNoCase', 'emptyInvalid', 'validRequired', 'raiseOnInvalidPaste')
+                          'compareNoCase', 'emptyInvalid', 'validRequired', 'raiseOnInvalidPaste',
+                          'stopFieldChangeIfInvalid')
 
     def __init__(self, **kwargs):
         """
@@ -1761,27 +1778,39 @@ class MaskedEditMixin:
         ## Initially populated with navigation and function control keys:
         self._keyhandlers = {
             # default navigation keys and handlers:
-            wx.WXK_BACK:   self._OnErase,
-            wx.WXK_LEFT:   self._OnArrow,
-            wx.WXK_RIGHT:  self._OnArrow,
-            wx.WXK_UP:     self._OnAutoCompleteField,
-            wx.WXK_DOWN:   self._OnAutoCompleteField,
-            wx.WXK_TAB:    self._OnChangeField,
-            wx.WXK_HOME:   self._OnHome,
-            wx.WXK_END:    self._OnEnd,
-            wx.WXK_RETURN: self._OnReturn,
-            wx.WXK_PRIOR:  self._OnAutoCompleteField,
-            wx.WXK_NEXT:   self._OnAutoCompleteField,
+            wx.WXK_BACK:            self._OnErase,
+            wx.WXK_LEFT:            self._OnArrow,
+            wx.WXK_NUMPAD_LEFT:     self._OnArrow,
+            wx.WXK_RIGHT:           self._OnArrow,
+            wx.WXK_NUMPAD_RIGHT:    self._OnArrow,
+            wx.WXK_UP:              self._OnAutoCompleteField,
+            wx.WXK_NUMPAD_UP:       self._OnAutoCompleteField,
+            wx.WXK_DOWN:            self._OnAutoCompleteField,
+            wx.WXK_NUMPAD_DOWN:     self._OnAutoCompleteField,
+            wx.WXK_TAB:             self._OnChangeField,
+            wx.WXK_HOME:            self._OnHome,
+            wx.WXK_NUMPAD_HOME:     self._OnHome,
+            wx.WXK_END:             self._OnEnd,
+            wx.WXK_NUMPAD_END:      self._OnEnd,
+            wx.WXK_RETURN:          self._OnReturn,
+            wx.WXK_NUMPAD_ENTER:    self._OnReturn,
+            wx.WXK_PRIOR:           self._OnAutoCompleteField,
+            wx.WXK_NUMPAD_PRIOR:    self._OnAutoCompleteField,
+            wx.WXK_NEXT:            self._OnAutoCompleteField,
+            wx.WXK_NUMPAD_NEXT:     self._OnAutoCompleteField,
 
             # default function control keys and handlers:
-            wx.WXK_DELETE: self._OnDelete,
-            wx.WXK_INSERT: self._OnInsert,
-            WXK_CTRL_A: self._OnCtrl_A,
-            WXK_CTRL_C: self._OnCtrl_C,
-            WXK_CTRL_S: self._OnCtrl_S,
-            WXK_CTRL_V: self._OnCtrl_V,
-            WXK_CTRL_X: self._OnCtrl_X,
-            WXK_CTRL_Z: self._OnCtrl_Z,
+            wx.WXK_DELETE:          self._OnDelete,
+            wx.WXK_NUMPAD_DELETE:   self._OnDelete,
+            wx.WXK_INSERT:          self._OnInsert,
+            wx.WXK_NUMPAD_INSERT:   self._OnInsert,
+            
+            WXK_CTRL_A:             self._OnCtrl_A,
+            WXK_CTRL_C:             self._OnCtrl_C,
+            WXK_CTRL_S:             self._OnCtrl_S,
+            WXK_CTRL_V:             self._OnCtrl_V,
+            WXK_CTRL_X:             self._OnCtrl_X,
+            WXK_CTRL_Z:             self._OnCtrl_Z,
             }
 
         ## bind standard navigational and control keycodes to this instance,
@@ -2780,8 +2809,12 @@ class MaskedEditMixin:
 ####            dbg('Registering numeric navigation and control handlers (if not already set)')
             if not self._keyhandlers.has_key(wx.WXK_DOWN):
                 self._SetKeycodeHandler(wx.WXK_DOWN, self._OnChangeField)
+            if not self._keyhandlers.has_key(wx.WXK_NUMPAD_DOWN):
+                self._SetKeycodeHandler(wx.WXK_DOWN, self._OnChangeField)
             if not self._keyhandlers.has_key(wx.WXK_UP):
                 self._SetKeycodeHandler(wx.WXK_UP, self._OnUpNumeric)  # (adds "shift" to up arrow, and calls _OnChangeField)
+            if not self._keyhandlers.has_key(wx.WXK_NUMPAD_UP):
+                self._SetKeycodeHandler(wx.WXK_UP, self._OnUpNumeric)  # (adds "shift" to up arrow, and calls _OnChangeField)
 
             # On ., truncate contents right of cursor to decimal point (if any)
             # leaves cursor after decimal point if floating point, otherwise at 0.
@@ -3001,7 +3034,7 @@ class MaskedEditMixin:
                     char = char.decode(self._defaultEncoding)
                 else:
                     char = unichr(event.GetUnicodeKey())
-                    dbg('unicode char:', char)
+##                    dbg('unicode char:', char)
                 excludes = u''
                 if type(field._excludeChars) != types.UnicodeType:
                     excludes += field._excludeChars.decode(self._defaultEncoding)
@@ -3205,25 +3238,25 @@ class MaskedEditMixin:
         keycode = event.GetKeyCode()
         sel_start, sel_to = self._GetSelection()
         entry_end = self._goEnd(getPosOnly=True)
-        if keycode in (wx.WXK_RIGHT, wx.WXK_DOWN):
+        if keycode in (wx.WXK_RIGHT, wx.WXK_DOWN, wx.WXK_NUMPAD_RIGHT, wx.WXK_NUMPAD_DOWN):
             if( ( not self._isTemplateChar(pos) and pos+1 > entry_end)
                 or ( self._isTemplateChar(pos) and pos >= entry_end) ):
 ##                dbg("can't advance", indent=0)
                 return False
             elif self._isTemplateChar(pos):
                 self._AdjustField(pos)
-        elif keycode in (wx.WXK_LEFT,wx.WXK_UP) and sel_start == sel_to and pos > 0 and self._isTemplateChar(pos-1):
+        elif keycode in (wx.WXK_LEFT, wx.WXK_UP, wx.WXK_NUMPAD_LEFT, wx.WXK_NUMPAD_UP) and sel_start == sel_to and pos > 0 and self._isTemplateChar(pos-1):
 ##            dbg('adjusting field')
             self._AdjustField(pos)
 
         # treat as shifted up/down arrows as tab/reverse tab:
-        if event.ShiftDown() and keycode in (wx.WXK_UP, wx.WXK_DOWN):
+        if event.ShiftDown() and keycode in (wx.WXK_UP, wx.WXK_DOWN, wx.WXK_NUMPAD_UP, wx.WXK_NUMPAD_DOWN):
             # remove "shifting" and treat as (forward) tab:
             event.m_shiftDown = False
             keep_processing = self._OnChangeField(event)
 
         elif self._FindField(pos)._selectOnFieldEntry:
-            if( keycode in (wx.WXK_UP, wx.WXK_LEFT)
+            if( keycode in (wx.WXK_UP, wx.WXK_LEFT, wx.WXK_NUMPAD_UP, wx.WXK_NUMPAD_LEFT)
                 and sel_start != 0
                 and self._isTemplateChar(sel_start-1)
                 and sel_start != self._masklength
@@ -3234,7 +3267,7 @@ class MaskedEditMixin:
                 event.m_shiftDown = True
                 event.m_ControlDown = True
                 keep_processing = self._OnChangeField(event)
-            elif( keycode in (wx.WXK_DOWN, wx.WXK_RIGHT)
+            elif( keycode in (wx.WXK_DOWN, wx.WXK_RIGHT, wx.WXK_NUMPAD_DOWN, wx.WXK_NUMPAD_RIGHT)
                   and sel_to != self._masklength
                   and self._isTemplateChar(sel_to)):
 
@@ -3247,8 +3280,8 @@ class MaskedEditMixin:
 ##                dbg('using base ctrl event processing')
                 event.Skip()
         else:
-            if( (sel_to == self._fields[0]._extent[0] and keycode == wx.WXK_LEFT)
-                or (sel_to == self._masklength and keycode == wx.WXK_RIGHT) ):
+            if( (sel_to == self._fields[0]._extent[0] and keycode in (wx.WXK_LEFT, wx.WXK_NUMPAD_LEFT) )
+                or (sel_to == self._masklength and keycode in (wx.WXK_RIGHT, wx.WXK_NUMPAD_RIGHT) ) ):
                 if not wx.Validator_IsSilent():
                     wx.Bell()
             else:
@@ -3358,11 +3391,11 @@ class MaskedEditMixin:
         # If trying to erase beyond "legal" bounds, disallow operation:
         if( (sel_to == 0 and key == wx.WXK_BACK)
             or (self._signOk and sel_to == 1 and value[0] == ' ' and key == wx.WXK_BACK)
-            or (sel_to == self._masklength and sel_start == sel_to and key == wx.WXK_DELETE and not field._insertRight)
+            or (sel_to == self._masklength and sel_start == sel_to and key in (wx.WXK_DELETE, wx.WXK_NUMPAD_DELETE) and not field._insertRight)
             or (self._signOk and self._useParens
                 and sel_start == sel_to
                 and sel_to == self._masklength - 1
-                and value[sel_to] == ' ' and key == wx.WXK_DELETE and not field._insertRight) ):
+                and value[sel_to] == ' ' and key in (wx.WXK_DELETE, wx.WXK_NUMPAD_DELETE) and not field._insertRight) ):
             if not wx.Validator_IsSilent():
                 wx.Bell()
 ##            dbg(indent=0)
@@ -3374,7 +3407,7 @@ class MaskedEditMixin:
             and sel_start >= start                              # and selection starts in field
             and ((sel_to == sel_start                           # and no selection
                   and sel_to == end                             # and cursor at right edge
-                  and key in (wx.WXK_BACK, wx.WXK_DELETE))            # and either delete or backspace key
+                  and key in (wx.WXK_BACK, wx.WXK_DELETE, wx.WXK_NUMPAD_DELETE))    # and either delete or backspace key
                  or                                             # or
                  (key == wx.WXK_BACK                               # backspacing
                     and (sel_to == end                          # and selection ends at right edge
@@ -3747,6 +3780,21 @@ class MaskedEditMixin:
 ##            dbg(indent=0)
             return False
 
+        field = self._FindField(sel_to)
+        index = field._index
+        field_start, field_end = field._extent
+        slice = self._GetValue()[field_start:field_end]
+
+##        dbg('field._stopFieldChangeIfInvalid?', field._stopFieldChangeIfInvalid)
+##        dbg('field.IsValid(slice)?', field.IsValid(slice))
+        
+        if field._stopFieldChangeIfInvalid and not field.IsValid(slice):
+##            dbg('field invalid; field change disallowed')
+            if not wx.Validator_IsSilent():
+                wx.Bell()
+##            dbg(indent=0)
+            return False
+
 
         if event.ShiftDown():
 
@@ -3755,13 +3803,12 @@ class MaskedEditMixin:
             # NOTE: doesn't yet work with SHIFT-tab under wx; the control
             # never sees this event! (But I've coded for it should it ever work,
             # and it *does* work for '.' in IpAddrCtrl.)
-            field = self._FindField(pos)
-            index = field._index
-            field_start = field._extent[0]
+
             if pos < field_start:
 ##                dbg('cursor before 1st field; cannot change to a previous field')
                 if not wx.Validator_IsSilent():
                     wx.Bell()
+##                dbg(indent=0)
                 return False
 
             if event.ControlDown():
@@ -3801,8 +3848,6 @@ class MaskedEditMixin:
 
         else:
             # "Go forward"
-            field = self._FindField(sel_to)
-            field_start, field_end = field._extent
             if event.ControlDown():
 ##                dbg('queuing select to end of field:', pos, field_end)
                 wx.CallAfter(self._SetInsertionPoint, pos)
@@ -3868,10 +3913,19 @@ class MaskedEditMixin:
                             wx.CallAfter(self._SetInsertionPoint, next_pos)
 ##                        dbg(indent=0)
                         return False
+##                dbg(indent=0)
 
 
     def _OnDecimalPoint(self, event):
 ##        dbg('MaskedEditMixin::_OnDecimalPoint', indent=1)
+        field = self._FindField(self._GetInsertionPoint())
+        start, end = field._extent
+        slice = self._GetValue()[start:end]
+        
+        if field._stopFieldChangeIfInvalid and not field.IsValid(slice):
+            if not wx.Validator_IsSilent():
+                wx.Bell()
+            return False
 
         pos = self._adjustPos(self._GetInsertionPoint(), event.GetKeyCode())
 
@@ -4001,7 +4055,7 @@ class MaskedEditMixin:
 
     def _findNextEntry(self,pos, adjustInsert=True):
         """ Find the insertion point for the next valid entry character position."""
-##        dbg('MaskedEditMixin::_findNextEntry', indent=1)        
+##        dbg('MaskedEditMixin::_findNextEntry', indent=1)
         if self._isTemplateChar(pos) or pos in self._explicit_field_boundaries:   # if changing fields, pay attn to flag
             adjustInsert = adjustInsert
         else:                           # else within a field; flag not relevant
@@ -4050,21 +4104,21 @@ class MaskedEditMixin:
 ##            dbg('choices:', field._choices)
 ##            dbg('compareChoices:', field._compareChoices)
             choices, choice_required = field._compareChoices, field._choiceRequired
-            if keycode in (wx.WXK_PRIOR, wx.WXK_UP):
+            if keycode in (wx.WXK_PRIOR, wx.WXK_UP, wx.WXK_NUMPAD_PRIOR, wx.WXK_NUMPAD_UP):
                 direction = -1
             else:
                 direction = 1
             match_index, partial_match = self._autoComplete(direction, choices, text, compareNoCase=field._compareNoCase, current_index = field._autoCompleteIndex)
             if( match_index is None
-                and (keycode in self._autoCompleteKeycodes + [wx.WXK_PRIOR, wx.WXK_NEXT]
-                     or (keycode in [wx.WXK_UP, wx.WXK_DOWN] and event.ShiftDown() ) ) ):
+                and (keycode in self._autoCompleteKeycodes + [wx.WXK_PRIOR, wx.WXK_NEXT, wx.WXK_NUMPAD_PRIOR, wx.WXK_NUMPAD_NEXT]
+                     or (keycode in [wx.WXK_UP, wx.WXK_DOWN, wx.WXK_NUMPAD_UP, wx.WXK_NUMPAD_DOWN] and event.ShiftDown() ) ) ):
                 # Select the 1st thing from the list:
                 match_index = 0
 
             if( match_index is not None
-                and ( keycode in self._autoCompleteKeycodes + [wx.WXK_PRIOR, wx.WXK_NEXT]
-                      or (keycode in [wx.WXK_UP, wx.WXK_DOWN] and event.ShiftDown())
-                      or (keycode == wx.WXK_DOWN and partial_match) ) ):
+                and ( keycode in self._autoCompleteKeycodes + [wx.WXK_PRIOR, wx.WXK_NEXT, wx.WXK_NUMPAD_PRIOR, wx.WXK_NUMPAD_NEXT]
+                      or (keycode in [wx.WXK_UP, wx.WXK_DOWN, wx.WXK_NUMPAD_UP, wx.WXK_NUMPAD_DOWN] and event.ShiftDown())
+                      or (keycode in [wx.WXK_DOWN, wx.WXK_NUMPAD_DOWN] and partial_match) ) ):
 
                 # We're allowed to auto-complete:
 ##                dbg('match found')
@@ -4077,10 +4131,11 @@ class MaskedEditMixin:
                 self._CheckValid()  # recolor as appopriate
 
 
-        if keycode in (wx.WXK_UP, wx.WXK_DOWN, wx.WXK_LEFT, wx.WXK_RIGHT):
+        if keycode in (wx.WXK_UP, wx.WXK_DOWN, wx.WXK_LEFT, wx.WXK_RIGHT, 
+                       wx.WXK_NUMPAD_UP, wx.WXK_NUMPAD_DOWN, wx.WXK_NUMPAD_LEFT, wx.WXK_NUMPAD_RIGHT):
             # treat as left right arrow if unshifted, tab/shift tab if shifted.
             if event.ShiftDown():
-                if keycode in (wx.WXK_DOWN, wx.WXK_RIGHT):
+                if keycode in (wx.WXK_DOWN, wx.WXK_RIGHT, wx.WXK_NUMPAD_DOWN, wx.WXK_NUMPAD_RIGHT):
                     # remove "shifting" and treat as (forward) tab:
                     event.m_shiftDown = False
                 keep_processing = self._OnChangeField(event)
@@ -4259,7 +4314,9 @@ class MaskedEditMixin:
 ####                    dbg('field_len?', field_len)
 ####                    dbg('pos==end; len (slice) < field_len?', len(slice) < field_len)
 ####                    dbg('not field._moveOnFieldFull?', not field._moveOnFieldFull)
-                    if len(slice) == field_len and field._moveOnFieldFull:
+                    if( len(slice) == field_len and field._moveOnFieldFull
+                        and (not field._stopFieldChangeIfInvalid or
+                             field._stopFieldChangeIfInvalid and field.IsValid(slice))):
                         # move cursor to next field:
                         pos = self._findNextEntry(pos)
                         self._SetInsertionPoint(pos)
@@ -4296,11 +4353,14 @@ class MaskedEditMixin:
             # else make sure the user is not trying to type over a template character
             # If they are, move them to the next valid entry position
             elif self._isTemplateChar(pos):
-                if( not field._moveOnFieldFull
-                      and (not self._signOk
-                           or (self._signOk
-                               and field._index == 0
-                               and pos > 0) ) ):      # don't move to next field without explicit cursor movement
+                if( (not field._moveOnFieldFull
+                     and (not self._signOk
+                          or (self._signOk and field._index == 0 and pos > 0) ) )
+                    
+                    or (field._stopFieldChangeIfInvalid
+                        and not field.IsValid(self._GetValue()[start:end]) ) ):
+                    
+                    # don't move to next field without explicit cursor movement
                     pass
                 else:
                     # find next valid position
@@ -5071,7 +5131,11 @@ class MaskedEditMixin:
 ####            dbg('field._moveOnFieldFull?', field._moveOnFieldFull)
 ####            dbg('len(fstr.lstrip()) == end-start?', len(fstr.lstrip()) == end-start)
             if( field._moveOnFieldFull and pos == end
-                and len(fstr.lstrip()) == end-start):   # if field now full
+                and len(fstr.lstrip()) == end-start     # if field now full
+                and (not field._stopFieldChangeIfInvalid     # and we either don't care about valid
+                     or (field._stopFieldChangeIfInvalid     # or we do and the current field value is valid
+                         and field.IsValid(fstr)))):
+
                 newpos = self._findNextEntry(end)       #   go to next field
             else:
                 newpos = pos                            # else keep cursor at current position
@@ -5144,7 +5208,11 @@ class MaskedEditMixin:
 
             if( field._insertRight                                  # if insert-right field (but we didn't start at right edge)
                 and field._moveOnFieldFull                          # and should move cursor when full
-                and len(newtext[start:end].strip()) == end-start):  # and field now full
+                and len(newtext[start:end].strip()) == end-start    # and field now full
+                and (not field._stopFieldChangeIfInvalid            # and we either don't care about valid
+                     or (field._stopFieldChangeIfInvalid            # or we do and the current field value is valid
+                         and field.IsValid(newtext[start:end].strip())))):
+
                 newpos = self._findNextEntry(end)                   #   go to next field
 ##                dbg('newpos = nextentry =', newpos)
             else:
@@ -6702,6 +6770,15 @@ __i=0
 
 ## CHANGELOG:
 ## ====================
+##  Version 1.13
+##  1. Added parameter option stopFieldChangeIfInvalid, which can be used to relax the 
+##     validation rules for a control, but make best efforts to stop navigation out of 
+##     that field should its current value be invalid.  Note: this does not prevent the 
+##     value from remaining invalid if focus for the control is lost, via mousing etc.
+##
+##  Version 1.12
+##  1. Added proper support for NUMPAD keypad keycodes for navigation and control.
+##
 ##  Version 1.11
 ##  1. Added value member to ValueError exceptions, so that people can catch them
 ##     and then display their own errors, and added attribute raiseOnInvalidPaste,
diff --git a/wxPython/wx/lib/masked/numctrl.py b/wxPython/wx/lib/masked/numctrl.py
index 73a837039b..dfcebc9065 100644
--- a/wxPython/wx/lib/masked/numctrl.py
+++ b/wxPython/wx/lib/masked/numctrl.py
@@ -2,7 +2,7 @@
 # Name:         wxPython.lib.masked.numctrl.py
 # Author:       Will Sadkin
 # Created:      09/06/2003
-# Copyright:   (c) 2003 by Will Sadkin
+# Copyright:   (c) 2003-2007 by Will Sadkin
 # RCS-ID:      $Id$
 # License:     wxWidgets license
 #----------------------------------------------------------------------------
@@ -81,6 +81,7 @@ masked.NumCtrl:
              min = None,
              max = None,
              limited = False,
+             limitOnFieldChange = False,
              selectOnEntry = True,
              foregroundColour = "Black",
              signedForegroundColour = "Red",
@@ -155,6 +156,12 @@ masked.NumCtrl:
         If False and bounds are set, out-of-bounds values will
         result in a background colored with the current invalidBackgroundColour.
 
+  limitOnFieldChange
+        An alternative to limited, this boolean indicates whether or not a
+        field change should be allowed if the value in the control
+        is out of bounds.  If True, and control focus is lost, this will also
+        cause the control to take on the nearest bound value.
+
   selectOnEntry
         Boolean indicating whether or not the value in each field of the
         control should be automatically selected (for replacement) when
@@ -312,6 +319,18 @@ IsLimited()
     Returns <I>True</I> if the control is currently limiting the
     value to fall within the current bounds.
 
+SetLimitOnFieldChange()
+    If called with a value of True, will cause the control to allow
+    out-of-bounds values, but will prevent field change if attempted
+    via navigation, and if the control loses focus, it will change
+    the value to the nearest bound.
+    
+GetLimitOnFieldChange()
+
+IsLimitedOnFieldChange()
+    Returns <I>True</I> if the control is currently limiting the
+    value on field change.
+
 
 SetAllowNone(bool)
     If called with a value of True, this function will cause the control
@@ -390,7 +409,7 @@ MININT = -maxint-1
 
 from wx.tools.dbg import Logger
 from wx.lib.masked import MaskedEditMixin, Field, BaseMaskedTextCtrl
-dbg = Logger()
+##dbg = Logger()
 ##dbg(enable=1)
 
 #----------------------------------------------------------------------------
@@ -442,6 +461,7 @@ class NumCtrlAccessorsMixin:
          'emptyInvalid',
          'validFunc',
          'validRequired',
+         'stopFieldChangeIfInvalid',
         )
     for param in exposed_basectrl_params:
         propname = param[0].upper() + param[1:]
@@ -478,6 +498,7 @@ class NumCtrl(BaseMaskedTextCtrl, NumCtrlAccessorsMixin):
         'min': None,                        # by default, no bounds set
         'max': None,
         'limited': False,                   # by default, no limiting even if bounds set
+        'limitOnFieldChange': False,        # by default, don't limit if changing fields, even if bounds set
         'allowNone': False,                 # by default, don't allow empty value
         'selectOnEntry': True,              # by default, select the value of each field on entry
         'foregroundColour': "Black",
@@ -759,6 +780,12 @@ class NumCtrl(BaseMaskedTextCtrl, NumCtrlAccessorsMixin):
                 maskededit_kwargs['validRequired'] = False
             self._limited = kwargs['limited']
 
+        if kwargs.has_key('limitOnFieldChange'):
+            if kwargs['limitOnFieldChange'] and not self._limitOnFieldChange:
+                maskededit_kwargs['stopFieldChangeIfInvalid'] = True
+            elif kwargs['limitOnFieldChange'] and self._limitOnFieldChange:
+                maskededit_kwargs['stopFieldChangeIfInvalid'] = False
+
 ##        dbg('maskededit_kwargs:', maskededit_kwargs)
         if maskededit_kwargs.keys():
             self.SetCtrlParameters(**maskededit_kwargs)
@@ -923,6 +950,43 @@ class NumCtrl(BaseMaskedTextCtrl, NumCtrlAccessorsMixin):
         wx.CallAfter(self.SetInsertionPoint, sel_start)      # preserve current selection/position
         wx.CallAfter(self.SetSelection, sel_start, sel_to)
 
+
+    def _OnChangeField(self, event):
+        """
+        This routine enhances the base masked control _OnFieldChange().  It's job
+        is to ensure limits are imposed if limitOnFieldChange is enabled.
+        """
+##        dbg('NumCtrl::_OnFieldChange', indent=1)
+        if self._limitOnFieldChange and not (self._min <= self.GetValue() <= self._max):
+            self._disallowValue()
+##            dbg('oob - field change disallowed',indent=0)
+            return False
+        else:
+##            dbg(indent=0)
+            return MaskedEditMixin._OnChangeField(self, event)     # call the baseclass function
+
+
+    def _LostFocus(self):
+        """
+        On loss of focus, if limitOnFieldChange is set, ensure value conforms to limits.
+        """
+##        dbg('NumCtrl::_LostFocus', indent=1)
+        if self._limitOnFieldChange:
+##            dbg("limiting on loss of focus")
+            value = self.GetValue()
+            if self._min is not None and value < self._min:
+##                dbg('Set to min value:', self._min)
+                self._SetValue(self._toGUI(self._min))
+
+            elif self._max is not None and value > self._max:
+##                dbg('Setting to max value:', self._max)
+                self._SetValue(self._toGUI(self._max))
+            # (else do nothing.)
+        # (else do nothing.)
+##        dbg(indent=0)
+        return True
+
+
     def _SetValue(self, value):
         """
         This routine supersedes the base masked control _SetValue().  It is
@@ -1346,7 +1410,32 @@ class NumCtrl(BaseMaskedTextCtrl, NumCtrlAccessorsMixin):
 
     def GetLimited(self):
         """ (For regularization of property accessors) """
-        return self.IsLimited
+        return self.IsLimited()
+
+    def SetLimitOnFieldChange(self, limit):
+        """
+        If called with a value of True, this function will cause the control
+        to prevent navigation out of the current field if its value is out-of-bounds,
+        and limit the value to fall within the bounds currently specified if the
+        control loses focus.
+
+        If called with a value of False, this function will disable value
+        limiting, but coloring of out-of-bounds values will still take
+        place if bounds have been set for the control.
+        """
+        self.SetParameters(limitOnFieldChange = limit)
+
+
+    def IsLimitedOnFieldChange(self):
+        """
+        Returns True if the control is currently limiting the
+        value to fall within the current bounds.
+        """
+        return self._limitOnFieldChange
+
+    def GetLimitOnFieldChange(self):
+        """ (For regularization of property accessors) """
+        return self.IsLimitedOnFieldChange()
 
 
     def IsInBounds(self, value=None):
@@ -1794,6 +1883,13 @@ __i=0
 ##   1. Add support for printf-style format specification.
 ##   2. Add option for repositioning on 'illegal' insertion point.
 ##
+## Version 1.4
+##   1. In response to user request, added limitOnFieldChange feature, so that
+##      out-of-bounds values can be temporarily added to the control, but should
+##      navigation be attempted out of an invalid field, it will not navigate,
+##      and if focus is lost on a control so limited with an invalid value, it
+##      will change the value to the nearest bound.
+##
 ## Version 1.3
 ##   1. fixed to allow space for a group char.
 ##
diff --git a/wxPython/wx/lib/masked/textctrl.py b/wxPython/wx/lib/masked/textctrl.py
index d374d7b247..9504da9036 100644
--- a/wxPython/wx/lib/masked/textctrl.py
+++ b/wxPython/wx/lib/masked/textctrl.py
@@ -152,29 +152,35 @@ class BaseMaskedTextCtrl( wx.TextCtrl, MaskedEditMixin ):
         return self.GetValue()
 
 
-    def _SetValue(self, value):
+    def _SetValue(self, value, use_change_value=False):
         """
         Allow mixin to set the raw value of the control with this function.
         REQUIRED by any class derived from MaskedEditMixin.
         """
-##        dbg('MaskedTextCtrl::_SetValue("%(value)s")' % locals(), indent=1)
+##        dbg('MaskedTextCtrl::_SetValue("%(value)s", use_change_value=%(use_change_value)d)' % locals(), indent=1)
         # Record current selection and insertion point, for undo
         self._prevSelection = self._GetSelection()
         self._prevInsertionPoint = self._GetInsertionPoint()
-        wx.TextCtrl.SetValue(self, value)
+        if use_change_value:
+            wx.TextCtrl.ChangeValue(self, value)
+        else:
+            wx.TextCtrl.SetValue(self, value)
 ##        dbg(indent=0)
 
-    def SetValue(self, value):
+    def SetValue(self, value, use_change_value=False):
         """
         This function redefines the externally accessible .SetValue() to be
         a smart "paste" of the text in question, so as not to corrupt the
         masked control.  NOTE: this must be done in the class derived
         from the base wx control.
         """
-##        dbg('MaskedTextCtrl::SetValue = "%s"' % value, indent=1)
+##        dbg('MaskedTextCtrl::SetValue("%(value)s", use_change_value=%(use_change_value)d)' % locals(), indent=1)
 
         if not self._mask:
-            wx.TextCtrl.SetValue(self, value)    # revert to base control behavior
+            if use_change_value:
+                wx.TextCtrl.ChangeValue(self, value)    # revert to base control behavior
+            else:
+                wx.TextCtrl.SetValue(self, value)    # revert to base control behavior
             return
 
         # empty previous contents, replacing entire value:
@@ -221,14 +227,20 @@ class BaseMaskedTextCtrl( wx.TextCtrl, MaskedEditMixin ):
 ##                dbg('exception thrown', indent=0)
                 raise
 
-        self._SetValue(value)   # note: to preserve similar capability, .SetValue()
-                                # does not change IsModified()
+        self._SetValue(value, use_change_value)   # note: to preserve similar capability, .SetValue()
+                                                  # does not change IsModified()
 ####        dbg('queuing insertion after .SetValue', replace_to)
         # set selection to last char replaced by paste
         wx.CallAfter(self._SetInsertionPoint, replace_to)
         wx.CallAfter(self._SetSelection, replace_to, replace_to)
 ##        dbg(indent=0)
 
+    def ChangeValue(self, value):
+        """
+        Provided to accomodate similar functionality added to base control in wxPython 2.7.1.1.
+        """
+        self.SetValue(value, use_change_value=True)
+
 
     def SetFont(self, *args, **kwargs):
         """ Set the font, then recalculate control size, if appropriate. """
@@ -372,6 +384,10 @@ class PreMaskedTextCtrl( BaseMaskedTextCtrl, MaskedEditAccessorsMixin ):
 __i=0
 ## CHANGELOG:
 ## ====================
+##  Version 1.3
+##  - Added support for ChangeValue() function, similar to that of the base
+##    control, added in wxPython 2.7.1.1.
+##
 ##  Version 1.2
 ##  - Converted docstrings to reST format, added doc for ePyDoc.
 ##    removed debugging override functions.
diff --git a/wxPython/wx/lib/mixins/inspection.py b/wxPython/wx/lib/mixins/inspection.py
new file mode 100644
index 0000000000..1a364fa2e3
--- /dev/null
+++ b/wxPython/wx/lib/mixins/inspection.py
@@ -0,0 +1,88 @@
+#----------------------------------------------------------------------------
+# Name:        wx.lib.mixins.inspection
+# Purpose:     A mix-in class that can add PyCrust-based inspection of the
+#              app's widgets and sizers.
+#
+# Author:      Robin Dunn
+#
+# Created:     21-Nov-2006
+# RCS-ID:      $Id$
+# Copyright:   (c) 2006 by Total Control Software
+# Licence:     wxWindows license
+#----------------------------------------------------------------------------
+
+# NOTE: This class was originally based on ideas sent to the
+# wxPython-users mail list by Dan Eloff.
+
+import wx
+from wx.lib.inspection import InspectionTool
+
+
+#----------------------------------------------------------------------------
+
+class InspectionMixin(object):
+    """
+    This class is intended to be used as a mix-in with the wx.App
+    class.  When used it will add the ability to popup a
+    InspectionFrame window where the widget under the mouse cursor
+    will be selected in the tree and loaded into the shell's namespace
+    as 'obj'.  The default key sequence to activate the inspector is
+    Ctrl-Alt-I (or Cmd-Alt-I on Mac) but this can be changed via
+    parameters to the `Init` method, or the application can call
+    `ShowInspectionTool` from other event handlers if desired.
+
+    To use this class simply derive a class from wx.App and
+    InspectionMixin and then call the `Init` method from the app's
+    OnInit.
+    """
+    def Init(self, pos=wx.DefaultPosition, size=wx.Size(850,700),
+             config=None, locals=None,
+             alt=True, cmd=True, shift=False, keyCode=ord('I')):
+        """
+        Make the event binding that will activate the InspectionFrame window.
+        """
+        self.Bind(wx.EVT_KEY_DOWN, self._OnKeyPress)
+        self._alt = alt
+        self._cmd = cmd
+        self._shift = shift
+        self._keyCode = keyCode
+        InspectionTool().Init(pos, size, config, locals, self)
+
+    def _OnKeyPress(self, evt):
+        """
+        Event handler, check for our hot-key.  Normally it is
+        Ctrl-Alt-I but that can be changed by what is passed to the
+        Init method.
+        """
+        if evt.AltDown() == self._alt  and \
+               evt.CmdDown() == self._cmd and \
+               evt.ShiftDown() == self._shift and \
+               evt.GetKeyCode() == self._keyCode:
+            self.ShowInspectionTool()
+        else:
+            evt.Skip()
+
+
+    def ShowInspectionTool(self):
+        """
+        Show the Inspection tool, creating it if neccesary, setting it
+        to display the widget under the cursor.
+        """
+        # get the current widget under the mouse
+        wnd = wx.FindWindowAtPointer()
+        InspectionTool().Show(wnd)
+
+
+#---------------------------------------------------------------------------
+
+class InspectableApp(wx.App, InspectionMixin):
+    """
+    A simple mix of wx.App and InspectionMixin that can be used stand-alone.
+    """
+
+    def OnInit(self):
+        self.Init()
+        return True
+
+#---------------------------------------------------------------------------
+
diff --git a/wxPython/wx/lib/mixins/listctrl.py b/wxPython/wx/lib/mixins/listctrl.py
index 921e250415..a28a164f79 100644
--- a/wxPython/wx/lib/mixins/listctrl.py
+++ b/wxPython/wx/lib/mixins/listctrl.py
@@ -120,6 +120,15 @@ class ColumnSorterMixin:
         if wx.Platform != "__WXMAC__" or wx.SystemOptions.GetOptionInt("mac.listctrl.always_use_generic") == 1:
             self.__updateImages(oldCol)
         evt.Skip()
+        self.OnSortOrderChanged()
+        
+        
+    def OnSortOrderChanged(self):
+        """
+        Callback called after sort order has changed (whenever user
+        clicked column header).
+        """
+        pass
 
 
     def __ColumnSorter(self, key1, key2):
diff --git a/wxPython/wx/lib/mixins/treemixin.py b/wxPython/wx/lib/mixins/treemixin.py
new file mode 100644
index 0000000000..41ad9fb8c6
--- /dev/null
+++ b/wxPython/wx/lib/mixins/treemixin.py
@@ -0,0 +1,651 @@
+'''
+treemixin.py 
+
+This module provides three mixin classes that can be used with tree
+controls: 
+
+- VirtualTree is a class that, when mixed in with a tree control,
+  makes the tree control virtual, similar to a ListCtrl in virtual mode. 
+  A virtual tree control builds the tree itself by means of callbacks,
+  so the programmer is freed from the burden of building the tree herself.
+
+- DragAndDrop is a mixin class that helps with dragging and dropping of
+  items. The graphical part of dragging and dropping tree items is done by
+  this mixin class. You only need to implement the OnDrop method that is
+  called when the drop happens.
+
+- ExpansionState is a mixin that can be queried for the expansion state of
+  all items in the tree to restore it later.
+
+All mixin classes work with wx.TreeCtrl, wx.gizmos.TreeListCtrl, 
+and wx.lib.customtree.CustomTreeCtrl. They can be used together or 
+separately.
+
+The VirtualTree and DragAndDrop mixins force the wx.TR_HIDE_ROOT style.
+
+Author: Frank Niessink <frank@niessink.com>
+License: wxWidgets license
+Version: 1.0
+Date: 15 April 2007
+
+ExpansionState is based on code and ideas from Karsten Hilbert.
+Andrea Gavana provided help with the CustomTreeCtrl integration.
+'''
+
+
+import wx, wx.lib.customtreectrl
+
+
+class TreeAPIHarmonizer(object):
+    ''' This class attempts to hide the differences in API between the
+    different tree controls that are part of wxPython. '''
+
+    def __callSuper(self, methodName, default, *args, **kwargs):
+        # If our super class has a method called methodName, call it,
+        # otherwise return the default value.
+        superClass = super(TreeAPIHarmonizer, self)
+        if hasattr(superClass, methodName):
+            return getattr(superClass, methodName)(*args, **kwargs)
+        else:
+            return default
+
+    def GetColumnCount(self, *args, **kwargs):
+        # Only TreeListCtrl has columns, return 0 if we are mixed in
+        # with another tree control.
+        return self.__callSuper('GetColumnCount', 0, *args, **kwargs)
+
+    def GetItemType(self, *args, **kwargs):
+        # Only CustomTreeCtrl has different item types, return the
+        # default item type if we are mixed in with another tree control.
+        return self.__callSuper('GetItemType', 0, *args, **kwargs)
+
+    def SetItemType(self, item, newType):
+        # CustomTreeCtrl doesn't support changing the item type on the fly,
+        # so we create a new item and delete the old one. We currently only
+        # keep the item text, would be nicer to also retain other attributes.
+        text = self.GetItemText(item)
+        newItem = self.InsertItem(self.GetItemParent(item), item, text, 
+                                  ct_type=newType)
+        self.Delete(item)
+        return newItem
+
+    def IsItemChecked(self, *args, **kwargs):
+        # Only CustomTreeCtrl supports checkable items, return False if
+        # we are mixed in with another tree control.
+        return self.__callSuper('IsItemChecked', False, *args, **kwargs)
+
+    def GetItemChecked(self, *args, **kwargs):
+        # For consistency's sake, provide a 'Get' and 'Set' method for 
+        # checkable items.
+        return self.IsItemChecked(*args, **kwargs)
+
+    def SetItemChecked(self, *args, **kwargs):
+        # For consistency's sake, provide a 'Get' and 'Set' method for 
+        # checkable items.
+        return self.CheckItem(*args, **kwargs)
+
+    def GetMainWindow(self, *args, **kwargs):
+        # Only TreeListCtrl has a separate main window, return self if we are 
+        # mixed in with another tree control.
+        return self.__callSuper('GetMainWindow', self, *args, **kwargs)
+
+    def GetItemImage(self, item, which=wx.TreeItemIcon_Normal, column=-1):
+        # CustomTreeCtrl always wants the which argument, so provide it
+        # TreeListCtr.GetItemImage has a different order of arguments than
+        # the other tree controls. Hide the differenes.
+        if self.GetColumnCount():
+            args = (item, column, which)
+        else:
+            args = (item, which)
+        return super(TreeAPIHarmonizer, self).GetItemImage(*args)
+
+    def SetItemImage(self, item, imageIndex, which=wx.TreeItemIcon_Normal, 
+                     column=-1):
+        # The SetItemImage signature is different for TreeListCtrl and
+        # other tree controls. This adapter method hides the differences.
+        if self.GetColumnCount():
+            args = (item, imageIndex, column, which)
+        else:
+            args = (item, imageIndex, which)
+        super(TreeAPIHarmonizer, self).SetItemImage(*args)
+
+    def UnselectAll(self):
+        # Unselect all items, regardless of whether we are in multiple 
+        # selection mode or not.
+        if self.HasFlag(wx.TR_MULTIPLE):
+            super(TreeAPIHarmonizer, self).UnselectAll()
+        else:
+            # CustomTreeCtrl Unselect() doesn't seem to work in all cases,
+            # also invoke UnselectAll just to be sure.
+            self.Unselect()
+            super(TreeAPIHarmonizer, self).UnselectAll()
+
+    def GetCount(self):
+        # TreeListCtrl correctly ignores the root item when it is hidden,
+        # but doesn't count the root item when it is visible
+        itemCount = super(TreeAPIHarmonizer, self).GetCount()
+        if self.GetColumnCount() and not self.HasFlag(wx.TR_HIDE_ROOT):
+            itemCount += 1
+        return itemCount
+
+    def GetSelections(self):
+        # Always return a list of selected items, regardless of whether
+        # we are in multiple selection mode or not.
+        if self.HasFlag(wx.TR_MULTIPLE):
+            selections = super(TreeAPIHarmonizer, self).GetSelections()
+        else:
+            selection = self.GetSelection()
+            if selection:
+                selections = [selection]
+            else:
+                selections = []
+        # If the root item is hidden, it should never be selected, 
+        # unfortunately, CustomTreeCtrl allows it to be selected.
+        if self.HasFlag(wx.TR_HIDE_ROOT):
+            rootItem = self.GetRootItem()
+            if rootItem and rootItem in selections:
+                selections.remove(rootItem)
+        return selections
+
+    def GetFirstVisibleItem(self):
+        # TreeListCtrl raises an exception or even crashes when invoking 
+        # GetFirstVisibleItem on an empty tree.
+        if self.GetRootItem():
+            return super(TreeAPIHarmonizer, self).GetFirstVisibleItem()
+        else:
+            return wx.TreeItemId()
+
+    def SelectItem(self, item, *args, **kwargs):
+        # Prevent the hidden root from being selected, otherwise TreeCtrl
+        # crashes 
+        if self.HasFlag(wx.TR_HIDE_ROOT) and item == self.GetRootItem():
+            return
+        else:
+            return super(TreeAPIHarmonizer, self).SelectItem(item, *args, 
+                                                             **kwargs)
+
+    def HitTest(self, *args, **kwargs):
+        ''' HitTest returns a two-tuple (item, flags) for tree controls
+        without columns and a three-tuple (item, flags, column) for tree
+        controls with columns. Our caller can indicate this method to
+        always return a three-tuple no matter what tree control we're mixed
+        in with by specifying the optional argument 'alwaysReturnColumn'
+        to be True. '''
+        alwaysReturnColumn = kwargs.pop('alwaysReturnColumn', False)
+        hitTestResult = super(TreeAPIHarmonizer, self).HitTest(*args, **kwargs)
+        if len(hitTestResult) == 2 and alwaysReturnColumn:
+            hitTestResult += (0,)
+        return hitTestResult
+
+    def ExpandAll(self, item=None):
+        # TreeListCtrl wants an item as argument. That's an inconsistency with
+        # the TreeCtrl API. Also, TreeCtrl doesn't allow invoking ExpandAll 
+        # on a tree with hidden root node, so prevent that.
+        if self.HasFlag(wx.TR_HIDE_ROOT):
+            rootItem = self.GetRootItem()
+            if rootItem:
+                child, cookie = self.GetFirstChild(rootItem)
+                while child:
+                    self.ExpandAllChildren(child)
+                    child, cookie = self.GetNextChild(rootItem, cookie)
+        else:
+            try:
+                super(TreeAPIHarmonizer, self).ExpandAll()
+            except TypeError:
+                if item is None:
+                    item = self.GetRootItem()
+                super(TreeAPIHarmonizer, self).ExpandAll(item)
+
+    def ExpandAllChildren(self, item):
+        # TreeListCtrl and CustomTreeCtrl don't have ExpandallChildren
+        try:
+            super(TreeAPIHarmonizer, self).ExpandAllChildren(item)
+        except AttributeError:
+            self.Expand(item)
+            child, cookie = self.GetFirstChild(item) 
+            while child:
+                self.ExpandAllChildren(child)
+                child, cookie = self.GetNextChild(item, cookie)
+
+
+class TreeHelper(object):
+    ''' This class provides methods that are not part of the API of any 
+    tree control, but are convenient to have available. '''
+
+    def GetItemChildren(self, item=None, recursively=False):
+        ''' Return the children of item as a list. '''
+        if not item:
+            item = self.GetRootItem()
+            if not item:
+                return []
+        children = []
+        child, cookie = self.GetFirstChild(item)
+        while child:
+            children.append(child)
+            if recursively:
+                children.extend(self.GetItemChildren(child, True))
+            child, cookie = self.GetNextChild(item, cookie)
+        return children
+
+    def GetIndexOfItem(self, item):
+        ''' Return the index of item. '''
+        parent = self.GetItemParent(item)
+        if parent:
+            parentIndices = self.GetIndexOfItem(parent)
+            ownIndex = self.GetItemChildren(parent).index(item)
+            return parentIndices + (ownIndex,)
+        else:
+            return ()
+
+    def GetItemByIndex(self, index):
+        ''' Return the item specified by index. '''
+        item = self.GetRootItem()
+        for i in index:
+            children = self.GetItemChildren(item)
+            item = children[i]
+        return item
+
+
+class VirtualTree(TreeAPIHarmonizer, TreeHelper):
+    ''' This is a mixin class that can be used to allow for virtual tree
+    controls. It can be mixed in with wx.TreeCtrl, wx.gizmos.TreeListCtrl, 
+    wx.lib.customtree.CustomTreeCtrl.
+
+    To use it derive a new class from this class and one of the tree
+    controls, e.g.:
+    class MyTree(VirtualTree, wx.TreeCtrl):
+        ...
+
+    VirtualTree uses several callbacks (such as OnGetItemText) to 
+    retrieve information needed to construct the tree and render the 
+    items. To specify what item the callback needs information about,
+    the callback passes an item index. Whereas for list controls a simple
+    integer index can be used, for tree controls indicating a specific
+    item is a little bit more complicated. See below for a more detailed 
+    explanation of the how index works.
+
+    Note that VirtualTree forces the wx.TR_HIDE_ROOT style.
+
+    In your subclass you *must* override OnGetItemText and 
+    OnGetChildrenCount. These two methods are the minimum needed to 
+    construct the tree and render the item labels. If you want to add 
+    images, change fonts our colours, etc., you need to override the 
+    appropriate OnGetXXX method as well.
+
+    About indices: your callbacks are passed a tuple of integers that 
+    identifies the item the VirtualTree wants information about. An 
+    empty tuple, i.e. (), represents the hidden root item.  A tuple with 
+    one integer, e.g. (3,), represents a visible root item, in this case 
+    the fourth one. A tuple with two integers, e.g. (3,0), represents a 
+    child of a visible root item, in this case the first child of the 
+    fourth root item. 
+    '''
+
+    def __init__(self, *args, **kwargs):
+        kwargs['style'] = kwargs.get('style', wx.TR_DEFAULT_STYLE) | \
+                          wx.TR_HIDE_ROOT
+        super(VirtualTree, self).__init__(*args, **kwargs)
+        self.Bind(wx.EVT_TREE_ITEM_EXPANDING, self.OnItemExpanding)
+        self.Bind(wx.EVT_TREE_ITEM_COLLAPSED, self.OnItemCollapsed)
+
+    def OnGetChildrenCount(self, index):
+        ''' This function *must* be overloaded in the derived class.
+        It should return the number of child items of the item with the 
+        provided index. If index == () it should return the number of 
+        root items. '''
+        raise NotImplementedError
+
+    def OnGetItemText(self, index, column=0):
+        ''' This function *must* be overloaded in the derived class. It 
+        should return the string containing the text of the specified
+        item. '''
+        raise NotImplementedError
+
+    def OnGetItemFont(self, index):
+        ''' This function may be overloaded in the derived class. It 
+        should return the wx.Font to be used for the specified item. '''
+        return wx.NullFont 
+
+    def OnGetItemTextColour(self, index):
+        ''' This function may be overloaded in the derived class. It 
+        should return the wx.Colour to be used as text colour for the 
+        specified item. '''
+        return wx.NullColour
+
+    def OnGetItemBackgroundColour(self, index):
+        ''' This function may be overloaded in the derived class. It 
+        should return the wx.Colour to be used as background colour for 
+        the specified item. '''
+        return wx.NullColour
+
+    def OnGetItemImage(self, index, which=wx.TreeItemIcon_Normal, column=0):
+        ''' This function may be overloaded in the derived class. It 
+        should return the index of the image to be used. Don't forget
+        to associate an ImageList with the tree control. '''
+        return -1
+
+    def OnGetItemType(self, index):
+        ''' This function may be overloaded in the derived class, but
+        that only makes sense when this class is mixed in with a tree 
+        control that supports checkable items, i.e. CustomTreeCtrl. 
+        This method should return whether the item is to be normal (0,
+        the default), a checkbox (1) or a radiobutton (2). 
+        Note that OnGetItemChecked needs to be implemented as well; it
+        should return whether the item is actually checked. '''
+        return 0 
+
+    def OnGetItemChecked(self, index):
+        ''' This function may be overloaded in the derived class, but
+        that only makes sense when this class is mixed in with a tree 
+        control that supports checkable items, i.e. CustomTreeCtrl. 
+        This method should return whether the item is to be checked. 
+        Note that OnGetItemType should return 1 (checkbox) or 2
+        (radiobutton) for this item. '''
+        return False 
+
+    def RefreshItems(self):
+        ''' Redraws all visible items. '''
+        rootItem = self.GetRootItem()
+        if not rootItem:
+            rootItem = self.AddRoot('Hidden root')
+        self.RefreshChildrenRecursively(rootItem)
+
+    def RefreshItem(self, index):
+        ''' Redraws the item with the specified index. '''
+        try:
+            item = self.GetItemByIndex(index)
+        except IndexError:
+            # There's no corresponding item for index, because its parent
+            # has not been expanded yet.
+            return
+        hasChildren = bool(self.OnGetChildrenCount(index))
+        self.DoRefreshItem(item, index, hasChildren)
+
+    def RefreshChildrenRecursively(self, item, itemIndex=None):
+        ''' Refresh the children of item, reusing as much of the
+        existing items in the tree as possible. '''
+        if itemIndex is None:
+            itemIndex = self.GetIndexOfItem(item)
+        reusableChildren = self.GetItemChildren(item)
+        for childIndex in self.ChildIndices(itemIndex):
+            if reusableChildren: 
+                child = reusableChildren.pop(0) 
+            else:
+                child = self.AppendItem(item, '')
+            self.RefreshItemRecursively(child, childIndex)
+        for child in reusableChildren:
+            self.Delete(child)
+
+    def RefreshItemRecursively(self, item, itemIndex):
+        ''' Refresh the item and its children recursively. '''
+        hasChildren = bool(self.OnGetChildrenCount(itemIndex))
+        item = self.DoRefreshItem(item, itemIndex, hasChildren)
+        # We need to refresh the children when the item is expanded and
+        # when the item has no children, because in the latter case we
+        # might have to delete old children from the tree:
+        if self.IsExpanded(item) or not hasChildren:
+            self.RefreshChildrenRecursively(item, itemIndex)
+        self.SetItemHasChildren(item, hasChildren)
+ 
+    def DoRefreshItem(self, item, index, hasChildren):
+        ''' Refresh one item. '''
+        item = self.RefreshItemType(item, index)
+        self.RefreshItemText(item, index)
+        self.RefreshColumns(item, index)
+        self.RefreshItemFont(item, index)
+        self.RefreshTextColour(item, index)
+        self.RefreshBackgroundColour(item, index)
+        self.RefreshItemImage(item, index, hasChildren)
+        self.RefreshCheckedState(item, index)
+        return item
+
+    def RefreshItemText(self, item, index):
+        self.__refreshAttribute(item, index, 'ItemText')
+
+    def RefreshColumns(self, item, index):
+        for columnIndex in range(1, self.GetColumnCount()):
+            self.__refreshAttribute(item, index, 'ItemText', columnIndex)
+
+    def RefreshItemFont(self, item, index):
+        self.__refreshAttribute(item, index, 'ItemFont')
+
+    def RefreshTextColour(self, item, index):
+        self.__refreshAttribute(item, index, 'ItemTextColour')
+
+    def RefreshBackgroundColour(self, item, index):
+        self.__refreshAttribute(item, index, 'ItemBackgroundColour')
+
+    def RefreshItemImage(self, item, index, hasChildren):
+        regularIcons = [wx.TreeItemIcon_Normal, wx.TreeItemIcon_Selected]
+        expandedIcons = [wx.TreeItemIcon_Expanded, 
+                         wx.TreeItemIcon_SelectedExpanded]
+        # Refresh images in first column:
+        for icon in regularIcons:
+            self.__refreshAttribute(item, index, 'ItemImage', icon)
+        for icon in expandedIcons:
+            if hasChildren:
+                imageIndex = self.OnGetItemImage(index, icon)
+            else:
+                imageIndex = -1
+            if self.GetItemImage(item, icon) != imageIndex or imageIndex == -1:
+                self.SetItemImage(item, imageIndex, icon)
+        # Refresh images in remaining columns, if any:
+        for columnIndex in range(1, self.GetColumnCount()):
+            for icon in regularIcons:
+                self.__refreshAttribute(item, index, 'ItemImage', icon, 
+                                        columnIndex)
+
+    def RefreshItemType(self, item, index):
+        return self.__refreshAttribute(item, index, 'ItemType')
+
+    def RefreshCheckedState(self, item, index):
+        self.__refreshAttribute(item, index, 'ItemChecked')
+
+    def ChildIndices(self, itemIndex):
+        childrenCount = self.OnGetChildrenCount(itemIndex) 
+        return [itemIndex + (childNumber,) for childNumber \
+                in range(childrenCount)]
+
+    def OnItemExpanding(self, event):
+        self.RefreshChildrenRecursively(event.GetItem())
+        event.Skip()
+
+    def OnItemCollapsed(self, event):
+        parent = self.GetItemParent(event.GetItem())
+        if not parent:
+            parent = self.GetRootItem()
+        self.RefreshChildrenRecursively(parent)
+        event.Skip()
+
+    def __refreshAttribute(self, item, index, attribute, *args):
+        ''' Refresh the specified attribute if necessary. '''
+        value = getattr(self, 'OnGet%s'%attribute)(index, *args)
+        if getattr(self, 'Get%s'%attribute)(item, *args) != value:
+            return getattr(self, 'Set%s'%attribute)(item, value, *args)
+        else:
+            return item
+
+
+class DragAndDrop(TreeAPIHarmonizer, TreeHelper):
+    ''' This is a mixin class that can be used to easily implement
+    dragging and dropping of tree items. It can be mixed in with 
+    wx.TreeCtrl, wx.gizmos.TreeListCtrl, or wx.lib.customtree.CustomTreeCtrl.
+
+    To use it derive a new class from this class and one of the tree
+    controls, e.g.:
+    class MyTree(DragAndDrop, wx.TreeCtrl):
+        ...
+
+    You *must* implement OnDrop. OnDrop is called when the user has
+    dropped an item on top of another item. It's up to you to decide how
+    to handle the drop. If you are using this mixin together with the
+    VirtualTree mixin, it makes sense to rearrange your underlying data
+    and then call RefreshItems to let the virtual tree refresh itself. '''    
+ 
+    def __init__(self, *args, **kwargs):
+        kwargs['style'] = kwargs.get('style', wx.TR_DEFAULT_STYLE) | \
+                          wx.TR_HIDE_ROOT
+        super(DragAndDrop, self).__init__(*args, **kwargs)
+        self.Bind(wx.EVT_TREE_BEGIN_DRAG, self.OnBeginDrag)
+
+    def OnDrop(self, dropItem, dragItem):
+        ''' This function must be overloaded in the derived class.
+        dragItem is the item being dragged by the user. dropItem is the
+        item dragItem is dropped upon. If the user doesn't drop dragItem
+        on another item, dropItem equals the (hidden) root item of the
+        tree control. '''
+        raise NotImplementedError
+
+    def OnBeginDrag(self, event):
+        # We allow only one item to be dragged at a time, to keep it simple
+        self._dragItem = event.GetItem()
+        if self._dragItem and self._dragItem != self.GetRootItem(): 
+            self.StartDragging()
+            event.Allow()
+        else:
+            event.Veto()
+
+    def OnEndDrag(self, event):
+        self.StopDragging()
+        dropTarget = event.GetItem()
+        if not dropTarget:
+            dropTarget = self.GetRootItem()
+        if self.IsValidDropTarget(dropTarget):
+            self.UnselectAll()
+            if dropTarget != self.GetRootItem():
+                self.SelectItem(dropTarget)
+            self.OnDrop(dropTarget, self._dragItem)
+
+    def OnDragging(self, event):
+        if not event.Dragging():
+            self.StopDragging()
+            return
+        item, flags, column = self.HitTest(wx.Point(event.GetX(), event.GetY()),
+                                           alwaysReturnColumn=True)
+        if not item:
+            item = self.GetRootItem()
+        if self.IsValidDropTarget(item):
+            self.SetCursorToDragging()
+        else:
+            self.SetCursorToDroppingImpossible()
+        if flags & wx.TREE_HITTEST_ONITEMBUTTON:
+            self.Expand(item)
+        if self.GetSelections() != [item]:
+            self.UnselectAll()
+            if item != self.GetRootItem(): 
+                self.SelectItem(item)
+        event.Skip()
+        
+    def StartDragging(self):
+        self.GetMainWindow().Bind(wx.EVT_MOTION, self.OnDragging)
+        self.Bind(wx.EVT_TREE_END_DRAG, self.OnEndDrag)
+        self.SetCursorToDragging()
+
+    def StopDragging(self):
+        self.GetMainWindow().Unbind(wx.EVT_MOTION)
+        self.Unbind(wx.EVT_TREE_END_DRAG)
+        self.ResetCursor()
+        self.UnselectAll()
+        self.SelectItem(self._dragItem)
+
+    def SetCursorToDragging(self):
+        self.GetMainWindow().SetCursor(wx.StockCursor(wx.CURSOR_HAND))
+        
+    def SetCursorToDroppingImpossible(self):
+        self.GetMainWindow().SetCursor(wx.StockCursor(wx.CURSOR_NO_ENTRY))
+        
+    def ResetCursor(self):
+        self.GetMainWindow().SetCursor(wx.NullCursor)
+
+    def IsValidDropTarget(self, dropTarget):
+        if dropTarget: 
+            allChildren = self.GetItemChildren(self._dragItem, recursively=True)
+            parent = self.GetItemParent(self._dragItem) 
+            return dropTarget not in [self._dragItem, parent] + allChildren
+        else:
+            return True        
+
+
+class ExpansionState(TreeAPIHarmonizer, TreeHelper):
+    ''' This is a mixin class that can be used to save and restore
+    the expansion state (i.e. which items are expanded and which items
+    are collapsed) of a tree. It can be mixed in with wx.TreeCtrl, 
+    wx.gizmos.TreeListCtrl, or wx.lib.customtree.CustomTreeCtrl.
+
+    To use it derive a new class from this class and one of the tree
+    controls, e.g.:
+    class MyTree(ExpansionState, wx.TreeCtrl):
+        ...
+
+    By default, ExpansionState uses the position of tree items in the tree 
+    to keep track of which items are expanded. This should be sufficient 
+    for the simple scenario where you save the expansion state of the tree 
+    when the user closes the application or file so that you can restore 
+    the expansion state when the user start the application or loads that 
+    file for the next session.  
+
+    If you need to add or remove items between the moments of saving and 
+    restoring the expansion state (e.g. in case of a multi-user application)
+    you must override GetItemIdentity so that saving and loading of the 
+    expansion doesn't depend on the position of items in the tree, but 
+    rather on some more stable characteristic of the underlying domain 
+    object, e.g. a social security number in case of persons or an isbn 
+    number in case of books. '''    
+
+    def GetItemIdentity(self, item):
+        ''' Return a hashable object that represents the identity of the
+        item. By default this returns the position of the item in the 
+        tree. You may want to override this to return the item label 
+        (if you know that labels are unique and don't change), or return 
+        something that represents the underlying domain object, e.g. 
+        a database key. ''' 
+        return self.GetIndexOfItem(item)
+ 
+    def GetExpansionState(self):
+        ''' GetExpansionState() -> list of expanded items. Expanded items 
+        are coded as determined by the result of GetItemIdentity(item). '''
+        root = self.GetRootItem()
+        if not root:
+            return []
+        if self.HasFlag(wx.TR_HIDE_ROOT):
+            return self.GetExpansionStateOfChildren(root)
+        else:
+            return self.GetExpansionStateOfItem(root)
+
+    def SetExpansionState(self, listOfExpandedItems):
+        ''' SetExpansionState(listOfExpandedItems). Expands all tree items 
+        whose identity, as determined by GetItemIdentity(item), is present
+        in the list and collapses all other tree items. '''
+        root = self.GetRootItem()
+        if not root:
+            return
+        if self.HasFlag(wx.TR_HIDE_ROOT):
+            self.SetExpansionStateOfChildren(listOfExpandedItems, root)
+        else:
+            self.SetExpansionStateOfItem(listOfExpandedItems, root)
+
+    ExpansionState = property(GetExpansionState, SetExpansionState)
+
+    def GetExpansionStateOfItem(self, item):
+        listOfExpandedItems = []
+        if self.IsExpanded(item):
+            listOfExpandedItems.append(self.GetItemIdentity(item))
+            listOfExpandedItems.extend(self.GetExpansionStateOfChildren(item))
+        return listOfExpandedItems
+
+    def GetExpansionStateOfChildren(self, item):
+        listOfExpandedItems = []
+        for child in self.GetItemChildren(item):
+            listOfExpandedItems.extend(self.GetExpansionStateOfItem(child))
+        return listOfExpandedItems
+
+    def SetExpansionStateOfItem(self, listOfExpandedItems, item):
+        if self.GetItemIdentity(item) in listOfExpandedItems:
+            self.Expand(item)
+            self.SetExpansionStateOfChildren(listOfExpandedItems, item)
+        else:
+            self.Collapse(item)
+
+    def SetExpansionStateOfChildren(self, listOfExpandedItems, item):
+        for child in self.GetItemChildren(item):
+            self.SetExpansionStateOfItem(listOfExpandedItems, child)
diff --git a/wxPython/wx/lib/ogl/_basic.py b/wxPython/wx/lib/ogl/_basic.py
index db095dd165..5d5f461fce 100644
--- a/wxPython/wx/lib/ogl/_basic.py
+++ b/wxPython/wx/lib/ogl/_basic.py
@@ -67,9 +67,6 @@ class ShapeEvtHandler(object):
         self._previousHandler = prev
         self._handlerShape = shape
 
-    def __del__(self):
-        pass
-
     def SetShape(self, sh):
         self._handlerShape = sh
 
@@ -311,9 +308,6 @@ class Shape(ShapeEvtHandler):
             self.GetEventHandler().OnDelete()
         self._eventHandler = None
         
-    def __del__(self):
-        ShapeEvtHandler.__del__(self)
-
     def Draggable(self):
         """TRUE if the shape may be dragged by the user."""
         return True
diff --git a/wxPython/wx/lib/ogl/_lines.py b/wxPython/wx/lib/ogl/_lines.py
index d4da07dbd2..77ce392cac 100644
--- a/wxPython/wx/lib/ogl/_lines.py
+++ b/wxPython/wx/lib/ogl/_lines.py
@@ -218,16 +218,6 @@ class LineShape(Shape):
         self._lineControlPoints = []
         self._arcArrows = []
 
-    def __del__(self):
-        if self._lineControlPoints:
-            self._lineControlPoints = []
-        for i in range(3):
-            if self._labelObjects[i]:
-                self._labelObjects[i].Select(False)
-                self._labelObjects[i].RemoveFromCanvas(self._canvas)
-        self._labelObjects = []
-        self.ClearArrowsAtPosition(-1)
-
     def GetFrom(self):
         """Return the 'from' object."""
         return self._from
@@ -492,6 +482,11 @@ class LineShape(Shape):
             self._from.GetLines().remove(self)
         self._to = None
         self._from = None
+        for i in range(3):
+            if self._labelObjects[i]:
+                self._labelObjects[i].Select(False)
+                self._labelObjects[i].RemoveFromCanvas(self._canvas)
+        self.ClearArrowsAtPosition(-1)
 
     def SetEnds(self, x1, y1, x2, y2):
         """Set the end positions of the line."""
diff --git a/wxPython/wx/lib/plot.py b/wxPython/wx/lib/plot.py
index 0e5d01f1ec..96827b67c7 100644
--- a/wxPython/wx/lib/plot.py
+++ b/wxPython/wx/lib/plot.py
@@ -554,6 +554,7 @@ class PlotCanvas(wx.Panel):
         self._ySpec= 'auto'
         self._gridEnabled= False
         self._legendEnabled= False
+        self._titleEnabled= True
         
         # Fonts
         self._fontCache = {}
@@ -567,6 +568,8 @@ class PlotCanvas(wx.Panel):
         self._pointLabelFunc= None
         self.canvas.Bind(wx.EVT_LEAVE_WINDOW, self.OnLeave)
 
+        self._useScientificNotation = False
+
         self.canvas.Bind(wx.EVT_PAINT, self.OnPaint)
         self.canvas.Bind(wx.EVT_SIZE, self.OnSize)
         # OnSize called to make sure the buffer is initialized.
@@ -746,6 +749,12 @@ class PlotCanvas(wx.Panel):
         """Set True to show scrollbars"""
         return self.sb_vert.IsShown()
 
+    def SetUseScientificNotation(self, useScientificNotation):
+        self._useScientificNotation = useScientificNotation
+
+    def GetUseScientificNotation(self):
+        return self._useScientificNotation
+
     def SetEnableDrag(self, value):
         """Set True to enable drag."""
         if value not in [True,False]:
@@ -799,6 +808,17 @@ class PlotCanvas(wx.Panel):
         """True if Legend enabled."""
         return self._legendEnabled
 
+    def SetEnableTitle(self, value):
+        """Set True to enable title."""
+        if value not in [True,False]:
+            raise TypeError, "Value should be True or False"
+        self._titleEnabled= value 
+        self.Redraw()
+
+    def GetEnableTitle(self):
+        """True if title enabled."""
+        return self._titleEnabled
+
     def SetEnablePointLabel(self, value):
         """Set True to enable pointLabel."""
         if value not in [True,False]:
@@ -1038,11 +1058,14 @@ class PlotCanvas(wx.Panel):
         textSize_scale= _Numeric.array([rhsW+lhsW,bottomH+topH]) # make plot area smaller by text size
         textSize_shift= _Numeric.array([lhsW, bottomH])          # shift plot area by this amount
 
-        # drawing title and labels text
-        dc.SetFont(self._getFont(self._fontSizeTitle))
-        titlePos= (self.plotbox_origin[0]+ lhsW + (self.plotbox_size[0]-lhsW-rhsW)/2.- titleWH[0]/2.,
-                 self.plotbox_origin[1]- self.plotbox_size[1])
-        dc.DrawText(graphics.getTitle(),titlePos[0],titlePos[1])
+        # draw title if requested
+        if self._titleEnabled:
+            dc.SetFont(self._getFont(self._fontSizeTitle))
+            titlePos= (self.plotbox_origin[0]+ lhsW + (self.plotbox_size[0]-lhsW-rhsW)/2.- titleWH[0]/2.,
+                       self.plotbox_origin[1]- self.plotbox_size[1])
+            dc.DrawText(graphics.getTitle(),titlePos[0],titlePos[1])
+
+        # draw label text
         dc.SetFont(self._getFont(self._fontSizeAxis))
         xLabelPos= (self.plotbox_origin[0]+ lhsW + (self.plotbox_size[0]-lhsW-rhsW)/2.- xLabelWH[0]/2.,
                  self.plotbox_origin[1]- xLabelWH[1])
@@ -1131,7 +1154,7 @@ class PlotCanvas(wx.Panel):
             l.append(cn)
         return l
 
-    def GetClosetPoint(self, pntXY, pointScaled= True):
+    def GetClosestPoint(self, pntXY, pointScaled= True):
         """Returns list with
             [curveNumber, legend, index of closest point, pointXY, scaledXY, distance]
             list for only the closest curve.
@@ -1151,6 +1174,8 @@ class PlotCanvas(wx.Panel):
         mdist = min(dists)  #Min dist
         i = dists.index(mdist)  #index for min dist
         return closestPts[i]  #this is the closest point on closest curve
+    
+    GetClosetPoint = GetClosestPoint
 
     def UpdatePointLabel(self, mDataDict):
         """Updates the pointLabel point on screen with data contained in
@@ -1355,8 +1380,11 @@ class PlotCanvas(wx.Panel):
         """Draws Title and labels and returns width and height for each"""
         # TextExtents for Title and Axis Labels
         dc.SetFont(self._getFont(self._fontSizeTitle))
-        title= graphics.getTitle()
-        titleWH= dc.GetTextExtent(title)
+        if self._titleEnabled:
+            title= graphics.getTitle()
+            titleWH= dc.GetTextExtent(title)
+        else:
+            titleWH= (0,0)
         dc.SetFont(self._getFont(self._fontSizeAxis))
         xLabel, yLabel= graphics.getXLabel(),graphics.getYLabel()
         xLabelWH= dc.GetTextExtent(xLabel)
@@ -1565,7 +1593,7 @@ class PlotCanvas(wx.Panel):
                 error = e
                 factor = f
         grid = factor * 10.**power
-        if power > 4 or power < -4:
+        if self._useScientificNotation and (power > 4 or power < -4):
             format = '%+7.1e'        
         elif power >= 0:
             digits = max(1, int(power))
@@ -2021,7 +2049,7 @@ class TestFrame(wx.Frame):
         if self.client.GetEnablePointLabel() == True:
             #make up dict with info for the pointLabel
             #I've decided to mark the closest point on the closest curve
-            dlst= self.client.GetClosetPoint( self.client._getXY(event), pointScaled= True)
+            dlst= self.client.GetClosestPoint( self.client._getXY(event), pointScaled= True)
             if dlst != []:    #returns [] if none
                 curveNum, legend, pIndex, pointXY, scaledXY, distance = dlst
                 #make up dictionary to pass to my user function (see DrawPointLabel) 
diff --git a/wxPython/wx/lib/wxpTag.py b/wxPython/wx/lib/wxpTag.py
index d362fb365f..13d2a172f9 100644
--- a/wxPython/wx/lib/wxpTag.py
+++ b/wxPython/wx/lib/wxpTag.py
@@ -163,16 +163,13 @@ class wxpTagHandler(wx.html.HtmlWinTagHandler):
         # create the object
         parent = self.GetParser().GetWindowInterface().GetHTMLWindow()
         if parent:
-            obj = apply(self.ctx.classObj,
-                        (parent,),
-                        self.ctx.kwargs)
+            obj = self.ctx.classObj(parent, **self.ctx.kwargs)
             obj.Show(True)
 
             # add it to the HtmlWindow
             self.GetParser().GetContainer().InsertCell(
                 wx.html.HtmlWidgetCell(obj, self.ctx.floatWidth))
             self.ctx = None
-
         return True
 
 
diff --git a/wxPython/wx/py/frame.py b/wxPython/wx/py/frame.py
index 2ca5ec9061..904c1b01fb 100644
--- a/wxPython/wx/py/frame.py
+++ b/wxPython/wx/py/frame.py
@@ -646,7 +646,7 @@ class Frame(wx.Frame):
 
 
     def LoadSettings(self, config):
-        """Called be derived classes to load settings specific to the Frame"""
+        """Called by derived classes to load settings specific to the Frame"""
         pos  = wx.Point(config.ReadInt('Window/PosX', -1),
                         config.ReadInt('Window/PosY', -1))
                         
diff --git a/wxPython/wx/tools/XRCed/CHANGES.txt b/wxPython/wx/tools/XRCed/CHANGES.txt
index 91b4dbd163..dcc4dcabf2 100644
--- a/wxPython/wx/tools/XRCed/CHANGES.txt
+++ b/wxPython/wx/tools/XRCed/CHANGES.txt
@@ -1,3 +1,66 @@
+0.1.8-5
+-------
+
+Preferences for default "sizeritem" parameters for new panels and
+controls can be configured ("File">"Preferences...").
+
+Implemented comment object for including simple one-line comments and
+comment directives as tree nodes. No validation is performed for a
+valid XML string so comments must not contain "-->". Comment directive
+is a special comment starting with '%' character, followed by a line
+of python code. It is executed using 'exec' when the resource file is
+opened. This is useful to import plugin modules containing custom
+handlers which are specific to the resource file, hovewer this is of
+course a security hole if you use foreign XRC files. A warning is
+displayed if the preference option 'ask' is selected (by default).
+
+Added support for custom controls and plugin modules. Refer to this
+wxPythonWiki for the details: 
+        http://wiki.wxpython.org/index.cgi/XRCed#custom
+
+Tool panel sections can be collapsed/expanded by clicking on the
+label of a tool group.
+
+Some undo/redo and other fixes.
+
+0.1.8-4
+-------
+
+Fixes for wxMSW (notebook highlighting, control sizes, tree Unselect).
+
+0.1.8-3
+-------
+
+Notebook page highlighting fix. Highlight resizes when the window 
+is resized. ParamUnit spin button detects event handler re-entry
+(wxGTK probably has a bug in wxSpinButton with repeated events).
+
+0.1.8-2
+-------
+
+Fix for dealing with empty 'growable' property, using MiniFrame
+for properties panel, the panel is restored together with the
+main window.
+
+0.1.8-1
+-------
+
+Fixed SetItemBold and editing 'growable' properties of 
+wxFlexGridSizer.
+
+0.1.8-0
+-------
+
+New feature added from a patch submitted on sourceforge by botg:
+moving of tree items. 
+
+Bugs fixed:
+- ChecklistBox content editing;
+- Window styles more in sync with the docs;
+- Replacing items;
+- Reference property page created correctly (every property is
+  optional).
+
 0.1.7-5
 -------
 
diff --git a/wxPython/wx/tools/XRCed/TODO.txt b/wxPython/wx/tools/XRCed/TODO.txt
index fddee3ba32..8246420546 100644
--- a/wxPython/wx/tools/XRCed/TODO.txt
+++ b/wxPython/wx/tools/XRCed/TODO.txt
@@ -1,6 +1,8 @@
 TODO for XRCed
 ==============
 
+- undo for Replace op
+
 - better help
 
 + undo/redo
@@ -28,4 +30,4 @@ TODO for XRCed
 
 + selecting object by clicking in test window
 
-- hidden items should not be highlighted
++ hidden items should not be highlighted
diff --git a/wxPython/wx/tools/XRCed/globals.py b/wxPython/wx/tools/XRCed/globals.py
index 845e3231ff..43f42e39d8 100644
--- a/wxPython/wx/tools/XRCed/globals.py
+++ b/wxPython/wx/tools/XRCed/globals.py
@@ -15,7 +15,7 @@ import sys
 # Global constants
 
 progname = 'XRCed'
-version = '0.1.7-5'
+version = '0.1.8-5'
 # Minimal wxWidgets version
 MinWxVersion = (2,6,0)
 if wx.VERSION[:3] < MinWxVersion:
@@ -48,6 +48,7 @@ class Globals:
     testWinPos = wx.DefaultPosition
     currentXXX = None
     currentEncoding = defaultEncoding
+    conf = None
 
     def _makeFonts(self):
         self._sysFont = wx.SystemSettings.GetFont(wx.SYS_SYSTEM_FONT)
@@ -70,3 +71,16 @@ class Globals:
     
 
 g = Globals()
+
+
+class MyDataObject(wx.PyDataObjectSimple):
+    def __init__(self):
+        wx.PyDataObjectSimple.__init__(self, wx.CustomDataFormat('XRCed_DND'))
+        self.data = ''
+    def GetDataSize(self):
+        return len(self.data)
+    def GetDataHere(self):
+        return self.data  # returns a string  
+    def SetData(self, data):
+        self.data = data
+        return True
diff --git a/wxPython/wx/tools/XRCed/images.py b/wxPython/wx/tools/XRCed/images.py
index 6d42855e83..a960ae3334 100644
--- a/wxPython/wx/tools/XRCed/images.py
+++ b/wxPython/wx/tools/XRCed/images.py
@@ -1,26 +1,25 @@
 #----------------------------------------------------------------------
 # This file was generated by encode_bitmaps.py
 #
-from wx import ImageFromStream, BitmapFromImage
-from wx import EmptyIcon
+from wx import ImageFromStream, BitmapFromImage, EmptyIcon
 import cStringIO
 
 
 def getAutoRefreshData():
     return \
-"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
-\x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
-\x00\xfaIDATH\x89\xb5T\xbb\x0e\x830\x0c<'\x1d\xe8\x9f2\x06X*>\xa0\xea\xd2\
-\xd6c\xff\xb4,m:\x01\xc1\x8a\x93@\x95\x932\x90\xc7\x1d\xf6\xd9&2\x165a\xaa\
-\xb2\x038\x95^|\x7f?^\xee\x9d\x8d\xa5\xdc\xbb\xa2\x08B\xf2\x17sR\xb4X`~\x1c#\
-\x0f\xff<'\x92\x8c F\xde\xf5\x03I\x91\xe7\xe3\xae\x8a\x14{\xd0:W\x94s\t\xd2\
-\xcaT\x0b]K\x8f&^,\x10\x9a\xdb\xf5\x03\xf9\xeb\xf6\x9c\x1b^\xd2\xb7K@\x12\
-\x03\xc0L\xce\r\xa3u\x0e\xcdM\x17Q=8\x1bK\xb3y\xf2\x11\x8d\xebY\x0ej\x049\
-\xc8\x14\x01\xf1\x08\x0e\x8d\x8a0E\xd3%}\xb7\xfa,\xca6Z\xaaS\xdd\xb4\x1a|H \
-\x14\n\xbfi\xdc\xd6<7\xbc\x08JdM\x0e\xcbU\x1a\x18+e@T\x1d\x19\x9b\\\x13\xe0\
-\xe7\xa5\xed3\xb3\xd7\xdegS\x14\x1b\r\xda\xf8\x8e\xa1\xb8\x0fbf\xcb\t\xfb\
-\x97\x00\x10\x1f\xcb)\xf2\xdd\x02GP\xbd\xd1~)\x14\xa25\xbe/\xa7J\x00\x00\x00\
-\x00IEND\xaeB`\x82" 
+"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x18\x08\x06\
+\x00\x00\x00\xe0w=\xf8\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00\xfdIDATH\x89\xc5T\xcb\x12\x820\x0c\xdc\x14\x0f\xf5O9\x16\xb88|\x80\xe3E\
+\xcd\xd1?\x95\x8b\xe2\xa9P2M[P\xc6\x9d\xe9\x81>vI6\t\x91\xa9\xb0'\xcc\xae\
+\xec\x00\x0e\xa5\x17\x9f\xef\xd7(\xf7\x8e\xa6\xa2\xdc\xbb\xa2\x08B\xf2\x07sR\
+\xb4X\xc0?\x8e\x91\x87\x7f\x9e\x13IF\x10#o\xda\x8e\xa4\xc8\xfdvUE\x8a=\xa8\
+\x9d+\xca\xb9\x04ie\xaa\x85\xae\xa5G\x13/\x16\x08\xcdm\xda\x8e\xc6\xf3\xf2\
+\x9c-O\xe9[% \x89\x01\xc0\x93\xb3e\xd4\xce\xc1^t\x11\xd5\x83\xa3\xa9\xc8\x9b\
+'\x1fQ?\x9f\xe5\xa0F\x90\x83L\x11\x10\x8f`\xd3\xa8\x08S4\x9c\xd2ww\x9fE\xd9F\
+Ku\xaa\x1bf\x837\t\x84B\xe17\xf5\xcb\x9ag\xcb\x93\xa0D\xd6\xe4\xb0\\\xa5\x81\
+\xb1R\x06D\xd5\x91\xa9\x92k\x00F\xbf\xb4}f\x1e\xb5\xf7\xd9\x14\xc5F\x836\xbe\
+c(\xee\x83\x98\xd9r\xc2~%\x00\xc4\xc7r\x8a|\xb5\xc0\x16\xfc\xb7\xd1~\x81\x0f\
+\xa3~\xa27=\x9c\x90\xeb\x00\x00\x00\x00IEND\xaeB`\x82" 
 
 def getAutoRefreshBitmap():
     return BitmapFromImage(getAutoRefreshImage())
@@ -76,23 +75,24 @@ def getIconIcon():
 #----------------------------------------------------------------------
 def getLocateData():
     return \
-'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
-\x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
-\x01\x84IDATH\x89\xb5U\xc1\x8d\x830\x10\\\'W\x07\xc2=\xe4\x83RG>i\xc2\xba\\\
-\x1d\x10\xdc\x04\x9f+$\x1fz\x00\xd1\x88\xef\x01k\xc6\xeb\x05r\xd2\xddJH\x04\
-\xdb3\xbb\xb3\xb3\x8e1\xa73\xfdg|\x1cm(\xab"\xec\xad\x8f\xaf\xc9\xec\xad\x9b\
-\xad\n\x12`\xbbqz8&:\xed\x82\xdb\x15\xdc]\xdc\x0c8,\xefb}\xab\xd2\x8c \x01_\
-\x80# \xc4\xd8M&!\xda Iz\xa0\x81\x13\x11}>\xbe\x8c\x06\x10\xbf\xdf\x8b@v\xae\
-\xae\xac\x8a\x80r%=(\xabe\xa3\x00/\xefz\xf9c\xb7\x02\xc5=\x03\x91\xbb\xb9H\
-\x1e%\xc2\xec$x\x94\x03z\xe0.\x8e\x90\x18\xc9\xfc\xb7\x8fI\xa4=\x00\xb7 \xf8\
-\xb3\xa9\x03g\x84\xebc7\xe5\xd5-\x18\xcf\xa6\x0e9\x01d\xcf\x81\xe0\xe3k2\xee\
-\x967\x9c\xc1\xb0\n\x8e\xd8\x83\xa8?x\x1b\x7fK\x9f\'\x86P\xcep\x1f\xd49\xd0\
-\x82\xb3\xfcmdW\x05J\xe0{O\x9a$DsE\xcf\xa6\x0er\x8f\xef}\xb2/#\xf0\xbd\x8fZr\
-\x03\xe5\x1c\xb0\\h\xe1-;\xa7\x12-Zb\xd3dF\xb8\xce.\xd3086\x07M\x1d"\x11ha9h\
-\\U~]\x0fDd\xd3\xec\x18\x88\x07(j~\xa1\x0c\x9c#\x9bd"\xb0\xe2\x90g\xae\r\x9a\
-\x06.M\x91\xd9T#\xd1$J\xbe\x0bpL\xe6\xcf\xfep4\xf0]\x02\xa2\xd9-xqi\x81\x92H\
-\xf0C\x02$"ZoI\xa9\xb3\x06\xbc2\x9c\xceo?\xf6j\x83\xbd\xda\xd0\xb6mx\xf7\xcc\
-\x0f\x93Y\xfb-\xb8Y\x01\xd4\x00\x00\x00\x00IEND\xaeB`\x82' 
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x18\x08\x06\
+\x00\x00\x00\xe0w=\xf8\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x01\x88IDATH\x89\xb5V\xc1\x8d\x830\x10\\\'W\x07\xc2=\xf0A\xa9#\x9f4a\xdd]\
+\x1d\t\xb8\t>WH>\xf4\x00\xa2\x11\xdf\x03\xd6\x8c\xd7\x0b\xe4\xa4\xcbJ\x91\
+\x12l\xcf\xec\xce\xce\x9a\x18s:\xd3;\xe3\xe3hCY\x17ao}|Nfo\xddlU\x90\x00\xdb\
+\x8d\xd3\xc31\xd1i\x17\xdc\xae\xe0\xaer3\xe0\xb0|\x17\xeb[\x95f\x04\t\xf8\
+\x02\x1c\x01!\xc6n2\t\xd1\x06I\xd2\x03\r\x9c\x88\xe8\xf3\xeb\xdbh\x00\xf1\
+\xf9\xad\x08d\xe7\xea\xca\xba\x08(W\xd2\x83\xb2^6\n\xf0\xf2\xa6\x97?v+P\xdc3\
+\x10\xb9\xab\x8b\xe4Q"\xccN\x82G9\xa0\x07\xaer\x84\xc4H\xe6\x7f|L"\xed\x01\
+\xb8\x05\xc1\x9b\xc7=pF\xb8>vS^\xdd\x82\xd1<\xee!\'\x80\xec9\x10||N\xc6]\xf3\
+\x863\x18V\xc1\x11{\x10\xf5\x07o\xe3o\xe9\xf3\xc4\x10\xca\x19\xee\x83:\x07Zp\
+\x96\x7f\x8d\xec\xaa@\t|\xefI\x93\x84h\xae\xa8y\xdc\x83\xdc\xe3{\x9f\xec\xcb\
+\x08|\xef\xa3\x96\xdc@9\x07,\x17Zx\xcb\xce\xa9D\x8b\x96\xd84\x99\x11\xae\xb3\
+\xcb4\x0c\x8e\xcdAS\x87H\x04ZX\x0e\x1aW\x95_\xd7\x03\x11\xd94;\x06\xe2\x01\
+\x8a\x9aW\x94\x81sd\x93L\x04V\x1c\xf2\xcc\xb5A\xd3\xc0\xa5)2\x9bj$\x9aD\xc9s\
+\x01\x8e\xc9\xfc\xdb\x0bG\x03\xdf% \x9a\xdd\x82\x17\x97\x16(\x89\x04?$@"\xa2\
+\xf5\x96\x94:k\xc0+\xc3\xe9\xfc\xf2\xc7^l\xb0\x17\x1b\xda\xb6\r/\x9f{\xf7\
+\xdf\x96_\xc7\x90\xfb4\xe23\t\xcc\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getLocateBitmap():
     return BitmapFromImage(getLocateImage())
@@ -109,23 +109,24 @@ def getLocateIcon():
 #----------------------------------------------------------------------
 def getLocateArmedData():
     return \
-'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
-\x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
-\x01zIDATH\x89\xb5U\xc1\x8d\xc2@\x0c\x9c\xe5\xeeO\x07\x14@\x03@!H\x14\xc0?\n\
-\xd4\x91D\xfb\xa7\x00$\n\x01\x1a\xa0\x00:\xa0\x82\xe5\x81\x86L\xbc\xde \xa4\
-\xbby\xc6\xce\x8c=\xb6\x93\x10&?\xf8O\xfc~J\xd8\xccgi,~\xbc\xdd\xc3X<\x94:P\
-\xe2j\xea\xbf\x1c\x1f\x9f\x85&c\xe4\xd5\xb4\'\xbf\xac+\xc4\xc7\x8b\xf4\xb2\
-\xae`\xe3\xa5N3\x01%\'1\t\x15\xab\xf3=\xa8PId \xe0\x91\x03@\xbd\xdb\x87z\xb7\
-\xcf,\xa8w\xfb\xb0:\xbf\xac)\x89\x0cf\xb0\x99\xcf\x92G~^\xf9\xed\x93\x1c\x00\
-\x98\x13\x1f\xc0b[\x81\x05\xbd;PeKN;t\x06\x97u\x05\x15V\xb1\xeb!\xfa\x16\xe9\
-\xb6(y\xd76\xc9ZD{lw\xe4\xe8\xda&e\x02Z=\xa1\xe4\xc7\xdb=,\xb6\xf9\xc0I\xa6]\
-\x10\xd9\xa1\xb1=Zv=Dl\xe6\xb3\xc4=\xa7\x98Z\xca\x9cL\xd9\xeb\xa0\x04V\xf9-\
-\xb2\x0e\x06\x16\x9c"<K\x80\x97]]\xdb\xa4,\xe7\x14\x07y\x99\xc0\xf2\x14\xdf^\
-r\x80\xd6\x16\xb5Ks\xbcu\x1eX\xc4o\x8b\x0emi*\xd28\xb7\xcc\xe3 \x8a\x87\xe6\
-\x1d\x91\x85\xae\xb0=4v\x95\t\x00\xfd.\xabH\xd76\x89\x1b\xa6\x9e[r\xc6\xb3K\
-\x06zo\x99\xa8\x95{\x87V"Wdk\xea\x89x\x16\xe9sK\xae\xc5\xfc\xd9\x0f\xc7#\x1f\
-\x15\x00\x86\xbe\x97`\xe7a\xe3\xa3\x02*\x04\xf4\x9f\x11\xeb\xb3G\xfc\x95\x00\
-A\xdbtK>\xe1\t\xf2\xe2\x0b\rG\xef\x97\xb3\x00\x00\x00\x00IEND\xaeB`\x82' 
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x18\x08\x06\
+\x00\x00\x00\xe0w=\xf8\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x01~IDATH\x89\xb5U\xc1\x8d\xc2@\x0c\x9c\xe5\xeeO\x07\x14@\x03@!H\x14\xc0?\n\
+\xd4\x91D\xfb\xa7\x00$\n\x01\x1a\xa0\x00:\xa0\x82\xbd\x07\x1a2\xf1z\x838\xdd\
+\xcd3vf\xec\xb1\x9d\x840\xf9\xc2\x7f\xe2\xfb]\xc2f>Kc\xf1\xe3\xed\x1e\xc6\
+\xe2\xa1\xd4\x81\x12WS\xff\xe5\xf8x/4\x19#\xaf\xa6=\xf9e]!>\x9e\xa4\x97u\x05\
+\x1b/u\x9a\t(9\x89I\xa8X\x9d\xefA\x85J"\x03\x01\x8f\x1c\x00\xea\xdd>\xd4\xbb\
+}fA\xbd\xdb\x87\xd5\xf9iMId0\x83\xcd|\x96<\xf2\xf3\xcao\x9f\xe4\x00\xc0\x9c\
+\xf8\x00\x16\xdb\n,\xe8\xd5\x81*[r\xda\xa13\xb8\xac+\xa8\xb0\x8a]\x0f\xd1\
+\xb7H\xb7E\xc9\xbb\xb6I\xd6"\xdac\xbb#G\xd76)\x13\xd0\xea\t%?\xde\xeea\xb1\
+\xcd\x07N2\xed\x82\xc8\x0e\x8d\xed\xd1\xb2\xeb!b3\x9f%\xee9\xc5\xd4R\xe6d\
+\xca^\x07%\xb0\xcaO\x91u0\xb0\xe0\x14\xe1Y\x02<\xed\xea\xda&e9\xa78\xc8\xcb\
+\x04\x96\xa7\xf8\xf2\x92\x03\xb4\xb6\xa8]\x9a\xe3\xad\xf3\xc0"~[thKS\x91\xc6\
+\xb9e\x1e\x07Q<4\xef\x88,t\x85\xed\xa1\xb1\xabL\x00\xe8wYE\xba\xb6I\xdc0\xf5\
+\xdc\x923\x9e]2\xd0{\xcbD\xad\xdc;\xb4\x12\xb9"[SO\xc4\xb3H\x9f[r-\xe6\xcf~8\
+\x1e\xf9\xa8\x000\xf4\xbd\x04;\x0f\x1b\x1f\x15P!\xa0\xff\x8cX\x9f=\xe2\x8f\
+\x04\x08\xda\xa6[\xf2\x0e\x1f\t\xfc\x06?%\xb3\x0b\x14\x95x1\xa9\x00\x00\x00\
+\x00IEND\xaeB`\x82' 
 
 def getLocateArmedBitmap():
     return BitmapFromImage(getLocateArmedImage())
@@ -142,16 +143,17 @@ def getLocateArmedIcon():
 #----------------------------------------------------------------------
 def getRefreshData():
     return \
-'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
-\x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
-\x00\xcaIDATH\x89\xc5\x94\xc1\x0e\x83 \x10Dw\xa1\x17\xff\xd4#m\xbf\xa3\xed\
-\x1e\xf9SOjO$Hve\x90\x10\xe7\xa6\xd1y0,\xc3\xec<\x8d\x94\x1b\xeaND\x0f\xf4\
-\xc3e[\xf7\xf2\xdd\xe4<\xd7\xfe\x83v\x90\x9bG\x91S(\x0cH?k\xe6\xf9\xcak\x90\
-\xd3\x1dh\xe6\xcf\xd7\x9bK\xc8\xef\xfb1!\xf0\x19\xcc!@\x99\x97bkL\xad\xad[\
-\xf1XpxL\xa3\x08E\x91C\x1cHL\xd5\x88\xf2\xa9I\xf9\xb7\xc8\x04L\xcesZ\xd5\x15\
-\xe3*\xa0\xd78ixU\xdc\x0bX\xb6u?\xbb\xa9]U\xd1b\x94OZ\x13\x00\xad\x03"{ \xe0\
-3\x98C8<#\xf1@\x00\xad\x1a\xac\xfa\xd6dvQ)m\xc5e\xc3v\x01\x88\xf4s\xa8]\xc6&\
-\xc0\x15\r\xbfh\x7f\xefOoH\x13\xe7\xb6\xfc\x00\x00\x00\x00IEND\xaeB`\x82' 
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x18\x08\x06\
+\x00\x00\x00\xe0w=\xf8\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00\xccIDATH\x89\xd5\x94\xc1\x0e\x83 \x10Dw\xa1\x17\xff\xd4#m\xbf\xa3\xed\
+\x1e\xf9SOjO$Hve\x90\x90\xa6s\xd3\xe8<\x18\x96av\x9eF\xca\ru\'\xa2\x1b\xfa\
+\xe1\xb2\xad{\xf9nr\x9ek\xffA;\xc8\xcd\xa3\xc8)\x14\x06\xa4\x9f5\xf3|\xe55\
+\xc8\xe9\x0e4\xf3\xfb\xe3\xc9%\xe4\xf3~\x99\x10\xf8\x0c\xe6\x10\xa0\xccK\xb1\
+5\xa6\xd6\xd6\xadx,8<\xa6Q\x84\xa2\xc8!\x0e$\xa6jD\xf9\xd4\xa4\xfc[d\x02&\
+\xe79\xad\xea\x8aq\x15\xd0k\x9c4\xbc*~\x0bX\xb6u?\xbb\xa9]U\xd1b\x94OZ\x13\
+\x00\xad\x03"{ \xe03\x98C8<#\xf1@\x00\xad\x1a\xac\xfa\xd6dvQ)m\xc5e\xc3v\x01\
+\x88\xf4s\xa8]\xc6&\xc0\x15\xfd\xffM\xfe\x02\x1c\xdeoJ\xc0]$\xb0\x00\x00\x00\
+\x00IEND\xaeB`\x82' 
 
 def getRefreshBitmap():
     return BitmapFromImage(getRefreshImage())
@@ -168,20 +170,20 @@ def getRefreshIcon():
 #----------------------------------------------------------------------
 def getTestData():
     return \
-'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
-\x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
-\x01\x1eIDATH\x89\xb5UK\x92\xc2 \x10}\r.r\x19G\x16.<N\xae0z\x8eh\x8e\x90\xe3\
-\xb8\x98\x05:\x97q\xe1\x0c.\xc6P|\x1a\xe8L)UTB\xa7y\x1f\x1a\x08\x91\xd2xgSoE\
-\x07\xb0\x92$\xb9\xdf\x1f\x97\xc6Hi\x92\xcc\xa5\xda\x12q\xc0K\x89X\x07\x9b\
-\x8f\xb5\x07\xb6\xd6V\t\xe6\xdc\xcb\xf5\x9b\'"\xa5\xa3n\x8cq\xb7;|\x07\xca=\
-\xcc3\xc6\xb8\x14\x8b\x94~m\x91O\xc7!_\xd2\x9a\xfa\x9a\x0b.\x8fs\xf1\xf2m\
-\x9a\xb9h\xa9\x0f\x1d\xa4\xef\x12\x17M\x07\xdds\x9f\xdd\xee\xf1\xb3\xab\x9c\
-\xa0\xd0\x85O\xb3\xd6\x16\'\xcd\xa0\xe1\xb8[\x95H\xe2m-\xaaA\nTS\x9f6q\x91g\
-\xd0%\xe0\x11\x81\xe4n\x91\x80\x8f\xe3\x18\x8d\xc5z\xc2:\xb4\x88>\xf7\x07/6Z\
-\xa2\x92\x0b\xae\xc8\\K\xd5g\x04\x12\xf0V<T\xcf\x12\x84.J \xdcwN=P\xa8\x01)M\
-\xa7\xe3\xe0v\xdb\t\x00p\xfe\xca\xaf\xec\xdd\xd6<\x81{\x1fK\xd5\x03\x8d\x1f\
-\x0e\xf0w*\xa7i\xca\xe2}_\x07\x16\x13\x84Di\xac\x06\xbc\x98\xe0\xbf\xed\x01\
-\xadi\xbd5g\xc8u\x0e\x00\x00\x00\x00IEND\xaeB`\x82' 
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x18\x08\x06\
+\x00\x00\x00\xe0w=\xf8\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x01"IDATH\x89\xb5VK\x92\xc2 \x10}\r.r\x19\x1d\x16.<N\xae\xa0\x9eC\xcd\x11r\
+\x9cY\xcc\x82\x19/\xe3\xc2\x19\\h(>\rt\xa6\x0cUT\x92N\xf3>4\x90\x10)\x8d%\
+\x9bZ\x14\x1d\xc0J\x92\xe4\xfe~]\x1a#\xa5I2\x96jS\xc4\x01\xcf%b\x1d|l\xd6\
+\x1e\xd8Z[%\x98r\xbf\x7f\xae<\x11)\x1duc\x8c\xbb\xdd\xe1;P\xeea\x9e1\xc6\xa5\
+X\xa4\xf4{\x8b|9\x9f\xf2)\xad\xa9\xaf\xb9\xe0\xf28\x17o_\xa6\x99\x8b\x96\xfa\
+\xd0Az/q\xd1t\xd0\xbd\xd6\xd9\xed\x1e_\xbb\xca\x0e\n]\xf84kmq\xd0\x04\x1a>w\
+\xab\x12I\xbc\xacE5H\x81j\xea\xd3&.\xf2\x04:\x07<"\x90\x9c-\x12\xf0a\x18\xa2\
+g\xb1\x9e\xb0\x0e-\xa2\xfd\xe1\xe8\xc5FSTr\xc1\x15\x99k\xa9\xfa\x8c@\x02\xde\
+\x8a\x87\xeaY\x82\xd0E\t\x84{\xcf\xa9\x07\n5 \xa5\xe9r>\xb9\xddv\x04\x00|~\
+\xe5G\xf6nk^\xc0\xbd\x8f\xa5\xea\x81\xc6\x07\x07x\xee\xcaq\x1c\xb3x\xdf\xd7\
+\x81\xc5\x04!Q\x1a\xab\x01\xcf&\xf8o[\xfc\xaf\xe2\x01cx\xbd7\x02\x98\x02\xd0\
+\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getTestBitmap():
     return BitmapFromImage(getTestImage())
@@ -646,6 +648,119 @@ def getToolMenuItemIcon():
     icon.CopyFromBitmap(getToolMenuItemBitmap())
     return icon
 
+#----------------------------------------------------------------------
+def getToolMoveDownData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x18\x08\x06\
+\x00\x00\x00\xe0w=\xf8\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00\xfcIDATH\x89\xb5VA\x12\x83 \x0c\xdc\x84~\xabm~f\xf9\x99m\xdf\xa5\xe9\
+\x05\xa64F\x01\xab\x99\xc98\x82d\xd9d\t\x12q\xc0\x99\xc6v@\xe7IO\x05\x00\x80\
+\xfb\xedz\x18\xc8\xa5\xf6\x81\xc7\x888P+\x80\xcb\xc0\x0b\x98\x1d\xe8c\xe82\
+\x18\xc7\x11\x006\x83\xcc\x89\x19W\xd8\xb8\x00"b\xc1v\x03\xad\xd6\xe0\xf9z\
+\xe7\x05\xea\xd5!\xa6\xe7P\x00y \xd5"\x13\x07\xf2r\x1es\xb0\x04>\xac\x81\x10\
+\x87\x1f\x07\xa0"\xa2v\xbc\xe6\x0f@\x15X\xac;\\\xa6\x96\xc5a2\x8d=En\x91i\
+\xab\xfd-\xd3]\x00@]\xa6\xadV\xad\x01q \x11\x81\x88@Q\xcf[\xb4\x03\xad2\xd5$\
+CO\x8a\xe5|\xb7L\x81o;\x00\x96-\xa1\x9c[\xec\x1e\r\'y6\xf9\xb7\xefepO\xaaM\
+\x0c\xb6,\xef\xba\xeb\x1c\x94\xc6\x1c\xc8\xa6h(\xd3Ri\xd7d/}\x9d\'\xf5Z\xc1V\
+\x1d67\xb8@\\Y\xdc\x13\xf4\'\xde\xd9\xbf-\x1f\x95\xdb\x82J\xbd\xd8\x18k\x00\
+\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolMoveDownBitmap():
+    return BitmapFromImage(getToolMoveDownImage())
+
+def getToolMoveDownImage():
+    stream = cStringIO.StringIO(getToolMoveDownData())
+    return ImageFromStream(stream)
+
+def getToolMoveDownIcon():
+    icon = EmptyIcon()
+    icon.CopyFromBitmap(getToolMoveDownBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolMoveLeftData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x18\x08\x06\
+\x00\x00\x00\xe0w=\xf8\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00\xceIDATH\x89\xb5\x96\xe1\x0e\x83 \x0c\x84\xafe\xaf\xa5\xb27\xef\xb6\xe7\
+\x1a\xf8G\x17GZ-\x02\x97\x98\x184|\xbd\xf6\x8c\x10q\xc0Hq\xb9\x90\xd37\x0f\
+\x05\x00\xc02O\xdd \x8f\xab\x174G\xc4\x81\xbc\x00\xd5\x81\xb6\xe1~\x01u\x0eU\
+\x07"\x02\x00]\xda\xa4\x02b\x8c%\xac/\x00\x00^\xef\xcf\xde\xe7\xdc\x92\xac\
+\xcb!\x13\x07Z\xe6)\x8b\xc8\x9f\xb3n\x00\xe0\xe7&\x1f\xee\xfb\x024y\xe3\xeb\
+\x8a\xa9%O|\xab\x1c\xdc\x89\xaf\x1b\xb0\x0f\xbb\x80\xb5\x03\xd2\xd6k\xe6@\
+\xc5\x80]\xf1=\x05\x1c7\xd7\xd6\x9f\x8e\xd8\x9a\x80t\xa8.\x19\x95z"{;E\xa5+K\
+\xa6\x03\xe6@V\x8b\xaa\n9}\xb8ml\xb5\xc8\xa3\xcb\x14\xb5T\x0f4~\xc9\xb7\x005\
+\xbfC\x8fh\xf4\xb1e\x05\xe0\xd1V\xfd\x0e\xdbmz\x00\x00\x00\x00IEND\xaeB`\x82\
+' 
+
+def getToolMoveLeftBitmap():
+    return BitmapFromImage(getToolMoveLeftImage())
+
+def getToolMoveLeftImage():
+    stream = cStringIO.StringIO(getToolMoveLeftData())
+    return ImageFromStream(stream)
+
+def getToolMoveLeftIcon():
+    icon = EmptyIcon()
+    icon.CopyFromBitmap(getToolMoveLeftBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolMoveRightData():
+    return \
+"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x18\x08\x06\
+\x00\x00\x00\xe0w=\xf8\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00\xd3IDATH\x89\xed\x96a\x0e\xc2 \x0c\x85_\x8b\xd7\xda\x867s'\xb3n\xe7r\
+\xf5\x0f\x18F0+\x0c\xfd\xe5KH\x06\t\xfdxm\xd3\x8c\x88\x1dR\xe9\xf6TbG\xe8$.\
+\x1dN\xe3\xa0)0_\xa7\x01\xb9\x88\x1d\xc5\x95?\xe0H\x97\xd2\xa1\x88\x00@\xd5K\
+\xab\x00\xde\xfb\x1c\xd6\x17\x00\x00\x8fe\x8d\x85\xae\xce\xbb\t\x10E\xech\
+\x1a\x07\x15\x91\x9d\xb3n\x00\xe0\xedF\x93o\x94\\\x95\xda\xdb\xd4E\x9fd\xe9.\
+\x93\x83\xa8\x96\xee2; v\xa4!zM-\xcc\x0e\xb6$\xe7w\x11\x10\xcauh\x02l\x85@\n\
+\xe0jpb\x02p(b\x04\xc5=\x96\xf5\xf8\xae\x05pF_\x07\x1c\xa6(-\xe4\xdc\x00\xa8\
+\x1a\xd73;\xba\xe1?\xae\x83~>\xae\xbb\x01\xc2d\xdc\x05L\xdcT\x8b\xf2\xdf\x96\
+\xdez\x01\x15\x93n\xa3D\xe4_\xf7\x00\x00\x00\x00IEND\xaeB`\x82" 
+
+def getToolMoveRightBitmap():
+    return BitmapFromImage(getToolMoveRightImage())
+
+def getToolMoveRightImage():
+    stream = cStringIO.StringIO(getToolMoveRightData())
+    return ImageFromStream(stream)
+
+def getToolMoveRightIcon():
+    icon = EmptyIcon()
+    icon.CopyFromBitmap(getToolMoveRightBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolMoveUpData():
+    return \
+"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x18\x08\x06\
+\x00\x00\x00\xe0w=\xf8\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00\xf1IDATH\x89\xd5\x96A\x12\x83 \x0cE\x7fB\xaf\xd5\xca\xcd\x1cnf\xdbs\t]\
+\xb4Li$\x01\x1c]43\xd9(\xfe\x97\x84\x0f#\x11;\x9c\x19|\xaa\xba\x04\xa4\xb8&m\
+a\x8ck\x8a\xc6\xfb.\x00\x00L\xb7\xebF$\x0b3;\x1a\x05\\Z\x0b\xca\xaae\x07=@s\
+\x0fZ#\xe9\x19\x9b\t\x90\x152;*\xb3\xa7\x90\xa6\x8b,!fG\xa1\x01\xe9\xb2\xa95\
+\xebP@\xe6\n\xc4\x04\xa4\xb8\xa6\x9c\x04@\xa3\x84O\x01s\xad8\x0b\x00\x00\xc4\
+\x8er\x02u\x1b[\xb1\xb1\xe9\xb2,\x000|\xa0\xba\x01\xde{\t;\x16\x00\x00\xf7\
+\xc73\x8f;Y\xd7\xc7n@\x0ebG#3\x0f\x95g\xcd\xab\xa2\xe8F\r\xeb\xa0\x99\x80\
+\xdaxH9x\x01_\xbb\x96\xb1\xcb\xa6\xf2\x0e\xd2\xc4\xab\x1d\x8c\xd84\xcf\\\x13\
+\xdf\x00\xe4\xa6j6\xed\x11.E\xd5\xc4\xbb\x93\x9f\xf4\xde'\xeb\x1b\x99\x87\
+\xda\xb4\xaa\xf1\xf7\x7f\x15/\xe4\x0f\x81\xb3\xb0\xca}\xd2\x00\x00\x00\x00IE\
+ND\xaeB`\x82" 
+
+def getToolMoveUpBitmap():
+    return BitmapFromImage(getToolMoveUpImage())
+
+def getToolMoveUpImage():
+    stream = cStringIO.StringIO(getToolMoveUpData())
+    return ImageFromStream(stream)
+
+def getToolMoveUpIcon():
+    icon = EmptyIcon()
+    icon.CopyFromBitmap(getToolMoveUpBitmap())
+    return icon
+
 #----------------------------------------------------------------------
 def getToolNotebookData():
     return \
@@ -1177,6 +1292,27 @@ def getToolUnknownIcon():
     icon.CopyFromBitmap(getToolUnknownBitmap())
     return icon
 
+#----------------------------------------------------------------------
+def getTreeCommentData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x0e\x08\x06\
+\x00\x00\x00&/\x9c\x8a\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00AIDAT(\x91cddbf\xa0\x040Q\xa4\x9bf\x06\xfc\xff\xf7\xf7\xff\xff\x7f\x7f\
+\xff\xa3\xb3\xe9\xe7\x02R\x00#z,\xe0s.#\x133#A\x17 +\xc2\xc5\xc6k\x00\xa9`\
+\x18x\x81\xfaa@*\x00\x00\xb0\xac\x18?Q\xffAR\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getTreeCommentBitmap():
+    return BitmapFromImage(getTreeCommentImage())
+
+def getTreeCommentImage():
+    stream = cStringIO.StringIO(getTreeCommentData())
+    return ImageFromStream(stream)
+
+def getTreeCommentIcon():
+    icon = EmptyIcon()
+    icon.CopyFromBitmap(getTreeCommentBitmap())
+    return icon
+
 #----------------------------------------------------------------------
 def getTreeDefaultData():
     return \
diff --git a/wxPython/wx/tools/XRCed/panel.py b/wxPython/wx/tools/XRCed/panel.py
index 42722aa53e..361ab59b66 100644
--- a/wxPython/wx/tools/XRCed/panel.py
+++ b/wxPython/wx/tools/XRCed/panel.py
@@ -19,12 +19,18 @@ class Panel(wx.Notebook):
         g.panel = panel = self
         self.modified = False
 
-        # Set common button size for parameter buttons
-        bTmp = wx.Button(self, -1, '')
+        # Set common sizes
         import params
-        params.buttonSize = (self.DLG_SZE(buttonSize)[0], bTmp.GetSize()[1])
-        bTmp.Destroy()
-        del bTmp
+        cTmp = wx.Button(self, -1, '')
+        params.buttonSize = (self.DLG_SZE(buttonSizeD)[0], cTmp.GetSize()[1])        
+        cTmp.Destroy()
+        cTmp = wx.TextCtrl(self, -1, '')
+        params.textSize = cTmp.GetSize()
+        cTmp.Destroy()
+        cTmp = wx.CheckBox(self, -1, 'growablerows ') # this is the longest
+        ParamPage.labelSize = cTmp.GetSize()
+        cTmp.Destroy()
+        del cTmp
 
         # List of child windows
         self.pages = []
@@ -89,7 +95,7 @@ class Panel(wx.Notebook):
             g.currentXXX = xxx.treeObject()
             # Normal or SizerItem page
             isGBSizerItem = isinstance(xxx.parent, xxxGridBagSizer)
-            cacheID = (xxx.__class__, isGBSizerItem)            
+            cacheID = (xxx.panelName(), isGBSizerItem)
             try:
                 page = self.pageCache[cacheID]
                 page.box.SetLabel(xxx.panelName())
@@ -102,7 +108,7 @@ class Panel(wx.Notebook):
             sizer.Add(page, 1, wx.EXPAND)
             if xxx.hasChild:
                 # Special label for child objects - they may have different GUI
-                cacheID = (xxx.child.__class__, xxx.__class__)
+                cacheID = (xxx.child.panelName(), xxx.__class__)
                 try:
                     page = self.pageCache[cacheID]
                     page.box.SetLabel(xxx.child.panelName())
@@ -160,6 +166,7 @@ class Panel(wx.Notebook):
         # Register undo object when modifying first time
         if not self.modified and value:
            g.undoMan.RegisterUndo(UndoEdit())
+           g.frame.SetModified()
         self.modified = value
         
     def Apply(self):
@@ -169,6 +176,7 @@ class Panel(wx.Notebook):
 
 # General class for notebook pages
 class ParamPage(wx.Panel):
+    labelSize = None
     def __init__(self, parent, xxx):
         wx.Panel.__init__(self, parent, -1)
         self.xxx = xxx
@@ -184,7 +192,7 @@ class ParamPage(wx.Panel):
         param = evt.GetEventObject().GetName()
         w = self.controls[param]
         w.Enable(True)
-        objElem = xxx.element
+        objElem = xxx.node
         if evt.IsChecked():
             # Ad  new text node in order of allParams
             w.SetValue('')              # set empty (default) value
@@ -192,7 +200,7 @@ class ParamPage(wx.Panel):
             elem = g.tree.dom.createElement(param)
             # Some classes are special
             if param == 'font':
-                xxx.params[param] = xxxParamFont(xxx.element, elem)
+                xxx.params[param] = xxxParamFont(xxx.node, elem)
             elif param in xxxObject.bitmapTags:
                 xxx.params[param] = xxxParamBitmap(elem)
             else:
@@ -218,7 +226,7 @@ class ParamPage(wx.Panel):
             xxx.params[param].remove()
             del xxx.params[param]
             w.SetValue('')
-            w.modified = False          # mark as not changed
+            w.SetModified(False)        # mark as not changed
             w.Enable(False)
         # Set modified flag (provokes undo storing is necessary)
         panel.SetModified(True)
@@ -228,7 +236,7 @@ class ParamPage(wx.Panel):
             name = self.controlName.GetValue()
             if xxx.name != name:
                 xxx.name = name
-                xxx.element.setAttribute('name', name)
+                xxx.node.setAttribute('name', name)
         for param, w in self.controls.items():
             if w.modified:
                 paramObj = xxx.params[param]
@@ -237,10 +245,11 @@ class ParamPage(wx.Panel):
                     xxx.setSpecial(param, value)
                 else:
                     paramObj.update(value)
+                
     # Save current state
     def SaveState(self):
         self.origChecks = map(lambda i: (i[0], i[1].GetValue()), self.checks.items())
-        self.origControls = map(lambda i: (i[0], i[1].GetValue(), i[1].IsEnabled()),
+        self.origControls = map(lambda i: (i[0], i[1].GetValue(), i[1].enabled),
                             self.controls.items())
         if self.controlName:
             self.origName = self.controlName.GetValue()
@@ -257,40 +266,43 @@ class ParamPage(wx.Panel):
         for k,v,e in state[1]:
             self.controls[k].SetValue(v)
             self.controls[k].Enable(e)
-            if e: self.controls[k].modified = True
+            # Set all states to modified
+            if e and k in self.xxx.params: self.controls[k].modified = True            
         if self.controlName:
             self.controlName.SetValue(state[2])
 
 ################################################################################
 
-LABEL_WIDTH = 125
-
 # Panel for displaying properties
 class PropPage(ParamPage):
+    renameDict = {'orient':'orientation', 'option':'proportion',
+                  'usenotebooksizer':'usesizer', 'dontattachtoframe':'dontattach',
+                  }
     def __init__(self, parent, label, xxx):
         ParamPage.__init__(self, parent, xxx)
         self.box = wx.StaticBox(self, -1, label)
         self.box.SetFont(g.labelFont())
         topSizer = wx.StaticBoxSizer(self.box, wx.VERTICAL)
-        sizer = wx.FlexGridSizer(len(xxx.allParams), 2, 0, 1)
+        sizer = wx.FlexGridSizer(len(xxx.allParams), 2, 1, 5)
         sizer.AddGrowableCol(1)
         if xxx.hasName:
-            label = wx.StaticText(self, -1, 'XML ID:', size=(LABEL_WIDTH,-1))
+            label = wx.StaticText(self, -1, 'XML ID:', size=self.labelSize)
             control = ParamText(self, 'XML_name', 200)
             sizer.AddMany([ (label, 0, wx.ALIGN_CENTER_VERTICAL),
                             (control, 0, wx.ALIGN_CENTER_VERTICAL | wx.BOTTOM | wx.GROW, 10) ])
             self.controlName = control
         for param in xxx.allParams:
             present = xxx.params.has_key(param)
+            sParam = self.renameDict.get(param, param)
             if param in xxx.required:
-                label = wx.StaticText(self, paramIDs[param], param + ':',
-                                     size = (LABEL_WIDTH,-1), name = param)
+                if isinstance(xxx, xxxComment):
+                    label = None
+                else:
+                    label = wx.StaticText(self, paramIDs[param], sParam,
+                                          size = self.labelSize, name = param)
             else:
-                # Notebook has one very loooooong parameter
-                if param == 'usenotebooksizer': sParam = 'usesizer:'
-                else: sParam = param + ':'
                 label = wx.CheckBox(self, paramIDs[param], sParam,
-                                   size = (LABEL_WIDTH,-1), name = param)
+                                   size = self.labelSize, name = param)
                 self.checks[param] = label
             try:
                 typeClass = xxx.paramDict[param]
@@ -303,13 +315,19 @@ class PropPage(ParamPage):
                     typeClass = ParamText
             control = typeClass(self, param)
             control.Enable(present)
-            sizer.AddMany([ (label, 0, wx.ALIGN_CENTER_VERTICAL),
-                            (control, 0, wx.ALIGN_CENTER_VERTICAL | wx.GROW) ])
+            # Comment has only one parameter
+            if isinstance(xxx, xxxComment):
+                # Bind char event to check Enter key
+                control.text.Bind(wx.EVT_CHAR, self.OnEnter)
+                sizer.Add(control, 0, wx.ALIGN_CENTER_VERTICAL | wx.GROW)
+            else:
+                sizer.AddMany([ (label, 0, wx.ALIGN_CENTER_VERTICAL),
+                                (control, 0, wx.ALIGN_CENTER_VERTICAL | wx.GROW) ])
             self.controls[param] = control
         topSizer.Add(sizer, 1, wx.ALL | wx.EXPAND, 3)
-        self.SetAutoLayout(True)
         self.SetSizer(topSizer)
         topSizer.Fit(self)
+        
     def SetValues(self, xxx):
         self.xxx = xxx
         self.origChecks = []
@@ -330,27 +348,37 @@ class PropPage(ParamPage):
                     self.origChecks.append((param, True))
                 self.origControls.append((param, value, True))
             except KeyError:
+                # Optional param not present in xxx - set empty value
                 self.checks[param].SetValue(False)
                 w.SetValue('')
                 w.Enable(False)
                 self.origChecks.append((param, False))
                 self.origControls.append((param, '', False))
 
+    # This is called only for comment now
+    def OnEnter(self, evt):
+        if evt.GetKeyCode() == 13:
+            g.tree.Apply(self.xxx, g.tree.selection)
+        else:
+            evt.Skip()
+
 ################################################################################
 
 # Style notebook page
 class StylePage(ParamPage):
+    renameDict = {'fg':'foreground', 'bg':'background'}
     def __init__(self, parent, label, xxx):
         ParamPage.__init__(self, parent, xxx)
         box = wx.StaticBox(self, -1, label)
         box.SetFont(g.labelFont())
         topSizer = wx.StaticBoxSizer(box, wx.VERTICAL)
-        sizer = wx.FlexGridSizer(len(xxx.styles), 2, 0, 1)
+        sizer = wx.FlexGridSizer(len(xxx.styles), 2, 1, 5)
         sizer.AddGrowableCol(1)
         for param in xxx.styles:
             present = xxx.params.has_key(param)
+            sParam = self.renameDict.get(param, param)
             check = wx.CheckBox(self, paramIDs[param],
-                               param + ':', size = (LABEL_WIDTH,-1), name = param)
+                                sParam, size = self.labelSize, name = param)
             check.SetValue(present)
             control = paramDict[param](self, name = param)
             control.Enable(present)
@@ -362,6 +390,7 @@ class StylePage(ParamPage):
         self.SetAutoLayout(True)
         self.SetSizer(topSizer)
         topSizer.Fit(self)
+        
     # Set data for a cahced page
     def SetValues(self, xxx):
         self.xxx = xxx
diff --git a/wxPython/wx/tools/XRCed/params.py b/wxPython/wx/tools/XRCed/params.py
index 71a7414989..c62d3e1f49 100644
--- a/wxPython/wx/tools/XRCed/params.py
+++ b/wxPython/wx/tools/XRCed/params.py
@@ -25,7 +25,11 @@ genericExStyles = [
     'wxWS_EX_PROCESS_UI_UPDATES'
     ]
 
-buttonSize = (35,-1)    # in dialog units, transformed to pixels in panel ctor
+# Global vars initialized in Panel.__init__ for button and textbox size in screen pixels
+buttonSize = textSise = None
+# Default Button size in dialog units
+buttonSizeD = (35,-1)
+
 
 # Class that can properly disable children
 class PPanel(wx.Panel):
@@ -33,13 +37,14 @@ class PPanel(wx.Panel):
         wx.Panel.__init__(self, parent, -1, name=name)
         self.modified = self.freeze = False
     def Enable(self, value):
+        self.enabled = value
         # Something strange is going on with enable so we make sure...
         for w in self.GetChildren():
             w.Enable(value)
         #wx.Panel.Enable(self, value)
-    def SetModified(self):
-        self.modified = True
-        g.panel.SetModified(True)
+    def SetModified(self, state=True):
+        self.modified = state
+        if state: g.panel.SetModified(True)
     # Common method to set modified state
     def OnChange(self, evt):
         if self.freeze: return
@@ -54,11 +59,10 @@ class ParamBinaryOr(PPanel):
         sizer = wx.BoxSizer()
         self.text = wx.TextCtrl(self, self.ID_TEXT_CTRL, size=wx.Size(200,-1))
         sizer.Add(self.text, 0, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 5)
-        self.button = wx.Button(self, self.ID_BUTTON_CHOICES, 'Edit...', size=buttonSize)
-        sizer.Add(self.button, 0, wx.ALIGN_CENTER_VERTICAL)
-        self.SetAutoLayout(True)
-        self.SetSizer(sizer)
-        sizer.Fit(self)
+        self.button = wx.Button(self, self.ID_BUTTON_CHOICES, 'Edit...', 
+                                size=(buttonSize[0], textSize[1]))
+        sizer.Add(self.button, 0, wx.EXPAND)
+        self.SetSizerAndFit(sizer)
         wx.EVT_BUTTON(self, self.ID_BUTTON_CHOICES, self.OnButtonChoices)
         wx.EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange)
     def GetValue(self):
@@ -94,10 +98,7 @@ class ParamBinaryOr(PPanel):
                     value.append(self.values[i])
             # Add ignored flags
             value.extend(ignored)
-            if value:
-                self.SetValue(reduce(lambda a,b: a+'|'+b, value))
-            else:
-                self.SetValue('')
+            self.SetValue('|'.join(value))
             self.SetModified()
         dlg.Destroy()
 
@@ -172,10 +173,7 @@ class ParamStyle(ParamBinaryOr):
                      [self.valuesGeneric[i]
                       for i in range(listBoxGeneric.GetCount())
                       if listBoxGeneric.IsChecked(i)] + ignored
-            if value:
-                self.SetValue(reduce(lambda a,b: a+'|'+b, value))
-            else:
-                self.SetValue('')
+            self.SetValue('|'.join(value))
             self.SetModified()
         dlg.Destroy()
 
@@ -197,9 +195,7 @@ class ParamColour(PPanel):
         sizer.Add(self.text, 0, wx.ALIGN_CENTER_VERTICAL | wx.TOP | wx.BOTTOM, 2)
         self.button = wx.Panel(self, self.ID_BUTTON, wx.DefaultPosition, wx.Size(20, 20))
         sizer.Add(self.button, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT, 5)
-        self.SetAutoLayout(True)
         self.SetSizer(sizer)
-        sizer.Fit(self)
         self.textModified = False
         wx.EVT_PAINT(self.button, self.OnPaintButton)
         wx.EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange)
@@ -259,9 +255,7 @@ class ParamFont(PPanel):
         sizer.Add(self.text, 0, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 5)
         self.button = wx.Button(self, self.ID_BUTTON_SELECT, 'Select...', size=buttonSize)
         sizer.Add(self.button, 0, wx.ALIGN_CENTER_VERTICAL)
-        self.SetAutoLayout(True)
         self.SetSizer(sizer)
-        sizer.Fit(self)
         self.textModified = False
         wx.EVT_BUTTON(self, self.ID_BUTTON_SELECT, self.OnButtonSelect)
         wx.EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange)
@@ -326,7 +320,6 @@ class ParamFont(PPanel):
         dlg = wx.FontDialog(self, data)
         if dlg.ShowModal() == wx.ID_OK:
             font = dlg.GetFontData().GetChosenFont()
-            print font.GetEncoding()
             if font.GetEncoding() == wx.FONTENCODING_SYSTEM:
                 encName = ''
             else:
@@ -354,9 +347,7 @@ class ParamInt(PPanel):
         self.spin = wx.SpinCtrl(self, self.ID_SPIN_CTRL, size=(60,-1))
         self.spin.SetRange(-2147483648, 2147483647) # min/max integers
         sizer.Add(self.spin)
-        self.SetAutoLayout(True)
         self.SetSizer(sizer)
-        sizer.Fit(self)
         wx.EVT_SPINCTRL(self, self.ID_SPIN_CTRL, self.OnChange)
     def GetValue(self):
         return str(self.spin.GetValue())
@@ -375,9 +366,7 @@ class ParamIntNN(PPanel):
         self.spin = wx.SpinCtrl(self, self.ID_SPIN_CTRL, size=(60,-1))
         self.spin.SetRange(0, 10000) # min/max integers
         sizer.Add(self.spin)
-        self.SetAutoLayout(True)
         self.SetSizer(sizer)
-        sizer.Fit(self)
         wx.EVT_SPINCTRL(self, self.ID_SPIN_CTRL, self.OnChange)
     def GetValue(self):
         return str(self.spin.GetValue())
@@ -394,26 +383,27 @@ class ParamUnit(PPanel):
         self.ID_TEXT_CTRL = wx.NewId()
         self.ID_SPIN_BUTTON = wx.NewId()
         sizer = wx.BoxSizer(wx.HORIZONTAL)
-        self.spin = wx.SpinButton(self, self.ID_SPIN_BUTTON, style = wx.SP_VERTICAL, size=(-1,1))
+        self.spin = wx.SpinButton(self, self.ID_SPIN_BUTTON, style = wx.SP_VERTICAL, size=(-1,0))
         textW = 60 - self.spin.GetSize()[0]
         self.text = wx.TextCtrl(self, self.ID_TEXT_CTRL, size=(textW,-1))
         self.spin.SetRange(-10000, 10000)
         sizer.Add(self.text, 0, wx.EXPAND)
         sizer.Add(self.spin, 0, wx.EXPAND)
-        #sizer.SetMinSize((50,-1))
-        self.SetAutoLayout(True)
         self.SetSizer(sizer)
-        sizer.Fit(self)
-        wx.EVT_SPIN_UP(self, self.ID_SPIN_BUTTON, self.OnSpinUp)
-        wx.EVT_SPIN_DOWN(self, self.ID_SPIN_BUTTON, self.OnSpinDown)
+        self.spin.Bind(wx.EVT_SPIN_UP, self.OnSpinUp)
+        self.spin.Bind(wx.EVT_SPIN_DOWN, self.OnSpinDown)
+        self.text.Bind(wx.EVT_TEXT, self.OnChange)
+        
     def GetValue(self):
         return self.text.GetValue()
     def SetValue(self, value):
         self.freeze = True
-        if not value: value = '0'
+        if not value: value = '0'        
         self.text.SetValue(value)
+        self.Change(0)
         self.freeze = False
     def Change(self, x):
+        self.freeze = True
         # Check if we are working with dialog units
         value = self.text.GetValue()
         units = ''
@@ -423,14 +413,19 @@ class ParamUnit(PPanel):
         try:
             intValue = int(value) + x
             self.spin.SetValue(intValue)
-            self.text.SetValue(str(intValue) + units)
-            self.SetModified()
+            if x:                       # 0 can be passed to update spin value only
+                self.text.SetValue(str(intValue) + units)
+                self.SetModified()
         except:
             # !!! Strange, if I use wx.LogWarning, event is re-generated
-            print 'incorrect unit format'
+            print 'ERROR: incorrect unit format'
+        self.freeze = False
     def OnSpinUp(self, evt):
+        self.freeze = True
         self.Change(1)
     def OnSpinDown(self, evt):
+        if self.freeze: return
+        self.freeze = True
         self.Change(-1)
 
 class ParamMultilineText(PPanel):
@@ -443,9 +438,7 @@ class ParamMultilineText(PPanel):
         sizer.Add(self.text, 0, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 5)
         self.button = wx.Button(self, self.ID_BUTTON_EDIT, 'Edit...', size=buttonSize)
         sizer.Add(self.button, 0, wx.ALIGN_CENTER_VERTICAL)
-        self.SetAutoLayout(True)
-        self.SetSizer(sizer)
-        sizer.Fit(self)
+        self.SetSizerAndFit(sizer)
         wx.EVT_BUTTON(self, self.ID_BUTTON_EDIT, self.OnButtonEdit)
         wx.EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange)
     def GetValue(self):
@@ -464,18 +457,16 @@ class ParamMultilineText(PPanel):
         dlg.Destroy()
 
 class ParamText(PPanel):
-    def __init__(self, parent, name, textWidth=-1):
+    def __init__(self, parent, name, textWidth=-1, style=0):
         PPanel.__init__(self, parent, name)
         self.ID_TEXT_CTRL = wx.NewId()
         # We use sizer even here to have the same size of text control
         sizer = wx.BoxSizer()
-        self.text = wx.TextCtrl(self, self.ID_TEXT_CTRL, size=wx.Size(textWidth,-1))
+        self.text = wx.TextCtrl(self, self.ID_TEXT_CTRL, size=wx.Size(textWidth,-1), style=style)
         if textWidth == -1: option = 1
         else: option = 0
         sizer.Add(self.text, option, wx.ALIGN_CENTER_VERTICAL | wx.TOP | wx.BOTTOM, 2)
-        self.SetAutoLayout(True)
         self.SetSizer(sizer)
-        sizer.Fit(self)
         wx.EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange)
     def GetValue(self):
         return self.text.GetValue()
@@ -500,6 +491,11 @@ class ParamEncoding(ParamText):
     def __init__(self, parent, name):
         ParamText.__init__(self, parent, name, 100)
 
+class ParamComment(ParamText):
+    def __init__(self, parent, name):
+        ParamText.__init__(self, parent, name, 330 + buttonSize[0],
+                           style=wx.TE_PROCESS_ENTER)
+
 class ContentDialog(wx.Dialog):
     def __init__(self, parent, value):
         # Load from resource
@@ -555,7 +551,7 @@ class ContentCheckListDialog(wx.Dialog):
         pre = wx.PreDialog()
         g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_CONTENT_CHECKLIST')
         self.PostCreate(pre)
-        self.list = xrc.XRCCTRL(self, 'CHECKLIST')
+        self.list = xrc.XRCCTRL(self, 'CHECK_LIST')
         # Set list items
         i = 0
         for v,ch in value:
@@ -618,9 +614,7 @@ class ParamContent(PPanel):
         sizer.Add(self.text, 0, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 5)
         self.button = wx.Button(self, self.ID_BUTTON_EDIT, 'Edit...', size=buttonSize)
         sizer.Add(self.button, 0, wx.ALIGN_CENTER_VERTICAL)
-        self.SetAutoLayout(True)
         self.SetSizer(sizer)
-        sizer.Fit(self)
         self.textModified = False
         wx.EVT_BUTTON(self, self.ID_BUTTON_EDIT, self.OnButtonEdit)
         wx.EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange)
@@ -631,18 +625,14 @@ class ParamContent(PPanel):
         if self.textModified:           # text has newer value
             try:
                 return self.text.GetValue().split('|')
-            except SyntaxError:
-                wx.LogError('Syntax error in parameter value: ' + self.GetName())
+            except ValueError:
                 return []
         return self.value
     def SetValue(self, value):
         self.freeze = True
         if not value: value = []
         self.value = value
-        if value:
-            repr_ = reduce(lambda a,b: '%s|%s' % (a,b), value)
-        else:
-            repr_ = ''
+        repr_ = '|'.join(map(str, value))
         self.text.SetValue(repr_)  # update text ctrl
         self.freeze = False
     def OnButtonEdit(self, evt):
@@ -657,6 +647,9 @@ class ParamContent(PPanel):
             self.SetModified()
             self.textModified = False
         dlg.Destroy()
+    def SetModified(self, state=True):
+        PPanel.SetModified(self, state)
+        self.textModified = False
 
 # CheckList content
 class ParamContentCheckList(ParamContent):
@@ -674,6 +667,13 @@ class ParamContentCheckList(ParamContent):
             self.SetModified()
             self.textModified = False
         dlg.Destroy()
+    def SetValue(self, value):
+        self.freeze = True
+        if not value: value = []
+        self.value = value
+        repr_ = '|'.join(map(str,value))
+        self.text.SetValue(repr_)  # update text ctrl
+        self.freeze = False        
 
 class IntListDialog(wx.Dialog):
     def __init__(self, parent, value):
@@ -729,9 +729,8 @@ class ParamIntList(ParamContent):
     def OnButtonEdit(self, evt):
         if self.textModified:           # text has newer value
             try:
-                self.value = eval(self.text.GetValue())
-            except SyntaxError:
-                wx.LogError('Syntax error in parameter value: ' + self.GetName())
+                self.value = map(int, self.text.GetValue().split('|'))
+            except ValueError:
                 self.value = []
         dlg = IntListDialog(self, self.value)
         if dlg.ShowModal() == wx.ID_OK:
@@ -754,9 +753,7 @@ class RadioBox(PPanel):
             button = wx.RadioButton(self, -1, i, size=(-1,buttonSize[1]), name=i)
             topSizer.Add(button, 0, wx.RIGHT, 5)
             wx.EVT_RADIOBUTTON(self, button.GetId(), self.OnRadioChoice)
-        self.SetAutoLayout(True)
         self.SetSizer(topSizer)
-        topSizer.Fit(self)
     def SetStringSelection(self, value):
         self.freeze = True
         for i in self.choices:
@@ -814,9 +811,7 @@ class ParamFile(PPanel):
         sizer.Add(self.text, 0, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 5)
         self.button = wx.Button(self, self.ID_BUTTON_BROWSE, 'Browse...',size=buttonSize)
         sizer.Add(self.button, 0, wx.ALIGN_CENTER_VERTICAL)
-        self.SetAutoLayout(True)
         self.SetSizer(sizer)
-        sizer.Fit(self)
         self.textModified = False
         wx.EVT_BUTTON(self, self.ID_BUTTON_BROWSE, self.OnButtonBrowse)
         wx.EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange)
@@ -943,5 +938,6 @@ paramDict = {
     'fg': ParamColour, 'bg': ParamColour, 'font': ParamFont,
     'enabled': ParamBool, 'focused': ParamBool, 'hidden': ParamBool,
     'tooltip': ParamText, 'bitmap': ParamBitmap, 'icon': ParamBitmap,
-    'encoding': ParamEncoding, 'borders': ParamUnit
+    'encoding': ParamEncoding, 'borders': ParamUnit,
+    'comment': ParamComment
     }
diff --git a/wxPython/wx/tools/XRCed/src-images/AutoRefresh.png b/wxPython/wx/tools/XRCed/src-images/AutoRefresh.png
index d957081d6e..539b61c7bc 100644
Binary files a/wxPython/wx/tools/XRCed/src-images/AutoRefresh.png and b/wxPython/wx/tools/XRCed/src-images/AutoRefresh.png differ
diff --git a/wxPython/wx/tools/XRCed/src-images/Locate.png b/wxPython/wx/tools/XRCed/src-images/Locate.png
index 0686506bdf..da264d5c1e 100644
Binary files a/wxPython/wx/tools/XRCed/src-images/Locate.png and b/wxPython/wx/tools/XRCed/src-images/Locate.png differ
diff --git a/wxPython/wx/tools/XRCed/src-images/LocateArmed.png b/wxPython/wx/tools/XRCed/src-images/LocateArmed.png
index 71379a7c84..04ee0df1cb 100644
Binary files a/wxPython/wx/tools/XRCed/src-images/LocateArmed.png and b/wxPython/wx/tools/XRCed/src-images/LocateArmed.png differ
diff --git a/wxPython/wx/tools/XRCed/src-images/Refresh.png b/wxPython/wx/tools/XRCed/src-images/Refresh.png
index 8180432feb..6d192f8f1b 100644
Binary files a/wxPython/wx/tools/XRCed/src-images/Refresh.png and b/wxPython/wx/tools/XRCed/src-images/Refresh.png differ
diff --git a/wxPython/wx/tools/XRCed/src-images/Test.png b/wxPython/wx/tools/XRCed/src-images/Test.png
index c6e7816f4a..f8b4c45252 100644
Binary files a/wxPython/wx/tools/XRCed/src-images/Test.png and b/wxPython/wx/tools/XRCed/src-images/Test.png differ
diff --git a/wxPython/wx/tools/XRCed/src-images/ToolMoveDown.png b/wxPython/wx/tools/XRCed/src-images/ToolMoveDown.png
new file mode 100644
index 0000000000..b78bc2f232
Binary files /dev/null and b/wxPython/wx/tools/XRCed/src-images/ToolMoveDown.png differ
diff --git a/wxPython/wx/tools/XRCed/src-images/ToolMoveLeft.png b/wxPython/wx/tools/XRCed/src-images/ToolMoveLeft.png
new file mode 100644
index 0000000000..99eb248ed0
Binary files /dev/null and b/wxPython/wx/tools/XRCed/src-images/ToolMoveLeft.png differ
diff --git a/wxPython/wx/tools/XRCed/src-images/ToolMoveRight.png b/wxPython/wx/tools/XRCed/src-images/ToolMoveRight.png
new file mode 100644
index 0000000000..7b0a7ce28a
Binary files /dev/null and b/wxPython/wx/tools/XRCed/src-images/ToolMoveRight.png differ
diff --git a/wxPython/wx/tools/XRCed/src-images/ToolMoveUp.png b/wxPython/wx/tools/XRCed/src-images/ToolMoveUp.png
new file mode 100644
index 0000000000..bac5995201
Binary files /dev/null and b/wxPython/wx/tools/XRCed/src-images/ToolMoveUp.png differ
diff --git a/wxPython/wx/tools/XRCed/src-images/TreeComment.png b/wxPython/wx/tools/XRCed/src-images/TreeComment.png
new file mode 100644
index 0000000000..c5aa5751fa
Binary files /dev/null and b/wxPython/wx/tools/XRCed/src-images/TreeComment.png differ
diff --git a/wxPython/wx/tools/XRCed/tools.py b/wxPython/wx/tools/XRCed/tools.py
index e0e3ac86d2..6fda618cfc 100644
--- a/wxPython/wx/tools/XRCed/tools.py
+++ b/wxPython/wx/tools/XRCed/tools.py
@@ -16,7 +16,6 @@ GROUP_WINDOWS, GROUP_MENUS, GROUP_SIZERS, GROUP_CONTROLS = range(GROUPNUM)
 
 # States depending on current selection and Control/Shift keys
 STATE_ROOT, STATE_MENUBAR, STATE_TOOLBAR, STATE_MENU, STATE_STDDLGBTN, STATE_ELSE = range(6)
-
 # Left toolbar for GUI elements
 class Tools(wx.Panel):
     TOOL_SIZE = (30, 30)
@@ -87,40 +86,50 @@ class Tools(wx.Panel):
 
              (ID_NEW.UNKNOWN, images.getToolUnknownBitmap())]
             ]
+        self.boxes = {}
         for grp in groups:
             self.AddGroup(grp[0])
             for b in grp[1:]:
                 self.AddButton(b[0], b[1], g.pullDownMenu.createMap[b[0]])
-        self.SetAutoLayout(True)
         self.SetSizerAndFit(self.sizer)
         # Allow to be resized in vertical direction only
         self.SetSizeHints(self.GetSize()[0], -1)
         # Events
         wx.EVT_COMMAND_RANGE(self, ID_NEW.PANEL, ID_NEW.LAST,
-                          wx.wxEVT_COMMAND_BUTTON_CLICKED, g.frame.OnCreate)
+                             wx.wxEVT_COMMAND_BUTTON_CLICKED, g.frame.OnCreate)
         wx.EVT_KEY_DOWN(self, self.OnKeyDown)
         wx.EVT_KEY_UP(self, self.OnKeyUp)
 
+        self.drag = None
+
     def AddButton(self, id, image, text):
         from wx.lib import buttons
         button = buttons.GenBitmapButton(self, id, image, size=self.TOOL_SIZE,
-                                           style=wx.NO_BORDER|wx.WANTS_CHARS)
+                                         style=wx.NO_BORDER|wx.WANTS_CHARS)
         button.SetBezelWidth(0)
         wx.EVT_KEY_DOWN(button, self.OnKeyDown)
         wx.EVT_KEY_UP(button, self.OnKeyUp)
+        wx.EVT_LEFT_DOWN(button, self.OnLeftDownOnButton)
+        wx.EVT_MOTION(button, self.OnMotionOnButton)
         button.SetToolTipString(text)
         self.curSizer.Add(button)
         self.groups[-1][1][id] = button
 
     def AddGroup(self, name):
         # Each group is inside box
-        box = wx.StaticBox(self, -1, name, style=wx.WANTS_CHARS)
+        id = wx.NewId()
+        box = wx.StaticBox(self, id, '[+] '+name, style=wx.WANTS_CHARS)
+        box.show = True
+        box.name = name
+        box.gnum = len(self.groups)
         box.SetFont(g.smallerFont())
+        box.Bind(wx.EVT_LEFT_DOWN, self.OnClickBox)
         boxSizer = wx.StaticBoxSizer(box, wx.VERTICAL)
         boxSizer.Add((0, 4))
+        self.boxes[id] = box
         self.curSizer = wx.GridSizer(0, 3)
         boxSizer.Add(self.curSizer)
-        self.sizer.Add(boxSizer, 0, wx.TOP | wx.LEFT | wx.RIGHT, 4)
+        self.sizer.Add(boxSizer, 0, wx.TOP | wx.LEFT | wx.RIGHT | wx.EXPAND, 4)
         self.groups.append((box,{}))
 
     # Enable/disable group
@@ -129,6 +138,12 @@ class Tools(wx.Panel):
         grp[0].Enable(enable)
         for b in grp[1].values(): b.Enable(enable)
 
+    # Show/hide group
+    def ShowGroup(self, gnum, show = True):
+        grp = self.groups[gnum]
+        grp[0].show = show
+        for b in grp[1].values(): b.Show(show)
+
     # Enable/disable group item
     def EnableGroupItem(self, gnum, id, enable = True):
         grp = self.groups[gnum]
@@ -140,6 +155,52 @@ class Tools(wx.Panel):
         for id in ids:
             grp[1][id].Enable(enable)
 
+    def OnClickBox(self, evt):
+        box = self.boxes[evt.GetId()]
+        # Collapse/restore static box, change label
+        self.ShowGroup(box.gnum, not box.show)
+        if box.show: box.SetLabel('[+] ' + box.name)
+        else: box.SetLabel('[-] ' + box.name)
+        self.Layout()
+
+    # DaD
+    def OnLeftDownOnButton(self, evt):
+        self.posDown = evt.GetPosition()
+        self.idDown = evt.GetId()
+        self.btnDown = evt.GetEventObject()
+        evt.Skip()
+
+    def OnMotionOnButton(self, evt):
+        # Detect dragging
+        if evt.Dragging() and evt.LeftIsDown():
+            d = evt.GetPosition() - self.posDown
+            if max(abs(d[0]), abs(d[1])) >= 5:
+                if self.btnDown.HasCapture(): 
+                    # Generate up event to release mouse
+                    evt = wx.MouseEvent(wx.EVT_LEFT_UP.typeId)
+                    evt.SetId(self.idDown)
+                    # Set flag to prevent normal button operation this time
+                    self.drag = True
+                    self.btnDown.ProcessEvent(evt)
+                self.StartDrag()
+        evt.Skip()
+
+    def StartDrag(self):
+        do = MyDataObject()
+        do.SetData(str(self.idDown))
+        bm = self.btnDown.GetBitmapLabel()
+        # wxGTK requires wxIcon cursor, wxWIN and wxMAC require wxCursor
+        if wx.Platform == '__WXGTK__':
+            icon = wx.EmptyIcon()
+            icon.CopyFromBitmap(bm)
+            dragSource = wx.DropSource(self, icon)
+        else:
+            curs = wx.CursorFromImage(wx.ImageFromBitmap(bm))
+            dragSource = wx.DropSource(self, curs)
+        dragSource.SetData(do)
+        g.frame.SetStatusText('Release the mouse button over the test window')
+        dragSource.DoDragDrop()
+
     # Process key events
     def OnKeyDown(self, evt):
         if evt.GetKeyCode() == wx.WXK_CONTROL:
diff --git a/wxPython/wx/tools/XRCed/tree.py b/wxPython/wx/tools/XRCed/tree.py
index 26e8b91a8a..949046400e 100644
--- a/wxPython/wx/tools/XRCed/tree.py
+++ b/wxPython/wx/tools/XRCed/tree.py
@@ -11,6 +11,12 @@ import traceback
 # Constant to define standart window name
 STD_NAME = '_XRCED_T_W'
 
+COLOUR_COMMENT  = 'Blue'
+COLOUR_REF      = 'DarkGreen'
+COLOUR_HIDDEN   = 'Grey'
+COLOUR_HL       = 'Red'
+COLOUR_DT       = 'DarkGreen'
+
 # Icons
 import images
 
@@ -86,10 +92,12 @@ class ID_NEW:
     CHOICEBOOK = wx.NewId()
     LISTBOOK = wx.NewId()
     SPLITTER_WINDOW = wx.NewId()
+    GRID = wx.NewId()
     SCROLLED_WINDOW = wx.NewId()
     HTML_WINDOW = wx.NewId()
     CALENDAR_CTRL = wx.NewId()
     DATE_CTRL = wx.NewId()
+    FILE_PICKER_CTRL = wx.NewId()
     GENERIC_DIR_CTRL = wx.NewId()
     SPIN_CTRL = wx.NewId()
     UNKNOWN = wx.NewId()
@@ -124,6 +132,10 @@ class ID_NEW:
     CONTEXT_HELP_BUTTON = wx.NewId()
 
     REF = wx.NewId()
+    COMMENT = wx.NewId()
+
+    CUSTOM = wx.NewId()
+    for i in range(99): wx.NewId()   # reserve IDs for custom controls
 
     LAST = wx.NewId()
 
@@ -193,10 +205,12 @@ class PullDownMenu:
             ID_NEW.CHOICEBOOK: 'wxChoicebook',
             ID_NEW.LISTBOOK: 'wxListbook',
             ID_NEW.SPLITTER_WINDOW: 'wxSplitterWindow',
+            ID_NEW.GRID: 'wxGrid',
             ID_NEW.SCROLLED_WINDOW: 'wxScrolledWindow',
             ID_NEW.HTML_WINDOW: 'wxHtmlWindow',
             ID_NEW.CALENDAR_CTRL: 'wxCalendarCtrl',
             ID_NEW.DATE_CTRL: 'wxDatePickerCtrl',
+            ID_NEW.FILE_PICKER_CTRL: 'wxFilePickerCtrl',
             ID_NEW.GENERIC_DIR_CTRL: 'wxGenericDirCtrl',
             ID_NEW.SPIN_CTRL: 'wxSpinCtrl',
 
@@ -268,10 +282,12 @@ class PullDownMenu:
              (ID_NEW.SCROLL_BAR, 'ScrollBar', 'Create scroll bar'),
              (ID_NEW.TREE_CTRL, 'TreeCtrl', 'Create tree'),
              (ID_NEW.LIST_CTRL, 'ListCtrl', 'Create list'),
+#             (ID_NEW.GRID, 'Grid', 'Create grid'),
              (ID_NEW.SCROLLED_WINDOW, 'ScrolledWindow', 'Create scrolled window'),
              (ID_NEW.HTML_WINDOW, 'HtmlWindow', 'Create HTML window'),
              (ID_NEW.CALENDAR_CTRL, 'CalendarCtrl', 'Create calendar control'),
              (ID_NEW.DATE_CTRL, 'DatePickerCtrl', 'Create date picker control'),
+#             (ID_NEW.FILE_PICKER_CTRL, 'FilePickerCtrl', 'Create file picker control'),
              (ID_NEW.GENERIC_DIR_CTRL, 'GenericDirCtrl', 'Create generic dir control'),
              (ID_NEW.UNKNOWN, 'Unknown', 'Create custom control placeholder'),
              ],
@@ -370,7 +386,13 @@ class PullDownMenu:
             ID_NEW.HELP_BUTTON: ('wxID_HELP', '&Help'),
             ID_NEW.CONTEXT_HELP_BUTTON: ('wxID_CONTEXT_HELP', '&Help'),
             }
-            
+        self.custom = ['custom', 'User-defined controls']
+        self.customMap = {}        
+        
+    def addCustom(self, klass):
+        n = len(self.custom)-2
+        self.custom.append((ID_NEW.CUSTOM + n, klass))
+        self.customMap[ID_NEW.CUSTOM + n] = klass
 
 
 ################################################################################
@@ -396,19 +418,24 @@ def SetMenu(m, list, shift=False):
 ################################################################################
 
 class HighLightBox:
+    colour = None
     def __init__(self, pos, size):
+        if not self.colour: colour = self.colour = wx.NamedColour(COLOUR_HL)
+        else: colour = self.colour
         if size.width == -1: size.width = 0
         if size.height == -1: size.height = 0
         w = g.testWin.panel
         l1 = wx.Window(w, -1, pos, wx.Size(size.width, 2))
-        l1.SetBackgroundColour(wx.RED)
+        l1.SetBackgroundColour(self.colour)
         l2 = wx.Window(w, -1, pos, wx.Size(2, size.height))
-        l2.SetBackgroundColour(wx.RED)
+        l2.SetBackgroundColour(self.colour)
         l3 = wx.Window(w, -1, wx.Point(pos.x + size.width - 2, pos.y), wx.Size(2, size.height))
-        l3.SetBackgroundColour(wx.RED)
+        l3.SetBackgroundColour(self.colour)
         l4 = wx.Window(w, -1, wx.Point(pos.x, pos.y + size.height - 2), wx.Size(size.width, 2))
-        l4.SetBackgroundColour(wx.RED)
+        l4.SetBackgroundColour(self.colour)
         self.lines = [l1, l2, l3, l4]
+        self.size = size
+        g.testWin.highLight = self
     # Move highlight to a new position
     def Replace(self, pos, size):
         if size.width == -1: size.width = 0
@@ -417,6 +444,7 @@ class HighLightBox:
         self.lines[1].SetDimensions(pos.x, pos.y, 2, size.height)
         self.lines[2].SetDimensions(pos.x + size.width - 2, pos.y, 2, size.height)
         self.lines[3].SetDimensions(pos.x, pos.y + size.height - 2, size.width, 2)
+        self.size = size
     # Remove it
     def Remove(self):
         map(wx.Window.Destroy, self.lines)
@@ -424,22 +452,64 @@ class HighLightBox:
     def Refresh(self):
         map(wx.Window.Refresh, self.lines)
 
+# Same for drop target
+class HighLightDTBox(HighLightBox):
+    colour = None
+    def __init__(self, pos, size):
+        if not self.colour: colour = self.colour = wx.NamedColour(COLOUR_DT)
+        else: colour = self.colour
+        if size.width == -1: size.width = 0
+        if size.height == -1: size.height = 0
+        w = g.testWin.panel
+        l1 = wx.Window(w, -1, pos, wx.Size(size.width, 2))
+        l1.SetBackgroundColour(colour)
+        l2 = wx.Window(w, -1, pos, wx.Size(2, size.height))
+        l2.SetBackgroundColour(colour)
+        l3 = wx.Window(w, -1, wx.Point(pos.x + size.width - 2, pos.y), wx.Size(2, size.height))
+        l3.SetBackgroundColour(colour)
+        l4 = wx.Window(w, -1, wx.Point(pos.x, pos.y + size.height - 2), wx.Size(size.width, 2))
+        l4.SetBackgroundColour(colour)
+        self.lines = [l1, l2, l3, l4]
+        self.size = size
+        self.item = None
+    # Remove it
+    def Remove(self):
+        map(wx.Window.Destroy, self.lines)
+        g.testWin.highLightDT = None
+
+def updateHL(hl, hlClass, pos, size):
+    if hl and hl.size == size:
+        hl.Remove()
+        hl = None
+    if hl:
+        hl.Replace(pos, size)
+        hl.Refresh()
+    else:
+        hl = hlClass(pos, size)
+    return hl
+
 ################################################################################
 
 class XML_Tree(wx.TreeCtrl):
     def __init__(self, parent, id):
-        wx.TreeCtrl.__init__(self, parent, id, style = wx.TR_HAS_BUTTONS | wx.TR_MULTIPLE)
+        wx.TreeCtrl.__init__(self, parent, id,
+                             style = wx.TR_HAS_BUTTONS | wx.TR_MULTIPLE | wx.TR_EDIT_LABELS)
         self.SetBackgroundColour(wx.Colour(224, 248, 224))
+        self.fontComment = wx.FFont(self.GetFont().GetPointSize(),
+                                    self.GetFont().GetFamily(),
+                                    wx.FONTFLAG_ITALIC)
         # Register events
         wx.EVT_TREE_SEL_CHANGED(self, self.GetId(), self.OnSelChanged)
         # One works on Linux, another on Windows
-        if wx.Platform == '__WXGTK__':
+        if wx.Platform == '__WXGTK__': # !!! MAC too?
             wx.EVT_TREE_ITEM_ACTIVATED(self, self.GetId(), self.OnItemActivated)
         else:
             wx.EVT_LEFT_DCLICK(self, self.OnDClick)
         wx.EVT_RIGHT_DOWN(self, self.OnRightDown)
         wx.EVT_TREE_ITEM_EXPANDED(self, self.GetId(), self.OnItemExpandedCollapsed)
         wx.EVT_TREE_ITEM_COLLAPSED(self, self.GetId(), self.OnItemExpandedCollapsed)
+        self.Bind(wx.EVT_TREE_BEGIN_LABEL_EDIT, self.OnBeginLabelEdit)
+        self.Bind(wx.EVT_TREE_END_LABEL_EDIT, self.OnEndLabelEdit)
 
         self.selection = None
         self.selectionChanging = False
@@ -450,6 +520,7 @@ class XML_Tree(wx.TreeCtrl):
         # Create image list
         il = wx.ImageList(16, 16, True)
         self.rootImage = il.Add(images.getTreeRootImage().Scale(16,16).ConvertToBitmap())
+        xxxComment.image = il.Add(images.getTreeCommentImage().Scale(16,16).ConvertToBitmap())
         xxxObject.image = il.Add(images.getTreeDefaultImage().Scale(16,16).ConvertToBitmap())
         xxxPanel.image = il.Add(images.getTreePanelImage().Scale(16,16).ConvertToBitmap())
         xxxDialog.image = il.Add(images.getTreeDialogImage().Scale(16,16).ConvertToBitmap())
@@ -511,6 +582,7 @@ class XML_Tree(wx.TreeCtrl):
         self.rootObj = xxxMainNode(self.dom)
         self.root = self.AddRoot('XML tree', self.rootImage,
                                  data=wx.TreeItemData(self.rootObj))
+        self.itemColour = self.GetItemTextColour(self.root)
         self.SetItemHasChildren(self.root)
         self.testElem = self.dom.createElement('dummy')
         self.mainNode.appendChild(self.testElem)
@@ -560,17 +632,22 @@ class XML_Tree(wx.TreeCtrl):
         item = self.AppendItem(itemParent, treeObj.treeName(),
                                image=treeObj.treeImage(),
                                data=wx.TreeItemData(xxx))
-        # Different color for references
-        if treeObj.ref:
-            self.SetItemTextColour(item, 'DarkGreen')
+        # Different color for comments and references
+        if xxx.className == 'comment':
+            self.SetItemTextColour(item, COLOUR_COMMENT)
+            self.SetItemFont(item, self.fontComment)
+        elif treeObj.ref:
+            self.SetItemTextColour(item, COLOUR_REF)
+        elif treeObj.hasStyle and treeObj.params.get('hidden', False):
+            self.SetItemTextColour(item, COLOUR_HIDDEN)
         # Try to find children objects
         if treeObj.hasChildren:
-            nodes = treeObj.element.childNodes[:]
+            nodes = treeObj.node.childNodes[:]
             for n in nodes:
                 if IsObject(n):
                     self.AddNode(item, treeObj, n)
                 elif n.nodeType != minidom.Node.ELEMENT_NODE:
-                    treeObj.element.removeChild(n)
+                    treeObj.node.removeChild(n)
                     n.unlink()
 
     # Insert new item at specific position
@@ -579,23 +656,30 @@ class XML_Tree(wx.TreeCtrl):
         xxx = MakeXXXFromDOM(parent, elem)
         # If nextItem is None, we append to parent, otherwise insert before it
         if nextItem.IsOk():
-            node = self.GetPyData(nextItem).element
-            parent.element.insertBefore(elem, node)
+            node = self.GetPyData(nextItem).node
+            parent.node.insertBefore(elem, node)
             # Inserting before is difficult, se we insert after or first child
             index = self.ItemIndex(nextItem)
             newItem = self.InsertItemBefore(itemParent, index,
                         xxx.treeName(), image=xxx.treeImage())
             self.SetPyData(newItem, xxx)
         else:
-            parent.element.appendChild(elem)
+            parent.node.appendChild(elem)
             newItem = self.AppendItem(itemParent, xxx.treeName(), image=xxx.treeImage(),
                                       data=wx.TreeItemData(xxx))
-        # Different color for references
-        if xxx.treeObject().ref:  self.SetItemTextColour(newItem, 'DarkGreen')
+        treeObj = xxx.treeObject()
+        # Different color for references and comments
+        if xxx.className == 'comment':
+            self.SetItemTextColour(newItem, COLOUR_COMMENT)
+            self.SetItemFont(newItem, self.fontComment)
+        elif treeObj.ref:
+            self.SetItemTextColour(newItem, COLOUR_REF)
+        elif treeObj.hasStyle and treeObj.params.get('hidden', False):
+            self.SetItemTextColour(newItem, COLOUR_HIDDEN)
         # Add children items
         if xxx.hasChildren:
             treeObj = xxx.treeObject()
-            for n in treeObj.element.childNodes:
+            for n in treeObj.node.childNodes:
                 if IsObject(n):
                     self.AddNode(newItem, treeObj, n)
         return newItem
@@ -603,13 +687,14 @@ class XML_Tree(wx.TreeCtrl):
     # Remove leaf of tree, return it's data object
     def RemoveLeaf(self, leaf):
         xxx = self.GetPyData(leaf)
-        node = xxx.element
+        node = xxx.node
         parent = node.parentNode
         parent.removeChild(node)
         self.Delete(leaf)
         # Reset selection object
         self.selection = None
         return node
+    
     # Find position relative to the top-level window
     def FindNodePos(self, item, obj=None):
         # Root at (0,0)
@@ -629,17 +714,18 @@ class XML_Tree(wx.TreeCtrl):
                         if g.testWin.highLight:
                             g.testWin.highLight.Remove()
                     break
-        # Find first ancestor which is a wxWindow (not a sizer)
+        # For sizers and notebooks we must select the first window-like parent
         winParent = itemParent
         while self.GetPyData(winParent).isSizer:
             winParent = self.GetItemParent(winParent)
         # Notebook children are layed out in a little strange way
-        if self.GetPyData(itemParent).treeObject().__class__ == xxxNotebook:
-            parentPos = wx.Point(0,0)
-        else:
-            parentPos = self.FindNodePos(winParent)
-        # Position (-1,-1) is really (0,0)
+        # wxGTK places NB panels relative to the NB parent
+        if wx.Platform == '__WXGTK__':
+            if self.GetPyData(itemParent).treeObject().__class__ == xxxNotebook:
+                winParent = self.GetItemParent(winParent)
+        parentPos = self.FindNodePos(winParent)
         pos = obj.GetPosition()
+        # Position (-1,-1) is really (0,0)
         if pos == (-1,-1): pos = (0,0)
         return parentPos + pos
 
@@ -685,6 +771,7 @@ class XML_Tree(wx.TreeCtrl):
         self.UnselectAll()
         self.SelectItem(evt.GetItem())
         self.selectionChanging = False
+        g.frame.SetStatusText('')
 
     def ChangeSelection(self, item):
         # Apply changes
@@ -692,19 +779,17 @@ class XML_Tree(wx.TreeCtrl):
         #oldItem = evt.GetOldItem()
         status = ''
         oldItem = self.selection
-        # use GetItemParent as a way to determine if the itemId is still valid
-        if oldItem and self.GetItemParent(oldItem):
+        if oldItem:
             xxx = self.GetPyData(oldItem)
             # If some data was modified, apply changes
             if g.panel.IsModified():
                 self.Apply(xxx, oldItem)
-                #if conf.autoRefresh:
                 if g.testWin:
                     if g.testWin.highLight:
                         g.testWin.highLight.Remove()
                     self.needUpdate = True
                 status = 'Changes were applied'
-        g.frame.SetStatusText(status)
+        if status: g.frame.SetStatusText(status)
         # Generate view
         self.selection = item
         if not self.selection.IsOk():
@@ -723,7 +808,8 @@ class XML_Tree(wx.TreeCtrl):
         if item == g.testWin.item: return False
         while item != self.root:
             item = self.GetItemParent(item)
-            if item == g.testWin.item: return True
+            if item == g.testWin.item:
+                return True
         return False
 
     # Highlight selected item
@@ -739,18 +825,18 @@ class XML_Tree(wx.TreeCtrl):
             return
         # Get window/sizer object
         obj = self.FindNodeObject(item)
-        if not obj:
+        xxx = self.GetPyData(item).treeObject()
+        # Remove existing HL if item not found or is hidden
+        if not obj or xxx.hasStyle and xxx.params.get('hidden', False):
             if g.testWin.highLight: g.testWin.highLight.Remove()
             return
-        pos = self.FindNodePos(item, obj)
+        pos = self.FindNodePos(item, obj)         
         size = obj.GetSize()
         # Highlight
         # Negative positions are not working quite well
-        if g.testWin.highLight:
-            g.testWin.highLight.Replace(pos, size)
-        else:
-            g.testWin.highLight = HighLightBox(pos, size)
-        g.testWin.highLight.Refresh()
+        # If highlight object has the same size SetDimension does not repaint it
+        # so we must remove the old HL window
+        g.testWin.highLight = updateHL(g.testWin.highLight, HighLightBox, pos, size)
         g.testWin.highLight.item = item
 
     def ShowTestWindow(self, item):
@@ -769,6 +855,7 @@ class XML_Tree(wx.TreeCtrl):
             return
         # Show item in bold
         if g.testWin:     # Reset old
+            self.UnselectAll()
             self.SetItemBold(g.testWin.item, False)
         try:
             wx.BeginBusyCursor()
@@ -804,19 +891,6 @@ class XML_Tree(wx.TreeCtrl):
         testWin = g.testWin
         # Create a window with this resource
         xxx = self.GetPyData(item).treeObject()
-
-        # If frame
-#        if xxx.__class__ == xxxFrame:
-            # Frame can't have many children,
-            # but it's first child possibly can...
-#            child = self.GetFirstChild(item)[0]
-#            if child.IsOk() and self.GetPyData(child).__class__ == xxxPanel:
-#                # Clean-up before recursive call or error
-#                wx.MemoryFSHandler.RemoveFile('xxx.xrc')
-#                wx.EndBusyCursor()
-#                self.CreateTestWin(child)
-#                return
-
         # Close old window, remember where it was
         highLight = None
         if testWin:
@@ -842,7 +916,7 @@ class XML_Tree(wx.TreeCtrl):
         # Save in memory FS
         memFile = MemoryFile('xxx.xrc')
         # Create memory XML file
-        elem = xxx.element.cloneNode(True)
+        elem = xxx.node.cloneNode(True)
         if not xxx.name:
             name = 'noname'
         else:
@@ -871,6 +945,11 @@ class XML_Tree(wx.TreeCtrl):
         if not g.currentEncoding:
             xmlFlags != xrc.XRC_USE_LOCALE
         res = xrc.XmlResource('', xmlFlags)
+        res.InitAllHandlers()
+        xrc.XmlResource.Set(res)        # set as global
+        # Register handlers
+        addHandlers()
+        # Same module list
         res.Load('memory:xxx.xrc')
         try:
             if xxx.__class__ == xxxFrame:
@@ -901,7 +980,7 @@ class XML_Tree(wx.TreeCtrl):
                 testWin.SetClientSize(testWin.GetBestSize())
                 testWin.Show(True)
             elif xxx.__class__ == xxxDialog:
-                testWin = g.testWin = res.LoadDialog(None, STD_NAME)
+                testWin = g.testWin = res.LoadDialog(g.frame, STD_NAME)
                 testWin.panel = testWin
                 testWin.Layout()
                 testWin.SetPosition(pos)
@@ -911,7 +990,7 @@ class XML_Tree(wx.TreeCtrl):
                 wx.EVT_BUTTON(testWin, wx.ID_CANCEL, self.OnCloseTestWin)
             elif xxx.__class__ == xxxWizard:
                 wiz = wx.wizard.PreWizard()
-                res.LoadOnObject(wiz, None, STD_NAME, 'wxWizard')
+                res.LoadOnObject(wiz, g.frame, STD_NAME, 'wxWizard')
                 # Find first page (don't know better way)
                 firstPage = None
                 for w in wiz.GetChildren():
@@ -953,10 +1032,18 @@ class XML_Tree(wx.TreeCtrl):
                 testWin.toolBar = res.LoadToolBar(testWin, STD_NAME)
                 testWin.SetToolBar(testWin.toolBar)
                 testWin.Show(True)
+            # Catch some events, set highlight
             if testWin:
                 testWin.item = item
                 wx.EVT_CLOSE(testWin, self.OnCloseTestWin)
-                testWin.highLight = None
+                wx.EVT_SIZE(testWin, self.OnSizeTestWin)
+                # Add drop target
+                if testWin.panel:
+                    testWin.panel.SetDropTarget(DropTarget())
+                else:
+                    testWin.SetDropTarget(DropTarget())
+                # Reset highlights
+                testWin.highLight = testWin.highLightDT = None
                 if highLight and not self.pendingHighLight:
                     self.HighLight(highLight)
         except:
@@ -968,6 +1055,9 @@ class XML_Tree(wx.TreeCtrl):
             inf = sys.exc_info()
             wx.LogError(traceback.format_exception(inf[0], inf[1], None)[-1])
             wx.LogError('Error loading resource')
+        # Cleanup
+        res.Unload('xxx.xrc')
+        xrc.XmlResource.Set(None)
         wx.MemoryFSHandler.RemoveFile('xxx.xrc')
 
     def CloseTestWindow(self):
@@ -981,6 +1071,11 @@ class XML_Tree(wx.TreeCtrl):
     def OnCloseTestWin(self, evt):
         self.CloseTestWindow()
 
+    def OnSizeTestWin(self, evt):
+        if g.testWin.highLight:
+            self.HighLight(g.testWin.highLight.item)
+        evt.Skip()
+
     # Return index in parent, for real window children
     def WindowIndex(self, item):
         n = 0                           # index of sibling
@@ -1029,6 +1124,7 @@ class XML_Tree(wx.TreeCtrl):
     # Override to use like single-selection tree
     def GetSelection(self):
         return self.selection
+    
     def SelectItem(self, item):
         self.UnselectAll()
         self.ChangeSelection(item)
@@ -1062,6 +1158,7 @@ class XML_Tree(wx.TreeCtrl):
                 SetMenu(m, pullDownMenu.topLevel)
                 m.AppendSeparator()
                 m.Append(ID_NEW.REF, 'reference...', 'Create object_ref node')
+                m.Append(ID_NEW.COMMENT, 'comment', 'Create comment node')
             else:
                 xxx = self.GetPyData(item).treeObject()
                 # Check parent for possible child nodes if inserting sibling
@@ -1083,8 +1180,12 @@ class XML_Tree(wx.TreeCtrl):
                         m.Enable(ID_NEW.SPACER, False)
                     if xxx.__class__ is not xxxFrame:
                         m.Enable(ID_NEW.MENU_BAR, False)
+                # Add custom controls menu
+                if len(pullDownMenu.custom) > 2:
+                    SetMenu(m, [pullDownMenu.custom])
                 m.AppendSeparator()
                 m.Append(ID_NEW.REF, 'reference...', 'Create object_ref node')
+                m.Append(ID_NEW.COMMENT, 'comment', 'Create comment node')
             # Select correct label for create menu
             if not needInsert:
                 if self.shift:
@@ -1116,15 +1217,16 @@ class XML_Tree(wx.TreeCtrl):
                         (ID_NEW.PANEL, 'Panel', 'Create panel'),
                         (ID_NEW.DIALOG, 'Dialog', 'Create dialog'),
                         (ID_NEW.FRAME, 'Frame', 'Create frame')], shift=True)
-                elif xxx.isSizer:
+                elif xxx.isSizer and self.ItemHasChildren(item):
                     SetMenu(m, pullDownMenu.sizers, shift=True)
                 else:
                     SetMenu(m, pullDownMenu.controls, shift=True)
-                id = wx.NewId()
-                menu.AppendMenu(id, 'Replace With', m)
-                if not m.GetMenuItemCount(): menu.Enable(id, False)
-                menu.Append(pullDownMenu.ID_SUBCLASS, 'Subclass...',
-                            'Set "subclass" property')
+                if xxx.isElement:
+                    id = wx.NewId()
+                    menu.AppendMenu(id, 'Replace With', m)
+                    if not m.GetMenuItemCount(): menu.Enable(id, False)
+                    menu.Append(pullDownMenu.ID_SUBCLASS, 'Subclass...',
+                                'Set "subclass" property')
             menu.AppendSeparator()
             # Not using standart IDs because we don't want to show shortcuts
             menu.Append(wx.ID_CUT, 'Cut', 'Cut to the clipboard')
@@ -1143,6 +1245,12 @@ class XML_Tree(wx.TreeCtrl):
         self.PopupMenu(menu, evt.GetPosition())
         menu.Destroy()
 
+    # Redefine to force the update of font dimentions on wxGTK
+    if wx.Platform == '__WXGTK__':
+        def SetItemBold(self, item, state=True):
+            wx.TreeCtrl.SetItemBold(self, item, state)
+            self.SetIndent(self.GetIndent())
+
     # Apply changes
     def Apply(self, xxx, item):
         g.panel.Apply()
@@ -1153,9 +1261,114 @@ class XML_Tree(wx.TreeCtrl):
             # Item width may have changed
             # !!! Tric to update tree width (wxGTK, ??)
             self.SetIndent(self.GetIndent())
+        elif xxx.className == 'comment':
+            self.SetItemText(item, xxx.treeName())
         # Change tree icon for sizers
         if isinstance(xxx, xxxBoxSizer):
             self.SetItemImage(item, xxx.treeImage())
         # Set global modified state
         g.frame.SetModified()
 
+    def OnBeginLabelEdit(self, evt):
+        xxx = self.GetPyData(evt.GetItem())
+        if xxx.isElement:
+            evt.Veto()
+        else:
+            evt.Skip()
+
+    def OnEndLabelEdit(self, evt):
+        xxx = self.GetPyData(evt.GetItem())
+        node = xxx.node
+        if not xxx.isElement:
+            node.data = evt.GetLabel()
+            g.panel.SetData(xxx)
+        evt.Skip()
+
+################################################################################
+
+# DragAndDrop
+
+class DropTarget(wx.PyDropTarget):
+    def __init__(self):
+        self.do = MyDataObject()
+        wx.DropTarget.__init__(self, self.do)
+
+    # Find best object for dropping
+    def WhereToDrop(self, x, y, d):
+        # Find object by position
+        obj = wx.FindWindowAtPoint(g.testWin.ClientToScreen((x,y)))
+        if not obj:
+            return wx.DragNone, ()
+        item = g.frame.FindObject(g.testWin.item, obj)
+        if not item:
+            return wx.DragNone, ()
+        xxx = g.tree.GetPyData(item).treeObject()
+        parentItem = None
+        # Check if window has a XRC sizer, then use it as parent
+        if obj.GetSizer():
+            sizer = obj.GetSizer()
+            sizerItem = g.frame.FindObject(g.testWin.item, sizer)
+            if sizerItem:
+                parentItem = sizerItem
+                obj = sizer
+                item = wx.TreeItemId()
+        # if not sizer but can have children, it is parent with free placement
+        elif xxx.hasChildren:
+            parentItem = item
+            item = wx.TreeItemId()
+        # Otherwise, try to add to item's parent
+        if not parentItem:
+            parentItem = g.tree.GetItemParent(item)
+            obj = g.tree.FindNodeObject(parentItem)
+        parent = g.tree.GetPyData(parentItem).treeObject()
+        return d,(obj,parent,parentItem,item)
+        
+    # Drop
+    def OnData(self, x, y, d):
+        self.GetData()
+        id = int(self.do.GetDataHere())
+        d,other = self.WhereToDrop(x, y, d)
+        if d != wx.DragNone:
+            obj,parent,parentItem,item = other
+            g.tree.selection = parentItem
+            xxx = g.frame.CreateXXX(parent, parentItem, item,  id)
+            # Set coordinates if parent is not sizer
+            if not parent.isSizer:
+                xxx.set('pos', '%d,%d' % (x, y))
+                g.panel.SetData(xxx)
+            g.frame.SetStatusText('Object created')
+        self.RemoveHL()
+        return d
+
+    def OnDragOver(self, x, y, d):
+        d,other = self.WhereToDrop(x, y, d)
+        if d != wx.DragNone:
+            obj,parent,parentItem,item = other
+            pos, size = g.tree.FindNodePos(parentItem, obj), obj.GetSize()
+            hl = g.testWin.highLightDT
+            # Set color of highlighted item back to normal
+            if hl and hl.item:
+                if hl.item != parentItem:
+                    g.tree.SetItemTextColour(hl.item, g.tree.itemColour)
+                    # Highlight future parent
+                    g.tree.itemColour = g.tree.GetItemTextColour(parentItem) # save current
+            g.testWin.highLightDT = updateHL(hl, HighLightDTBox, pos, size)
+            g.testWin.highLightDT.item = parentItem
+            g.tree.SetItemTextColour(parentItem, COLOUR_DT)
+            g.tree.EnsureVisible(parentItem)
+            g.frame.SetStatusText('Drop target: %s' % parent.treeName())
+        else:
+            g.frame.SetStatusText('Inappropriate drop target')
+            self.RemoveHL()
+        return d
+
+    def OnLeave(self):
+        self.RemoveHL()
+
+    def RemoveHL(self):
+        hl = g.testWin.highLightDT
+        if hl:
+            if hl.item:
+                g.tree.SetItemTextColour(hl.item, g.tree.itemColour)
+            hl.Remove()
+        
diff --git a/wxPython/wx/tools/XRCed/undo.py b/wxPython/wx/tools/XRCed/undo.py
index fe0c181739..f883f88e93 100644
--- a/wxPython/wx/tools/XRCed/undo.py
+++ b/wxPython/wx/tools/XRCed/undo.py
@@ -6,6 +6,7 @@
 
 from globals import *
 from xxx import MakeXXXFromDOM
+from tree import *
 #from panel import *
 
 # Undo/redo classes
@@ -123,20 +124,21 @@ class UndoPasteCreate:
 class UndoReplace:
     def __init__(self, item):
         self.itemIndex = g.tree.ItemFullIndex(item)
-        self.xxx = g.tree.GetPyData(item)
+        #self.xxx = g.tree.GetPyData(item)
+        self.elem = None
     def destroy(self):
-        if self.xxx: self.xxx.element.unlink()
+        if self.elem: self.elem.unlink()
     def undo(self):
         print 'Sorry, UndoReplace is not yet implemented.'
         return
         item = g.tree.ItemAtFullIndex(self.itemIndex)
         xxx = g.tree.GetPyData(item)
         # Replace with old element
-        parent = xxx.parent.element
+        parent = xxx.parent.node
         if xxx is self.xxx:   # sizeritem or notebookpage - replace child
-            parent.replaceChild(self.xxx.child.element, xxx.child.element)
+            parent.replaceChild(self.xxx.child.node, xxx.child.node)
         else:
-            parent.replaceChild(self.xxx.element, xxx.element)
+            parent.replaceChild(self.xxx.node, xxx.node)
         self.xxx.parent = xxx.parent
         xxx = self.xxx
         g.tree.SetPyData(item, xxx)
@@ -163,6 +165,91 @@ class UndoReplace:
     def redo(self):
         return
 
+class UndoMove:
+    def __init__(self, oldParent, oldIndex, newParent, newIndex):
+        self.oldParent = oldParent
+        self.oldIndex = oldIndex
+        self.newParent = newParent
+        self.newIndex = newIndex
+    def destroy(self):
+        pass
+    def undo(self):
+        item = g.tree.GetFirstChild(self.newParent)[0]
+        for i in range(self.newIndex): item = g.tree.GetNextSibling(item)
+        elem = g.tree.RemoveLeaf(item)
+        nextItem = g.tree.GetFirstChild(self.oldParent)[0]
+        for i in range(self.oldIndex): nextItem = g.tree.GetNextSibling(nextItem) 
+
+        parent = g.tree.GetPyData(self.oldParent).treeObject()
+
+        # Check parent and child relationships.
+        # If parent is sizer or notebook, child is of wrong class or
+        # parent is normal window, child is child container then detach child.
+        xxx = MakeXXXFromDOM(parent, elem)
+        isChildContainer = isinstance(xxx, xxxChildContainer)
+        if isChildContainer and \
+           ((parent.isSizer and not isinstance(xxx, xxxSizerItem)) or \
+            (isinstance(parent, xxxNotebook) and not isinstance(xxx, xxxNotebookPage)) or \
+           not (parent.isSizer or isinstance(parent, xxxNotebook))):
+            elem.removeChild(xxx.child.node) # detach child
+            elem.unlink()           # delete child container
+            elem = xxx.child.node # replace
+            # This may help garbage collection
+            xxx.child.parent = None
+            isChildContainer = False
+        # Parent is sizer or notebook, child is not child container
+        if parent.isSizer and not isChildContainer and not isinstance(xxx, xxxSpacer):
+            # Create sizer item element
+            sizerItemElem = MakeEmptyDOM('sizeritem')
+            sizerItemElem.appendChild(elem)
+            elem = sizerItemElem
+        elif isinstance(parent, xxxNotebook) and not isChildContainer:
+            pageElem = MakeEmptyDOM('notebookpage')
+            pageElem.appendChild(elem)
+            elem = pageElem
+
+        selected = g.tree.InsertNode(self.oldParent, parent, elem, nextItem)
+        g.tree.EnsureVisible(selected)
+        g.tree.SelectItem(selected)
+    def redo(self):
+        item = g.tree.GetFirstChild(self.oldParent)[0]
+        for i in range(self.oldIndex): item = g.tree.GetNextSibling(item)
+        elem = g.tree.RemoveLeaf(item)
+
+        parent = g.tree.GetPyData(self.newParent).treeObject()
+
+        # Check parent and child relationships.
+        # If parent is sizer or notebook, child is of wrong class or
+        # parent is normal window, child is child container then detach child.
+        xxx = MakeXXXFromDOM(parent, elem)
+        isChildContainer = isinstance(xxx, xxxChildContainer)
+        if isChildContainer and \
+           ((parent.isSizer and not isinstance(xxx, xxxSizerItem)) or \
+            (isinstance(parent, xxxNotebook) and not isinstance(xxx, xxxNotebookPage)) or \
+           not (parent.isSizer or isinstance(parent, xxxNotebook))):
+            elem.removeChild(xxx.child.node) # detach child
+            elem.unlink()           # delete child container
+            elem = xxx.child.node # replace
+            # This may help garbage collection
+            xxx.child.parent = None
+            isChildContainer = False
+        # Parent is sizer or notebook, child is not child container
+        if parent.isSizer and not isChildContainer and not isinstance(xxx, xxxSpacer):
+            # Create sizer item element
+            sizerItemElem = MakeEmptyDOM('sizeritem')
+            sizerItemElem.appendChild(elem)
+            elem = sizerItemElem
+        elif isinstance(parent, xxxNotebook) and not isChildContainer:
+            pageElem = MakeEmptyDOM('notebookpage')
+            pageElem.appendChild(elem)
+            elem = pageElem
+
+        nextItem = g.tree.GetFirstChild(self.newParent)[0]
+        for i in range(self.newIndex): nextItem = g.tree.GetNextSibling(nextItem) 
+        selected = g.tree.InsertNode(self.newParent, parent, elem, nextItem)
+        g.tree.EnsureVisible(selected)
+        g.tree.SelectItem(selected)
+
 class UndoEdit:
     def __init__(self):
         self.pages = map(ParamPage.GetState, g.panel.pages)
@@ -187,7 +274,8 @@ class UndoEdit:
         # Save current state for redo
         map(ParamPage.SaveState, g.panel.pages)
         pages = map(ParamPage.GetState, g.panel.pages)
-        map(ParamPage.SetState, g.panel.pages, self.pages)
+        if self.pages:
+            map(ParamPage.SetState, g.panel.pages, self.pages)
         self.pages = pages
         self.update(selected)
     def redo(self):
diff --git a/wxPython/wx/tools/XRCed/xrced.py b/wxPython/wx/tools/XRCed/xrced.py
index e47b62f287..26d6bc6f30 100644
--- a/wxPython/wx/tools/XRCed/xrced.py
+++ b/wxPython/wx/tools/XRCed/xrced.py
@@ -28,6 +28,7 @@ from xml.parsers import expat
 from tree import *                      # imports xxx which imports params
 from panel import *
 from tools import *
+from params import genericStyles
 # Cleanup recursive import sideeffects, otherwise we can't create undoMan
 import undo
 undo.ParamPage = ParamPage
@@ -39,6 +40,9 @@ if __name__ == '__main__':
 else:
     basePath = os.path.dirname(__file__)
 
+# Remember system path
+sys_path = sys.path
+
 # 1 adds CMD command to Help menu
 debug = 0
 
@@ -50,7 +54,7 @@ select "Append Child", and then any command.<P>
 Or just press one of the buttons on the tools palette.<P>
 Enter XML ID, change properties, create children.<P>
 To test your interface select Test command (View menu).<P>
-Consult README file for the details.</HTML>
+Consult README.txt file for the details.</HTML>
 """
 
 defaultIDs = {xxxPanel:'PANEL', xxxDialog:'DIALOG', xxxFrame:'FRAME',
@@ -70,13 +74,13 @@ class ScrolledMessageDialog(wx.Dialog):
                              wx.DefaultSize, wx.TE_MULTILINE | wx.TE_READONLY)
         text.SetFont(g.modernFont())
         dc = wx.WindowDC(text)
-        # !!! possible bug - GetTextExtent without font returns sysfont dims
         w, h = dc.GetFullTextExtent(' ', g.modernFont())[:2]
         ok = wx.Button(self, wx.ID_OK, "OK")
+        ok.SetDefault()
         text.SetConstraints(Layoutf('t=t5#1;b=t5#2;l=l5#1;r=r5#1', (self,ok)))
         text.SetSize((w * 80 + 30, h * 40))
-        text.ShowPosition(1)
-        ok.SetConstraints(Layoutf('b=b5#1;x%w50#1;w!80;h!25', (self,)))
+        text.ShowPosition(1)            # scroll to the first line
+        ok.SetConstraints(Layoutf('b=b5#1;x%w50#1;w!80;h!35', (self,)))
         self.SetAutoLayout(True)
         self.Fit()
         self.CenterOnScreen(wx.BOTH)
@@ -101,7 +105,7 @@ class Frame(wx.Frame):
         self.inIdle = False
 
         # Load our own resources
-        self.res = xrc.XmlResource('')
+        self.res = xrc.EmptyXmlResource()
         # !!! Blocking of assert failure occurring in older unicode builds
         try:
             quietlog = wx.LogNull()
@@ -116,9 +120,13 @@ class Frame(wx.Frame):
         menu.Append(wx.ID_NEW, '&New\tCtrl-N', 'New file')
         menu.AppendSeparator()
         menu.Append(wx.ID_OPEN, '&Open...\tCtrl-O', 'Open XRC file')
+        
         self.recentMenu = wx.Menu()
-        self.AppendRecent(self.recentMenu)
-        menu.AppendMenu(-1, 'Open Recent', self.recentMenu, 'Open a recent file')
+        g.fileHistory.UseMenu(self.recentMenu)
+        g.fileHistory.AddFilesToMenu()
+        self.Bind(wx.EVT_MENU, self.OnRecentFile, id=wx.ID_FILE1, id2=wx.ID_FILE9)
+        menu.AppendMenu(-1, 'Open &Recent', self.recentMenu, 'Open a recent file')
+        
         menu.AppendSeparator()
         menu.Append(wx.ID_SAVE, '&Save\tCtrl-S', 'Save XRC file')
         menu.Append(wx.ID_SAVEAS, 'Save &As...', 'Save XRC file under different name')
@@ -126,6 +134,9 @@ class Frame(wx.Frame):
         menu.Append(self.ID_GENERATE_PYTHON, '&Generate Python...', 
                     'Generate a Python module that uses this XRC')
         menu.AppendSeparator()
+        self.ID_PREFS = wx.NewId()
+        menu.Append(self.ID_PREFS, 'Preferences...', 'Change XRCed settings')
+        menu.AppendSeparator()
         menu.Append(wx.ID_EXIT, '&Quit\tCtrl-Q', 'Exit application')
 
         menuBar.Append(menu, '&File')
@@ -160,17 +171,28 @@ class Frame(wx.Frame):
         self.ID_REFRESH = wx.NewId()
         menu.Append(self.ID_REFRESH, '&Refresh\tCtrl-R', 'Refresh test window')
         self.ID_AUTO_REFRESH = wx.NewId()
-        menu.Append(self.ID_AUTO_REFRESH, '&Auto-refresh\tCtrl-A',
+        menu.Append(self.ID_AUTO_REFRESH, '&Auto-refresh\tAlt-A',
                     'Toggle auto-refresh mode', True)
         menu.Check(self.ID_AUTO_REFRESH, conf.autoRefresh)
         self.ID_TEST_HIDE = wx.NewId()
-        menu.Append(self.ID_TEST_HIDE, '&Hide\tCtrl-H', 'Close test window')
+        menu.Append(self.ID_TEST_HIDE, '&Hide\tF6', 'Close test window')
         menuBar.Append(menu, '&View')
 
+        menu = wx.Menu()
+        self.ID_MOVEUP = wx.NewId()
+        menu.Append(self.ID_MOVEUP, '&Up', 'Move before previous sibling')
+        self.ID_MOVEDOWN = wx.NewId()
+        menu.Append(self.ID_MOVEDOWN, '&Down', 'Move after next sibling')
+        self.ID_MOVELEFT = wx.NewId()
+        menu.Append(self.ID_MOVELEFT, '&Make sibling', 'Make sibling of parent')
+        self.ID_MOVERIGHT = wx.NewId()
+        menu.Append(self.ID_MOVERIGHT, '&Make child', 'Make child of previous sibling')
+        menuBar.Append(menu, '&Move')
+
         menu = wx.Menu()
         menu.Append(wx.ID_ABOUT, '&About...', 'About XCRed')
         self.ID_README = wx.NewId()
-        menu.Append(self.ID_README, '&Readme...', 'View the README file')
+        menu.Append(self.ID_README, '&Readme...\tF1', 'View the README file')
         if debug:
             self.ID_DEBUG_CMD = wx.NewId()
             menu.Append(self.ID_DEBUG_CMD, 'CMD', 'Python command line')
@@ -212,6 +234,15 @@ class Frame(wx.Frame):
                          'Refresh', 'Refresh view')
         tb.AddSimpleTool(self.ID_AUTO_REFRESH, images.getAutoRefreshBitmap(),
                          'Auto-refresh', 'Toggle auto-refresh mode', True)
+        tb.AddControl(wx.StaticLine(tb, -1, size=(-1,23), style=wx.LI_VERTICAL))
+        tb.AddSimpleTool(self.ID_MOVEUP, images.getToolMoveUpBitmap(),
+                         'Up', 'Move before previous sibling')
+        tb.AddSimpleTool(self.ID_MOVEDOWN, images.getToolMoveDownBitmap(),
+                         'Down', 'Move after next sibling')
+        tb.AddSimpleTool(self.ID_MOVELEFT, images.getToolMoveLeftBitmap(),
+                         'Make Sibling', 'Make sibling of parent')
+        tb.AddSimpleTool(self.ID_MOVERIGHT, images.getToolMoveRightBitmap(),
+                         'Make Child', 'Make child of previous sibling')
 #        if wx.Platform == '__WXGTK__':
 #            tb.AddSeparator()   # otherwise auto-refresh sticks in status line
         tb.ToggleTool(self.ID_AUTO_REFRESH, conf.autoRefresh)
@@ -226,6 +257,7 @@ class Frame(wx.Frame):
         wx.EVT_MENU(self, wx.ID_SAVE, self.OnSaveOrSaveAs)
         wx.EVT_MENU(self, wx.ID_SAVEAS, self.OnSaveOrSaveAs)
         wx.EVT_MENU(self, self.ID_GENERATE_PYTHON, self.OnGeneratePython)
+        wx.EVT_MENU(self, self.ID_PREFS, self.OnPrefs)
         wx.EVT_MENU(self, wx.ID_EXIT, self.OnExit)
         # Edit
         wx.EVT_MENU(self, wx.ID_UNDO, self.OnUndo)
@@ -244,6 +276,11 @@ class Frame(wx.Frame):
         wx.EVT_MENU(self, self.ID_REFRESH, self.OnRefresh)
         wx.EVT_MENU(self, self.ID_AUTO_REFRESH, self.OnAutoRefresh)
         wx.EVT_MENU(self, self.ID_TEST_HIDE, self.OnTestHide)
+        # Move
+        wx.EVT_MENU(self, self.ID_MOVEUP, self.OnMoveUp)
+        wx.EVT_MENU(self, self.ID_MOVEDOWN, self.OnMoveDown)
+        wx.EVT_MENU(self, self.ID_MOVELEFT, self.OnMoveLeft)
+        wx.EVT_MENU(self, self.ID_MOVERIGHT, self.OnMoveRight)        
         # Help
         wx.EVT_MENU(self, wx.ID_ABOUT, self.OnAbout)
         wx.EVT_MENU(self, self.ID_README, self.OnReadme)
@@ -264,7 +301,7 @@ class Frame(wx.Frame):
 
         # Build interface
         sizer = wx.BoxSizer(wx.VERTICAL)
-        sizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND)
+        #sizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND)
         # Horizontal sizer for toolbar and splitter
         self.toolsSizer = sizer1 = wx.BoxSizer()
         splitter = wx.SplitterWindow(self, -1, style=wx.SP_3DSASH)
@@ -285,11 +322,10 @@ class Frame(wx.Frame):
 
         tree.RegisterKeyEvents()
 
-        # !!! frame styles are broken
-        # Miniframe for not embedded mode
-        miniFrame = wx.Frame(self, -1, 'Properties & Style',
-                            (conf.panelX, conf.panelY),
-                            (conf.panelWidth, conf.panelHeight))
+        # Miniframe for split mode
+        miniFrame = wx.MiniFrame(self, -1, 'Properties & Style',
+                                 (conf.panelX, conf.panelY),
+                                 (conf.panelWidth, conf.panelHeight))
         self.miniFrame = miniFrame
         sizer2 = wx.BoxSizer()
         miniFrame.SetAutoLayout(True)
@@ -311,9 +347,6 @@ class Frame(wx.Frame):
         self.SetAutoLayout(True)
         self.SetSizer(sizer)
 
-        # Initialize
-        self.Clear()
-
         # Other events
         wx.EVT_IDLE(self, self.OnIdle)
         wx.EVT_CLOSE(self, self.OnCloseWindow)
@@ -321,25 +354,22 @@ class Frame(wx.Frame):
         wx.EVT_KEY_UP(self, tools.OnKeyUp)
         wx.EVT_ICONIZE(self, self.OnIconize)
     
-    def AppendRecent(self, menu):
-        # add recently used files to the menu
-        for id,name in conf.recentfiles.iteritems():
-            menu.Append(id,name)
-            wx.EVT_MENU(self,id,self.OnRecentFile)
-        return 
-        
     def OnRecentFile(self,evt):
         # open recently used file
         if not self.AskSave(): return
         wx.BeginBusyCursor()
-        try:
-            path=conf.recentfiles[evt.GetId()]
-            if self.Open(path):
-                self.SetStatusText('Data loaded')
-            else:
-                self.SetStatusText('Failed')
-        except KeyError:
-            self.SetStatusText('No such file')
+
+        # get the pathname based on the menu ID
+        fileNum = evt.GetId() - wx.ID_FILE1
+        path = g.fileHistory.GetHistoryFile(fileNum)
+            
+        if self.Open(path):
+            self.SetStatusText('Data loaded')
+            # add it back to the history so it will be moved up the list
+            self.SaveRecent(path)
+        else:
+            self.SetStatusText('Failed')
+
         wx.EndBusyCursor()
 
     def OnNew(self, evt):
@@ -357,9 +387,9 @@ class Frame(wx.Frame):
             try:
                 if self.Open(path):
                     self.SetStatusText('Data loaded')
+                    self.SaveRecent(path)
                 else:
                     self.SetStatusText('Failed')
-                self.SaveRecent(path)
             finally:
                 wx.EndBusyCursor()
         dlg.Destroy()
@@ -404,6 +434,7 @@ class Frame(wx.Frame):
                 self.Save(tmpName) # save temporary file first
                 shutil.move(tmpName, path)
                 self.dataFile = path
+                self.SetModified(False)
                 if conf.localconf.ReadBool("autogenerate", False):
                     pypath = conf.localconf.Read("filename")
                     embed = conf.localconf.ReadBool("embedResource", False)
@@ -419,11 +450,7 @@ class Frame(wx.Frame):
 
     def SaveRecent(self,path):
         # append to recently used files
-        if path not in conf.recentfiles.values():
-            newid = wx.NewId()
-            self.recentMenu.Append(newid, path)
-            wx.EVT_MENU(self, newid, self.OnRecentFile)
-            conf.recentfiles[newid] = path
+        g.fileHistory.AddFileToHistory(path)
 
     def GeneratePython(self, dataFile, pypath, embed, genGettext):
         try:
@@ -445,7 +472,18 @@ class Frame(wx.Frame):
         dlg = PythonOptions(self, conf.localconf, self.dataFile)
         dlg.ShowModal()
         dlg.Destroy()
-
+        
+    def OnPrefs(self, evt):
+        dlg = PrefsDialog(self)
+        if dlg.ShowModal() == wx.ID_OK:
+            # Fetch new preferences
+            for id,cdp in dlg.checkControls.items():
+                c,d,p = cdp
+                if dlg.FindWindowById(id).IsChecked():
+                    d[p] = str(c.GetValue())
+                elif p in d: del d[p]
+            g.conf.allowExec = ('ask', 'yes', 'no')[dlg.radio_allow_exec.GetSelection()]
+        dlg.Destroy()
         
     def OnExit(self, evt):
         self.Close()
@@ -454,20 +492,28 @@ class Frame(wx.Frame):
         # Extra check to not mess with idle updating
         if undoMan.CanUndo():
             undoMan.Undo()
+            g.panel.SetModified(False)
+            if not undoMan.CanUndo():
+                self.SetModified(False)
 
     def OnRedo(self, evt):
         if undoMan.CanRedo():
             undoMan.Redo()
+            self.SetModified(True)
 
     def OnCopy(self, evt):
         selected = tree.selection
         if not selected: return         # key pressed event
         xxx = tree.GetPyData(selected)
         if wx.TheClipboard.Open():
-            data = wx.CustomDataObject('XRCED')
-            # Set encoding in header
-            # (False,True)
-            s = xxx.element.toxml(encoding=expat.native_encoding)
+            if xxx.isElement:
+                data = wx.CustomDataObject('XRCED')
+                # Set encoding in header
+                # (False,True)
+                s = xxx.node.toxml(encoding=expat.native_encoding)
+            else:
+                data = wx.CustomDataObject('XRCED_node')
+                s = xxx.node.data
             data.SetData(cPickle.dumps(s))
             wx.TheClipboard.SetData(data)
             wx.TheClipboard.Close()
@@ -502,60 +548,41 @@ class Frame(wx.Frame):
         parent = tree.GetPyData(parentLeaf).treeObject()
 
         # Create a copy of clipboard pickled element
-        success = False
+        success = success_node = False
         if wx.TheClipboard.Open():
-            data = wx.CustomDataObject('XRCED')
-            if wx.TheClipboard.IsSupported(data.GetFormat()):
-                success = wx.TheClipboard.GetData(data)
-            wx.TheClipboard.Close()
+            try:
+                data = wx.CustomDataObject('XRCED')
+                if wx.TheClipboard.IsSupported(data.GetFormat()):
+                    try:
+                        success = wx.TheClipboard.GetData(data)
+                    except:
+                        # there is a problem if XRCED_node is in clipboard
+                        # but previous SetData was for XRCED
+                        pass
+                if not success:             # try other format
+                    data = wx.CustomDataObject('XRCED_node')
+                    if wx.TheClipboard.IsSupported(data.GetFormat()):
+                        success_node = wx.TheClipboard.GetData(data)
+            finally:
+                wx.TheClipboard.Close()
 
-        if not success:
+        if not success and not success_node:
             wx.MessageBox(
                 "There is no data in the clipboard in the required format",
                 "Error")
             return
 
         xml = cPickle.loads(data.GetData()) # xml representation of element
-        elem = minidom.parseString(xml).childNodes[0]
+        if success:
+            elem = minidom.parseString(xml).childNodes[0]
+        else:
+            elem = g.tree.dom.createComment(xml)
+        
         # Tempopary xxx object to test things
         xxx = MakeXXXFromDOM(parent, elem)
+        
         # Check compatibility
-        error = False
-        # Top-level
-        x = xxx.treeObject()
-        if x.__class__ in [xxxDialog, xxxFrame, xxxWizard]:
-            # Top-level classes
-            if parent.__class__ != xxxMainNode: error = True
-        elif x.__class__ == xxxMenuBar:
-            # Menubar can be put in frame or dialog
-            if parent.__class__ not in [xxxMainNode, xxxFrame, xxxDialog]: error = True
-        elif x.__class__ == xxxToolBar:
-            # Toolbar can be top-level of child of panel or frame
-            if parent.__class__ not in [xxxMainNode, xxxPanel, xxxFrame] and \
-               not parent.isSizer: error = True
-        elif x.__class__ == xxxPanel and parent.__class__ == xxxMainNode:
-            pass
-        elif x.__class__ == xxxSpacer:
-            if not parent.isSizer: error = True
-        elif x.__class__ == xxxSeparator:
-            if not parent.__class__ in [xxxMenu, xxxToolBar]: error = True
-        elif x.__class__ == xxxTool:
-            if parent.__class__ != xxxToolBar: error = True
-        elif x.__class__ == xxxMenu:
-            if not parent.__class__ in [xxxMainNode, xxxMenuBar, xxxMenu]: error = True
-        elif x.__class__ == xxxMenuItem:
-            if not parent.__class__ in [xxxMenuBar, xxxMenu]: error = True
-        elif x.isSizer and parent.__class__ in [xxxNotebook, xxxChoicebook, xxxListbook]:
-            error = True
-        else:                           # normal controls can be almost anywhere
-            if parent.__class__ == xxxMainNode or \
-               parent.__class__ in [xxxMenuBar, xxxMenu]: error = True
-        if error:
-            if parent.__class__ == xxxMainNode: parentClass = 'root'
-            else: parentClass = parent.className
-            wx.LogError('Incompatible parent/child: parent is %s, child is %s!' %
-                       (parentClass, x.className))
-            return
+        if not self.ItemsAreCompatible(parent, xxx.treeObject()): return
 
         # Check parent and child relationships.
         # If parent is sizer or notebook, child is of wrong class or
@@ -566,9 +593,9 @@ class Frame(wx.Frame):
            ((parent.isSizer and not isinstance(xxx, xxxSizerItem)) or \
             (parentIsBook and not isinstance(xxx, xxxPage)) or \
            not (parent.isSizer or parentIsBook)):
-            elem.removeChild(xxx.child.element) # detach child
+            elem.removeChild(xxx.child.node) # detach child
             elem.unlink()           # delete child container
-            elem = xxx.child.element # replace
+            elem = xxx.child.node # replace
             # This may help garbage collection
             xxx.child.parent = None
             isChildContainer = False
@@ -609,6 +636,248 @@ class Frame(wx.Frame):
         self.SetModified()
         self.SetStatusText('Pasted')
 
+
+    def ItemsAreCompatible(self, parent, child):
+        # Check compatibility
+        error = False
+        # Comments are always compatible
+        if child.__class__ == xxxComment:
+            return True
+        # Top-level
+        if child.__class__ in [xxxDialog, xxxFrame, xxxWizard]:
+            # Top-level classes
+            if parent.__class__ != xxxMainNode: error = True
+        elif child.__class__ == xxxMenuBar:
+            # Menubar can be put in frame or dialog
+            if parent.__class__ not in [xxxMainNode, xxxFrame, xxxDialog]: error = True
+        elif child.__class__ == xxxToolBar:
+            # Toolbar can be top-level of child of panel or frame
+            if parent.__class__ not in [xxxMainNode, xxxPanel, xxxFrame] and \
+               not parent.isSizer: error = True
+        elif child.__class__ == xxxPanel and parent.__class__ == xxxMainNode:
+            pass
+        elif child.__class__ == xxxSpacer:
+            if not parent.isSizer: error = True
+        elif child.__class__ == xxxSeparator:
+            if not parent.__class__ in [xxxMenu, xxxToolBar]: error = True
+        elif child.__class__ == xxxTool:
+            if parent.__class__ != xxxToolBar: error = True
+        elif child.__class__ == xxxMenu:
+            if not parent.__class__ in [xxxMainNode, xxxMenuBar, xxxMenu]: error = True
+        elif child.__class__ == xxxMenuItem:
+            if not parent.__class__ in [xxxMenuBar, xxxMenu]: error = True
+        elif child.isSizer and parent.__class__ in [xxxNotebook, xxxChoicebook, xxxListbook]:
+            error = True
+        else:                           # normal controls can be almost anywhere
+            if parent.__class__ == xxxMainNode or \
+               parent.__class__ in [xxxMenuBar, xxxMenu]: error = True
+        if error:
+            if parent.__class__ == xxxMainNode: parentClass = 'root'
+            else: parentClass = parent.className
+            wx.LogError('Incompatible parent/child: parent is %s, child is %s!' %
+                       (parentClass, child.className))
+            return False
+        return True
+
+    def OnMoveUp(self, evt):
+        selected = tree.selection
+        if not selected: return
+
+        index = tree.ItemIndex(selected)
+        if index == 0: return # No previous sibling found
+
+        # Remove highlight, update testWin
+        if g.testWin and g.testWin.highLight:
+            g.testWin.highLight.Remove()
+            tree.needUpdate = True
+
+        # Undo info
+        self.lastOp = 'MOVEUP'
+        status = 'Moved before previous sibling'
+
+        # Prepare undo data
+        panel.Apply()
+        tree.UnselectAll()
+
+        parent = tree.GetItemParent(selected)
+        elem = tree.RemoveLeaf(selected)
+        nextItem = tree.GetFirstChild(parent)[0]
+        for i in range(index - 1): nextItem = tree.GetNextSibling(nextItem)
+        selected = tree.InsertNode(parent, tree.GetPyData(parent).treeObject(), elem, nextItem)
+        newIndex = tree.ItemIndex(selected)
+        tree.SelectItem(selected)
+
+        undoMan.RegisterUndo(UndoMove(parent, index, parent, newIndex))
+
+        self.modified = True
+        self.SetStatusText(status)
+
+        return
+
+    def OnMoveDown(self, evt):
+        selected = tree.selection
+        if not selected: return
+
+        index = tree.ItemIndex(selected)
+        next = tree.GetNextSibling(selected)
+        if not next: return
+
+        # Remove highlight, update testWin
+        if g.testWin and g.testWin.highLight:
+            g.testWin.highLight.Remove()
+            tree.needUpdate = True
+
+        # Undo info
+        self.lastOp = 'MOVEDOWN'
+        status = 'Moved after next sibling'
+
+        # Prepare undo data
+        panel.Apply()
+        tree.UnselectAll()
+
+        parent = tree.GetItemParent(selected)
+        elem = tree.RemoveLeaf(selected)
+        nextItem = tree.GetFirstChild(parent)[0]
+        for i in range(index + 1): nextItem = tree.GetNextSibling(nextItem)
+        selected = tree.InsertNode(parent, tree.GetPyData(parent).treeObject(), elem, nextItem)
+        newIndex = tree.ItemIndex(selected)
+        tree.SelectItem(selected)
+
+        undoMan.RegisterUndo(UndoMove(parent, index, parent, newIndex))
+
+        self.modified = True
+        self.SetStatusText(status)
+
+        return
+    
+    def OnMoveLeft(self, evt):
+        selected = tree.selection
+        if not selected: return
+
+        oldParent = tree.GetItemParent(selected)
+        if not oldParent: return
+        pparent = tree.GetItemParent(oldParent)
+        if not pparent: return
+
+        # Check compatibility
+        if not self.ItemsAreCompatible(tree.GetPyData(pparent).treeObject(), tree.GetPyData(selected).treeObject()): return
+
+        # Remove highlight, update testWin
+        if g.testWin and g.testWin.highLight:
+            g.testWin.highLight.Remove()
+            tree.needUpdate = True
+
+        # Undo info
+        self.lastOp = 'MOVELEFT'
+        status = 'Made next sibling of parent'
+
+        oldIndex = tree.ItemIndex(selected)
+        elem = tree.RemoveLeaf(selected)
+        nextItem = tree.GetFirstChild(pparent)[0]
+        parentIndex = tree.ItemIndex(oldParent)
+        for i in range(parentIndex + 1): nextItem = tree.GetNextSibling(nextItem)
+
+        # Check parent and child relationships.
+        # If parent is sizer or notebook, child is of wrong class or
+        # parent is normal window, child is child container then detach child.
+        parent = tree.GetPyData(pparent).treeObject()
+        xxx = MakeXXXFromDOM(parent, elem)
+        isChildContainer = isinstance(xxx, xxxChildContainer)
+        if isChildContainer and \
+           ((parent.isSizer and not isinstance(xxx, xxxSizerItem)) or \
+            (isinstance(parent, xxxNotebook) and not isinstance(xxx, xxxNotebookPage)) or \
+           not (parent.isSizer or isinstance(parent, xxxNotebook))):
+            elem.removeChild(xxx.child.node) # detach child
+            elem.unlink()           # delete child container
+            elem = xxx.child.node # replace
+            # This may help garbage collection
+            xxx.child.parent = None
+            isChildContainer = False
+        # Parent is sizer or notebook, child is not child container
+        if parent.isSizer and not isChildContainer and not isinstance(xxx, xxxSpacer):
+            # Create sizer item element
+            sizerItemElem = MakeEmptyDOM('sizeritem')
+            sizerItemElem.appendChild(elem)
+            elem = sizerItemElem
+        elif isinstance(parent, xxxNotebook) and not isChildContainer:
+            pageElem = MakeEmptyDOM('notebookpage')
+            pageElem.appendChild(elem)
+            elem = pageElem
+
+        selected = tree.InsertNode(pparent, tree.GetPyData(pparent).treeObject(), elem, nextItem)
+        newIndex = tree.ItemIndex(selected)
+        tree.oldItem = None
+        tree.SelectItem(selected)
+
+        undoMan.RegisterUndo(UndoMove(oldParent, oldIndex, pparent, newIndex))
+        
+        self.modified = True
+        self.SetStatusText(status)
+
+    def OnMoveRight(self, evt):
+        selected = tree.selection
+        if not selected: return
+
+        oldParent = tree.GetItemParent(selected)
+        if not oldParent: return
+        
+        newParent = tree.GetPrevSibling(selected)
+        if not newParent: return
+
+        parent = tree.GetPyData(newParent).treeObject()
+
+        # Check compatibility
+        if not self.ItemsAreCompatible(parent, tree.GetPyData(selected).treeObject()): return
+
+        # Remove highlight, update testWin
+        if g.testWin and g.testWin.highLight:
+            g.testWin.highLight.Remove()
+            tree.needUpdate = True
+
+        # Undo info
+        self.lastOp = 'MOVERIGHT'
+        status = 'Made last child of previous sibling'
+
+        oldIndex = tree.ItemIndex(selected)
+        elem = tree.RemoveLeaf(selected)
+
+        # Check parent and child relationships.
+        # If parent is sizer or notebook, child is of wrong class or
+        # parent is normal window, child is child container then detach child.
+        xxx = MakeXXXFromDOM(parent, elem)
+        isChildContainer = isinstance(xxx, xxxChildContainer)
+        if isChildContainer and \
+           ((parent.isSizer and not isinstance(xxx, xxxSizerItem)) or \
+            (isinstance(parent, xxxNotebook) and not isinstance(xxx, xxxNotebookPage)) or \
+           not (parent.isSizer or isinstance(parent, xxxNotebook))):
+            elem.removeChild(xxx.child.node) # detach child
+            elem.unlink()           # delete child container
+            elem = xxx.child.node # replace
+            # This may help garbage collection
+            xxx.child.parent = None
+            isChildContainer = False
+        # Parent is sizer or notebook, child is not child container
+        if parent.isSizer and not isChildContainer and not isinstance(xxx, xxxSpacer):
+            # Create sizer item element
+            sizerItemElem = MakeEmptyDOM('sizeritem')
+            sizerItemElem.appendChild(elem)
+            elem = sizerItemElem
+        elif isinstance(parent, xxxNotebook) and not isChildContainer:
+            pageElem = MakeEmptyDOM('notebookpage')
+            pageElem.appendChild(elem)
+            elem = pageElem
+
+        selected = tree.InsertNode(newParent, tree.GetPyData(newParent).treeObject(), elem, wx.TreeItemId())
+
+        newIndex = tree.ItemIndex(selected)
+        tree.oldItem = None
+        tree.SelectItem(selected)
+
+        undoMan.RegisterUndo(UndoMove(oldParent, oldIndex, newParent, newIndex))
+
+        self.modified = True
+        self.SetStatusText(status)
+
         
     def OnCutDelete(self, evt):
         selected = tree.selection
@@ -634,14 +903,19 @@ class Frame(wx.Frame):
         # Prepare undo data
         panel.Apply()
         index = tree.ItemFullIndex(selected)
+        xxx = tree.GetPyData(selected)
         parent = tree.GetPyData(tree.GetItemParent(selected)).treeObject()
         elem = tree.RemoveLeaf(selected)
         undoMan.RegisterUndo(UndoCutDelete(index, parent, elem))
         if evt.GetId() == wx.ID_CUT:
             if wx.TheClipboard.Open():
-                data = wx.CustomDataObject('XRCED')
-                # (False, True)
-                s = elem.toxml(encoding=expat.native_encoding)
+                if xxx.isElement:
+                    data = wx.CustomDataObject('XRCED')
+                    # (False, True)
+                    s = elem.toxml(encoding=expat.native_encoding)
+                else:
+                    data = wx.CustomDataObject('XRCED_node')
+                    s = xxx.node.data
                 data.SetData(cPickle.dumps(s))
                 wx.TheClipboard.SetData(data)
                 wx.TheClipboard.Close()
@@ -659,7 +933,7 @@ class Frame(wx.Frame):
     def OnSubclass(self, evt):
         selected = tree.selection
         xxx = tree.GetPyData(selected).treeObject()
-        elem = xxx.element
+        elem = xxx.node
         subclass = xxx.subclass
         dlg = wx.TextEntryDialog(self, 'Subclass:', defaultValue=subclass)
         if dlg.ShowModal() == wx.ID_OK:
@@ -702,6 +976,7 @@ class Frame(wx.Frame):
             self.miniFrame.Show(True)
             self.miniFrame.SetDimensions(conf.panelX, conf.panelY,
                                          conf.panelWidth, conf.panelHeight)
+            self.miniFrame.Layout()
             # Reduce width
             self.SetDimensions(pos.x, pos.y,
                                max(size.width - sizePanel.width, self.minWidth), size.height)
@@ -737,8 +1012,9 @@ class Frame(wx.Frame):
                 child = tree.GetNextSibling(child)
         return None
 
+    # Click event after locate activated
     def OnTestWinLeftDown(self, evt):
-        pos = evt.GetPosition()
+        # Restore normal event processing
         self.SetHandler(g.testWin)
         g.testWin.Disconnect(wx.ID_ANY, wx.ID_ANY, wx.wxEVT_LEFT_DOWN)
         item = self.FindObject(g.testWin.item, evt.GetEventObject())
@@ -825,6 +1101,10 @@ Homepage: http://xrced.sourceforge.net\
                 print msg
 
     def OnCreate(self, evt):
+        # Ignore fake events generated while dragging
+        if g.tools.drag: 
+            g.tools.drag = False
+            return
         selected = tree.selection
         if tree.ctrl: appendChild = False
         else: appendChild = not tree.NeedInsert(selected)
@@ -850,34 +1130,50 @@ Homepage: http://xrced.sourceforge.net\
         parent = tree.GetPyData(parentLeaf)
         if parent.hasChild: parent = parent.child
 
+        self.CreateXXX(parent, parentLeaf, nextItem, evt.GetId())
+
+    # Actual method to create object and add to XML and wx trees
+    def CreateXXX(self, parent, parentLeaf, nextItem, id):
+        selected = tree.selection
         # Create object_ref?
-        if evt.GetId() == ID_NEW.REF:
+        if id == ID_NEW.REF:
             ref = wx.GetTextFromUser('Create reference to:', 'Create reference')
             if not ref: return
             xxx = MakeEmptyRefXXX(parent, ref)
+        elif id == ID_NEW.COMMENT:
+            xxx = MakeEmptyCommentXXX(parent)
         else:
             # Create empty element
-            className = pullDownMenu.createMap[evt.GetId()]
+            if id >= ID_NEW.CUSTOM:
+                className = pullDownMenu.customMap[id]
+            else:
+                className = pullDownMenu.createMap[id]
             xxx = MakeEmptyXXX(parent, className)
 
-        # Set default name for top-level windows
-        if parent.__class__ == xxxMainNode:
-            cl = xxx.treeObject().__class__
-            frame.maxIDs[cl] += 1
-            xxx.setTreeName('%s%d' % (defaultIDs[cl], frame.maxIDs[cl]))
-        # And for some other standard controls
-        elif parent.__class__ == xxxStdDialogButtonSizer:
-            xxx.setTreeName(pullDownMenu.stdButtonIDs[evt.GetId()][0])
-            # We can even set label
-            obj = xxx.treeObject()
-            elem = g.tree.dom.createElement('label')
-            elem.appendChild(g.tree.dom.createTextNode(pullDownMenu.stdButtonIDs[evt.GetId()][1]))
-            obj.params['label'] = xxxParam(elem)
-            xxx.treeObject().element.appendChild(elem)
-
         # Insert new node, register undo
-        elem = xxx.element
-        newItem = tree.InsertNode(parentLeaf, parent, elem, nextItem)
+        if xxx.isElement:                 # true object
+            # Set default name for top-level windows
+            if parent.__class__ == xxxMainNode:
+                cl = xxx.treeObject().__class__
+                frame.maxIDs[cl] += 1
+                xxx.setTreeName('%s%d' % (defaultIDs[cl], frame.maxIDs[cl]))
+            # And for some other standard controls
+            elif parent.__class__ == xxxStdDialogButtonSizer:
+                # ... we can even set automatically tree name
+                xxx.setTreeName(pullDownMenu.stdButtonIDs[id][0])
+                obj = xxx.treeObject()
+                # ... and label
+                elem = g.tree.dom.createElement('label')
+                elem.appendChild(g.tree.dom.createTextNode(pullDownMenu.stdButtonIDs[id][1]))
+                obj.params['label'] = xxxParam(elem)
+                xxx.treeObject().node.appendChild(elem)
+            # Else, set label if exists to class name
+            elif 'label' in xxx.treeObject().allParams:
+                label = className
+                if label[:2] == 'wx': label = label[2:]
+                xxx.treeObject().set('label', label.upper())
+        # For comment nodes, simply add node
+        newItem = tree.InsertNode(parentLeaf, parent, xxx.node, nextItem)
         undoMan.RegisterUndo(UndoPasteCreate(parentLeaf, parent, newItem, selected))
         tree.EnsureVisible(newItem)
         tree.SelectItem(newItem)
@@ -885,24 +1181,28 @@ Homepage: http://xrced.sourceforge.net\
             tree.ScrollTo(newItem)
             tree.Refresh()
         # Update view?
-        if g.testWin and tree.IsHighlatable(newItem):
+        if xxx.isElement and g.testWin and tree.IsHighlatable(newItem):
             if conf.autoRefresh:
                 tree.needUpdate = True
                 tree.pendingHighLight = newItem
             else:
                 tree.pendingHighLight = None
         tree.SetFocus()
+        if not xxx.isElement:
+            tree.EditLabel(newItem)
         self.SetModified()
+        return xxx
 
     # Replace one object with another
     def OnReplace(self, evt):
         selected = tree.selection
         xxx = tree.GetPyData(selected).treeObject()
-        elem = xxx.element
+        elem = xxx.node
         parent = elem.parentNode
         undoMan.RegisterUndo(UndoReplace(selected))
         # New class
         className = pullDownMenu.createMap[evt.GetId() - 1000]
+        
         # Create temporary empty node (with default values)
         dummy = MakeEmptyDOM(className)
         if className == 'spacer' and xxx.className != 'spacer':
@@ -938,7 +1238,7 @@ Homepage: http://xrced.sourceforge.net\
             sizeritem.removeChild(elem)
             elem.unlink()
             elem = sizeritem
-            tree.GetPyData(selected).hasChild = false
+            tree.GetPyData(selected).hasChild = False
         elif xxx.className == 'spacer' and className != 'spacer':
             # Create sizeritem element
             assert xxx.parent.isSizer
@@ -962,6 +1262,17 @@ Homepage: http://xrced.sourceforge.net\
             elem.removeAttribute('subclass') # clear subclassing
         # Re-create xxx element
         xxx = MakeXXXFromDOM(xxx.parent, elem)
+        # Remove incompatible style flags
+        if 'style' in xxx.params:
+            styles = map(string.strip, xxx.params['style'].value().split('|'))
+            newStyles = [s for s in styles if s in klass.winStyles or s in genericStyles]
+            if newStyles != styles:
+                if newStyles:
+                    value = reduce(lambda a,b: a+'|'+b, newStyles)
+                else:
+                    value = ''
+                xxx.params['style'].update(value)
+
         # Update parent in child objects
         if tree.ItemHasChildren(selected):
             i, cookie = tree.GetFirstChild(selected)
@@ -974,9 +1285,7 @@ Homepage: http://xrced.sourceforge.net\
         # Update tree
         if tree.GetPyData(selected).hasChild: # child container
             container = tree.GetPyData(selected)
-            container.child = xxx
-            container.hasChildren = xxx.hasChildren
-            container.isSizer = xxx.isSizer
+            container.resetChild(xxx)
             xxx = container
         else:
             tree.SetPyData(selected, xxx)
@@ -1043,17 +1352,17 @@ Homepage: http://xrced.sourceforge.net\
             if tree.needUpdate:
                 if conf.autoRefresh:
                     if g.testWin:
-                        self.SetStatusText('Refreshing test window...')
+                        #self.SetStatusText('Refreshing test window...')
                         # (re)create
                         tree.CreateTestWin(g.testWin.item)
-                        self.SetStatusText('')
+                        #self.SetStatusText('')
                     tree.needUpdate = False
             elif tree.pendingHighLight:
                 try:
                     tree.HighLight(tree.pendingHighLight)
                 except:
                     # Remove highlight if any problem
-                    if g.testWin.highLight:
+                    if g.testWin and g.testWin.highLight:
                         g.testWin.highLight.Remove()
                     tree.pendingHighLight = None
                     raise
@@ -1067,14 +1376,18 @@ Homepage: http://xrced.sourceforge.net\
         return
 
     def OnIconize(self, evt):
-        conf.x, conf.y = self.GetPosition()
-        conf.width, conf.height = self.GetSize()
-        if conf.embedPanel:
-            conf.sashPos = self.splitter.GetSashPosition()
+        if evt.Iconized():
+            conf.x, conf.y = self.GetPosition()
+            conf.width, conf.height = self.GetSize()
+            if conf.embedPanel:
+                conf.sashPos = self.splitter.GetSashPosition()
+            else:
+                conf.panelX, conf.panelY = self.miniFrame.GetPosition()
+                conf.panelWidth, conf.panelHeight = self.miniFrame.GetSize()
+                self.miniFrame.Iconize()
         else:
-            conf.panelX, conf.panelY = self.miniFrame.GetPosition()
-            conf.panelWidth, conf.panelHeight = self.miniFrame.GetSize()
-            self.miniFrame.Iconize()
+            if not conf.embedPanel:
+                self.miniFrame.Iconize(False)
         evt.Skip()
 
     def OnCloseWindow(self, evt):
@@ -1095,13 +1408,11 @@ Homepage: http://xrced.sourceforge.net\
                 conf.panelWidth, conf.panelHeight = self.miniFrame.GetSize()
         evt.Skip()
 
-
     def CreateLocalConf(self, path):
         name = os.path.splitext(path)[0]
         name += '.xcfg'
         return wx.FileConfig(localFilename=name)
 
-
     def Clear(self):
         self.dataFile = ''
         conf.localconf = None
@@ -1118,6 +1429,13 @@ Homepage: http://xrced.sourceforge.net\
                    xxxMenuBar, xxxMenu, xxxToolBar,
                    xxxWizard, xxxBitmap, xxxIcon]:
             self.maxIDs[cl] = 0
+        # Restore handlers, menu, etc. to initial
+        setHandlers(self.handlers[:])
+        g.pullDownMenu.custom = self.custom[:]
+        # Remove modules imported from comment directives
+        map(sys.modules.pop, [m for m in sys.modules if m not in self.modules])
+        xxxParamComment.locals = {}     # clear local namespace
+        xxxParamComment.allow = None    # clear execution state
 
     def SetModified(self, state=True):
         self.modified = state
@@ -1148,6 +1466,8 @@ Homepage: http://xrced.sourceforge.net\
             self.dataFile = path = os.path.abspath(path)
             dir = os.path.dirname(path)
             if dir: os.chdir(dir)
+            # Allow importing modules from the same directory
+            sys.path = sys_path + [dir]
             tree.SetData(dom)
             self.SetTitle(progname + ': ' + os.path.basename(path))
             conf.localconf = self.CreateLocalConf(self.dataFile)
@@ -1161,6 +1481,10 @@ Homepage: http://xrced.sourceforge.net\
         return True
 
     def Indent(self, node, indent = 0):
+        if node.nodeType == minidom.Node.COMMENT_NODE:
+            text = self.domCopy.createTextNode('\n' + ' ' * indent)
+            node.parentNode.insertBefore(text, node)
+            return                      # no children
         # Copy child list because it will change soon
         children = node.childNodes[:]
         # Main node doesn't need to be indented
@@ -1174,7 +1498,8 @@ Homepage: http://xrced.sourceforge.net\
                 node.appendChild(text)
             # Indent children which are elements
             for n in children:
-                if n.nodeType == minidom.Node.ELEMENT_NODE:
+                if n.nodeType == minidom.Node.ELEMENT_NODE or \
+                       n.nodeType == minidom.Node.COMMENT_NODE:
                     self.Indent(n, indent + 2)
 
     def Save(self, path):
@@ -1228,9 +1553,6 @@ Homepage: http://xrced.sourceforge.net\
             return True
         return False
 
-    def SaveUndo(self):
-        pass                            # !!!
-
 ################################################################################
 
 class PythonOptions(wx.Dialog):
@@ -1297,9 +1619,82 @@ class PythonOptions(wx.Dialog):
 
         self.EndModal(wx.ID_OK)
     
-        
 ################################################################################
 
+class PrefsDialog(wx.Dialog):
+
+    def __init__(self, parent):
+        pre = wx.PreDialog()
+        g.frame.res.LoadOnDialog(pre, parent, "DIALOG_PREFS")
+        self.PostCreate(pre)
+        self.checkControls = {} # map of check IDs to (control,dict,param)
+
+        ##xxx = sys.modules['xxx']
+        import xxx
+        d = xxx.xxxSizerItem.defaults_panel
+
+        self.check_proportion_panel = xrc.XRCCTRL(self, 'check_proportion_panel')
+        id = self.check_proportion_panel.GetId()
+        wx.EVT_CHECKBOX(self, id, self.OnCheck)
+        self.checkControls[id] = (xrc.XRCCTRL(self, 'spin_proportion_panel'),
+                                  d, 'option')
+
+        self.check_flag_panel = xrc.XRCCTRL(self, 'check_flag_panel')
+        id = self.check_flag_panel.GetId()
+        wx.EVT_CHECKBOX(self, id, self.OnCheck)
+        self.checkControls[id] = (xrc.XRCCTRL(self, 'text_flag_panel'),
+                                  d, 'flag')
+
+        d = xxx.xxxSizerItem.defaults_control
+
+        self.check_proportion_panel = xrc.XRCCTRL(self, 'check_proportion_control')
+        id = self.check_proportion_panel.GetId()
+        wx.EVT_CHECKBOX(self, id, self.OnCheck)
+        self.checkControls[id] = (xrc.XRCCTRL(self, 'spin_proportion_control'),
+                                  d, 'option')
+
+        self.check_flag_panel = xrc.XRCCTRL(self, 'check_flag_control')
+        id = self.check_flag_panel.GetId()
+        wx.EVT_CHECKBOX(self, id, self.OnCheck)
+        self.checkControls[id] = (xrc.XRCCTRL(self, 'text_flag_control'),
+                                  d, 'flag')
+
+        for id,cdp in self.checkControls.items():
+            c,d,p = cdp
+            try:
+                if isinstance(c, wx.SpinCtrl):
+                    c.SetValue(int(d[p]))
+                else:
+                    c.SetValue(d[p])
+                self.FindWindowById(id).SetValue(True)
+            except KeyError:
+                c.Enable(False)
+
+        self.radio_allow_exec = xrc.XRCCTRL(self, 'radio_allow_exec')
+        try:
+            radio = {'ask': 0, 'yes':1, 'no':2}[g.conf.allowExec]
+        except KeyError:
+            radio = 0
+        self.radio_allow_exec.SetSelection(radio)
+
+    def OnCheck(self, evt):
+        self.checkControls[evt.GetId()][0].Enable(evt.IsChecked())
+        evt.Skip()
+
+################################################################################
+
+# Parse string in form var1=val1[,var2=val2]* as dictionary
+def ReadDictFromString(s):
+    d = {}
+    for vv in s.split(','):
+        var,val = vv.split(':')
+        d[var.strip()] = val
+    return d
+
+# Transform dictionary with strings into one string
+def DictToString(d):
+    return ','.join(map(':'.join, d.items()))
+
 def usage():
     print >> sys.stderr, 'usage: xrced [-dhiv] [file]'
 
@@ -1342,12 +1737,11 @@ Please upgrade wxWidgets to %d.%d.%d or higher.''' % MinWxVersion)
         conf.embedPanel = conf.ReadInt('embedPanel', True)
         conf.showTools = conf.ReadInt('showTools', True)
         conf.sashPos = conf.ReadInt('sashPos', 200)
+
         # read recently used files
-        recentfiles=conf.Read('recentFiles','')
-        conf.recentfiles={}
-        if recentfiles:
-            for fil in recentfiles.split('|'):
-                conf.recentfiles[wx.NewId()]=fil
+        g.fileHistory = wx.FileHistory()
+        g.fileHistory.Load(conf)
+
         if not conf.embedPanel:
             conf.panelX = conf.ReadInt('panelX', -1)
             conf.panelY = conf.ReadInt('panelY', -1)
@@ -1356,11 +1750,49 @@ Please upgrade wxWidgets to %d.%d.%d or higher.''' % MinWxVersion)
         conf.panelWidth = conf.ReadInt('panelWidth', 200)
         conf.panelHeight = conf.ReadInt('panelHeight', 200)
         conf.panic = not conf.HasEntry('nopanic')
+        # Preferences
+        conf.allowExec = conf.Read('Prefs/allowExec', 'ask')
+        p = 'Prefs/sizeritem_defaults_panel'
+        import xxx
+        if conf.HasEntry(p):
+            ##sys.modules['xxx'].xxxSizerItem.defaults_panel = ReadDictFromString(conf.Read(p))
+            xxx.xxxSizerItem.defaults_panel = ReadDictFromString(conf.Read(p))
+        p = 'Prefs/sizeritem_defaults_control'
+        if conf.HasEntry(p):
+            ##sys.modules['xxx'].xxxSizerItem.defaults_control = ReadDictFromString(conf.Read(p))
+            xxx.xxxSizerItem.defaults_control = ReadDictFromString(conf.Read(p))
+            
         # Add handlers
         wx.FileSystem.AddHandler(wx.MemoryFSHandler())
         # Create main frame
         frame = Frame(pos, size)
         frame.Show(True)
+        
+        # Load plugins
+        plugins = os.getenv('XRCEDPATH')
+        if plugins:
+            cwd = os.getcwd()
+            try:
+                for dir in plugins.split(':'):
+                    if os.path.isdir(dir) and \
+                       os.path.isfile(os.path.join(dir, '__init__.py')):
+                        # Normalize
+                        dir = os.path.abspath(os.path.normpath(dir))
+                        sys.path = sys_path + [os.path.dirname(dir)]
+                        try:
+                            os.chdir(dir)
+                            __import__(os.path.basename(dir), globals(), locals(), ['*'])
+                        except:
+                            print traceback.print_exc()
+            finally:
+                os.chdir(cwd)
+        # Store important data
+        frame.handlers = getHandlers()[:]
+        frame.custom = g.pullDownMenu.custom[:]
+        frame.modules = sys.modules.copy()
+
+        # Initialize
+        frame.Clear()
 
         # Load file after showing
         if args:
@@ -1386,8 +1818,19 @@ Please upgrade wxWidgets to %d.%d.%d or higher.''' % MinWxVersion)
         wc.WriteInt('sashPos', conf.sashPos)
         wc.WriteInt('panelWidth', conf.panelWidth)
         wc.WriteInt('panelHeight', conf.panelHeight)
-        wc.WriteInt('nopanic', True)
-        wc.Write('recentFiles', '|'.join(conf.recentfiles.values()[-5:]))
+        wc.WriteInt('nopanic', 1)
+        g.fileHistory.Save(wc)
+        # Preferences
+        wc.DeleteGroup('Prefs')
+        wc.Write('Prefs/allowExec', conf.allowExec)
+        import xxx
+        ##v = sys.modules['xxx'].xxxSizerItem.defaults_panel
+        v = xxx.xxxSizerItem.defaults_panel
+        if v: wc.Write('Prefs/sizeritem_defaults_panel', DictToString(v))
+        ###v = sys.modules['xxx'].xxxSizerItem.defaults_control
+        v = xxx.xxxSizerItem.defaults_control
+        if v: wc.Write('Prefs/sizeritem_defaults_control', DictToString(v))
+        
         wc.Flush()
 
 def main():
diff --git a/wxPython/wx/tools/XRCed/xrced.xrc b/wxPython/wx/tools/XRCed/xrced.xrc
index 9ebe7d1fdd..04965a2811 100644
--- a/wxPython/wx/tools/XRCed/xrced.xrc
+++ b/wxPython/wx/tools/XRCed/xrced.xrc
@@ -10,6 +10,7 @@
           <orient>wxHORIZONTAL</orient>
           <object class="sizeritem">
             <object class="wxTextCtrl" name="TEXT">
+              <value></value>
               <size>250,100</size>
               <style>wxTE_MULTILINE</style>
             </object>
@@ -22,23 +23,17 @@
         <flag>wxEXPAND</flag>
       </object>
       <object class="sizeritem">
-        <object class="wxStaticLine"/>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <orient>wxHORIZONTAL</orient>
-          <object class="sizeritem">
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
             <object class="wxButton" name="wxID_OK">
-              <label>OK</label>
-              <default>1</default>
+              <label></label>
+              <label>&amp;Ok</label>
             </object>
-            <flag>wxRIGHT</flag>
-            <border>10</border>
           </object>
-          <object class="sizeritem">
+          <object class="button">
             <object class="wxButton" name="wxID_CANCEL">
-              <label>Cancel</label>
+              <label></label>
+              <label>&amp;Cancel</label>
             </object>
           </object>
         </object>
@@ -191,24 +186,21 @@
         <option>1</option>
         <flag>wxEXPAND</flag>
       </object>
-      <object class="sizeritem">
-        <object class="wxStaticLine"/>
-        <flag>wxEXPAND</flag>
+      <object class="spacer">
+        <size>0,10</size>
       </object>
       <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <orient>wxHORIZONTAL</orient>
-          <object class="sizeritem">
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
             <object class="wxButton" name="wxID_OK">
-              <label>OK</label>
-              <default>1</default>
+              <label></label>
+              <label>&amp;Ok</label>
             </object>
-            <flag>wxRIGHT</flag>
-            <border>10</border>
           </object>
-          <object class="sizeritem">
+          <object class="button">
             <object class="wxButton" name="wxID_CANCEL">
-              <label>Cancel</label>
+              <label></label>
+              <label>&amp;Cancel</label>
             </object>
           </object>
         </object>
@@ -233,24 +225,21 @@
         <flag>wxALL|wxEXPAND</flag>
         <border>5</border>
       </object>
-      <object class="sizeritem">
-        <object class="wxStaticLine"/>
-        <flag>wxEXPAND</flag>
+      <object class="spacer">
+        <size>0,10</size>
       </object>
       <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <orient>wxHORIZONTAL</orient>
-          <object class="sizeritem">
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
             <object class="wxButton" name="wxID_OK">
-              <label>OK</label>
-              <default>1</default>
+              <label></label>
+              <label>&amp;Ok</label>
             </object>
-            <flag>wxRIGHT</flag>
-            <border>10</border>
           </object>
-          <object class="sizeritem">
+          <object class="button">
             <object class="wxButton" name="wxID_CANCEL">
-              <label>Cancel</label>
+              <label></label>
+              <label>&amp;Cancel</label>
             </object>
           </object>
         </object>
@@ -261,7 +250,7 @@
     <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</style>
   </object>
   <object class="wxDialog" name="DIALOG_STYLES">
-    <title>Window styles</title>
+    <title>Window Styles</title>
     <centered>1</centered>
     <object class="wxBoxSizer">
       <orient>wxVERTICAL</orient>
@@ -299,24 +288,21 @@
         <flag>wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND</flag>
         <border>5</border>
       </object>
-      <object class="sizeritem">
-        <object class="wxStaticLine"/>
-        <flag>wxEXPAND</flag>
+      <object class="spacer">
+        <size>0,10</size>
       </object>
       <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <orient>wxHORIZONTAL</orient>
-          <object class="sizeritem">
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
             <object class="wxButton" name="wxID_OK">
-              <label>OK</label>
-              <default>1</default>
+              <label></label>
+              <label>&amp;Ok</label>
             </object>
-            <flag>wxRIGHT</flag>
-            <border>10</border>
           </object>
-          <object class="sizeritem">
+          <object class="button">
             <object class="wxButton" name="wxID_CANCEL">
-              <label>Cancel</label>
+              <label></label>
+              <label>&amp;Cancel</label>
             </object>
           </object>
         </object>
@@ -350,7 +336,7 @@
               <orient>wxVERTICAL</orient>
               <object class="sizeritem">
                 <object class="wxSpinCtrl" name="SPIN">
-                  <size>20,-1d</size>
+                  <size>60,-1</size>
                 </object>
                 <flag>wxBOTTOM</flag>
                 <border>5</border>
@@ -381,25 +367,23 @@
         </object>
         <option>1</option>
         <flag>wxEXPAND</flag>
+        <border>0</border>
+      </object>
+      <object class="spacer">
+        <size>0,10</size>
       </object>
       <object class="sizeritem">
-        <object class="wxStaticLine"/>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <orient>wxHORIZONTAL</orient>
-          <object class="sizeritem">
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
             <object class="wxButton" name="wxID_OK">
-              <label>OK</label>
-              <default>1</default>
+              <label></label>
+              <label>&amp;Ok</label>
             </object>
-            <flag>wxRIGHT</flag>
-            <border>10</border>
           </object>
-          <object class="sizeritem">
+          <object class="button">
             <object class="wxButton" name="wxID_CANCEL">
-              <label>Cancel</label>
+              <label></label>
+              <label>&amp;Cancel</label>
             </object>
           </object>
         </object>
@@ -619,4 +603,114 @@
       </object>
     </object>
   </object>
+  <object class="wxDialog" name="DIALOG_PREFS">
+    <title>XRCed Preferences</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxStaticBoxSizer">
+          <label>Defaults for new containes</label>
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <object class="wxFlexGridSizer">
+              <cols>2</cols>
+              <rows>2</rows>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="check_proportion_panel">
+                  <label>proportion</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxSpinCtrl" name="spin_proportion_panel">
+                  <size>30,-1d</size>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="check_flag_panel">
+                  <label>flag</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxTextCtrl" name="text_flag_panel">
+                  <size>150,-1</size>
+                </object>
+              </object>
+              <hgap>10</hgap>
+            </object>
+          </object>
+        </object>
+        <flag>wxALL</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStaticBoxSizer">
+          <label>Defaults for new controls</label>
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <object class="wxFlexGridSizer">
+              <cols>2</cols>
+              <rows>2</rows>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="check_proportion_control">
+                  <label>proportion</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxSpinCtrl" name="spin_proportion_control">
+                  <size>30,-1d</size>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="check_flag_control">
+                  <label>flag</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxTextCtrl" name="text_flag_control">
+                  <size>150,-1</size>
+                </object>
+              </object>
+              <hgap>10</hgap>
+            </object>
+          </object>
+        </object>
+        <flag>wxALL</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxRadioBox" name="radio_allow_exec">
+          <label>Execution of comment directives</label>
+          <content>
+            <item>ask</item>
+            <item>always</item>
+            <item>never</item>
+          </content>
+          <style>wxRA_SPECIFY_ROWS</style>
+        </object>
+        <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
+        <border>5</border>
+      </object>
+      <object class="spacer">
+        <size>0,10</size>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
+            <object class="wxButton" name="wxID_OK">
+              <label></label>
+              <label>&amp;Ok</label>
+            </object>
+          </object>
+          <object class="button">
+            <object class="wxButton" name="wxID_CANCEL">
+              <label></label>
+              <label>&amp;Cancel</label>
+            </object>
+          </object>
+        </object>
+        <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
+        <border>10</border>
+      </object>
+    </object>
+  </object>
 </resource>
\ No newline at end of file
diff --git a/wxPython/wx/tools/XRCed/xxx.py b/wxPython/wx/tools/XRCed/xxx.py
index 781c404814..c0ef04012f 100644
--- a/wxPython/wx/tools/XRCed/xxx.py
+++ b/wxPython/wx/tools/XRCed/xxx.py
@@ -7,6 +7,7 @@
 from xml.dom import minidom
 from globals import *
 from params import *
+import traceback, types
 
 # Base class for interface parameter classes
 class xxxNode:
@@ -189,6 +190,7 @@ class xxxObject:
     hasStyle = True                     # almost everyone
     hasName = True                      # has name attribute?
     isSizer = hasChild = False
+    isElement = True
     allParams = None                    # Some nodes have no parameters
     # Style parameters (all optional)
     styles = ['fg', 'bg', 'font', 'enabled', 'focused', 'hidden', 'tooltip']
@@ -210,7 +212,7 @@ class xxxObject:
     # parent is parent xxx object (or None if none), element is DOM element object
     def __init__(self, parent, element, refElem=None):
         self.parent = parent
-        self.element = element
+        self.node = element
         self.refElem = refElem
         self.undo = None
         # Reference are dereferenced
@@ -230,33 +232,32 @@ class xxxObject:
         if self.hasName: self.name = element.getAttribute('name')
         # Set parameters (text element children)
         self.params = {}
-        nodes = element.childNodes[:]
-        for node in nodes:
-            if node.nodeType == minidom.Node.ELEMENT_NODE:
-                tag = node.tagName
+        for n in element.childNodes[:]:
+            if n.nodeType == minidom.Node.ELEMENT_NODE:
+                tag = n.tagName
                 if tag in ['object', 'object_ref']:
                     continue            # do nothing for object children here
                 elif tag not in self.allParams and tag not in self.styles:
                     print 'WARNING: unknown parameter for %s: %s' % \
                           (self.className, tag)
                 elif tag in self.specials:
-                    self.special(tag, node)
+                    self.special(tag, n)
                 elif tag == 'content':
                     if self.className == 'wxCheckListBox':
-                        self.params[tag] = xxxParamContentCheckList(node)
+                        self.params[tag] = xxxParamContentCheckList(n)
                     else:
-                        self.params[tag] = xxxParamContent(node)
+                        self.params[tag] = xxxParamContent(n)
                 elif tag == 'font': # has children
-                    self.params[tag] = xxxParamFont(element, node)
+                    self.params[tag] = xxxParamFont(element, n)
                 elif tag in self.bitmapTags:
                     # Can have attributes
-                    self.params[tag] = xxxParamBitmap(node)
+                    self.params[tag] = xxxParamBitmap(n)
                 else:                   # simple parameter
-                    self.params[tag] = xxxParam(node)
-            elif node.nodeType == minidom.Node.TEXT_NODE and node.data.isspace():
+                    self.params[tag] = xxxParam(n)
+            elif n.nodeType == minidom.Node.TEXT_NODE and n.data.isspace():
                 # Remove empty text nodes
-                element.removeChild(node)
-                node.unlink()
+                element.removeChild(n)
+                n.unlink()
 
         # Check that all required params are set
         for param in self.required:
@@ -281,9 +282,9 @@ class xxxObject:
                             break
                     if found:
                         nextTextElem = self.params[p].node
-                        self.element.insertBefore(elem, nextTextElem)
+                        self.node.insertBefore(elem, nextTextElem)
                     else:
-                        self.element.appendChild(elem)
+                        self.node.appendChild(elem)
                 else:
                     wx.LogWarning('Required parameter %s of %s missing' %
                                  (param, self.className))
@@ -313,7 +314,34 @@ class xxxObject:
         if self.hasChild: obj = self.child
         else: obj = self
         obj.name = name
-        obj.element.setAttribute('name', name)
+        obj.node.setAttribute('name', name)
+    # Set normal (text) params
+    def set(self, param, value):
+        try:
+            self.params[param].update(value)
+        except KeyError:
+            elem = g.tree.dom.createElement(param)
+            p = xxxParam(elem)
+            p.update(value)
+            self.params[param] = p
+            self.node.appendChild(elem)
+    # Special processing for growablecols-like parameters
+    # represented by several nodes
+    def special(self, tag, node):
+        if not self.params.has_key(tag):
+            # Create new multi-group
+            self.params[tag] = xxxParamMulti(node)
+        self.params[tag].append(xxxParamInt(node))
+    def setSpecial(self, param, value):
+        # Straightforward implementation: remove, add again
+        self.params[param].remove()
+        del self.params[param]
+        for i in value:
+            node = g.tree.dom.createElement(param)
+            text = g.tree.dom.createTextNode(str(i))
+            node.appendChild(text)
+            self.node.appendChild(node)
+            self.special(param, node)
 
 # Imitation of FindResource/DoFindResource from xmlres.cpp
 def DoFindResource(parent, name, classname, recursive):
@@ -360,7 +388,7 @@ class xxxParamFont(xxxObject, xxxNode):
         self.data = v
     def update(self, value):
         # `value' is a list of strings corresponding to all parameters
-        elem = self.element
+        elem = self.node
         # Remove old elements first
         childNodes = elem.childNodes[:]
         for node in childNodes: elem.removeChild(node)
@@ -605,8 +633,8 @@ class xxxCalendarCtrl(xxxObject):
 
 class xxxNotebook(xxxContainer):
     allParams = ['pos', 'size', 'style']
-    winStyles = ['wxNB_DEFAULT', 'wxNB_LEFT', 'wxNB_RIGHT', 'wxNB_BOTTOM',
-                 'wxNB_FIXEDWIDTH', 'wxNB_MULTILINE', 'wxNB_NOPAGETHEME']
+    winStyles = ['wxNB_TOP', 'wxNB_LEFT', 'wxNB_RIGHT', 'wxNB_BOTTOM',
+                 'wxNB_FIXEDWIDTH', 'wxNB_MULTILINE', 'wxNB_NOPAGETHEME', 'wxNB_FLAT']
 
 class xxxChoicebook(xxxContainer):
     allParams = ['pos', 'size', 'style']
@@ -638,6 +666,16 @@ class xxxDateCtrl(xxxObject):
     winStyles = ['wxDP_DEFAULT', 'wxDP_SPIN', 'wxDP_DROPDOWN',
                  'wxDP_ALLOWNONE', 'wxDP_SHOWCENTURY']
 
+class xxxGrid(xxxObject):
+    allParams = ['pos', 'size', 'style']
+
+class xxxFilePickerCtrl(xxxObject):
+    allParams = ['value', 'message', 'wildcard', 'pos', 'size', 'style']
+    winStyles = ['wxFLP_OPEN', 'wxFLP_SAVE', 'wxFLP_OVERWRITE_PROMPT',
+                 'wxFLP_FILE_MUST_EXIST', 'wxFLP_CHANGE_DIR',
+                 'wxFLP_DEFAULT_STYLE']
+
+
 ################################################################################
 # Buttons
 
@@ -645,7 +683,8 @@ class xxxButton(xxxObject):
     allParams = ['label', 'default', 'pos', 'size', 'style']
     paramDict = {'default': ParamBool}
     required = ['label']
-    winStyles = ['wxBU_LEFT', 'wxBU_TOP', 'wxBU_RIGHT', 'wxBU_BOTTOM', 'wxBU_EXACTFIT']
+    winStyles = ['wxBU_LEFT', 'wxBU_TOP', 'wxBU_RIGHT', 'wxBU_BOTTOM', 'wxBU_EXACTFIT',
+                 'wxNO_BORDER']
 
 class xxxBitmapButton(xxxObject):
     allParams = ['bitmap', 'selected', 'focus', 'disabled', 'default',
@@ -654,7 +693,7 @@ class xxxBitmapButton(xxxObject):
                  'default': ParamBool}
     required = ['bitmap']
     winStyles = ['wxBU_AUTODRAW', 'wxBU_LEFT', 'wxBU_RIGHT',
-                 'wxBU_TOP', 'wxBU_BOTTOM', 'wxBU_EXACTFIT']
+                 'wxBU_TOP', 'wxBU_BOTTOM']
 
 class xxxRadioButton(xxxObject):
     allParams = ['label', 'value', 'pos', 'size', 'style']
@@ -770,45 +809,11 @@ class xxxFlexGridSizer(xxxGridSizer):
     specials = ['growablecols', 'growablerows']
     allParams = ['cols', 'rows', 'vgap', 'hgap'] + specials
     paramDict = {'growablecols': ParamIntList, 'growablerows': ParamIntList}
-    # Special processing for growable* parameters
-    # (they are represented by several nodes)
-    def special(self, tag, node):
-        if not self.params.has_key(tag):
-            # Create new multi-group
-            self.params[tag] = xxxParamMulti(node)
-        self.params[tag].append(xxxParamInt(node))
-    def setSpecial(self, param, value):
-        # Straightforward implementation: remove, add again
-        self.params[param].remove()
-        del self.params[param]
-        for i in value:
-            node = g.tree.dom.createElement(param)
-            text = g.tree.dom.createTextNode(str(i))
-            node.appendChild(text)
-            self.element.appendChild(node)
-            self.special(param, node)
 
 class xxxGridBagSizer(xxxSizer):
     specials = ['growablecols', 'growablerows']
     allParams = ['vgap', 'hgap'] + specials
-    paramDict = {'growablecols':ParamIntList, 'growablerows':ParamIntList}
-    # Special processing for growable* parameters
-    # (they are represented by several nodes)
-    def special(self, tag, node):
-        if not self.params.has_key(tag):
-            # Create new multi-group
-            self.params[tag] = xxxParamMulti(node)
-        self.params[tag].append(xxxParamInt(node))
-    def setSpecial(self, param, value):
-        # Straightforward implementation: remove, add again
-        self.params[param].remove()
-        del self.params[param]
-        for i in value:
-            node = g.tree.dom.createElement(param)
-            text = g.tree.dom.createTextNode(str(i))
-            node.appendChild(text)
-            self.element.appendChild(node)
-            self.special(param, node)
+    paramDict = {'growablecols': ParamIntList, 'growablerows': ParamIntList}
 
 # Container with only one child.
 # Not shown in tree.
@@ -833,11 +838,17 @@ class xxxChildContainer(xxxObject):
                 element.removeChild(node)
                 node.unlink()
         assert 0, 'no child found'
+    def resetChild(self, xxx):
+        '''Reset child info (for replacing with another class).'''
+        self.child = xxx
+        self.hasChildren = xxx.hasChildren
+        self.isSizer = xxx.isSizer        
 
 class xxxSizerItem(xxxChildContainer):
     allParams = ['option', 'flag', 'border', 'minsize', 'ratio']
     paramDict = {'option': ParamInt, 'minsize': ParamPosSize, 'ratio': ParamPosSize}
-    #default = {'cellspan': '1,1'}
+    defaults_panel = {}
+    defaults_control = {}
     def __init__(self, parent, element, refElem=None):
         # For GridBag sizer items, extra parameters added
         if isinstance(parent, xxxGridBagSizer):
@@ -847,6 +858,12 @@ class xxxSizerItem(xxxChildContainer):
         if 'pos' in self.child.allParams:
             self.child.allParams = self.child.allParams[:]
             self.child.allParams.remove('pos')
+    def resetChild(self, xxx):
+        xxxChildContainer.resetChild(self, xxx)
+        # Remove pos parameter - not needed for sizeritems
+        if 'pos' in self.child.allParams:
+            self.child.allParams = self.child.allParams[:]
+            self.child.allParams.remove('pos')        
 
 class xxxSizerItemButton(xxxSizerItem):
     allParams = []
@@ -911,7 +928,143 @@ class xxxUnknown(xxxObject):
     winStyles = ['wxNO_FULL_REPAINT_ON_RESIZE']
 
 ################################################################################
+# Comment
 
+_handlers = []                          # custom handler classes/funcs
+def getHandlers():
+    return _handlers
+def setHandlers(handlers):
+    global _handlers
+    _handlers = handlers
+_CFuncPtr = None                        # ctypes function type
+
+def register(hndlr):
+    """Register hndlr function or XmlResourceHandler class."""
+    if _CFuncPtr and isinstance(hndlr, _CFuncPtr):
+        _handlers.append(hndlr)
+        return
+    if not isinstance(hndlr, type):
+        wx.LogError('handler is not a type: %s' % hndlr)
+    elif not issubclass(hndlr, wx.xrc.XmlResourceHandler):
+        wx.LogError('handler is not a XmlResourceHandler: %s' % hndlr)
+    else:
+        _handlers.append(hndlr)
+
+def load_dl(path, localname=''):
+    """Load shared/dynamic library into xxx namespace.
+
+    If path is not absolute or relative, try to find in the module's directory.
+    """
+    if not localname:
+        localname = os.path.basename(os.path.splitext(path)[0])
+    try:
+        import ctypes
+        global _CFuncPtr
+        _CFuncPtr = ctypes._CFuncPtr    # use as a flag of loaded ctypes
+        #if not os.path.dirname(path) and os.path.isfile(path):
+            
+    except ImportError:
+        wx.LogError('ctypes module not found')
+        globals()[localname] = None
+        return
+    try:
+        dl = ctypes.CDLL(path)
+        globals()[localname] = dl
+        # Register AddXmlHandlers() if exists
+        try:
+            register(dl.AddXmlHandlers)
+        except:
+            pass
+    except:
+        wx.LogError('error loading dynamic library: %s' % path)
+        print traceback.print_exc()
+
+# Called when creating test window
+def addHandlers():
+    for h in _handlers:
+        if _CFuncPtr and isinstance(h, _CFuncPtr):
+            try:
+                apply(h, ())
+            except:
+                wx.LogError('error calling DL func: "%s"' % h)
+                print traceback.print_exc()
+        else:
+            try:
+                xrc.XmlResource.Get().AddHandler(apply(h, ()))
+            except:
+                wx.LogError('error adding XmlHandler: "%s"' % h)
+                print traceback.print_exc()
+
+def custom(klassName, klass='unknown'):
+    """Define custom control based on xrcClass.
+
+    klass: new object name
+    xrcClass: name of an existing XRC object class or
+              a class object defining class parameters.
+    """
+    if type(klass) is str:
+        # Copy correct xxx class under new name
+        kl = xxxDict[klass]
+        xxxClass = types.ClassType('xxx' + klassName, kl.__bases__, kl.__dict__)
+    else:
+        xxxClass = klass
+        # Register param IDs
+        for param in klass.allParams + klass.paramDict.keys():
+            if not paramIDs.has_key(param):
+                paramIDs[param] = wx.NewId()
+    # Insert in dictionaty
+    xxxDict[klassName] = xxxClass
+    # Add to menu
+    g.pullDownMenu.addCustom(klassName)
+
+class xxxParamComment(xxxParam):
+    locals = {}                         # namespace for comment directives
+    allow = None                        # undefined initial state for current file
+    def __init__(self, node):
+        xxxNode.__init__(self, node)
+        self.textNode = node
+        # Parse "pragma" comments if enabled
+        if node.data and node.data[0] == '%' and g.conf.allowExec != 'no' and \
+               xxxParamComment.allow is not False:
+            # Show warning
+            if g.conf.allowExec == 'ask' and xxxParamComment.allow is None:
+                flags = wx.ICON_EXCLAMATION | wx.YES_NO | wx.CENTRE
+                dlg = wx.MessageDialog(g.frame, '''
+This file contains executable %comment directives. Allow to execute?''',
+                                       'Warning', flags)
+                say = dlg.ShowModal()
+                dlg.Destroy()
+                if say == wx.ID_YES:
+                    xxxParamComment.allow = True
+                else:
+                    xxxParamComment.allow = False
+            try:
+                code = node.data[1:]
+                exec code in globals(), self.locals
+            except:
+                wx.LogError('exec error: "%s"' % code)
+                print traceback.print_exc()
+
+class xxxComment(xxxObject):
+    hasStyle = hasName = False
+    allParams = required = ['comment']
+    
+    def __init__(self, parent, node):
+        self.parent = parent
+        self.node = node
+        self.isElement = False
+        self.undo = None
+        self.className = 'comment'
+        self.ref = self.subclass = None
+        self.params = {'comment': xxxParamComment(node)}
+        
+    def treeName(self):
+        # Replace newlines by \n to avoid tree item resizing
+        return self.params['comment'].value().replace('\n', r'\n')
+
+################################################################################
+
+# Mapping of XRC names to xxx classes
 xxxDict = {
     'wxPanel': xxxPanel,
     'wxDialog': xxxDialog,
@@ -961,6 +1114,8 @@ xxxDict = {
     'wxGenericDirCtrl': xxxGenericDirCtrl,
     'wxSpinCtrl': xxxSpinCtrl,
     'wxScrolledWindow': xxxScrolledWindow,
+    'wxGrid': xxxGrid,
+    'wxFilePickerCtrl': xxxFilePickerCtrl,
     'wxDatePickerCtrl': xxxDateCtrl,
 
     'wxBoxSizer': xxxBoxSizer,
@@ -978,13 +1133,15 @@ xxxDict = {
     'separator': xxxSeparator,
 
     'unknown': xxxUnknown,
+    'comment': xxxComment,
     }
 
 # Create IDs for all parameters of all classes
 paramIDs = {'fg': wx.NewId(), 'bg': wx.NewId(), 'exstyle': wx.NewId(), 'font': wx.NewId(),
             'enabled': wx.NewId(), 'focused': wx.NewId(), 'hidden': wx.NewId(),
             'tooltip': wx.NewId(), 'encoding': wx.NewId(),
-            'cellpos': wx.NewId(), 'cellspan': wx.NewId()
+            'cellpos': wx.NewId(), 'cellspan': wx.NewId(),
+            'text': wx.NewId()
             }
 for cl in xxxDict.values():
     if cl.allParams:
@@ -997,25 +1154,29 @@ for cl in xxxDict.values():
 
 # Test for object elements
 def IsObject(node):
-    return node.nodeType == minidom.Node.ELEMENT_NODE and node.tagName in ['object', 'object_ref']
+    return node.nodeType == minidom.Node.ELEMENT_NODE and \
+           node.tagName in ['object', 'object_ref'] or \
+           node.nodeType == minidom.Node.COMMENT_NODE
 
 # Make XXX object from some DOM object, selecting correct class
-def MakeXXXFromDOM(parent, element):
-    if element.tagName == 'object_ref':
-        ref = element.getAttribute('ref')
+def MakeXXXFromDOM(parent, node):
+    if node.nodeType == minidom.Node.COMMENT_NODE:
+        return xxxComment(parent, node)
+    if node.tagName == 'object_ref':
+        ref = node.getAttribute('ref')
         refElem = FindResource(ref)
         if refElem: cls = refElem.getAttribute('class')
-        else: return xxxUnknown(parent, element)
+        else: return xxxUnknown(parent, node)
     else:
         refElem = None
-        cls = element.getAttribute('class')
+        cls = node.getAttribute('class')
     try:
         klass = xxxDict[cls]
     except KeyError:
         # If we encounter a weird class, use unknown template
-        print 'WARNING: unsupported class:', element.getAttribute('class')
+        print 'WARNING: unsupported class:', node.getAttribute('class')
         klass = xxxUnknown
-    return klass(parent, element, refElem)
+    return klass(parent, node, refElem)
 
 # Make empty DOM element
 def MakeEmptyDOM(className):
@@ -1039,7 +1200,8 @@ def MakeEmptyDOM(className):
 def MakeEmptyXXX(parent, className):
     # Make corresponding DOM object first
     elem = MakeEmptyDOM(className)
-    # If parent is a sizer, we should create sizeritem object, except for spacers
+    # Special handling, e.g. if parent is a sizer, we should create
+    # sizeritem object, except for spacers, etc.
     if parent:
         if parent.isSizer and className != 'spacer':
             sizerItemElem = MakeEmptyDOM(parent.itemTag)
@@ -1058,7 +1220,16 @@ def MakeEmptyXXX(parent, className):
             pageElem.appendChild(elem)
             elem = pageElem
     # Now just make object
-    return MakeXXXFromDOM(parent, elem)
+    xxx = MakeXXXFromDOM(parent, elem)
+    # Special defaults for new panels and controls
+    if isinstance(xxx, xxxSizerItem):
+        if isinstance(xxx.child, xxxContainer) and not xxx.child.isSizer:
+            for param,v in xxxSizerItem.defaults_panel.items():
+                xxx.set(param, v)
+        elif isinstance(xxx.child, xxxObject):
+            for param,v in xxxSizerItem.defaults_control.items():
+                xxx.set(param, v)
+    return xxx            
 
 # Make empty DOM element for reference
 def MakeEmptyRefDOM(ref):
@@ -1089,5 +1260,21 @@ def MakeEmptyRefXXX(parent, ref):
             pageElem.appendChild(elem)
             elem = pageElem
     # Now just make object
-    return MakeXXXFromDOM(parent, elem)
+    xxx = MakeXXXFromDOM(parent, elem)
+    # Label is not used for references
+    xxx.allParams = xxx.allParams[:]
+    #xxx.allParams.remove('label')
+    return xxx
+
+# Make empty comment node
+def MakeEmptyCommentDOM():
+    node = g.tree.dom.createComment('')
+    return node
+
+# Make empty xxxComment
+def MakeEmptyCommentXXX(parent):
+    node = MakeEmptyCommentDOM()
+    # Now just make object
+    xxx = MakeXXXFromDOM(parent, node)
+    return xxx
 
diff --git a/wxPython/wx/tools/helpviewer.py b/wxPython/wx/tools/helpviewer.py
index b025eccce1..48fe6ef5c5 100644
--- a/wxPython/wx/tools/helpviewer.py
+++ b/wxPython/wx/tools/helpviewer.py
@@ -1,5 +1,5 @@
 #----------------------------------------------------------------------
-# Name:        wxPython.tools.helpviewer
+# Name:        wx.tools.helpviewer
 # Purpose:     HTML Help viewer
 #
 # Author:      Robin Dunn
@@ -26,6 +26,12 @@ import sys, os
 
 #---------------------------------------------------------------------------
 
+def makeOtherFrame(helpctrl):
+    import wx
+    parent = helpctrl.GetFrame()
+    otherFrame = wx.Frame(parent)
+    
+
 def main(args=sys.argv):
     if len(args) < 2:
         print __doc__
@@ -66,6 +72,14 @@ def main(args=sys.argv):
         print "Adding %s..." % helpfile
         helpctrl.AddBook(helpfile, 1)
 
+    # The frame used by the HtmlHelpController is set to not prevent
+    # app exit, so in the case of a standalone helpviewer like this
+    # when the about box or search box is closed the help frame will
+    # be the only one left and the app will close unexpectedly.  To
+    # work around this we'll create another frame that is never shown,
+    # but which will be closed when the helpviewer frame is closed.
+    wx.CallAfter(makeOtherFrame, helpctrl)
+
     # start it up!
     helpctrl.DisplayContents()
     app.MainLoop()
diff --git a/wxPython/wx/tools/img2py.py b/wxPython/wx/tools/img2py.py
index 71a6099b6d..5d9425054e 100644
--- a/wxPython/wx/tools/img2py.py
+++ b/wxPython/wx/tools/img2py.py
@@ -10,9 +10,12 @@
 #----------------------------------------------------------------------
 # 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o V2.5 compatability update 
 #
-
+# 2/25/2007 - Gianluca Costa (archimede86@katamail.com)
+#
+#
+# o V2.5 compatibility update 
+#
 
 """
 img2py.py  --  Convert an image to PNG format and embed it in a Python
@@ -38,10 +41,12 @@ Options:
                    fucntions, (getNameBitmap, etc.)
 
     -c             Maintain a catalog of names that can be used to reference
-                   images.  Catalog can be accessed via catalog and index attributes
-                   of the module.  If the -n <name> option is specified then <name>
+                   images.  Catalog can be accessed via catalog and 
+                   index attributes of the module.  
+                   If the -n <name> option is specified then <name>
                    is used for the catalog key and index value, otherwise
-                   the filename without any path or extension is used as the key.
+                   the filename without any path or extension is used 
+                   as the key.
 
     -a             This flag specifies that the python_file should be appended
                    to instead of overwritten.  This in combination with -n will
@@ -51,6 +56,9 @@ Options:
 
     -i             Also output a function to return the image as a wxIcon.
 
+
+You can also import this module from your Python scripts, and use its img2py()
+function. See its docstring for more info.
 """
 
 #
@@ -60,20 +68,30 @@ Options:
 #
 # 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
-# o V2.5 compatability update 
 #
-
+# 2/25/2007 - Gianluca Costa (archimede86@katamail.com)
+#        -Refactorization of the script-creation code in a specific "img2py()" function
+#        -Added regex parsing instead of module importing
+#        -Added some "try/finally" statements
+#        -Added default values as named constants
+#        -Made some parts of code a bit easier to read
+#        -Updated the module docstring
+#        -Corrected a bug with EmptyIcon
+#
+# o V2.5 compatibility update 
+#
 import  cPickle
 import  cStringIO
 import  getopt
 import  glob
 import  os
+import  os.path
 import  sys
 import  tempfile
 import  zlib
+import  re
 
 import  wx
-
 import  img2img
 
 
@@ -87,7 +105,7 @@ def crunch_data(data, compressed):
 
     # This next bit is borrowed from PIL.  It is used to wrap the text intelligently.
     fp = cStringIO.StringIO()
-    data = data + " "  # buffer for the +1 test
+    data += " "  # buffer for the +1 test
     c = i = 0
     word = ""
     octdigits = "01234567"
@@ -95,52 +113,198 @@ def crunch_data(data, compressed):
     while i < len(data):
         if data[i] != "\\":
             word = data[i]
-            i = i + 1
+            i += 1
         else:
             if data[i+1] in octdigits:
-                for n in range(2, 5):
+                for n in xrange(2, 5):
                     if data[i+n] not in octdigits:
                         break
                 word = data[i:i+n]
-                i = i + n
+                i += n
             elif data[i+1] == 'x':
-                for n in range(2, 5):
+                for n in xrange(2, 5):
                     if data[i+n] not in hexdigits:
                         break
                 word = data[i:i+n]
-                i = i + n
+                i += n
             else:
                 word = data[i:i+2]
-                i = i + 2
+                i += 2
 
         l = len(word)
         if c + l >= 78-1:
             fp.write("\\\n")
             c = 0
         fp.write(word)
-        c = c + l
+        c += l
 
     # return the formatted compressed data
     return fp.getvalue()
 
 
 app = None
+DEFAULT_APPEND = False
+DEFAULT_COMPRESSED = True
+DEFAULT_MASKCLR = None
+DEFAULT_IMGNAME = ""
+DEFAULT_ICON = False
+DEFAULT_CATALOG = False
+
+#THIS IS USED TO IDENTIFY, IN THE GENERATED SCRIPT, LINES IN THE FORM "index.append('Image name')"
+indexPattern = re.compile(r"\s*index.append\('(.+)'\)\s*")
+
+def img2py(image_file, python_file, append=DEFAULT_APPEND, compressed=DEFAULT_COMPRESSED, maskClr=DEFAULT_MASKCLR, imgName=DEFAULT_IMGNAME, icon=DEFAULT_ICON, catalog=DEFAULT_CATALOG):
+    """
+    Converts an image file to a data structure written in a Python file
+    --image_file: string; the path of the source image file
+    --python_file: string; the path of the destination python file
+    --other arguments: they are equivalent to the command-line arguments
+    """
+    global app
+    if not wx.GetApp():
+        app = wx.PySimpleApp()
+        
+    # convert the image file to a temporary file
+    tfname = tempfile.mktemp()
+    try:
+        ok, msg = img2img.convert(image_file, maskClr, None, tfname, wx.BITMAP_TYPE_PNG, ".png")
+        if not ok:
+            print msg
+            return
+            
+        data = open(tfname, "rb").read()
+        data = crunch_data(data, compressed)
+    finally:
+        if os.path.exists(tfname):
+            os.remove(tfname)
+    
+
+    old_index = []
+    if catalog and append:
+        # check to see if catalog exists already (file may have been created
+        # with an earlier version of img2py or without -c option)
+        pyPath, pyFile = os.path.split(python_file)
+        
+        append_catalog = True
+        
+        sourcePy = open(python_file, "r")
+        try:
+            for line in sourcePy:
+                
+                if line == "catalog = {}\n":
+                    append_catalog = False
+                else:
+                    lineMatcher = indexPattern.match(line)
+                    if lineMatcher:
+                        old_index.append(lineMatcher.groups()[0])
+        finally:
+            sourcePy.close()
+                    
+                    
+        if append_catalog:
+            out = open(python_file, "a")
+            try:
+                out.write("\n# ***************** Catalog starts here *******************")
+                out.write("\n\ncatalog = {}\n")
+                out.write("index = []\n\n")
+                out.write("class ImageClass: pass\n\n")
+            finally:
+                out.close()
+        
+        
+    
+    if append:
+        out = open(python_file, "a")
+    else:
+        out = open(python_file, "w")
+        
+    try:
+        if catalog:
+            imgPath, imgFile = os.path.split(image_file)
+    
+            if not imgName:
+                imgName = os.path.splitext(imgFile)[0]
+                print "\nWarning: -n not specified. Using filename (%s) for catalog entry." % imgName
+    
+        out.write("#" + "-" * 70 + "\n")
+        if not append:
+            out.write("# This file was generated by %s\n#\n" % sys.argv[0])
+            out.write("from wx import ImageFromStream, BitmapFromImage, EmptyIcon\n")        
+            if compressed:
+                out.write("import cStringIO, zlib\n\n\n")
+            else:
+                out.write("import cStringIO\n\n\n")
+    
+            if catalog:
+                out.write("catalog = {}\n")
+                out.write("index = []\n\n")
+                out.write("class ImageClass: pass\n\n")
+    
+        if compressed:
+            out.write("def get%sData():\n"
+                      "    return zlib.decompress(\n%s)\n\n"
+                      % (imgName, data))
+        else:
+            out.write("def get%sData():\n"
+                      "    return \\\n%s\n\n"
+                      % (imgName, data))
+    
+    
+        out.write("def get%sBitmap():\n"
+                  "    return BitmapFromImage(get%sImage())\n\n"
+                  "def get%sImage():\n"
+                  "    stream = cStringIO.StringIO(get%sData())\n"
+                  "    return ImageFromStream(stream)\n\n"
+                  % tuple([imgName] * 4))
+        if icon:
+            out.write("def get%sIcon():\n"
+                      "    icon = EmptyIcon()\n"
+                      "    icon.CopyFromBitmap(get%sBitmap())\n"
+                      "    return icon\n\n"
+                      % tuple([imgName] * 2))
+    
+        if catalog:
+            if imgName in old_index:
+                print "Warning: %s already in catalog." % imgName
+                print "         Only the last entry will be accessible.\n"
+            old_index.append(imgName)
+            out.write("index.append('%s')\n" % imgName)
+            out.write("catalog['%s'] = ImageClass()\n" % imgName)
+            out.write("catalog['%s'].getData = get%sData\n" % tuple([imgName] * 2))
+            out.write("catalog['%s'].getImage = get%sImage\n" % tuple([imgName] * 2))
+            out.write("catalog['%s'].getBitmap = get%sBitmap\n" % tuple([imgName] * 2))
+            if icon:
+                out.write("catalog['%s'].getIcon = get%sIcon\n" % tuple([imgName] * 2))
+            out.write("\n\n")
+    
+
+        if imgName:
+            n_msg = ' using "%s"' % imgName
+        else:
+            n_msg = ""        
+            
+        if maskClr:
+            m_msg = " with mask %s" % maskClr 
+        else:
+            m_msg = ""
+
+        print "Embedded %s%s into %s%s" % (image_file, n_msg, python_file, m_msg)
+    finally:
+        out.close()
+        
+
+    
 def main(args):
     if not args or ("-h" in args):
         print __doc__
         return
-
-    # some bitmap related things need to have a wxApp initialized...
-    if wx.GetApp() is None:
-        global app
-        app = wx.PySimpleApp()
-
-    append = 0
-    compressed = 1
-    maskClr = None
-    imgName = ""
-    icon = 0
-    catalog = 0
+        
+    append = DEFAULT_APPEND
+    compressed = DEFAULT_COMPRESSED
+    maskClr = DEFAULT_MASKCLR
+    imgName = DEFAULT_IMGNAME
+    icon = DEFAULT_ICON
+    catalog = DEFAULT_CATALOG
 
     try:
         opts, fileArgs = getopt.getopt(args, "auicn:m:")
@@ -150,131 +314,26 @@ def main(args):
 
     for opt, val in opts:
         if opt == "-a":
-            append = 1
+            append = True
         elif opt == "-u":
-            compressed = 0
+            compressed = False
         elif opt == "-n":
             imgName = val
         elif opt == "-m":
             maskClr = val
         elif opt == "-i":
-            icon = 1
+            icon = True
         elif opt == "-c":
-            catalog = 1
+            catalog = True
 
     if len(fileArgs) != 2:
         print __doc__
         return
 
     image_file, python_file = fileArgs
+    img2py(image_file, python_file, append, compressed, maskClr, imgName, icon, catalog)
+    
 
-    # convert the image file to a temporary file
-    tfname = tempfile.mktemp()
-    ok, msg = img2img.convert(image_file, maskClr, None, tfname, wx.BITMAP_TYPE_PNG, ".png")
-    if not ok:
-        print msg
-        return
-
-    data = open(tfname, "rb").read()
-    data = crunch_data(data, compressed)
-    os.unlink(tfname)
-
-    if append:
-        out = open(python_file, "a")
-    else:
-        out = open(python_file, "w")
-
-    if catalog:
-        pyPath, pyFile = os.path.split(python_file)
-        imgPath, imgFile = os.path.split(image_file)
-
-        if not imgName:
-            imgName = os.path.splitext(imgFile)[0]
-            print "\nWarning: -n not specified. Using filename (%s) for catalog entry." % imgName
-
-        old_index = []
-        if append:
-            # check to see if catalog exists already (file may have been created
-            # with an earlier version of img2py or without -c option)
-            oldSysPath = sys.path[:]
-            sys.path = [pyPath] # make sure we don't import something else by accident
-            mod = __import__(os.path.splitext(pyFile)[0])
-            if 'index' not in dir(mod):
-                print "\nWarning: %s was originally created without catalog." % python_file
-                print "         Any images already in file will not be cataloged.\n"
-                out.write("\n# ***************** Catalog starts here *******************")
-                out.write("\n\ncatalog = {}\n")
-                out.write("index = []\n\n")
-                out.write("class ImageClass: pass\n\n")
-            else: # save a copy of the old index so we can warn about duplicate names
-                old_index[:] = mod.index[:]
-            del mod
-            sys.path = oldSysPath[:]
-
-    out.write("#" + "-" * 70 + "\n")
-    if not append:
-        out.write("# This file was generated by %s\n#\n" % sys.argv[0])
-        out.write("from wx import ImageFromStream, BitmapFromImage\n")
-        if icon:
-            out.write("from wx import EmptyIcon\n")
-        if compressed:
-            out.write("import cStringIO, zlib\n\n\n")
-        else:
-            out.write("import cStringIO\n\n\n")
-
-        if catalog:
-            out.write("catalog = {}\n")
-            out.write("index = []\n\n")
-            out.write("class ImageClass: pass\n\n")
-
-    if compressed:
-        out.write("def get%sData():\n"
-                  "    return zlib.decompress(\n%s)\n\n"
-                  % (imgName, data))
-    else:
-        out.write("def get%sData():\n"
-                  "    return \\\n%s\n\n"
-                  % (imgName, data))
-
-
-    out.write("def get%sBitmap():\n"
-              "    return BitmapFromImage(get%sImage())\n\n"
-              "def get%sImage():\n"
-              "    stream = cStringIO.StringIO(get%sData())\n"
-              "    return ImageFromStream(stream)\n\n"
-              % tuple([imgName] * 4))
-    if icon:
-        out.write("def get%sIcon():\n"
-                  "    icon = EmptyIcon()\n"
-                  "    icon.CopyFromBitmap(get%sBitmap())\n"
-                  "    return icon\n\n"
-                  % tuple([imgName] * 2))
-
-    if catalog:
-        if imgName in old_index:
-            print "Warning: %s already in catalog." % imgName
-            print "         Only the last entry will be accessible.\n"
-        old_index.append(imgName)
-        out.write("index.append('%s')\n" % imgName)
-        out.write("catalog['%s'] = ImageClass()\n" % imgName)
-        out.write("catalog['%s'].getData = get%sData\n" % tuple([imgName] * 2))
-        out.write("catalog['%s'].getImage = get%sImage\n" % tuple([imgName] * 2))
-        out.write("catalog['%s'].getBitmap = get%sBitmap\n" % tuple([imgName] * 2))
-        if icon:
-            out.write("catalog['%s'].getIcon = get%sIcon\n" % tuple([imgName] * 2))
-        out.write("\n\n")
-
-    if imgName:
-        n_msg = ' using "%s"' % imgName
-    else:
-        n_msg = ""
-    if maskClr:
-        m_msg = " with mask %s" % maskClr
-    else:
-        m_msg = ""
-    print "Embedded %s%s into %s%s" % (image_file, n_msg, python_file, m_msg)
-
-
+    
 if __name__ == "__main__":
     main(sys.argv[1:])
-
diff --git a/wxPython/wx/tools/pywxrc.py b/wxPython/wx/tools/pywxrc.py
index 9093b2e125..459a07674a 100644
--- a/wxPython/wx/tools/pywxrc.py
+++ b/wxPython/wx/tools/pywxrc.py
@@ -89,12 +89,19 @@ class xrc%(windowName)s(wx.%(windowClass)s):
         pre.thisown = 0
         if hasattr(self, '_setOORInfo'):
             self._setOORInfo(self)
-        if hasattr(self, '_setCallbackInfo'):
-            self._setCallbackInfo(self, self.__class__)
 
         # Define variables for the menu items
 """
 
+    MENUBAR_CLASS_HEADER = """\
+class xrc%(windowName)s(wx.%(windowClass)s):
+    def __init__(self):
+        pre = get_resources().LoadMenuBar("%(windowName)s")
+        self.PostCreate(pre)
+        
+        # Define variables for the menu items
+"""
+
     CREATE_MENUITEM_VAR = """\
         self.%(widgetName)s = self.FindItemById(xrc.XRCID(\"%(widgetName)s\"))
 """
@@ -227,7 +234,9 @@ class XmlResourceCompiler:
             windowClass = re.sub("^wx", "", windowClass)
             windowName = topWindow.getAttribute("name")
             
-            if windowClass in ["Menu", "MenuItem"]:
+            if windowClass in ["MenuBar"]:
+                outputList.append(self.templates.MENUBAR_CLASS_HEADER % locals())
+            elif windowClass in ["Menu"]:
                 outputList.append(self.templates.MENU_CLASS_HEADER % locals())
             else:
                 outputList.append(self.templates.CLASS_HEADER % locals())
diff --git a/wxPython/wxPython/__init__.py b/wxPython/wxPython/__init__.py
index a984cd13e2..0b59d5bdc1 100644
--- a/wxPython/wxPython/__init__.py
+++ b/wxPython/wxPython/__init__.py
@@ -3,7 +3,7 @@
 import warnings
 warnings.warn(
     "The wxPython compatibility package is no longer automatically generated "
-    "or activly maintained.  Please switch to the wx package as soon as possible.",
+    "or actively maintained.  Please switch to the wx package as soon as possible.",
     DeprecationWarning, stacklevel=2)
 
 # We need to be able to import from the wx package, but there is also
diff --git a/wxPython/wxaddons/sized_controls.py b/wxPython/wxaddons/sized_controls.py
index 446249efe5..04d74c1fc7 100644
--- a/wxPython/wxaddons/sized_controls.py
+++ b/wxPython/wxaddons/sized_controls.py
@@ -576,4 +576,4 @@ class SizedFrame(wx.Frame):
         self.SetAutoLayout(True)
         
     def GetContentsPane(self):
-        return self.mainPanel
\ No newline at end of file
+        return self.mainPanel
diff --git a/wxX11.spec b/wxX11.spec
index 218ef93c1b..839294e25b 100644
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -1,7 +1,7 @@
 %define pref /usr
-%define ver  2.8.1
+%define ver  2.8.4
 %define ver2 2.8
-%define rel  1
+%define rel  4
 
 # Configurable settings (use --with(out) unicode on rpmbuild cmd line):
 %define unicode 0